1
0
forked from 0ad/0ad
Commit Graph

3272 Commits

Author SHA1 Message Date
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
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
7120014451 This was SVN commit r8477. 2010-10-27 06:22:29 +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
9de72d1d19 Fix internal icons too
This was SVN commit r8441.
2010-10-22 23:28:57 +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
aade0de3b4 This was SVN commit r8420. 2010-10-21 09:00:30 +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
2cd62a04d2 This was SVN commit r8418. 2010-10-21 08:24:00 +00:00
c34aa82c5d This was SVN commit r8417. 2010-10-21 08:23:31 +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
ceb5dd1dfd Wood texture looks less like chocolate cake.
This was SVN commit r8415.
2010-10-20 00:26:56 +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
c5045ecfa7 This was SVN commit r8413. 2010-10-17 21:27:24 +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
add040f7e1 Hide city phase indicator
This was SVN commit r8409.
2010-10-17 20:13:02 +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
43f2be44ba label
This was SVN commit r8405.
2010-10-17 18:57:51 +00:00
eca237647e Play victory/defeat music at appropriate times.
Stop ambient sounds when returning to main menu.

This was SVN commit r8404.
2010-10-17 18:30:36 +00:00
7b7e98ea7b Delete obsolete version of GUI files
This was SVN commit r8403.
2010-10-17 18:28:53 +00:00
c486e5cde0 Add victory/defeat music files
This was SVN commit r8402.
2010-10-17 18:28:23 +00:00
7fbc3c42b3 This was SVN commit r8398. 2010-10-17 03:04:02 +00:00
fffece9128 map tweaks.
This was SVN commit r8397.
2010-10-17 02:40:51 +00:00