Commit Graph

7368 Commits

Author SHA1 Message Date
58b33af168 Support X mouse buttons on Windows
This was SVN commit r8591.
2010-11-13 19:51:15 +00:00
10820ae3f8 Add a map for some resource testing
This was SVN commit r8590.
2010-11-13 19:16:16 +00:00
4100a13e0a # Add resource shuttling.
Add resource-carrying animations/props to an actor for testing.
Warn more quietly about invalid cursor names.

This was SVN commit r8589.
2010-11-13 19:15:29 +00:00
6325a1eafe Adjusting build times.
This was SVN commit r8588.
2010-11-13 06:27:00 +00:00
2b70b43086 Based selection groups off of a new tag which must contain a valid template name.
<SelectionGroupName>unit_template_name_b</SelectionGroupName>

This was SVN commit r8587.
2010-11-13 05:35:40 +00:00
af4c2c091d Removed stone_light. Adjusted the footprint of the field entity.
This was SVN commit r8586.
2010-11-13 04:19:09 +00:00
6c7f9f7b8d #Treasure objects.
This was SVN commit r8585.
2010-11-13 03:44:38 +00:00
513ff50926 Food treasures.
This was SVN commit r8584.
2010-11-13 02:57:04 +00:00
3cefbbe253 Modified UnitAI to respect diplomatic status of players, allies can no longer be attacked, and fixed some related bugs in player init
This was SVN commit r8583.
2010-11-13 02:36:53 +00:00
25cd781641 Support horizontal scroll wheels for camera rotation
This was SVN commit r8582.
2010-11-13 01:00:54 +00:00
e1aaedcc32 Alternate Persian emblems.
This was SVN commit r8581.
2010-11-13 00:35:18 +00:00
490574bc03 Emblems
This was SVN commit r8578.
2010-11-12 23:37:56 +00:00
36d7ef65a6 Treasure/Ruins tweaks and additions.
This was SVN commit r8577.
2010-11-12 22:31:19 +00:00
245f29b798 Summary screen. Closes #638.
This was SVN commit r8576.
2010-11-12 22:24:49 +00:00
6c3368886b Bigger Iberian emblem.
This was SVN commit r8575.
2010-11-12 19:05:30 +00:00
ff3c7b46f4 Added food.treasure, wood.treasure, stone.treasure, wood.ruins, stone.ruins
Added placeholder cursor for ruins
Added entities for testing these types

This was SVN commit r8574.
2010-11-12 18:58:33 +00:00
52ad8a836d New idle animation for the Greek archers.
Some updated faction emblems.

A new Metal portrait.

This was SVN commit r8573.
2010-11-12 05:33:12 +00:00
75eb6847af Shield tweaks.
This was SVN commit r8572.
2010-11-12 04:34:46 +00:00
f3c5a2383b #Some cool new treasure objects. Lots of map tweaks as well.
Added treasure gathering for ships. It would be cool to have
food.treasure, wood.treasure, and stone.treasure gathering types in
addition to the current metal.treasure.

This was SVN commit r8571.
2010-11-12 03:08:23 +00:00
6cb66b7ef1 Moved from Internal
This was SVN commit r8570.
2010-11-12 01:08:53 +00:00
1a1f7caee1 Moved to Public.
This was SVN commit r8569.
2010-11-12 01:08:17 +00:00
46bde9969e Made a "poleis" branch emblem sprite.
This was SVN commit r8568.
2010-11-11 19:50:06 +00:00
4dc5766273 New Celt emblem
This was SVN commit r8567.
2010-11-11 19:39:48 +00:00
c5f0b5d7be Hide the lower session panel if nothing is selected
This was SVN commit r8566.
2010-11-11 16:00:53 +00:00
83285504cb Disable RTTI in test project, for consistency
This was SVN commit r8565.
2010-11-10 15:26:29 +00:00
8494a5bc4c Moar tweaking.
This was SVN commit r8564.
2010-11-10 02:58:33 +00:00
0036f1ce9c Map tweaks.
This was SVN commit r8563.
2010-11-10 02:48:33 +00:00
f452c79e46 Fixed civ for Hellenic Buildings. Continued work on Belgian Bog.
This was SVN commit r8562.
2010-11-09 14:44:03 +00:00
7d26b8eefd Roman civ sprite
This was SVN commit r8561.
2010-11-08 23:52:44 +00:00
c03c2f0168 Fixed hoplite prop switching (heads) when gathering meat.
Tweaked maps.
New "Bog" map, w.i.p.
Tweaked ship health.

This was SVN commit r8560.
2010-11-08 23:40:45 +00:00
dde2cd38be Show Population Cost in unit training buttons
Show Population Bonus in unit construction buttons

This was SVN commit r8559.
2010-11-08 23:23:52 +00:00
6e74c53ee9 fix file/dir mode bits
fixes #648
also fix self-test on ICC 12

This was SVN commit r8558.
2010-11-08 15:02:05 +00:00
0517d41275 Removed extraneous cancel button from multiplayer setup dialogs
Adjusted the right side of the bottom panel in the session GUI
Renamed "dev console" to "dev overlay" in the chat message to be more
consistent

This was SVN commit r8557.
2010-11-08 14:49:40 +00:00
6935a03743 remove no-longer needed GLU dependency; avoids delay-load warning.
This was SVN commit r8555.
2010-11-08 10:42:34 +00:00
24f1a00190 avoid setting executable bit in files/dirs we create
thanks to fabio for reporting + a suggested fix.
fixes #648

This was SVN commit r8554.
2010-11-08 10:39:52 +00:00
6b4d5091b3 fixes from work: use ICC bswap intrinsics instead of fallbacks; update UNUSED2 to work with ICC; update mahaf for Win7
This was SVN commit r8553.
2010-11-08 10:01:12 +00:00
9c53fda749 Misc. art stuff.
This was SVN commit r8552.
2010-11-08 00:36:34 +00:00
85fc7cae52 Cleaning up the props.
This was SVN commit r8551.
2010-11-08 00:23:06 +00:00
323cda17c3 cleaning
This was SVN commit r8550.
2010-11-07 23:57:04 +00:00
ffa6c14a24 More cleaning.
This was SVN commit r8549.
2010-11-07 23:51:46 +00:00
a7059092cb cleaning
This was SVN commit r8548.
2010-11-07 23:40:48 +00:00
dafc0e6dbd This was SVN commit r8547. 2010-11-07 23:32:02 +00:00
e43eb0c18b # Various hotkey fixes and cleanups.
Support ctrl for removing entities from selection.
Move big screenshot hotkey to shift+F2.
Increase mouse wheel rotation speed.
Fix HotkeyIsPressed when a more specific hotkey was matched instead.
Support multiple hotkeys with the same binding.
Use hotkeys instead of raw key events in GUI.
Delete some obsolete hotkey definitions.
Remove unused broken EntitySelection toggle method.

This was SVN commit r8546.
2010-11-07 20:42:52 +00:00
a13836bd68 safely handle zero-sized XMB files ensuing from a crash while loading
fixes #662

This was SVN commit r8545.
2010-11-07 16:14:13 +00:00
644b9aedea # Add double-click and triple-click selection modes, based on patch by Christoph and evans.
Fixes #515.

This was SVN commit r8544.
2010-11-07 00:12:55 +00:00
f45c74c368 thread-safety fixes to debug.cpp - most functions were already reentrant, just CAS-ified the assert suppression flags.
(NB: the debug_filter stuff remains non-reentrant because it's usually
only called from main() or at least the main thread)
closes #654

This was SVN commit r8543.
2010-11-06 19:14:16 +00:00
3407983e98 remove no-longer needed (and non-reentrant) MICROLOG as per today's meeting
This was SVN commit r8542.
2010-11-06 19:11:40 +00:00
b4d6ad9f0b Template fixes and tweaks. Gave ships larger Health bars. Fixed some range things with ranged units.
This was SVN commit r8541.
2010-11-06 18:45:42 +00:00
43665f09c5 Fixed some template stuff.
This was SVN commit r8540.
2010-11-06 17:52:30 +00:00
741477926c Make the minimap fit completely inside the border when in circular mode (to prevent units from sneaking around behind the rim)
This was SVN commit r8539.
2010-11-06 02:13:40 +00:00