1
0
forked from 0ad/0ad
Commit Graph

664 Commits

Author SHA1 Message Date
fe6d7c058a This was SVN commit r4278. 2006-09-01 05:41:51 +00:00
5ae400a8fd This was SVN commit r4277. 2006-09-01 05:41:27 +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
35bf56b348 #Spartan single player and multi-player shields
This was SVN commit r4274.
2006-09-01 05:37:31 +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
eb3b5abd9b #Completed a series of commits for the Roman helmets and other knick knacks!
This was SVN commit r4221.
2006-08-11 20:13:46 +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
50fe377f8c This was SVN commit r4218. 2006-08-10 22:44:59 +00:00
0ba281e702 This was SVN commit r4217. 2006-08-10 22:44:24 +00:00
4dbed4678e This was SVN commit r4216. 2006-08-10 22:44:06 +00:00
e93fbeb83d This was SVN commit r4215. 2006-08-10 22:43:46 +00:00
3f7e88931e This was SVN commit r4214. 2006-08-10 22:43:22 +00:00
5786328996 This was SVN commit r4213. 2006-08-09 16:45:35 +00:00
e9226e48a6 This was SVN commit r4212. 2006-08-09 16:45:10 +00:00
9fda86622c This was SVN commit r4211. 2006-08-09 15:14:45 +00:00
964b79e11c #New Roman Elite Triarius unit.
This was SVN commit r4210.
2006-08-09 15:14:27 +00:00
3e20982866 #New Roman helmet meshes by Wijitmaker.
This was SVN commit r4202.
2006-08-07 04:16:25 +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
93b2c6ad1b #A series of commits for the Roman Triarius.
This was SVN commit r4195.
2006-08-04 01:26:50 +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
177c50df32 This was SVN commit r4191. 2006-08-02 00:53:17 +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
6af0cba958 This was SVN commit r4117. 2006-07-14 22:28:56 +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
08f363bb45 This was SVN commit r4108. 2006-07-13 22:10:23 +00:00
e202373983 #New curved Roman Scutum shield. Looks awesome!
This was SVN commit r4107.
2006-07-13 21:51:57 +00:00
edacfef847 This was SVN commit r4104. 2006-07-13 21:27:00 +00:00
7cd347a8d3 This was SVN commit r4103. 2006-07-13 21:26:28 +00:00
1f92aa7b8f This was SVN commit r4102. 2006-07-13 21:25:54 +00:00
b9334ec9b9 This was SVN commit r4101. 2006-07-13 21:25:11 +00:00
e2c0302ddf # Roman Helmets
This was SVN commit r4092.
2006-07-13 05:08:11 +00:00
f1d984897b This was SVN commit r4068. 2006-07-07 01:29:23 +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
cd444810a5 This was SVN commit r4060. 2006-07-04 04:08:07 +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
1422028b72 This was SVN commit r4054. 2006-07-02 06:06:18 +00:00
cf83617d07 This was SVN commit r4053. 2006-07-02 06:02:34 +00:00
0a0f0905f3 This was SVN commit r4046. 2006-06-28 05:16:24 +00:00
fc81dd9f29 # Cavalry attack animations
This was SVN commit r4045.
2006-06-27 04:46:50 +00:00
Aeros
4b0c04a272 This was SVN commit r4044. 2006-06-26 20:48:45 +00:00
f9a4da9c34 This was SVN commit r4042. 2006-06-26 04:35:51 +00:00
468ec68d6b This was SVN commit r4041. 2006-06-26 04:35:38 +00:00
ccb5f540a2 This was SVN commit r4040. 2006-06-26 04:26:52 +00:00
f2f4ff5fbe This was SVN commit r4038. 2006-06-25 19:01:12 +00:00
6d88e8e129 This was SVN commit r4037. 2006-06-25 19:00:51 +00:00
a23ca48867 This was SVN commit r4036. 2006-06-25 16:58:52 +00:00
7582f8fbbc reversed spear
This was SVN commit r4033.
2006-06-25 04:48:19 +00:00
58a8ee13fe This was SVN commit r4032. 2006-06-25 04:32:46 +00:00
93b5e9c27a # Hoplite animations
This was SVN commit r4031.
2006-06-25 04:12:32 +00:00
96d230114e This was SVN commit r4030. 2006-06-25 04:00:58 +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
7c3a9c91fd This was SVN commit r4026. 2006-06-25 00:32:06 +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
65f07e300f #Wintry goodies
This was SVN commit r3965.
2006-06-07 07:42:58 +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
1036d9944d ships with props
This was SVN commit r3934.
2006-06-02 07:41:12 +00:00
99e0dbddca Added unique names for variants (in one actor)
This was SVN commit r3918.
2006-05-31 20:46:57 +00:00
Aeros
5eef6f4951 #Winter skin for Celt Structures
This was SVN commit r3915.
2006-05-31 07:41:31 +00:00
d605cb39ec # Atlas editor: Control over 'random' actor variations.
Actor variation selection (though not saved to maps, so not very
useful).
Added more levels of complexity to the waiting-for-game-to-respond
message pump, to fix reentrancy problems.
Use number keys to assign player to selected unit.

This was SVN commit r3913.
2006-05-31 05:27:02 +00:00
835bfbc74f This was SVN commit r3910. 2006-05-29 08:36:42 +00:00
bc368485da This was SVN commit r3909. 2006-05-29 08:34:46 +00:00
76a2116da5 fixed horse actor color randomization
This was SVN commit r3908.
2006-05-29 08:32:46 +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
56b592e1b4 This was SVN commit r3882. 2006-05-18 07:15:45 +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
06d6528bee # Updated celt actors to grant the ability to collect resources
This was SVN commit r3856.
2006-05-13 04:50:38 +00:00
90f5dbed15 # Updated Spartan units
This was SVN commit r3855.
2006-05-13 04:41:50 +00:00
11e53a3ce0 This was SVN commit r3817. 2006-04-25 06:14:26 +00:00
4f57f533a9 #Committed an edit of the Spartan Super Unit actor to take advantage of the new Spartiate texture by Brownboot.
This was SVN commit r3816.
2006-04-25 06:14:04 +00:00
fdc2900775 # Hellenes SU texture update
This was SVN commit r3809.
2006-04-24 10:09:50 +00:00
ca12496c2f # Updated the prop switching test unit
Fixed the missing props, fixed the animationless bones, fixed some bad
actors

This was SVN commit r3770.
2006-04-14 09:55:50 +00:00
8b1b11c0c6 Corrected prop-switching actor
This was SVN commit r3760.
2006-04-14 02:32:04 +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
0eff1cac9f #Completed first draft of the roman mill and fortress.
This was SVN commit r3724.
2006-04-03 10:25:34 +00:00
31dd421c15 # Updated test actor and script for prop switch testing
This was SVN commit r3714.
2006-04-01 23:49:59 +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
a201382bad Fixing the greek trireme
This was SVN commit r3706.
2006-03-30 07:03:14 +00:00
083e495ecc #* Updated the forage and hoe animations for props
Moved some props around (moved out of temp, because they aren't temp)

This was SVN commit r3704.
2006-03-29 10:47:44 +00:00
43ee589760 #* Updated the lumber and mining animations to work correctly with props
I can't see if they work though, because the prop switcher doesn't seem
to be working *looks at Philip*

This was SVN commit r3701.
2006-03-28 11:35:32 +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
e72adfff5c # Two new updated animations for the chop and the mine actions. Updated test actor accordingly.
This was SVN commit r3679.
2006-03-24 12:11:46 +00:00
3efeeecb84 # Made two new animation files (gather, hoe) for testing animations. Also modified the hele_inf_jav_b to use the new actor format for testing purposes.
This was SVN commit r3675.
2006-03-23 10:50:45 +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