1
0
forked from 0ad/0ad
Commit Graph

451 Commits

Author SHA1 Message Date
ab620ee93a This was SVN commit r4404. 2006-09-28 00:34:45 +00:00
4e81f374d2 #A slew of new Mediterranean grass terrains.
This was SVN commit r4398.
2006-09-28 00:23:42 +00:00
7dececbc5f This was SVN commit r4397. 2006-09-28 00:22:44 +00:00
95b21acfec This was SVN commit r4396. 2006-09-27 20:28:33 +00:00
054cbaf644 This was SVN commit r4370. 2006-09-20 22:46:15 +00:00
0c0c0c1450 This was SVN commit r4369. 2006-09-20 22:16:15 +00:00
7f50e5b726 This was SVN commit r4368. 2006-09-20 22:15:17 +00:00
56670403ea This was SVN commit r4367. 2006-09-20 22:13:15 +00:00
acdf2efbc0 This was SVN commit r4365. 2006-09-20 21:51:51 +00:00
fa7320981c This was SVN commit r4364. 2006-09-20 21:44:24 +00:00
df36e3db0d #Artichoke Plants for Mediterranean Maps.
This was SVN commit r4360.
2006-09-20 21:39:46 +00:00
87598ebf40 This was SVN commit r4356. 2006-09-17 22:14:34 +00:00
ff5a9bb5c4 This was SVN commit r4355. 2006-09-17 22:14:16 +00:00
2774fd9167 This was SVN commit r4353. 2006-09-17 21:49:24 +00:00
b626abfda9 #New Oak tree leaf textures
This was SVN commit r4351.
2006-09-17 20:59:49 +00:00
58c159faa0 texture tweaks
This was SVN commit r4344.
2006-09-16 20:30:29 +00:00
d370aa226c This was SVN commit r4343. 2006-09-16 20:29:46 +00:00
bb649c2d4c This was SVN commit r4342. 2006-09-16 20:29:05 +00:00
99a3241616 This was SVN commit r4328. 2006-09-14 18:48:18 +00:00
2896d607c3 This was SVN commit r4276. 2006-09-01 05:39:27 +00:00
cbd76bb839 This was SVN commit r4275. 2006-09-01 05:38:52 +00:00
pyrolink
50e5e9acd9 # Aura and territory rendering
-Auras now take additional parameters from XML, containing a tag for r,
g, b, and a.  No line thickness parameter yet.
-For territories, added function to frustum for determining if line
segment passes through the frustum.

This was SVN commit r4242.
2006-08-25 06:04:33 +00:00
Dnas
afd3589f33 minor nit-picky fix to the right side of the helmet
This was SVN commit r4223.
2006-08-11 21:34:28 +00:00
f082b0a939 This was SVN commit r4220. 2006-08-11 20:12:54 +00:00
6473d68a1c A nice commit of new grasses, shields, and helmets
This was SVN commit r4219.
2006-08-10 22:47:30 +00:00
3f7e88931e This was SVN commit r4214. 2006-08-10 22:43:22 +00:00
e9226e48a6 This was SVN commit r4212. 2006-08-09 16:45:10 +00:00
964b79e11c #New Roman Elite Triarius unit.
This was SVN commit r4210.
2006-08-09 15:14:27 +00:00
1dd2196d30 This was SVN commit r4199. 2006-08-05 09:33:39 +00:00
6620322603 This was SVN commit r4198. 2006-08-05 09:30:18 +00:00
1f2a36bfdc This was SVN commit r4193. 2006-08-04 01:24:59 +00:00
1ff43562ec This was SVN commit r4192. 2006-08-03 00:14:18 +00:00
0415048114 This was SVN commit r4190. 2006-08-02 00:52:44 +00:00
ba14397b5f This was SVN commit r4189. 2006-08-02 00:52:00 +00:00
5b6505235e #A whole slew of brand new grass terrains for the Temperate Biome.
This was SVN commit r4188.
2006-08-01 06:21:25 +00:00
f76d0ffdc6 XML / JavaScript changes for new case-aware XMB format. Mostly deals with changing things like structciv to structCiv and subtype to subType, and ensuring parent is specified with Parent on all entities.
This was SVN commit r4185.
2006-08-01 03:29:10 +00:00
cddd4cab14 # Orchards, Fields, Plots, Corrals
# New farm terrain textures

Added, Damian's sounds
Updated the test map

This was SVN commit r4160.
2006-07-21 06:36:39 +00:00
Aeros
30b4a1936e This was SVN commit r4148. 2006-07-20 04:48:59 +00:00
8edaf70b1a # Roman Helmets, retextured and actorized
This was SVN commit r4118.
2006-07-15 03:59:59 +00:00
3608c1da4a #Roman Hastatus Basic, Advanced, and Elite textures completed. Also fixed the rome_isw_e entity with the correct parental properties.
This was SVN commit r4116.
2006-07-14 22:28:17 +00:00
1f92aa7b8f This was SVN commit r4102. 2006-07-13 21:25:54 +00:00
e2c0302ddf # Roman Helmets
This was SVN commit r4092.
2006-07-13 05:08:11 +00:00
66306b553a This was SVN commit r4064. 2006-07-04 07:49:25 +00:00
dd31fa8d6a This was SVN commit r4063. 2006-07-04 07:49:04 +00:00
7e73481a2c This was SVN commit r4062. 2006-07-04 07:47:14 +00:00
266ec3f09d This was SVN commit r4061. 2006-07-04 07:29:24 +00:00
7fc71ff1e2 This was SVN commit r4059. 2006-07-04 04:06:28 +00:00
7f1b7bd399 Basket texture; tech script. (I must have forgotten to re-add these when restoring the lost SVN revisions.)
This was SVN commit r4058.
2006-07-03 20:07:11 +00:00
b0600a9fd9 #New Hellenes Female Citizen
This was SVN commit r4056.
2006-07-03 00:59:59 +00:00
cf83617d07 This was SVN commit r4053. 2006-07-02 06:02:34 +00:00
Aeros
4b0c04a272 This was SVN commit r4044. 2006-06-26 20:48:45 +00:00
58a8ee13fe This was SVN commit r4032. 2006-06-25 04:32:46 +00:00
e9c9d47add This was SVN commit r4029. 2006-06-25 04:00:09 +00:00
861f078250 #More tweaks to the Hellenes unit-set.
This was SVN commit r4027.
2006-06-25 03:17:02 +00:00
863fa8c633 This was SVN commit r4025. 2006-06-25 00:23:44 +00:00
8de929fb03 #Tweaks to Greek actors and textures. New Hetairoi textures.
This was SVN commit r4024.
2006-06-24 23:58:27 +00:00
3cce1039d1 #Replaced placeholder cursor art with new and improved cursors.
This was SVN commit r4023.
2006-06-24 22:38:09 +00:00
f67f537fed This was SVN commit r4018. 2006-06-23 02:48:03 +00:00
c63aeeb3df This was SVN commit r4017. 2006-06-23 02:44:26 +00:00
35e4dce969 This was SVN commit r4004. 2006-06-11 10:13:17 +00:00
e10fb780ca bumpier water
This was SVN commit r3991.
2006-06-09 09:39:25 +00:00
41f45e4240 fixing some player color
This was SVN commit r3989.
2006-06-09 08:01:42 +00:00
1065c4ba58 larger ship textures
This was SVN commit r3988.
2006-06-09 07:51:43 +00:00
6cc15d9f51 This was SVN commit r3987. 2006-06-09 07:03:07 +00:00
c59da97ed7 another shot at the water, less bump
This was SVN commit r3966.
2006-06-07 08:06:00 +00:00
127c5113d2 new water
This was SVN commit r3963.
2006-06-07 07:33:55 +00:00
13b76f2540 # Altered water textures
This was SVN commit r3947.
2006-06-05 08:55:38 +00:00
c1b70dcea5 Converted water normalmaps to lossless ABGR DDS'es.
This was SVN commit r3938.
2006-06-03 21:45:57 +00:00
Aeros
5eef6f4951 #Winter skin for Celt Structures
This was SVN commit r3915.
2006-05-31 07:41:31 +00:00
835bfbc74f This was SVN commit r3910. 2006-05-29 08:36:42 +00:00
36533151d6 Small water tweaks, and TGA (lossless) versions of the water textures.
This was SVN commit r3899.
2006-05-28 09:52:34 +00:00
9ecd5e8a25 # Horses now walk as well as galloping
Fixed other actor speed issues, upgraded appropriate Greek actors to do
citizen soldier functions

This was SVN commit r3890.
2006-05-23 08:51:26 +00:00
6cf040b325 Made the water normalmaps bluer (so the blue component represents "outwards") and also increased the number of water frames to 60.
This was SVN commit r3885.
2006-05-20 20:05:19 +00:00
4978c2f4d3 # Created some animated water normalmaps.
Also copied the existing colour maps to textures/animated/water. Stuart
and I decided this is a better place for them then terrain
textures/terrain/types/water.

This was SVN commit r3884.
2006-05-19 18:54:13 +00:00
e557d99eb3 One test with larger (512x512) dxt1 texture
This was SVN commit r3880.
2006-05-18 06:47:45 +00:00
Dnas
376e6815a0 # Updated Spartan helmet textures
This was SVN commit r3878.
2006-05-18 00:00:03 +00:00
58bed083ba Sky texture format changes, and deletion of the bottom side which is now unneeded
This was SVN commit r3873.
2006-05-17 09:52:57 +00:00
da3834abd2 Corrected spelling of twilight.
This was SVN commit r3872.
2006-05-17 04:01:38 +00:00
3cb34fb311 Removed the "day1" skyset since it was the same as Jason's "default".
This was SVN commit r3868.
2006-05-17 02:22:54 +00:00
8b5834aba7 # 10 new skyboxes
This was SVN commit r3867.
2006-05-16 09:02:25 +00:00
6bf7f2c4eb Jason's skybox as well as entity changes for the new heal, trample and repair actions and fixes for the per-player templates.
This was SVN commit r3866.
2006-05-16 04:43:11 +00:00
dcbd118356 # Winter items
This was SVN commit r3858.
2006-05-13 04:56:03 +00:00
90f5dbed15 # Updated Spartan units
This was SVN commit r3855.
2006-05-13 04:41:50 +00:00
fdc2900775 # Hellenes SU texture update
This was SVN commit r3809.
2006-04-24 10:09:50 +00:00
47880f4213 # New Pine Trees
This was SVN commit r3757.
2006-04-13 09:29:40 +00:00
4bab7c82df # New Roman Temple and Farmstead
Increased the movement rate of the units a bit as they seems to walk
quite slowly.

This was SVN commit r3750.
2006-04-11 09:46:17 +00:00
Aeros
d17c57657f April fools celtic genetic engineering lab added - actor is under /temp
This was SVN commit r3712.
2006-04-01 19:37:21 +00:00
66fa4f51f1 # Updating of some cursors to replace temporary artwork.
This was SVN commit r3707.
2006-03-30 09:41:09 +00:00
35e9a966dc #*Colorized teh command icon sheet
#*Updated all the formation icons

This was SVN commit r3698.
2006-03-27 11:12:20 +00:00
34ff09529d # Implemented "pick list" selection code in UI. (Stances and formations can now be selected.)
# Added Explore tag for infantry units.
# Temporarily assigned a standard set of formations to all units for
testing purposes.
# Fixed pick list tab style.
* (Also updated traits.formation in Wiki to keep in sync.)
* Added "loose" formation -- is there a better name for that? -- since
presumably we'll need an option to disband the current formation.
* Pushed selection tab behind the pane as an easy alternative to
shifting it about.
* Started working on lists with "mixed" items (from different sheets,
like Allegiances), but decided halfway to commit the formation stuff for
Andrew.
* (Incidentally, as suspected, there isn't enough room for all these
items. All four horizontal tabs are now maxed out on a typical CS. Might
have to append the kill and player tribute items from Allegiance onto
Stance.)
* (Also, if we need more than 11 items in the list, that will also need
to be adapted sooner rather than later. The representative formation
list is maxed out.)

This was SVN commit r3680.
2006-03-24 20:59:09 +00:00
c802dc3152 * Fixed minor glitch which was causing the garrison icon to not appear. (Temporarily moved garrison value into command cell sheet, then changed mind and swapped it back to having its own sheet, since it'd probably need to be coloured to match the nearby supply icon.)
This was SVN commit r3673.
2006-03-22 18:21:27 +00:00
be382223f8 fixing the glossy buttons
This was SVN commit r3667.
2006-03-19 02:34:02 +00:00
8315bcce96 * Fixed invalid name bug that slipped in when I did a blind commit. (Minimap buttons aren't positioned right, but at least I've got some of them up.)
* Split command backs into outer ring and inner bubble (so nested
add_color can be used to illuminate only the interior).
* Used nested add_color (when you have a new toy, you have to play with
it) to make only the icon of a tab illuminate, which looks a lot better.
* Removed garrison sprite definition, since that cell sheet is not long
for this world.

This was SVN commit r3662.
2006-03-18 06:58:16 +00:00
6f506dcc33 * UI tweaks, fixes, updates for the affected files.
* New horizontal tab

This was SVN commit r3655.
2006-03-17 10:52:00 +00:00
3f95dcb6ba Idle and Flare buttons on the MiniMap (though I'm currently not sure why they're unclickable).
Started on the surrounding buttons, but unsure if they work or not since
the engine is now crashing for me after archive. :( (Modifying a data
file while the game is running also causes the game to crash.)
Committing some changes anyway.

This was SVN commit r3650.
2006-03-16 17:38:55 +00:00
f32388742b * New command icons because the old ones were ugly (tried out the new abrg dds convert - works nicely and looks better with these monochromatic gradients)
* Experimented with rollovers for the command icons

This was SVN commit r3649.
2006-03-16 11:29:50 +00:00
72af90ea14 This was SVN commit r3645. 2006-03-16 04:00:42 +00:00
26dc8cc4c8 - tex_dds: fix comment; enable warning on unsupported formats
- renderer: avoid particle-emitter memory leak warnings

This was SVN commit r3639.
2006-03-15 18:32:24 +00:00
8438a45948 * fixed the stat icons (resizing 64x64 textures down to 16x16 isn't as pretty as the real 16x16 texture)
* made the menu icons
* tweaked the tech icon

This was SVN commit r3638.
2006-03-15 11:59:32 +00:00
55f91550b5 * CSV-based icon sheet definitions. (Mmm, data-driven methodology ...)
* First wave of minimap changes (still need to do all the buttons).
* Removed deprecated UI art.

This was SVN commit r3633.
2006-03-14 23:01:55 +00:00
ed38414b41 Texture converter, DevIL: ABGR DDS support.
Textures: converted ARGB to ABGR.
Misc: warning fixes, etc.

This was SVN commit r3631.
2006-03-14 21:29:19 +00:00
1c1bfcbb53 fixed orientation of minimap pane
This was SVN commit r3630.
2006-03-14 20:14:34 +00:00
fd65ae8415 Minimap side of the session - background with some buttons and icons
This was SVN commit r3629.
2006-03-14 10:58:50 +00:00
0defe7a347 New command icons
Updated the rank icons
darkened 3 of the civ status images to help with readability

This was SVN commit r3620.
2006-03-10 12:57:05 +00:00
23409df58c * Icon reshuffling.
This was SVN commit r3616.
2006-03-09 16:46:02 +00:00
5aed6a1ef6 This was SVN commit r3615. 2006-03-09 16:43:09 +00:00
3f98bdc76d UI goodies - new status pane, civ overlays for the status pane, new resource icon background stuff, fixed the stat icons as requested
This was SVN commit r3614.
2006-03-09 11:25:57 +00:00
78710b8ff1 * Adjusted position of buttons so they arc the Status Pane.
* Started work on health bars below selection/garrison row (hidden for
now, as it's buggy).
* Implemented Jason's civ emblem icons.

This was SVN commit r3613.
2006-03-08 19:13:56 +00:00
efffb34f4a New statistic icons, merged the armour and attack sheets into the blanks of the statistic sheet.
This was SVN commit r3612.
2006-03-08 11:51:34 +00:00
b48dc75fe8 Here are some civ icons
This was SVN commit r3611.
2006-03-08 07:32:39 +00:00
4b3997f1f6 update for small entity icons
This was SVN commit r3604.
2006-03-04 21:27:31 +00:00
780e441117 Moved some icon locations.
This was SVN commit r3600.
2006-03-04 18:28:52 +00:00
6e35ac1554 This was SVN commit r3599. 2006-03-04 18:28:13 +00:00
d55593abf9 SVN seems to have become confused by the replaced icons. So deleted the tree and recommitted them to hopefully get back in sync.
This was SVN commit r3597.
2006-03-04 17:57:02 +00:00
c0875f6d95 This was SVN commit r3596. 2006-03-04 17:55:25 +00:00
a793889a8b UI overlay portraits
This was SVN commit r3595.
2006-03-04 12:48:24 +00:00
c9250bd415 GUI Updates:
* Implemented Jason's new tabs for portraits. Shuffled buttons around a
bit.
* Started on Status Pane elements ... portrait, health and stamina bars,
garrison and supply counters, and descriptive text.

This was SVN commit r3585.
2006-03-03 00:02:01 +00:00
7fe7ddb6a1 yay, nice looking images - no lossless issues
This was SVN commit r3584.
2006-03-02 11:11:22 +00:00
65ddbcf2f9 new backgrounds
This was SVN commit r3575.
2006-03-01 09:23:44 +00:00
33c2877065 Jason's new Status Pane backdrop.
This was SVN commit r3574.
2006-02-28 18:27:38 +00:00
268584d177 Initial commit of GUI changes. You're not liable to see much difference (in fact, there's probably less functionality than there used to be).
This is mostly to commit the new icon sheets so Jason can commit changes
directly if he prefers, and because I'm about to get back onto fixing
the command lists (not necessarily ones that actually do things when you
click them, but at least get them updating properly on the screen for
Matei), and want to commit a semi-usable update before I potentially
break it all again.

This was SVN commit r3571.
2006-02-27 23:37:43 +00:00
2aebdd1894 another update
This was SVN commit r3561.
2006-02-25 12:54:11 +00:00
ffcd73ad96 played around with the icons a bit more
This was SVN commit r3559.
2006-02-24 10:50:38 +00:00
e959e59614 icon demos
This was SVN commit r3555.
2006-02-23 12:01:37 +00:00
a52365f90a ranked stuff
This was SVN commit r3552.
2006-02-23 07:07:58 +00:00
acbed7a656 Vercingetorix, our first Celtic hero (minus his horse)
This was SVN commit r3545.
2006-02-21 10:56:02 +00:00
e0fe2b7253 This was SVN commit r3538. 2006-02-19 02:42:52 +00:00
6d0a9c6d04 This was SVN commit r3536. 2006-02-19 02:39:49 +00:00
41f08eecb8 Seems we didn't have just a "plain white" terrain... so I made one.
This was SVN commit r3463.
2006-02-03 07:00:28 +00:00
3e2017147d Snazzier resizing resource counters and some miscellaneous fixes.
This was SVN commit r3460.
2006-02-03 03:15:49 +00:00
Aeros
111b5cf42d This was SVN commit r3393. 2006-01-22 08:07:23 +00:00
livingaftermidnight
5dd1dba521 This was SVN commit r3370. 2006-01-19 11:32:09 +00:00
165e4aacb9 cliff texture fix
This was SVN commit r3323.
2005-12-31 22:44:14 +00:00
5487d069c4 Female fixes - new head, new head texture, new dress mesh, new celtic texture
This was SVN commit r3321.
2005-12-31 12:16:52 +00:00
736aece049 This was SVN commit r3319. 2005-12-31 03:22:11 +00:00
ee9a2c9825 texture for shadow orientations
This was SVN commit r3294.
2005-12-28 05:30:04 +00:00
4ef9198c92 flipped textures horizontal, then vertically. This seems to fix their orientation in Atlas and the Engine. A further tweak would be to adjust them a further 45 degrees to get the "proper" shadow angle based upon "default" sun angle. This will probably have to be done by CheeZy. Doing terrains is doubly difficult, because the engine seems to flip them both horizontally and vertically before rendering them? I have no idea. PS: Sorry this notation is so long. ;)
This was SVN commit r3293.
2005-12-27 07:29:37 +00:00
c3e0c6a2dd flipped textures to see if the engine renders them at the correct angle.
This was SVN commit r3292.
2005-12-27 07:27:18 +00:00
Aeros
706c440279 big terrain update - bobbo
This was SVN commit r3291.
2005-12-27 03:48:37 +00:00
74b8c5b15f More Greek unit tweaks
This was SVN commit r3266.
2005-12-17 20:45:27 +00:00
299248ec46 Entity fixes, new greek material
This was SVN commit r3259.
2005-12-16 13:03:53 +00:00
3dc4d7d184 Removed the gaia_ designation from gaia entities, at Jason's request.
This was SVN commit r3254.
2005-12-16 05:37:27 +00:00
b14dc940ef New entities and associated changes to scripts.
This was SVN commit r3248.
2005-12-15 21:55:18 +00:00
00a15f0ccb Here are the celt ships!
This was SVN commit r3244.
2005-12-14 09:23:15 +00:00
Aeros
78cc73481c This was SVN commit r3228. 2005-12-11 04:11:08 +00:00
5e12267025 Balrog for Philip (all in temporary/test folders to be removed prior to release)
This was SVN commit r3223.
2005-12-11 00:08:30 +00:00
Aeros
ce3bd33d76 grass clumps
This was SVN commit r3206.
2005-12-07 07:51:19 +00:00
Aeros
15ce055695 This was SVN commit r3191. 2005-12-03 11:05:00 +00:00
48ef5c0a32 Greek Ships!
This was SVN commit r3189.
2005-12-03 00:50:19 +00:00
fd7af9481a Siege wagons for the packed versions of the siege weapons
This was SVN commit r3168.
2005-11-21 10:40:26 +00:00