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
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
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
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
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
12bea99ea1
Fixed some purple blobs.
...
This was SVN commit r8482.
2010-10-28 06:19:50 +00:00
c5b5fa8e6f
Fixed the purple blobs.
...
This was SVN commit r8481.
2010-10-27 20:21:47 +00:00
6576b64ce0
Cleaning up the field entities.
...
This was SVN commit r8480.
2010-10-27 11:10:34 +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
09b2a4ade8
#Starting some work on Carthage.
...
This was SVN commit r8469.
2010-10-25 17:09:23 +00:00
b053bc846b
Fixed a stat error.
...
This was SVN commit r8468.
2010-10-25 12:18:28 +00:00
cb859d15da
This was SVN commit r8467.
2010-10-25 12:10:11 +00:00
6a024a86b9
Rudimentary ship stats.
...
This was SVN commit r8466.
2010-10-25 11:07:29 +00:00
ecf1e0556e
This was SVN commit r8465.
2010-10-25 10:26:58 +00:00
4deaa14456
added descriptions to maps.
...
This was SVN commit r8464.
2010-10-25 10:25:55 +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
b100ba5a08
Show a 1 when only a single unit remains garrisoned (re-fixes #610 )
...
This was SVN commit r8457.
2010-10-24 18:01:11 +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
ec27e78e60
Clear out the displayed garrison quantity number if no units are garrisoned
...
This was SVN commit r8454.
2010-10-24 01:32:35 +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
6d0e59c0a3
Fixed ownership of some trees.
...
This was SVN commit r8447.
2010-10-23 08:31:00 +00:00
a6925ded91
Moar animal portraits. Stock or CC where possible.
...
This was SVN commit r8446.
2010-10-23 07:58:33 +00:00
eb2e2c4244
Some updated portraits.
...
This was SVN commit r8445.
2010-10-23 07:49:31 +00:00
f6154b0d89
Temp portraits for public Roman units.
...
This was SVN commit r8443.
2010-10-23 01:28:35 +00:00
cf2ce4870e
This was SVN commit r8442.
2010-10-23 01:13:56 +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
e8000c7a90
This was SVN commit r8439.
2010-10-22 10:52:35 +00:00
9227eeb5ec
Block wall texture for giant Greek temple.
...
This was SVN commit r8438.
2010-10-22 10:10:43 +00:00
8ddb6f98a4
This was SVN commit r8437.
2010-10-22 10:06:10 +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
48121bcef6
Icon portraits at 128x128 please.
...
This was SVN commit r8432.
2010-10-21 23:09:44 +00:00
55741aed44
This was SVN commit r8427.
2010-10-21 15:11:26 +00:00
06b3457c5f
This was SVN commit r8426.
2010-10-21 10:24:25 +00:00
faacb80004
This was SVN commit r8425.
2010-10-21 10:20:56 +00:00
c78c16d607
two new portrait icons
...
This was SVN commit r8424.
2010-10-21 10:12:17 +00:00
d6720e00a4
Tweaked animation speeds for new Roman units.
...
This was SVN commit r8423.
2010-10-21 09:15:40 +00:00
fdb002a334
This was SVN commit r8422.
2010-10-21 09:04:06 +00:00
