1
0
forked from 0ad/0ad
Commit Graph

3420 Commits

Author SHA1 Message Date
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
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
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
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
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
e7b5f9eeb9 Allow up to 24 construction or training buttons
Add tooltip of generic name back to the unit name
Move civ name to player name tooltip
Make player name colored with the player color again

This was SVN commit r8538.
2010-11-06 01:55:29 +00:00
c1daf9a9bc This was SVN commit r8537. 2010-11-05 13:22:06 +00:00
4f4c19be85 new portraits
This was SVN commit r8536.
2010-11-05 13:17:30 +00:00
c2bafa78cb A bunch of stuff.
This was SVN commit r8535.
2010-11-04 23:51:42 +00:00
dbcd004844 Fix player assignments on map change (number of players may decrease, knocking assigned players out of a slot). Fixes #655
This was SVN commit r8534.
2010-11-04 20:34:29 +00:00
4a9ae1de17 Touched up Hellenised Egypt and Massacre of Delphi. Overhaul and completion of 'Median Oasis.' -- Check it out!
This was SVN commit r8533.
2010-11-04 20:30:13 +00:00
31f263d688 This was SVN commit r8532. 2010-11-04 01:07:00 +00:00
b3f2363c2d Altered the "generic name" of the Cretan Archer from "Infantry Archer" to "Mercenary Infantry Archer" to emphasize the reason they cost only Metal.
This was SVN commit r8531.
2010-11-04 01:06:00 +00:00
3ebbd8a9ce tweaks on these buildings to make them buildable under certain circumstances.
This was SVN commit r8530.
2010-11-04 00:53:15 +00:00
0b48fc0484 Added costs to these buildings.
This was SVN commit r8529.
2010-11-03 23:42:41 +00:00
818ea52c3b Delete obsolete non-working i18n code
This was SVN commit r8527.
2010-11-03 17:52:07 +00:00
81f5e0ac5f Allow continuing playing when a client leaves a multiplayer game (fixes #620).
Fix multiplayer autostart.
Make NETTURN_LOG syntax differently ugly.

This was SVN commit r8525.
2010-11-03 00:21:52 +00:00
786279fb95 New minimap circle.
This was SVN commit r8524.
2010-11-02 17:08:50 +00:00
2186ac8e76 Tweaked blank giant map in Internal folder. Updated a few Mediterranean terrains. A Creative Commons object. A generic Gaia "field" object. Humpback Whale.
This was SVN commit r8523.
2010-11-02 16:26:06 +00:00
947ce01f68 Got rid of the whale entities giving an error.
This was SVN commit r8522.
2010-11-02 16:21:51 +00:00
1b9f198520 Deleted the whale. It is an interesting experiment whose time has not come yet (needs some new attack code for units and possibly unitAI for attacking units).
This was SVN commit r8519.
2010-11-01 16:29:05 +00:00
6351102705 trying to create a 'whale' object that moves around and must be killed first (probably by warships). Then fishing boats can gather from it. I get an error though when I try to place it in Atlas. Can someone take a look at it for me? <3
This was SVN commit r8518.
2010-11-01 15:22:43 +00:00
5d764f1435 Run network server in a separate thread, to minimise latency.
Make some parts of logger and console thread-safe.
Simplify console: remove special commands; remove prefix for script
commands.
Remove LOG_ONCE, to simplify logger.
Change some code to use the new logger interface.
Fix OOS when revealing map.
Clean up some formatting.

This was SVN commit r8511.
2010-10-31 22:00:28 +00:00
5b1f0b2b19 Tweaked the map description.
This was SVN commit r8509.
2010-10-31 18:47:51 +00:00
909d9d84cb Work in progress--Acropolis 256 Radius map.
This was SVN commit r8508.
2010-10-31 18:33:02 +00:00
94a57d141a This was SVN commit r8507. 2010-10-31 15:17:27 +00:00
491f4592a7 This was SVN commit r8506. 2010-10-31 15:00:28 +00:00
62c90b5dc4 Fix tests
This was SVN commit r8504.
2010-10-31 00:29:29 +00:00
a952767f48 Changed the disabled state messages for some menu buttons, they were a bit rough for a public release imho
This was SVN commit r8503.
2010-10-31 00:16:33 +00:00
1840bb3507 Stop units walking outside the edges of circular maps.
Switch the GUI between square/circular minimap automatically.

This was SVN commit r8500.
2010-10-30 18:25:34 +00:00
21b0504ca5 Adding the missing player_defaults.json for #590
This was SVN commit r8499.
2010-10-30 18:07:31 +00:00
10c5dbcba4 Fix Atlas and autostart.
Fix non-POD in varargs.
Remove misleading max_players config variable (the engine doesn't care
about it, all the limits are hard-coded).
Remove civ-center-based player civ initialisation hack.
Add dummy player_defaults.json.
Clean up formatting a bit.

This was SVN commit r8498.
2010-10-30 13:27:23 +00:00
d6bf303740 Clean up line endings
This was SVN commit r8497.
2010-10-30 12:22:18 +00:00
5567727bd1 New maps get player data per #590, and some minor bugfixes
This was SVN commit r8496.
2010-10-30 05:19:55 +00:00
22672e69d9 Info icons for #590
This was SVN commit r8495.
2010-10-30 04:17:01 +00:00
9ee44bd9b8 Game setup changes, including showing name, civ, team, and some options loaded from the scenarios. Civ data added. Civ info window to preview civs. Icon tooltips. Support for random map implementation. Fixes #590.
This was SVN commit r8494.
2010-10-30 04:02:42 +00:00
0b978d5e26 hacked in the attack for Persian trireme too.
This was SVN commit r8493.
2010-10-29 22:20:20 +00:00
fcf9fbf10d Hacked in some ship ranged attacks to play with.
This was SVN commit r8492.
2010-10-29 22:18:25 +00:00
4f452eccde This was SVN commit r8490. 2010-10-29 20:14:37 +00:00