1
0
forked from 0ad/0ad
Commit Graph

426 Commits

Author SHA1 Message Date
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
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
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
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
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
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
c1daf9a9bc This was SVN commit r8537. 2010-11-05 13:22:06 +00:00
c2bafa78cb A bunch of stuff.
This was SVN commit r8535.
2010-11-04 23:51:42 +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
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
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
62c90b5dc4 Fix tests
This was SVN commit r8504.
2010-10-31 00:29:29 +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
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
fcf9fbf10d Hacked in some ship ranged attacks to play with.
This was SVN commit r8492.
2010-10-29 22:18:25 +00:00
4b8fcaa135 Garrisoning for ships. This is only temporary for play-testing until final garrisoning code is implemented.
This was SVN commit r8489.
2010-10-29 20:14:09 +00:00
70cfff0f05 started work on Median Oasis. Fixed the fact that the Celtic special building cost zero (!) resources. A "slight" oversight.
This was SVN commit r8488.
2010-10-29 16:55:14 +00:00
8f532b81cd Fixed oasis map AGAIN. Fixed names of some units. Slave template.
This was SVN commit r8485.
2010-10-28 14:22:27 +00:00
af235da6f4 #Updated Greek trading ship with cargo. Split up 3 dozen UI icons into their individual files. Began testing an idea discussed in the irc chat room.
This was SVN commit r8483.
2010-10-28 12:22:04 +00:00
c6c1b2b549 This was SVN commit r8479. 2010-10-27 10:35:58 +00:00
93cd028616 Moar portrait stuff. Fixed the Persian Super Cavalry to align with the new Persian civ profile. Moved War Elephant to editor object.
This was SVN commit r8478.
2010-10-27 08:16:26 +00:00
5db9465b25 A bunch of new portraits. The hero portraits are just temp until they are painted.
This was SVN commit r8476.
2010-10-27 05:49:04 +00:00
45a99a393d New Greek merchant ship. Model is not final though.
This was SVN commit r8475.
2010-10-27 02:16:45 +00:00
7d7127a1bb Scaled down the Roman Quinquereme.
This was SVN commit r8474.
2010-10-26 16:21:51 +00:00
728e03cee2 This was SVN commit r8473. 2010-10-26 11:34:34 +00:00
64b9824d5a tweaks
This was SVN commit r8472.
2010-10-26 11:31:33 +00:00
f4b27e22b0 A bunch of new portraits. I fixed Waypoint Flag so that it floats on water. Edited Miletus map.
This was SVN commit r8471.
2010-10-26 09:46:05 +00:00
02aa8499ed Partial experimental version of circular maps
This was SVN commit r8470.
2010-10-25 21:59:52 +00:00
b053bc846b Fixed a stat error.
This was SVN commit r8468.
2010-10-25 12:18:28 +00:00
6a024a86b9 Rudimentary ship stats.
This was SVN commit r8466.
2010-10-25 11:07:29 +00:00
791c4f52fa Continued unit balancing. Edited actor projectiles animation times, etc.
This was SVN commit r8462.
2010-10-25 10:01:01 +00:00
504eb3b12b This was SVN commit r8461. 2010-10-25 04:29:15 +00:00
7492f458e0 Allow garrisoning of siege weapons in the Fortress
Civil Center can now hold 20 units
Temple can now garrison units (15)

This was SVN commit r8460.
2010-10-25 04:21:18 +00:00
b680e95e25 New epic Greek temple, primarily for eye candy. UV mapped by Amish.
This was SVN commit r8459.
2010-10-25 04:10:25 +00:00
6373c2cfcb Made GUI always visible
Adjusted size of icon buttons in the session GUI
Allowed support units to garrison in watch towers

This was SVN commit r8458.
2010-10-24 23:40:09 +00:00
2b2cac2a8d Fix tests
This was SVN commit r8456.
2010-10-24 12:37:55 +00:00
dcd7211d34 Re-exported Greek Civic Centre to remove some of the vases (seemed cluttered before), and to make player color more prominent. Gave ships farther vision.
This was SVN commit r8455.
2010-10-24 10:05:28 +00:00
3521c8f51e Made garrisoning based on the quantity of units, not the population cost of those units.
This was SVN commit r8453.
2010-10-24 01:14:34 +00:00
7f52ca875b Made Celtic heroes inherit from a specific type of hero, instead of a generic hero
This was SVN commit r8452.
2010-10-23 22:53:33 +00:00
0aaddf62aa Garrisoning for buildings based on patch by Evans (fixes #610)
This was SVN commit r8451.
2010-10-23 22:43:15 +00:00
f6154b0d89 Temp portraits for public Roman units.
This was SVN commit r8443.
2010-10-23 01:28:35 +00:00
24fb9cd313 Split unit icon sheets into individual textures, for easier editing
This was SVN commit r8440.
2010-10-22 23:27:42 +00:00
4a9292b2e3 This was SVN commit r8436. 2010-10-22 04:27:25 +00:00
c15d777762 #Editing stats for Super Cavalry and special Roman units.
This was SVN commit r8435.
2010-10-22 04:02:48 +00:00
eba84f32f6 Updating Super Infantry templates.
This was SVN commit r8434.
2010-10-22 02:32:03 +00:00
faacb80004 This was SVN commit r8425. 2010-10-21 10:20:56 +00:00
fdb002a334 This was SVN commit r8422. 2010-10-21 09:04:06 +00:00
5e84f57a04 Moved 3 special Roman units from Internal to Public (hopefully this will quell the calls for more Roman material for a while). Made 2 new Super Unit templates for ease of balancing (more of these later, and more on this later).
This was SVN commit r8419.
2010-10-21 08:56:42 +00:00
a99005976d Messing with stats. Made a roof tile texture for the giant Greek temple that will soon be coming.
This was SVN commit r8416.
2010-10-20 09:07:44 +00:00
4256055f58 #Brand new Celtic Market. Unit entity tweaks. Starting to re-balance units. New table and bench eyecandy objects.
This was SVN commit r8414.
2010-10-19 10:04:33 +00:00
38e2ebfee7 Give female citizens enough attack to get a chicken in one hit
This was SVN commit r8412.
2010-10-17 20:51:45 +00:00
0e09f952a0 chickens are now skittish. ;)
This was SVN commit r8411.
2010-10-17 20:36:24 +00:00
a0b1b5c4e1 chicken health reduced.
This was SVN commit r8410.
2010-10-17 20:33:15 +00:00
2a9cbe9a19 1. Re-exported the Celt fishing ship (was missing mast).
2. Re-exported Celt Wall (it was originally exported off-center). Added
some player color fiddly bits.

3. Fixed wall Foundation Actors.

4. Enabled building of fishing boats from docks
(template_structure_military_dock).

5. Nerfed javelinist and archer attack.

This was SVN commit r8408.
2010-10-17 20:05:04 +00:00
937769035a Only show formation icons for units
This was SVN commit r8407.
2010-10-17 20:01:18 +00:00
0a756380bf This was SVN commit r8396. 2010-10-17 02:37:31 +00:00
ecdb5740fe Temporarily using the old Celt Market actor until a new market is made.
This was SVN commit r8393.
2010-10-17 02:02:16 +00:00
b22e72d1d8 This was SVN commit r8392. 2010-10-17 01:50:05 +00:00
5617480db2 Renamed some objects.
This was SVN commit r8391.
2010-10-17 01:47:09 +00:00
7839fe4c2b Deleted old PMD files for Celt SB. Re-exported Celt SB in Collada, plus some tweaks and props for it. Re-did the Celt Civic Centre. Moved the "old/new" round CC to a special object called a Celtic Homestead.
This was SVN commit r8390.
2010-10-17 01:34:15 +00:00
9ccff5d5d6 Fishing boats fixed. Edited fishing demo map.
This was SVN commit r8389.
2010-10-17 00:29:52 +00:00
ae7af8ed4d New Greek fishing boat. There seems to be a problem with the entity though.
This was SVN commit r8388.
2010-10-17 00:07:44 +00:00
5ca46883e6 Limit training queue size
(Fixes #613)

This was SVN commit r8382.
2010-10-16 21:53:50 +00:00
1f4eb955ee Make fields and fences brown on the minimap
This was SVN commit r8381.
2010-10-16 21:03:58 +00:00
2188fd6507 Hunting added for females (they needed an attack value). Their hunting and unit behavior will need some work. Maybe for Alpha IV or something. Added treasure gathering to all units, specifically so that Heroes could gather treasures.
This was SVN commit r8380.
2010-10-16 20:59:37 +00:00
f3afa9c005 Improve obstruction shapes of some wall-related objects
This was SVN commit r8379.
2010-10-16 20:50:51 +00:00
ee8d49200a Fix formation movement loop when switching from column
This was SVN commit r8369.
2010-10-15 19:25:17 +00:00
71108ff458 #New Camel fauna.
This was SVN commit r8363.
2010-10-15 06:19:06 +00:00
7bbc19c791 testing making new, better looking pine trees. added a new "farmland" terrain texture. added the FIF tree as a fruit bearing tree. Added a jagged stone mine quarry for the Gold Rush map.
This was SVN commit r8360.
2010-10-15 04:29:08 +00:00
8edd28c43c Decal for Celt CC. New Celt Temple.
This was SVN commit r8355.
2010-10-14 19:54:08 +00:00
3cedddf60d Disable rank icons
This was SVN commit r8354.
2010-10-14 16:25:00 +00:00
fa9d51cbb1 This was SVN commit r8349. 2010-10-13 21:27:55 +00:00
888afbccb5 Made the war dog 1 pop. Fixed an attack range thing where the dog was unable to attack or hunt.
This was SVN commit r8345.
2010-10-13 19:28:52 +00:00
c1967848d2 # Fix units killing their own farms
This was SVN commit r8343.
2010-10-13 15:14:15 +00:00
2559496fdf A new stoa for the Greeks.
This was SVN commit r8341.
2010-10-13 00:40:25 +00:00
78c0312542 edited some Health for animals. (Elephants needed Health boost)
This was SVN commit r8337.
2010-10-12 04:46:48 +00:00
1013082de6 Footprint and Status bar height tweaks.
This was SVN commit r8336.
2010-10-12 04:41:34 +00:00
c99357c880 Tweaked cavalry footprints/obstruction to be consistent.
This was SVN commit r8335.
2010-10-12 04:11:12 +00:00
a37399b33b Fixed a few stats.
This was SVN commit r8328.
2010-10-10 22:17:49 +00:00
2399c283ce Removed unnecessary health component from fish which made fishing impossible
This was SVN commit r8318.
2010-10-09 19:39:20 +00:00
db9a2eecee Adjusted resource value of the Metal Mines.
This was SVN commit r8312.
2010-10-08 21:45:00 +00:00
43b110a43b Final 3 waypoint flags.
This was SVN commit r8308.
2010-10-08 04:54:23 +00:00
3f7941d5c2 Hide the health bar when a unit containing resources is killed
This was SVN commit r8307.
2010-10-07 22:41:48 +00:00
7ebf258033 Fix tests
This was SVN commit r8299.
2010-10-07 10:35:45 +00:00
368b07b04e # Add hunting (animals get killed before gathering meat from them)
This was SVN commit r8296.
2010-10-06 21:37:55 +00:00
f05e403ee5 This was SVN commit r8290. 2010-10-05 17:44:51 +00:00
5e197be0b4 This was SVN commit r8287. 2010-10-05 10:09:16 +00:00
e9d3bf05a8 This was SVN commit r8284. 2010-10-05 09:08:40 +00:00
9faedfbc90 Lots of art tweaks. Brand new Celtic Civic Centre.
This was SVN commit r8283.
2010-10-05 08:42:16 +00:00
adefbc7b23 This was SVN commit r8279. 2010-10-05 02:29:09 +00:00
9872cb17b8 Deselect units that disappear into fog-of-war.
Fixes #596.

This was SVN commit r8278.
2010-10-05 00:08:05 +00:00
f662e069b1 Tighten schema for ranks, to help detect errors
This was SVN commit r8277.
2010-10-05 00:07:15 +00:00
19066998c1 Show rank icon on selected units
This was SVN commit r8276.
2010-10-05 00:05:52 +00:00
ab77ec40e4 Fix highlighting of obstructed building placement previews.
Prevent building in non-visible areas.
Fixes #594.

This was SVN commit r8272.
2010-10-04 17:34:33 +00:00
2959cce0e8 Another "campaign" unit for people to play with in Atlas for Alpha II--The Theban Sacred Band.
This was SVN commit r8267.
2010-10-04 09:27:50 +00:00
ec681ce8a8 This was SVN commit r8266. 2010-10-04 07:00:44 +00:00
e8314783d9 New Celtic Dock. :) New Celtic waypoint banner.
This was SVN commit r8265.
2010-10-04 06:43:20 +00:00
f8853fe7b2 Touched up the waypoint textures. Continued work on Arcadia III. Tweak footprints for House and Barracks.
This was SVN commit r8263.
2010-10-04 05:23:19 +00:00
deadd4d31e Footprints.
This was SVN commit r8262.
2010-10-04 02:12:09 +00:00
cc0a680a21 Increase box/column formation switching distance
This was SVN commit r8257.
2010-10-03 23:20:21 +00:00
2cc6280d70 Fix OOS
This was SVN commit r8255.
2010-10-03 20:12:08 +00:00
59c8ecfa3d Use voices for infantry/cavalry units.
Make arrows quieter.
Handle order-related sounds via the GUI instead of simulation, to make
them player-specific and to reduce latency.

This was SVN commit r8254.
2010-10-03 17:58:49 +00:00
a47227daaa #New Celt Market
This was SVN commit r8252.
2010-10-03 09:24:26 +00:00
91a644df3c This was SVN commit r8251. 2010-10-03 02:51:36 +00:00
bf177d6a7d Messed with the sizes of the Health bars. See what everyone thinks.
This was SVN commit r8250.
2010-10-03 01:28:38 +00:00
9a0db9713e Add resource supply status bars.
Change bar size for buildings.
Only highlight one entity on mouse hover, and only if it's not a unit.
Display status bars on foundations.

This was SVN commit r8249.
2010-10-03 00:30:43 +00:00
1d32223e1a Tweaked the names of these units.
This was SVN commit r8248.
2010-10-02 23:54:31 +00:00
21a07af553 Messed with the GUI backgrounds to make them fit better. Starting a new Arcadia III map.
This was SVN commit r8247.
2010-10-02 23:46:09 +00:00
7412e5563a Switch to column formation when moving longer distances.
Increase minimum box formation width to 5.

This was SVN commit r8243.
2010-10-02 19:40:30 +00:00
7ea522a484 # Add on-screen health bars
This was SVN commit r8241.
2010-10-02 12:41:29 +00:00
fcedcae052 # Add victory/defeat conditions, based on patch from fcxSanya.
Fixes #565.

This was SVN commit r8234.
2010-10-01 20:51:21 +00:00
3e03a8ae10 #Re-exported Celtic Mill and Farmstead to Collada with some tweaks and additions. Can now delete their *.PMD meshes. Added a Celtic "hut" eye candy building.
This was SVN commit r8232.
2010-10-01 07:34:29 +00:00
138a937f6d This was SVN commit r8229. 2010-10-01 04:43:35 +00:00
3631c12337 This was SVN commit r8228. 2010-10-01 04:37:16 +00:00
91c5101e48 This was SVN commit r8226. 2010-10-01 04:23:35 +00:00
317abe51d4 Tweaked some templates. New 'heal' cursor for Healers (eventually). New 'command' icons for the GUI.
This was SVN commit r8225.
2010-10-01 02:36:08 +00:00
81788eb55d #New Celt Barracks.
This was SVN commit r8214.
2010-09-30 03:16:15 +00:00
0be4b5858f This was SVN commit r8212. 2010-09-29 11:41:25 +00:00
fadc725c4e Moar eye candy and an update the Arcadia II.
This was SVN commit r8211.
2010-09-29 08:56:09 +00:00
f15ed58ffb #Re-exported the Celtic house meshes to Collada format--added player color fiddly bits and increased their size about 20%. Re-exported the Celtic broch and added some cool stuff (!) to it.
This was SVN commit r8210.
2010-09-29 08:16:27 +00:00
8f979d3250 New foundation mesh and actor for the Corrals. Tweaked the corral entities for gameplay testing. Tweaked the fauna footprint radius.
This was SVN commit r8209.
2010-09-29 06:20:21 +00:00
e981380f33 This was SVN commit r8199. 2010-09-28 09:59:44 +00:00
abb0e3fcd2 Fixed icon.
This was SVN commit r8198.
2010-09-28 09:22:39 +00:00
e84c79c066 New GUI art assets. Brian please let me (Michael) know if things need changed or if you need more assets.
This was SVN commit r8195.
2010-09-28 08:02:06 +00:00
0ef9ec916c Tweaked foundation sizes.
This was SVN commit r8194.
2010-09-27 22:34:38 +00:00
d7801ea211 New Celt kennel and tavern.
This was SVN commit r8193.
2010-09-27 09:05:03 +00:00
85178ae88d I made the selection ring for the field a little bigger. Previously it was covered by the wheat objects.
This was SVN commit r8191.
2010-09-27 02:48:17 +00:00
9bdbc3906f A remodeled Greek gate. Changed the name of the Greek cavalry swordsman to the more accurate "Hippeus."
This was SVN commit r8189.
2010-09-26 09:27:16 +00:00
8c16820d5b Playing with LOS ranged of towers to make them useful to use.
This was SVN commit r8188.
2010-09-26 07:43:06 +00:00
28fe458c51 This was SVN commit r8187. 2010-09-26 07:04:09 +00:00
a4f7b7e530 Added the Spartan phalangite editor unit for Alpha II. Renamed the Greek temple from "Anaktoron" to "Naos" on the advice of a Greek scholar friend.
This was SVN commit r8186.
2010-09-26 04:59:50 +00:00
be92780300 Gave Celtic house a smaller foundation.
This was SVN commit r8184.
2010-09-26 01:20:25 +00:00
768f0728da Tweaks to some maps and entities. Added Celtic dog kennel for testing.
This was SVN commit r8183.
2010-09-26 01:18:29 +00:00
fa1dc05de2 New GUI layout
Delete confirmation dialog
Resource bar replaces resource quantity/icon
Selected units are grouped by type regardless of rank
Ranked units use the same icon
"Basic" units are now considered to have the rank of "Basic" for
grouping purposes

This was SVN commit r8180.
2010-09-25 15:22:41 +00:00
0974a06321 #New Celtic Corral and Greek Wall Gate.
This was SVN commit r8179.
2010-09-25 09:54:09 +00:00