1
0
forked from 0ad/0ad
Commit Graph

403 Commits

Author SHA1 Message Date
f378a63d94 Add some tests for UnitAI.
Fix said tests for UnitAI.
Hopefully fix #647 too.
Document HFSM interface a bit.
Add Engine.DumpSimState() console command for debugging.

This was SVN commit r8681.
2010-11-22 20:12:04 +00:00
e4d356c3bf Map exploration counter for summary screen
This was SVN commit r8679.
2010-11-21 19:42:26 +00:00
333492b4a9 Add SetInterval to Timer.
Add tests for Timer.

This was SVN commit r8678.
2010-11-21 19:27:53 +00:00
fe5c7cb978 Buildings now target units randomly. Firing interval also made random
This was SVN commit r8677.
2010-11-21 18:41:13 +00:00
e7b859b8a5 Add allied victory condition to EndGameManager, defaults to true for now because we can't change teams, but later it can be changed during setup
This was SVN commit r8674.
2010-11-21 00:35:08 +00:00
7e41f6d664 Changed treasures gathering: now units will gather treasures immediately, rather than carry resources from treasures to dropsites.
This was SVN commit r8670.
2010-11-20 21:37:31 +00:00
17e580ec42 Rate adjustment.
This was SVN commit r8658.
2010-11-20 07:09:20 +00:00
ab8bb65611 Adjusting rates
This was SVN commit r8655.
2010-11-19 23:07:07 +00:00
f20a6dcfc8 Fixed bug where players would not initialize resource counts properly from scenario
This was SVN commit r8652.
2010-11-19 05:05:45 +00:00
bf295edda6 shooting fortresses
This was SVN commit r8646.
2010-11-18 06:16:43 +00:00
d8bc3635a2 Adjusted the desert stone.
Adjusted costs and other things for defensive structures.
Continued work on the Saharan Oases map.

This was SVN commit r8645.
2010-11-18 05:53:40 +00:00
12944d1fdc removed the Corinthian trireme entity (but not the actor).
This was SVN commit r8644.
2010-11-18 03:00:04 +00:00
ee86e13be6 Deleted some overlapping textures. Moved Roman and Persian ships from Internal to Public.
This was SVN commit r8641.
2010-11-17 23:51:04 +00:00
23cb21ada4 1st of the new Greek houses. A bunch of other stuff, trying to get projectiles to work with towers. I propped a Celtic jav dude into one of the Celt towers to test propping. First graphics (borders) for a new loading screen.
This was SVN commit r8640.
2010-11-17 21:30:00 +00:00
f1f1a44031 Made changes to BuildingAI based on Philip's comments
This was SVN commit r8639.
2010-11-17 18:25:00 +00:00
222095fa44 Added Building AI, and some small changes to GarrisonHolder
This was SVN commit r8636.
2010-11-17 07:30:25 +00:00
9c521ceb3b Add minimum range to range queries
This was SVN commit r8627.
2010-11-16 20:43:15 +00:00
efd0b14029 Make fishing ship not gather treasure
This was SVN commit r8624.
2010-11-15 21:25:22 +00:00
11cf570faf Fixed some ship problems. Edited cavalry.
This was SVN commit r8623.
2010-11-15 21:05:42 +00:00
70019ed81c Made civ centres more expensive.
This was SVN commit r8620.
2010-11-15 04:00:55 +00:00
c1c8f64f0d Move statistics from GuiInterface.GetSimulationState to GuiInterface.GetExtendedSimulationState
This was SVN commit r8603.
2010-11-14 19:09:13 +00:00
43a4667745 Tweaking treasures. Warships no longer gather treasures. Fishing and Merchant boats have greater capacities.
This was SVN commit r8601.
2010-11-14 05:50:30 +00:00
eab9f540af Hacked the dock to be a dropsite. Will probably need looked at further by a programmer duder.
This was SVN commit r8599.
2010-11-14 02:27:54 +00:00
cbbca4d3da Basket for shuttling grain.
This was SVN commit r8598.
2010-11-14 00:44:23 +00:00
acc229f367 new vase food.treasure. New vase meshes. A brontoburger slab.
This was SVN commit r8596.
2010-11-13 23:49:50 +00:00
8798b7671c Use separate mode when carrying meat.
Fix tests.

This was SVN commit r8594.
2010-11-13 21:39:39 +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
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