1
0
forked from 0ad/0ad
Commit Graph

358 Commits

Author SHA1 Message Date
04dc0c2d3c Moved "civs" json files to Public because we are releasing a few of the other civs' units as a teaser.
Lots of unit and map tweaks. Names, stats, civs, etc.

Made the civ icons at the top of the screen 96 pixels instead of 64
pixels just to see if people like them. They are easily changed back to
64 pixels if unsatisfactory.

This was SVN commit r9296.
2011-04-22 03:51:18 +00:00
712eda131d Random map tweaks for better, faster resource placement.
Moves some constants to rmgen library.

This was SVN commit r9291.
2011-04-21 14:13:13 +00:00
87d97000e3 Some nice updates to the Death Canyon map (I think this should be the next 'default' map for Alpha V).
Updated the name for the Roman legions.

Fixed footprint for Iberian Fortress.

This was SVN commit r9274.
2011-04-16 06:32:37 +00:00
b4503bb61e Simplifies random map output, see #782.
Changes random maps to XZ coordinates, matching the engine.
More documentation for rmgen library.

This was SVN commit r9271.
2011-04-16 04:04:06 +00:00
3adba8721a Some map updates
This was SVN commit r9270.
2011-04-16 03:49:43 +00:00
ac81892517 Replaced Greeks with Iberians.
This was SVN commit r9268.
2011-04-16 00:11:18 +00:00
d445e9eb35 Fixed a mistake
This was SVN commit r9266.
2011-04-15 22:50:39 +00:00
9b227e4626 Added Iberians and Celts to the Serengeti map.
This was SVN commit r9265.
2011-04-15 22:39:42 +00:00
a627f4a34e tweaked lighting
This was SVN commit r9245.
2011-04-13 22:41:30 +00:00
216e09afdd Map tweaks.
This was SVN commit r9230.
2011-04-12 07:55:57 +00:00
942a45372c Random maps generated in their own thread, loading GUI is updated with progress.
Fixes some bugs in game loader error handling.

This was SVN commit r9220.
2011-04-10 05:31:18 +00:00
fe51c90cf5 This was SVN commit r9211. 2011-04-08 23:58:43 +00:00
d7fa62b3e6 Tweaks to map. Replaced some stone mines with some stone quarries. Gave a stone quarry to the Player 4 starting area, which erroneously had no stone before.
This was SVN commit r9210.
2011-04-08 23:52:33 +00:00
1b606ed276 This was SVN commit r9204. 2011-04-08 00:08:25 +00:00
98910972c6 This was SVN commit r9191. 2011-04-06 22:34:10 +00:00
8cb19ff1f3 Fixed civs
This was SVN commit r9176.
2011-04-06 00:13:47 +00:00
1956e2bd23 Map tweaks and new (work in progress) maps.
This was SVN commit r9173.
2011-04-05 23:45:51 +00:00
bbc5d4142e This was SVN commit r9135. 2011-03-31 04:45:06 +00:00
7d95b3bc62 Added Iberians to Gold Rush.
This was SVN commit r9134.
2011-03-31 02:23:40 +00:00
98fa860199 Adjusting lighting.
This was SVN commit r9131.
2011-03-30 13:57:37 +00:00
044eaaccf3 Messing with the new lighting.
This was SVN commit r9130.
2011-03-30 13:34:05 +00:00
0dfc72bc2c Fixes filter behavior in setup when switching map type.
Fixes broken texture in Latium rms.
Adds demo keyword to rms test.
Fixes default rms lighting with new model.

This was SVN commit r9127.
2011-03-27 22:00:49 +00:00
d295dacb9b # Add new renderer mode based on GL_ARB_fragment_program.
Change lighting model for new maps to allow better overbrightness.
Cache player colours instead of loading from scripts every time the
renderer wants them.

This was SVN commit r9123.
2011-03-26 20:17:21 +00:00
0b8e3b3adf Fixes rounding error on Latium map, would break with odd number of players. Fixes #761.
This was SVN commit r9113.
2011-03-23 20:25:46 +00:00
8f658ee81d Change remaining scenarios with "rome" civ. Fixes #758.
This was SVN commit r9112.
2011-03-23 20:16:10 +00:00
f618605477 Changes default random map sizes.
Tweaks random map resources.
Adds support for circular maps to rmgen library.
Various fixes in map generator.
On Miletus map, change player 2 civ, as Romans are not fully implemented
(fixes #758)

This was SVN commit r9104.
2011-03-23 08:12:04 +00:00
c4cd85bb98 Build fixes
This was SVN commit r9100.
2011-03-22 18:46:39 +00:00
5565b9e898 Fixes bugs in Latium map script. Changes default environment settings for random maps, adds environment setters
This was SVN commit r9099.
2011-03-22 08:19:19 +00:00
0e0ed94926 Implements random map system, fixes #6.
Includes default library "rmgen" w/ API based on rmgen tool.
Modifies rmgen scripts Cantabrian Highlands, Neareastern Badlands, and
Latium.
Old map support dropped from MapReader.
Fixes a few bugs in existing game setup and initialization scripts.

This was SVN commit r9096.
2011-03-22 01:34:45 +00:00
a77c807e06 Simple bridge demo map
This was SVN commit r9043.
2011-03-07 22:31:00 +00:00
dd501b2a5a # Add initial basic player AI framework.
Support direct access to serializer streams, so serializers can be
nested.
Make component script "this.template" read-only.
Stop globally-subscribed component scripts receiving messages posted to
local components, to reduce out-of-sync risks.
Move pathfinder data out of entity template directory.
Fix GuiInterface deserialization.

This was SVN commit r8865.
2011-01-12 12:29:00 +00:00
78f2924f9c Changed default maps
This was SVN commit r8827.
2010-12-09 01:30:51 +00:00
2cfd3abf08 This was SVN commit r8818. 2010-12-08 19:16:49 +00:00
e710fd25b4 Minor tweaks to game setup layout: options are now properly aligned and "locked teams" defaults to yes (which is what they are). Fix team indices on one map.
This was SVN commit r8809.
2010-12-08 06:19:34 +00:00
4f67615774 Fixes #701
This was SVN commit r8804.
2010-12-06 21:27:35 +00:00
9714b5dd53 Keyword clean-ups
This was SVN commit r8801.
2010-12-06 04:34:26 +00:00
6a20743dc3 Add new Keywords tag to maps. Add map list filtering API to game setup. Add some default filters that use map keywords. Cleaned up client game setup a bit. Removed deprecated GUI utility functions.
This was SVN commit r8800.
2010-12-06 02:51:21 +00:00
01f699b62d Too much stuff to itemize. I'm lazy.
This was SVN commit r8799.
2010-12-06 02:20:57 +00:00
15a663b91c New Iberian Walls
This was SVN commit r8794.
2010-12-05 13:30:04 +00:00
62dae2279b Updated the map.
This was SVN commit r8793.
2010-12-05 12:10:03 +00:00
1de0ce051f This was SVN commit r8783. 2010-12-04 00:12:51 +00:00
6662195f66 New desert plants! Updated Death Canyon with the new plants.
This was SVN commit r8779.
2010-12-03 21:33:45 +00:00
f9fb602445 Iberian sail.
This was SVN commit r8759.
2010-12-01 18:29:24 +00:00
85d093eae1 Made a garrison flag. Added it to the Greek Civic Centre and scout Tower for testing.
This was SVN commit r8758.
2010-12-01 10:40:25 +00:00
1a1bed1294 This was SVN commit r8755. 2010-11-30 16:16:53 +00:00
3401672887 Update pathfinding demo map for testing.
This was SVN commit r8750.
2010-11-30 12:28:51 +00:00
75d6eec95d This was SVN commit r8738. 2010-11-29 08:36:35 +00:00
8019ee8b5f This was SVN commit r8733. 2010-11-28 16:08:58 +00:00
1f02df5abc Moved some things. Deleted other things. Updated a few maps.
This was SVN commit r8726.
2010-11-28 09:15:26 +00:00
3de4ed7649 Added decals to the Greek buildings.
Updated Saharan Oases.
New "underbrush" object.

This was SVN commit r8721.
2010-11-28 06:46:45 +00:00
c1cc8d3a19 Updating the Cycladic Archipelago map.
This was SVN commit r8712.
2010-11-27 12:37:23 +00:00
ddd2f2a193 Made Units Demo map bigger to accommodate all the entities.
This was SVN commit r8697.
2010-11-26 10:39:56 +00:00
cc3d9de386 New berry bushes. Finished Cycladic Archipelago.
This was SVN commit r8695.
2010-11-26 07:08:18 +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
e971c85da5 map tweaks
This was SVN commit r8660.
2010-11-20 11:50:06 +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
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
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
ccca9554c6 #Update for Saharan Oases.
This was SVN commit r8626.
2010-11-16 00:36:23 +00:00
4328476b67 Actors variations for shuttling.
This was SVN commit r8619.
2010-11-15 03:48:28 +00:00
bfbd47ffec Fix initial unit separation in combat demo map
This was SVN commit r8612.
2010-11-15 00:34:34 +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
10820ae3f8 Add a map for some resource testing
This was SVN commit r8590.
2010-11-13 19:16:16 +00:00
6c7f9f7b8d #Treasure objects.
This was SVN commit r8585.
2010-11-13 03:44:38 +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
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
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
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
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
947ce01f68 Got rid of the whale entities giving an error.
This was SVN commit r8522.
2010-11-02 16:21:51 +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
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
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
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
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
7d7127a1bb Scaled down the Roman Quinquereme.
This was SVN commit r8474.
2010-10-26 16:21:51 +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
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
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
6d0e59c0a3 Fixed ownership of some trees.
This was SVN commit r8447.
2010-10-23 08:31:00 +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
c5045ecfa7 This was SVN commit r8413. 2010-10-17 21:27:24 +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
fffece9128 map tweaks.
This was SVN commit r8397.
2010-10-17 02:40:51 +00:00
9ccff5d5d6 Fishing boats fixed. Edited fishing demo map.
This was SVN commit r8389.
2010-10-17 00:29:52 +00:00
46efdbbb45 Made roadway wider on Massacre map. Tweaked forces on Combat_Demo map.
This was SVN commit r8387.
2010-10-16 23:36:47 +00:00
76e96a83c5 A new Combat Demo iteration. Tweaked Boudicca's hair color. lol
This was SVN commit r8386.
2010-10-16 23:13:51 +00:00
556a40ff08 Fix JSON parse error in maps
This was SVN commit r8385.
2010-10-16 23:07:40 +00:00
1e53fa2e27 deleted the Mountain pass map.
This was SVN commit r8383.
2010-10-16 22:31:22 +00:00
db2b7ed62b This was SVN commit r8374. 2010-10-16 03:08:27 +00:00
6ebd688589 Added descriptions to some maps.
This was SVN commit r8373.
2010-10-16 02:28:44 +00:00
fbe809287c This was SVN commit r8366. 2010-10-15 08:53:00 +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
f41434e3f6 This was SVN commit r8340. 2010-10-13 00:39:04 +00:00
9e71973135 This was SVN commit r8339. 2010-10-12 06:11:19 +00:00
be6aab1f93 Added description to Macedonia map. Completely changed the Gold Rush map. It will be a lot cooler. Will complete it before the weekend.
This was SVN commit r8338.
2010-10-12 05:23:10 +00:00
4af13e4ce1 This was SVN commit r8330. 2010-10-11 15:27:39 +00:00
0b51957faf This was SVN commit r8327. 2010-10-10 21:27:43 +00:00
0b418f887b This was SVN commit r8325. 2010-10-10 17:40:33 +00:00
43b110a43b Final 3 waypoint flags.
This was SVN commit r8308.
2010-10-08 04:54:23 +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
e2bbdd2448 This was SVN commit r8281. 2010-10-05 05:36:07 +00:00
adefbc7b23 This was SVN commit r8279. 2010-10-05 02:29:09 +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
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
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
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
81788eb55d #New Celt Barracks.
This was SVN commit r8214.
2010-09-30 03:16:15 +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
e981380f33 This was SVN commit r8199. 2010-09-28 09:59:44 +00:00
ec36a942e1 Fixed some stone mines from Player 1 to Gaia.
This was SVN commit r8197.
2010-09-28 09:04:29 +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
d7801ea211 New Celt kennel and tavern.
This was SVN commit r8193.
2010-09-27 09:05:03 +00:00
d59b9c2298 This was SVN commit r8192. 2010-09-27 04:30:31 +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
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
0974a06321 #New Celtic Corral and Greek Wall Gate.
This was SVN commit r8179.
2010-09-25 09:54:09 +00:00
12de784e3f Texture tweaks. Animation tweaks. Building entity tweaks.
This was SVN commit r8178.
2010-09-25 05:24:07 +00:00
75f0fa87c0 Edited some Celtic and Greek unit animations and some entity stats (namely footprints and such). I probably missed some. In fact I am positive I did, so we'll have to keep tweaking these in the coming weeks. I made a new Mediterranean city tile texture too, so check it out.
This was SVN commit r8174.
2010-09-25 00:49:28 +00:00
7531cab8a6 Added lions to the map.
This was SVN commit r8168.
2010-09-23 23:34:58 +00:00
d0d879d3f6 Some new fallen columns eye candy.
This was SVN commit r8164.
2010-09-23 19:17:15 +00:00
924d1219a7 # Add fog-of-war.
Move Vision component to C++, for more efficient FoW processing.
Disable FoW on demo maps.

This was SVN commit r8160.
2010-09-23 12:13:13 +00:00
1caa4e7016 new date palm, wall foundations, map tweaks, and celtic longhouse.
This was SVN commit r8158.
2010-09-22 06:47:29 +00:00
6f69e02490 This was SVN commit r8155. 2010-09-22 03:55:26 +00:00
ac7a170f95 A wide open Savanna map, called 'Serengeti.' A savanna "city tile" terrain.
This was SVN commit r8154.
2010-09-22 03:51:36 +00:00
c5610cd111 Added a pebbly, rocky decal beneath the Savanna quarries. Tweaked the Mediterranean metal mine textures.
This was SVN commit r8152.
2010-09-22 02:02:34 +00:00