Commit Graph

3616 Commits

Author SHA1 Message Date
0d0af824e7 Treasures collected counter for summary screen
This was SVN commit r8690.
2010-11-25 18:01:23 +00:00
7820c51673 #New loading screen assets.
This was SVN commit r8688.
2010-11-25 06:51:01 +00:00
8fe513aba5 1) Added decals to some Iberian buildings. 2) New Greek house variations. 3) skeleton eyecandy thing.
This was SVN commit r8686.
2010-11-24 06:04:03 +00:00
8148987e59 Added the "cheering" idle animations to the Celt super infantryman so people can see the animations that we could use for capturing buildings and leveling-up.
Also added a skull eyecandy object. lol

This was SVN commit r8685.
2010-11-24 03:09:16 +00:00
5672275298 edited starting resources and teams.
This was SVN commit r8683.
2010-11-23 04:24:48 +00:00
180ab8a748 #New Celt ships.
Some new siege engines. Caution: They need a lot of work.

This was SVN commit r8682.
2010-11-23 02:54:38 +00:00
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
78ae72d87a Message to let players know formations don't work yet
This was SVN commit r8680.
2010-11-22 00:07:38 +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
e1fa9cd22b Show resource subtype in GUI if main type is treasure
This was SVN commit r8673.
2010-11-20 22:36:04 +00:00
68a63d62c8 Displaying civ icons on summary screen, moving "Civ centres built" and "Enemy civ centres destroyed" to new "Conquest" tab
This was SVN commit r8671.
2010-11-20 21:42:54 +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
ed5d91e71f blood
This was SVN commit r8668.
2010-11-20 21:09:11 +00:00
35e43e133b This was SVN commit r8667. 2010-11-20 21:06:28 +00:00
eeb9fc2145 Resized the Persian trireme a little.
This was SVN commit r8665.
2010-11-20 19:48:44 +00:00
fee8668887 PMDs can't use 'root' prop point, so I removed the blood prop.
This was SVN commit r8664.
2010-11-20 19:48:10 +00:00
c36fc2b8d7 Add script-based system for doing messy stuff based on system configuration.
Display warning for certain broken NVIDIA drivers.

This was SVN commit r8663.
2010-11-20 19:46:49 +00:00
2925ab4ce4 Ghosted version labels in session GUI
This was SVN commit r8662.
2010-11-20 17:40:54 +00:00
e971c85da5 map tweaks
This was SVN commit r8660.
2010-11-20 11:50:06 +00:00
c6491b1916 Added blood to animal deaths. Muahahahahahahaha.
This was SVN commit r8659.
2010-11-20 09:31:14 +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
a481209669 Updated the ship attacks map with the new ships.
This was SVN commit r8654.
2010-11-19 07:07:56 +00:00
d95a87a5c6 New islands man, work in progress.
This was SVN commit r8653.
2010-11-19 05:32:25 +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
f236fb7bd1 Fixed bug where gaia was not treated as attackable (fences could not be destroyed)
This was SVN commit r8651.
2010-11-18 23:25:42 +00:00
21acf61d69 This was SVN commit r8650. 2010-11-18 07:40:57 +00:00
ffd184fdd3 added name and description to map.
This was SVN commit r8649.
2010-11-18 07:09:29 +00:00
3d3720026a Updated Saharan Oases with some more starting treasures, teams, and lower starting resources.
This was SVN commit r8648.
2010-11-18 07:01:35 +00:00
aa9788a40e Fix team index bug in game setup GUI
This was SVN commit r8647.
2010-11-18 06:51:10 +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
1ea07fad83 Moved basket to the female's back.
This was SVN commit r8643.
2010-11-18 02:27:20 +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
bd3bd084c0 Support new SpiderMonkey API.
wposix: Define int8_t compatibly with SpiderMonkey.
Remove unused camera, lightenv JS interfaces.
Remove most of vector JS interface.
Remove some of the redundant JS string conversion functions.
Remove unneeded vmem, _lodBias functions.
Clean up some formatting.

This was SVN commit r8629.
2010-11-16 23:00:52 +00:00
9c521ceb3b Add minimum range to range queries
This was SVN commit r8627.
2010-11-16 20:43:15 +00:00
ccca9554c6 #Update for Saharan Oases.
This was SVN commit r8626.
2010-11-16 00:36:23 +00:00
b7e4b197f2 Fixed meat gathering props for the Celt spearman.
This was SVN commit r8625.
2010-11-15 21:28:45 +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
58a95ba95c fixed meat gathering animation
This was SVN commit r8621.
2010-11-15 05:11:39 +00:00
70019ed81c Made civ centres more expensive.
This was SVN commit r8620.
2010-11-15 04:00:55 +00:00
4328476b67 Actors variations for shuttling.
This was SVN commit r8619.
2010-11-15 03:48:28 +00:00
d65e47dda0 Properly center loaded resource text
Add attack stats to "armour" icon

This was SVN commit r8618.
2010-11-15 03:38:01 +00:00
ce085e7930 Prop point testing for the wall gate.
This was SVN commit r8617.
2010-11-15 02:21:27 +00:00
bfbd47ffec Fix initial unit separation in combat demo map
This was SVN commit r8612.
2010-11-15 00:34:34 +00:00
e68900e5c4 New metal and stone shuttling. Test out on 'Resources Demo' map. Use spearman and cavjav.
This was SVN commit r8611.
2010-11-15 00:18:03 +00:00
6b444ea23b Testing a wall gate to see if static prop points will work.
This was SVN commit r8609.
2010-11-14 22:33:02 +00:00
042972e298 Renamed "session_new" to "session"
This was SVN commit r8608.
2010-11-14 20:32:38 +00:00
b0e9f7197b Once more.
This was SVN commit r8607.
2010-11-14 19:57:48 +00:00
577aebe467 This was SVN commit r8606. 2010-11-14 19:27:14 +00:00
51e10e185e And again.
This was SVN commit r8605.
2010-11-14 19:16:37 +00:00
1fde5cd4c7 Again, with feeling.
This was SVN commit r8604.
2010-11-14 19:11:24 +00:00
c1c8f64f0d Move statistics from GuiInterface.GetSimulationState to GuiInterface.GetExtendedSimulationState
This was SVN commit r8603.
2010-11-14 19:09:13 +00:00
15327ac40b Added projectile dummy object to the hele Scout tower for evan.
This was SVN commit r8602.
2010-11-14 18:53:36 +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
90d7c0a54f #Another prop for resource shuttling.
This was SVN commit r8600.
2010-11-14 04:21:39 +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
62da7e1b37 The Celtic basic spearman now carries brontosaurus burgers when shuttling meat.
This was SVN commit r8597.
2010-11-14 00:10: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
74ed8cf464 Adjusted size of resource icons
This was SVN commit r8595.
2010-11-13 22:19:17 +00:00
8798b7671c Use separate mode when carrying meat.
Fix tests.

This was SVN commit r8594.
2010-11-13 21:39:39 +00:00
f4b0b72aa8 Fixed bug introduced by recent change to input.js: diplomacy is properly read to determine enemy players for attacking
This was SVN commit r8593.
2010-11-13 20:49:58 +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
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
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
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