1
0
forked from 0ad/0ad
Commit Graph

3332 Commits

Author SHA1 Message Date
ae7af8ed4d New Greek fishing boat. There seems to be a problem with the entity though.
This was SVN commit r8388.
2010-10-17 00:07:44 +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
5ca46883e6 Limit training queue size
(Fixes #613)

This was SVN commit r8382.
2010-10-16 21:53:50 +00:00
1f4eb955ee Make fields and fences brown on the minimap
This was SVN commit r8381.
2010-10-16 21:03:58 +00:00
2188fd6507 Hunting added for females (they needed an attack value). Their hunting and unit behavior will need some work. Maybe for Alpha IV or something. Added treasure gathering to all units, specifically so that Heroes could gather treasures.
This was SVN commit r8380.
2010-10-16 20:59:37 +00:00
f3afa9c005 Improve obstruction shapes of some wall-related objects
This was SVN commit r8379.
2010-10-16 20:50:51 +00:00
f4df65d7f1 Change default maps to newer ones
This was SVN commit r8378.
2010-10-16 20:49:29 +00:00
468816aaea Show chat message when the developer console is opened or closed. (For SHIFT-D hotkey)
This was SVN commit r8377.
2010-10-16 19:57:26 +00:00
86cb0db407 Fix chat input not getting cleared when ESC is pressed
Allow chat messages to be sent internally (bypass chat input box)
Show chat message when the developer console is opened or closed.
(moved dev console back to the right side)

This was SVN commit r8376.
2010-10-16 19:49:48 +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
ee8d49200a Fix formation movement loop when switching from column
This was SVN commit r8369.
2010-10-15 19:25:17 +00:00
eec07b3f85 Fix missing main menu music when S3TC warning is displayed, by removing archive builder from GUI startup.
This was SVN commit r8368.
2010-10-15 14:10:36 +00:00
835609df20 Change S3TC warning yet again, to point to a web page with more information. Also stop hard-coding the message.
This was SVN commit r8367.
2010-10-15 12:29:20 +00:00
fbe809287c This was SVN commit r8366. 2010-10-15 08:53:00 +00:00
86f0e0ba32 Re-exported the Gallic Fortress, with new player color tidbits and mesh fixes. Deleted 19 old PMD meshes.
This was SVN commit r8365.
2010-10-15 08:18:31 +00:00
5efa4ac15a This was SVN commit r8364. 2010-10-15 06:20:26 +00:00
71108ff458 #New Camel fauna.
This was SVN commit r8363.
2010-10-15 06:19:06 +00:00
8191e8d1dc This was SVN commit r8362. 2010-10-15 04:38:05 +00:00
c6f50be71b This was SVN commit r8361. 2010-10-15 04:37:42 +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
87782e3242 This was SVN commit r8359. 2010-10-15 03:42:13 +00:00
659515f89d Cleaning
This was SVN commit r8358.
2010-10-15 03:40:04 +00:00
5040068948 This was SVN commit r8357. 2010-10-15 01:35:30 +00:00
a1a7264aec Set force_s3tc_enable automatically for greater chance of compressed texture support on Linux (see #575).
This was SVN commit r8356.
2010-10-15 00:06:48 +00:00
8edd28c43c Decal for Celt CC. New Celt Temple.
This was SVN commit r8355.
2010-10-14 19:54:08 +00:00
3cedddf60d Disable rank icons
This was SVN commit r8354.
2010-10-14 16:25:00 +00:00
3fce7d86f3 Temporarily re-enable fake formations in GUI
This was SVN commit r8350.
2010-10-13 21:40:56 +00:00
fa9d51cbb1 This was SVN commit r8349. 2010-10-13 21:27:55 +00:00
0c61f34db1 Reference group count by name instead of templateName
This was SVN commit r8347.
2010-10-13 20:16:03 +00:00
bd3ffd2c6a Reworked EntityGroups
Moved selection size check into selection.js

This was SVN commit r8346.
2010-10-13 19:48:13 +00:00
888afbccb5 Made the war dog 1 pop. Fixed an attack range thing where the dog was unable to attack or hunt.
This was SVN commit r8345.
2010-10-13 19:28:52 +00:00
c1967848d2 # Fix units killing their own farms
This was SVN commit r8343.
2010-10-13 15:14:15 +00:00
8abfa5ec89 slight color tweak
This was SVN commit r8342.
2010-10-13 07:50:50 +00:00
2559496fdf A new stoa for the Greeks.
This was SVN commit r8341.
2010-10-13 00:40:25 +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
78c0312542 edited some Health for animals. (Elephants needed Health boost)
This was SVN commit r8337.
2010-10-12 04:46:48 +00:00
1013082de6 Footprint and Status bar height tweaks.
This was SVN commit r8336.
2010-10-12 04:41:34 +00:00
c99357c880 Tweaked cavalry footprints/obstruction to be consistent.
This was SVN commit r8335.
2010-10-12 04:11:12 +00:00
d08f6b7c46 This was SVN commit r8334. 2010-10-12 01:52:56 +00:00
e82ed0f7ae Beginning to add new single icons to the game. :)
This was SVN commit r8333.
2010-10-12 01:46:29 +00:00
9909675b68 Made EntityGroups more efficient
"Ability to add units to or remove from an already selected group of
units" based on patch by k776 (modified to avoid going over the max
selection size)
(Fixes #602)

This was SVN commit r8332.
2010-10-11 17:24:06 +00:00
1cdc8d1726 Warn about some obsolete documentation
This was SVN commit r8331.
2010-10-11 17:03:58 +00:00
4af13e4ce1 This was SVN commit r8330. 2010-10-11 15:27:39 +00:00
a37399b33b Fixed a few stats.
This was SVN commit r8328.
2010-10-10 22:17:49 +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
40eabf0441 This was SVN commit r8324. 2010-10-10 16:07:40 +00:00
96162bf2b4 This was SVN commit r8323. 2010-10-10 15:12:44 +00:00
3b38240d4f Make hoplites gather food from dead animals like other units do (instead of stabbing at them with spears).
This was SVN commit r8320.
2010-10-10 06:06:14 +00:00
2399c283ce Removed unnecessary health component from fish which made fishing impossible
This was SVN commit r8318.
2010-10-09 19:39:20 +00:00
184779e00e # Add "[", "]" keys to rotate buildings during placement, based on patch from k776.
Fixes #588.

This was SVN commit r8314.
2010-10-09 13:53:17 +00:00
db9a2eecee Adjusted resource value of the Metal Mines.
This was SVN commit r8312.
2010-10-08 21:45:00 +00:00
b62b316c56 Delete obsolete scripts
This was SVN commit r8311.
2010-10-08 16:58:06 +00:00
43b110a43b Final 3 waypoint flags.
This was SVN commit r8308.
2010-10-08 04:54:23 +00:00
3f7941d5c2 Hide the health bar when a unit containing resources is killed
This was SVN commit r8307.
2010-10-07 22:41:48 +00:00
5eedb07297 Fix selection of loading screen textures with pre-converted texture cache
This was SVN commit r8305.
2010-10-07 19:56:13 +00:00
ff983a7114 Remove obsolete file
This was SVN commit r8301.
2010-10-07 18:40:30 +00:00
0c170e2e01 Add test for NVTT bug
This was SVN commit r8300.
2010-10-07 10:56:38 +00:00
7ebf258033 Fix tests
This was SVN commit r8299.
2010-10-07 10:35:45 +00:00
368b07b04e # Add hunting (animals get killed before gathering meat from them)
This was SVN commit r8296.
2010-10-06 21:37:55 +00:00
69b2581ff0 Preparation for garrison code
This was SVN commit r8295.
2010-10-06 18:55:46 +00:00
1784c67c8b Changed background icon for total unit count
This was SVN commit r8294.
2010-10-06 05:25:30 +00:00
a4fad2a549 This was SVN commit r8293. 2010-10-06 05:17:12 +00:00
ca223eeb5b Made multiple unit selection health bar vertical again
Increased unit selection icons to 16
Added total unit count

This was SVN commit r8292.
2010-10-06 04:19:25 +00:00
ff8477c339 Made unit selection icons the same size as the formation icons
This was SVN commit r8291.
2010-10-05 22:44:32 +00:00
f05e403ee5 This was SVN commit r8290. 2010-10-05 17:44:51 +00:00
22920d34d9 This was SVN commit r8289. 2010-10-05 17:44:14 +00:00
5e197be0b4 This was SVN commit r8287. 2010-10-05 10:09:16 +00:00
3092691690 This was SVN commit r8286. 2010-10-05 09:13:40 +00:00
0baa84f6ab texture for Celt temple
This was SVN commit r8285.
2010-10-05 09:10:37 +00:00
e9d3bf05a8 This was SVN commit r8284. 2010-10-05 09:08:40 +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
759da20346 Some new wood textures.
This was SVN commit r8282.
2010-10-05 06:12:13 +00:00
e2bbdd2448 This was SVN commit r8281. 2010-10-05 05:36:07 +00:00
a399c2af03 Round roof for a Celt building.
This was SVN commit r8280.
2010-10-05 03:13:47 +00:00
adefbc7b23 This was SVN commit r8279. 2010-10-05 02:29:09 +00:00
9872cb17b8 Deselect units that disappear into fog-of-war.
Fixes #596.

This was SVN commit r8278.
2010-10-05 00:08:05 +00:00
f662e069b1 Tighten schema for ranks, to help detect errors
This was SVN commit r8277.
2010-10-05 00:07:15 +00:00
19066998c1 Show rank icon on selected units
This was SVN commit r8276.
2010-10-05 00:05:52 +00:00
bf77f61b0f This was SVN commit r8274. 2010-10-04 17:58:02 +00:00
ab77ec40e4 Fix highlighting of obstructed building placement previews.
Prevent building in non-visible areas.
Fixes #594.

This was SVN commit r8272.
2010-10-04 17:34:33 +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
ec681ce8a8 This was SVN commit r8266. 2010-10-04 07:00:44 +00:00
e8314783d9 New Celtic Dock. :) New Celtic waypoint banner.
This was SVN commit r8265.
2010-10-04 06:43:20 +00:00
bd17bc349e This was SVN commit r8264. 2010-10-04 06:36:00 +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
deadd4d31e Footprints.
This was SVN commit r8262.
2010-10-04 02:12:09 +00:00
50ed028dcb New way-point flag, including a new flag for possible faction-specific implementation. Persian and Greek versions complete so far.
This was SVN commit r8261.
2010-10-04 01:49:28 +00:00
47c9f8144c This was SVN commit r8260. 2010-10-04 00:11:07 +00:00
c146fe24ba sunset sky
This was SVN commit r8259.
2010-10-04 00:10:24 +00:00
b8bd93d22b Deleted the old 'temp' portrait sheets.
This was SVN commit r8258.
2010-10-03 23:42:02 +00:00
cc0a680a21 Increase box/column formation switching distance
This was SVN commit r8257.
2010-10-03 23:20:21 +00:00
eff766d6b9 Made ESC close out open dialogs rather than offer to close the game
Fixed the multiple unit health bar failing to work correctly
Changed multiple selection area to fit layout better.
Organized code

This was SVN commit r8256.
2010-10-03 22:42:15 +00:00
2cc6280d70 Fix OOS
This was SVN commit r8255.
2010-10-03 20:12:08 +00:00
59c8ecfa3d Use voices for infantry/cavalry units.
Make arrows quieter.
Handle order-related sounds via the GUI instead of simulation, to make
them player-specific and to reduce latency.

This was SVN commit r8254.
2010-10-03 17:58:49 +00:00
aa32677784 Restore highlighting of units on hover.
Optimise overlay code a bit.

This was SVN commit r8253.
2010-10-03 16:48:52 +00:00
a47227daaa #New Celt Market
This was SVN commit r8252.
2010-10-03 09:24:26 +00:00
91a644df3c This was SVN commit r8251. 2010-10-03 02:51:36 +00:00
bf177d6a7d Messed with the sizes of the Health bars. See what everyone thinks.
This was SVN commit r8250.
2010-10-03 01:28:38 +00:00
9a0db9713e Add resource supply status bars.
Change bar size for buildings.
Only highlight one entity on mouse hover, and only if it's not a unit.
Display status bars on foundations.

This was SVN commit r8249.
2010-10-03 00:30:43 +00:00
1d32223e1a Tweaked the names of these units.
This was SVN commit r8248.
2010-10-02 23:54:31 +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
f9b5bd37ca Removed button background from command icons
This was SVN commit r8246.
2010-10-02 23:24:13 +00:00
cd12571845 This was SVN commit r8245. 2010-10-02 22:32:39 +00:00
96f417ab3b Control-group icons.
This was SVN commit r8244.
2010-10-02 22:27:51 +00:00
7412e5563a Switch to column formation when moving longer distances.
Increase minimum box formation width to 5.

This was SVN commit r8243.
2010-10-02 19:40:30 +00:00
7ea522a484 # Add on-screen health bars
This was SVN commit r8241.
2010-10-02 12:41:29 +00:00
5e9a968bd6 This was SVN commit r8240. 2010-10-02 04:01:25 +00:00
4afcd057f6 Made lower panel sprites same scale
Adjusted vertical spacing of player and unit names.

This was SVN commit r8239.
2010-10-02 03:24:12 +00:00
3eb50d0763 command icons moved to a 32x32 cell grid. :)
This was SVN commit r8238.
2010-10-02 03:15:27 +00:00
d2f07800ed Fixed bug where resource bar sometimes covered the health bar
This was SVN commit r8237.
2010-10-01 22:29:55 +00:00
8a01e11db7 Health bar shows average for multiple selections
Center panel texture shrunk and dark tile texture is tiled over the
panels better
Command icons reference new sheet

This was SVN commit r8236.
2010-10-01 22:18:03 +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
4b3e819b67 Celt scout tower variation.
This was SVN commit r8233.
2010-10-01 09:13:34 +00:00
3e03a8ae10 #Re-exported Celtic Mill and Farmstead to Collada with some tweaks and additions. Can now delete their *.PMD meshes. Added a Celtic "hut" eye candy building.
This was SVN commit r8232.
2010-10-01 07:34:29 +00:00
607e176b9b This was SVN commit r8231. 2010-10-01 07:21:15 +00:00
9d923233ac This was SVN commit r8230. 2010-10-01 07:17:22 +00:00
138a937f6d This was SVN commit r8229. 2010-10-01 04:43:35 +00:00
3631c12337 This was SVN commit r8228. 2010-10-01 04:37:16 +00:00
71b469c115 New Celtic Outpost.
This was SVN commit r8227.
2010-10-01 04:24:39 +00:00
91c5101e48 This was SVN commit r8226. 2010-10-01 04:23:35 +00:00
317abe51d4 Tweaked some templates. New 'heal' cursor for Healers (eventually). New 'command' icons for the GUI.
This was SVN commit r8225.
2010-10-01 02:36:08 +00:00
009f0c035d This was SVN commit r8224. 2010-10-01 01:56:28 +00:00
53abdf4717 Fixed the size of the menu and civ icon sprites
This was SVN commit r8223.
2010-10-01 01:13:43 +00:00
f76d3da89a Redone faction emblems for UI ribbon. 64x64 now.
This was SVN commit r8222.
2010-10-01 01:01:11 +00:00
c49489dda5 This was SVN commit r8221. 2010-10-01 00:17:31 +00:00
20a87d1477 Toned down the yellow color of the gold UI borders.
This was SVN commit r8220.
2010-09-30 23:57:55 +00:00
b9ec3cbce3 This was SVN commit r8219. 2010-09-30 23:41:03 +00:00
729cf72d2b More GUI fixes. Specifically, making panel textures size appropriately in different resolutions.
Smaller panel image with less dark on the sides.

This was SVN commit r8217.
2010-09-30 23:01:24 +00:00
61fa8d29f6 Some more in-game GUI progress. Multiple selections now look more like the mockup, but all the stats icons and bars still reference the first unit. I will fix that part later.
This was SVN commit r8216.
2010-09-30 22:39:45 +00:00
ae2e61f90c This was SVN commit r8215. 2010-09-30 04:01:22 +00:00
81788eb55d #New Celt Barracks.
This was SVN commit r8214.
2010-09-30 03:16:15 +00:00
54142e5ee8 Some more progress towards Michael's GUI design.
This was SVN commit r8213.
2010-09-29 21:55:51 +00:00
0be4b5858f This was SVN commit r8212. 2010-09-29 11:41:25 +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
8f979d3250 New foundation mesh and actor for the Corrals. Tweaked the corral entities for gameplay testing. Tweaked the fauna footprint radius.
This was SVN commit r8209.
2010-09-29 06:20:21 +00:00
c9a2a97c25 Deleted cursor DDS files per Philip.
This was SVN commit r8208.
2010-09-28 21:20:46 +00:00
8035840fa8 hellenes portrait sheet in PNG
This was SVN commit r8207.
2010-09-28 21:07:11 +00:00
41819d3189 Moved notification area to rest on right side of lower panel.
(Hide right panel when not used)

This was SVN commit r8206.
2010-09-28 18:31:40 +00:00
4e897394dc Fixed some overlapping issues
Added menu hotkey

This was SVN commit r8205.
2010-09-28 18:15:11 +00:00
b2278e56a6 Fixed menu graphics
Misc consistency improvements
Added pause hotkey

This was SVN commit r8204.
2010-09-28 17:40:41 +00:00
ac11a5cf28 Fixed chat dialog graphics
This was SVN commit r8203.
2010-09-28 15:53:20 +00:00
93e81319e8 Added civ icon
Fixed Settings Dialog graphics

This was SVN commit r8202.
2010-09-28 14:58:14 +00:00