1
0
forked from 0ad/0ad
Commit Graph

1480 Commits

Author SHA1 Message Date
c63aeeb3df This was SVN commit r4017. 2006-06-23 02:44:26 +00:00
c97129d711 Added water murkiness parameters to shaders.
This was SVN commit r4014.
2006-06-22 21:11:56 +00:00
536d6f4cd3 # bugfix (main menu music fading)
fixes #123

This was SVN commit r4012.
2006-06-22 19:13:25 +00:00
92b9c07f95 Restoring SVN repository:
Greek basket texture

# New Greek vases

# housekeeping
documentation fix: trailing / in directory names is mandatory

# Atlas: Sky texture selection; save with maps

Atlas code tidying: Slightly nicer syntax for defining command handlers,
and some explanation of how it works

Automated build.

This was SVN commit r4008.
2006-06-21 22:37:31 +00:00
e9149574e2 This was SVN commit r4005. 2006-06-11 10:41:21 +00:00
35e4dce969 This was SVN commit r4004. 2006-06-11 10:13:17 +00:00
6e57ef7e08 #Top Secret map for amazing screenshot. ;)
This was SVN commit r4001.
2006-06-10 04:51:31 +00:00
fd1202b027 Units will now reserve population space when added to a create queue, rather than only when they get created.
This was SVN commit r3999.
2006-06-10 03:33:22 +00:00
77c59070c1 # Various gameplay updates.
- Added per-player resource pool and modified the GUI and entity scripts
to work with it.
- Modified unit creation functions so the unit is always assigned a
player before firing its initialize event, so that this event can deduct
population, etc from the right player.
- Fixed various small bugs, like a unit not cancelling all of its queued
items when it dies, or buildings not costing anything.

This was SVN commit r3998.
2006-06-10 03:05:16 +00:00
005983f237 Renamed tech and formation directories for better organization, and created a scripts directory for the game startup script, entity scripts, and eventually things like victory condition scripts for different game modes, or possibly triggers.
This was SVN commit r3995.
2006-06-09 23:04:47 +00:00
e10fb780ca bumpier water
This was SVN commit r3991.
2006-06-09 09:39:25 +00:00
5bd13b1aac This was SVN commit r3990. 2006-06-09 08:12:36 +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
ba9e7c13c4 This was SVN commit r3964. 2006-06-07 07:42:11 +00:00
127c5113d2 new water
This was SVN commit r3963.
2006-06-07 07:33:55 +00:00
0ecb2dad1e Updates to the sample tech.
This was SVN commit r3957.
2006-06-07 01:42:17 +00:00
b631ac6007 Modified the example tech a little.
This was SVN commit r3953.
2006-06-07 01:03:47 +00:00
pyrolink
7aad858966 forgot to add this
This was SVN commit r3952.
2006-06-06 23:50:21 +00:00
pyrolink
e4c40841b2 #Configurable game speed, techs, elevation attack bonus
-techs are not operational yet
-set the game speed with setSimRate() in the console or in the config
file under hotkey.speed.increase or hotkey.speed.decrease
-made a few other small fixes

This was SVN commit r3950.
2006-06-06 06:31:17 +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
54c1508db6 Renamed autobuilt ps.exe to pyrogenesis.exe, to match the new project layout.
Fixed Atlas project creation.
Improved VS2005 linking speed.
Added work-in-progress environment (water, sun) editing to Atlas.

This was SVN commit r3935.
2006-06-03 05:08:32 +00:00
1036d9944d ships with props
This was SVN commit r3934.
2006-06-02 07:41:12 +00:00
ccb468e337 Small updates to the water shader: Refractions will now be less wavy than reflections, which makes it slightly easier to look through the water, and the water will get less transparent faster at low view angles (my project used different scale so this wasn't happening as fast as it should).
This was SVN commit r3920.
2006-05-31 22:39:29 +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
03a08e00a5 # Fixed infinite loop.
Also fixed sectorDivs so it's always initialised, since the complaints
were annoying.
Camera: Added a const.
Super cavalry: Added required(?) aura attributes.

This was SVN commit r3906.
2006-05-29 03:28:54 +00:00
7ac2fc94a9 Updates to the water shaders and a fix to stamina bar display on ships.
This was SVN commit r3903.
2006-05-28 22:00:01 +00:00
b6055f891b This was SVN commit r3901. 2006-05-28 10:34:50 +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
27c38e2fc8 Full fancy water shaders.
This was SVN commit r3896.
2006-05-28 02:10:23 +00:00
0b4ab29dc2 This was SVN commit r3895. 2006-05-26 21:40:30 +00:00
965b4c9f92 Some water shaders, with per-pixel fresnel and lighting but no reflection and refraction yet.
This was SVN commit r3892.
2006-05-25 05:43:32 +00:00
e02d42b746 # Loading screen now uses dynamic textures for random backgrounds.
Thanks, Philip. (y)

This was SVN commit r3891.
2006-05-25 03:05:06 +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
0444cee877 This was SVN commit r3883. 2006-05-18 07:16:15 +00:00
56b592e1b4 This was SVN commit r3882. 2006-05-18 07:15:45 +00:00
ff95075dd2 #Committed a super-secret new map to create uber-cool screenshots.
This was SVN commit r3881.
2006-05-18 06:49:48 +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
4af9cd2dce Entity script changes for per-player templates and an extra sanity check on prepareorder for build.
This was SVN commit r3864.
2006-05-13 22:12:57 +00:00
03f21c772f Made the gather animation start slightly faster after a unit starts gathering, though it's still not perfect.
This was SVN commit r3860.
2006-05-13 06:21:06 +00:00
0af22ec50f # Fixed a bug which was causing the gather action to not actually gather resources.
This was SVN commit r3859.
2006-05-13 05:54:01 +00:00
dcbd118356 # Winter items
This was SVN commit r3858.
2006-05-13 04:56:03 +00:00
7d39e03831 Correcting the drunken units walking over uneven terrain
This was SVN commit r3857.
2006-05-13 04:57:40 +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
404c4221df XML and script fixes for running and pass-through-allies attribute.
This was SVN commit r3854.
2006-05-13 04:08:41 +00:00
08ec780f17 Enable main menu music.
This was SVN commit r3852.
2006-05-05 17:01:02 +00:00
086418993d Undid config change
This was SVN commit r3847.
2006-05-04 14:45:44 +00:00
6df8229a3a Script changes for the updated construction system.
This was SVN commit r3846.
2006-05-04 07:41:06 +00:00
pyrolink
39e89c406e #Fixes to flank penalty, notifications, sectors, terrain conformance. Added speed bonus based on terrain slope.
-added NOTIFY_ORDER_CHANGE, which is used for flank penalty instead of
idle.
-entity speed is now actions.move.speed_curr for the current speed, but
the original speed is still actions.move.speed.  Changes take place in
entityEventMovemen.

This was SVN commit r3840.
2006-05-04 04:14:48 +00:00
b512733787 # Completed the new unit production system and tied it in with the GUI.
This was SVN commit r3831.
2006-04-30 20:34:39 +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
f791a61c46 # Fixed SxS CRT usage.
Also added wx's .rc file to Atlas.

This was SVN commit r3812.
2006-04-24 18:01:01 +00:00
fdc2900775 # Hellenes SU texture update
This was SVN commit r3809.
2006-04-24 10:09:50 +00:00
pyrolink
2702a268ef This was SVN commit r3793. 2006-04-22 05:44:32 +00:00
8c440a4e24 Updated VC8 DLLs to match the ones from VS2005 Professional.
Removed .manifest files (because the SxS system is too confusing - but
we should sort it out when properly distributing the game).
Removed ScEd files, because it's out of date and unsupported.

This was SVN commit r3780.
2006-04-20 00:14:02 +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
d5383db5fc Fix for the rank rendering issue (turns out the rank height was not set in the XML's).
This was SVN commit r3766.
2006-04-14 08:24:21 +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
pyrolink
c38a5379f6 This was SVN commit r3733. 2006-04-08 22:35:23 +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
ef155571c0 # As requested by Jason, now only one tab list in the Status Pane will be open at any time (hovering one will close any others that are open).
(Probably. I couldn't test with units due to the ModelRenderer
javelinist crash, but it seems to have the desired effect for the Civ
Centre. Which isn't the most conclusive test since the research list is
empty anyway.)

# Implemented Andrew's formation functions in the formation "pick list".

(Again, probably. Since this is completely untestable without being able
to select units, I can only speculate that it might work. The game
didn't crash and burn on startup as a result of my meddling, which I
take as a good sign.)

(Andrew: The changed section is a formation case switch at line 376 of
functions_page_session_status_commands.js. I endeavoured to use all your
functions to try them out. Like I said, I'm not sure if any of this
works -- and being sick and feverish doesn't help -- but it might at
least give you somewhere to start.)

This was SVN commit r3723.
2006-04-03 04:54:43 +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
pyrolink
cf14a7bc15 -rank/formation stuff and fixes. To give a unit a rank texture, just set rank.name in the entity's XML to the filename of the texture e.g. elite.dds or advanced.dds
This was SVN commit r3711.
2006-03-31 03:37:36 +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
799d3f0fce #A well eye-candied map for testers and staff members to marvel at the new self-shadowing.
Task things around, guys, and check out how cool the shadows look. You
can even task the ships around. What's cool is that the bireme and
trireme use the "double-click" charge attack, just like the foot units.
This would be a very intuitive way to use the "ramming" ability of
ships.

This was SVN commit r3705.
2006-03-30 05:23:08 +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
8fd256c458 #Use EXT_framebuffer_object when available
* noframebufferobject configuration in system.cfg can be used to
  disable EXT_fbo (in case drivers are flaky etc.)
* shadow texture size now honours the OpenGL maximum texture size as
reported
  by the implementation

This was SVN commit r3693.
2006-03-26 17:36:33 +00:00
12b214bf27 #Tweak of some lighting settings on Ken's map
This was SVN commit r3692.
2006-03-26 11:12:11 +00:00
e2bbd9a654 #Models receive shadows now, including self-shadows.
This is a huge patch, including:
* add a LitRenderModifier abstract base class for RenderModifiers with
  shadow+light
* add LitRenderModifiers for all types of models
* add STREAM_TEXGENTOUV1 to request generation of shadow map texcoords
  for models
* create facilities to pass the texture matrix from the
  RenderModifier (fragment stage) to the ModelRenderer (vertex stage)
* split ambient and diffuse terms of lighting until further down in the
  pipeline; this is necessary since shadowed regions receive only
ambient light
* small improvement in how RenderPathVertexShader scales to a greater
  number of vertex shaders

This was SVN commit r3690.
2006-03-26 00:54: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
ad8c29a8c7 Just a test map to see how close I can get to an actual Mediterranean biomic map given our current art assets. It is currently unfinished, but will continuously update.
This was SVN commit r3678.
2006-03-24 05:24: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
792c479165 * Fixed bug in command lists that was causing the first item in a production list to not be displayed.
* Got selection list (shows a list of portraits of the currently
selected units, with health bars) to work, including horizontally
expanding tab (using a helmet tab temporarily to get an idea of the icon
location).
* Todo: Dynamically adjust tab position when horizontal list (tabs need
more blending room); bleed portraits into additional rows above when the
number of entities in the selection exceeds the length of a list.

This was SVN commit r3674.
2006-03-23 07:45:52 +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
8dd3a61a3a * Took Philip's advice and made all local GUI variables actually local using var.
* Added a simple "Game is Paused" text message to the Pause hotkey.

This was SVN commit r3672.
2006-03-21 22:30:29 +00:00
ccc8055226 Fail more nicely with invalid actors
This was SVN commit r3669.
2006-03-19 22:37:56 +00:00
c29f4ca444 Minor alignment correction.
This was SVN commit r3668.
2006-03-19 06:38:24 +00:00
be382223f8 fixing the glossy buttons
This was SVN commit r3667.
2006-03-19 02:34:02 +00:00
28c6bc2fbb * Minimap buttons are in place and clickable (though not actually hooked up with any events yet). The arc buttons still don't look quite right, but artist intervention will no doubt set me right.
This was SVN commit r3663.
2006-03-18 17:42:37 +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
7fc3d5cfac This was SVN commit r3661. 2006-03-18 05:49:56 +00:00
b0d1110f52 Reduced length of some of the player names, since they were longer than the GUI pane where they're displayed. (And thanks for the XML, Philip.)
This was SVN commit r3660.
2006-03-18 05:31:35 +00:00
c2f13c689e Load default player data from XML
This was SVN commit r3658.
2006-03-18 04:38:41 +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
0a1077bdbd removing a pesky (local?) log that causes my SVN to error
This was SVN commit r3646.
2006-03-16 06:56:10 +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
d2c9a02df2 This was SVN commit r3637. 2006-03-15 09:10:02 +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
e1d5b241f2 New 'validProperty (propertyString)' function takes care of checking the validity of each subelement in an entity property. (Reduces all that 'if (a && a.b && a.b.c && a.b.c.d)' malarky to 'if (validProperty ("a.b.c.d"))'.)
This was SVN commit r3626.
2006-03-13 20:58:21 +00:00
2c405028f4 * Increased Optimus font to 14b.
* Got selection healthbars into correct position.
* Implemented statistic icons. (todo: tooltips)
* Enabled pick lists (had to resort to brute-force
check-every-subsection-of-an-entity-property-whenever-I-use-it method).

This was SVN commit r3621.
2006-03-10 21:23:39 +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
3a35ea935c * Revised and hopefully ultimate resource counters. I have to admit they look pretty damn good to me.
This was SVN commit r3619.
2006-03-09 22:17:04 +00:00
ab58cab488 * Status-Pane-integrated civ information.
This was SVN commit r3617.
2006-03-09 16:49:26 +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
4fe718f536 committing a nice and big trace file; will be updated periodically. this is a bit more thorough (-> better archive) than a trace generated from quick test runs.
This was SVN commit r3607.
2006-03-05 18:57:56 +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
8d3222f9e2 Missing Optimus Princeps font.
This was SVN commit r3598.
2006-03-04 18:00:31 +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
6c67e84ecd * Added player colour to player name, using Matei's new getColour() function.
* Used the actual player names instead of sharing the profile name
(though the default names are a bit lengthy and extend off the UI; need
to figure out how to change those during game setup using each player's
profile name).

* Fixed health/stamina bug.

* Added an onMouseEnter() event for tabs at Matei's suggestion (so the
tabs will open simply by getting the cursor in proximity, instead of
needing two clicks).

This was SVN commit r3592.
2006-03-04 00:20:09 +00:00
0abb49ab09 * Removed portrait background from the large status portrait (by changing default sprites for all entities).
* Made tabs remain closed by default.

* Fixed error where foundations were referencing the older cell sheets.

* Added text equivalents for health and stamina.

This was SVN commit r3588.
2006-03-03 19:05:01 +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
03da3b23a1 hook up to builder; call archiveBuilderCancel
This was SVN commit r3577.
2006-03-01 22:17:02 +00:00
083d6f6104 Did more updates to commands.
* Pick lists should now display, though no events yet. (Except I've
disabled them for now, as their condition checks will fail in most
cases.)
* Building lists should now provide a building cursor when clicked, so
Matei can work on his stuff (though it gets a bit glitchy after that ...
The UI expects a portrait name and ID from the foundation, for example,
and so fails to find them and therefore continue to refresh the command
lists.)

This was SVN commit r3576.
2006-03-01 20:23:09 +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
238ea155f3 Last update for tonight ... Tabs and commands are now displaying (albeit very fragilely due to unpredictable error-checking), "pick lists" and events still disabled while I work on getting them right. Also need to reshuffle button locations later when adapting to Jason's new Status Pane shape.
This was SVN commit r3573.
2006-02-28 07:03:35 +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
cbdc4e9686 Quick fix in the init(), where non-foundations seemed to produce errors (since their building property would be undefined). Just added an extra if check.
This was SVN commit r3570.
2006-02-27 04:58:04 +00:00
24a1ce0fd0 Removed an XMB file that got added to version control for some reason.
This was SVN commit r3569.
2006-02-26 22:51:43 +00:00
c55b49164a Tweaked foundations' LOS so it depends on their sizes.
This was SVN commit r3567.
2006-02-26 22:25:17 +00:00
2e26b5e1da Added foundations for all the building types.
This was SVN commit r3566.
2006-02-26 22:10:01 +00:00
422c1e1bc4 Construction JavaScript and XML changes, at least for houses (still need to convert the other building types over).
This was SVN commit r3565.
2006-02-26 09:56:47 +00:00
2aebdd1894 another update
This was SVN commit r3561.
2006-02-25 12:54:11 +00:00
0be99c65bf Removed hourglass from archive builder screen since it was ambiguous (user does have input, and can just click to skip that screen -- which isn't used at present anyway).
Also restored the Esc key to its previous role of quick-quit, as I'm
just too used to using it. :)

This was SVN commit r3560.
2006-02-24 18:12:54 +00:00
ffcd73ad96 played around with the icons a bit more
This was SVN commit r3559.
2006-02-24 10:50:38 +00:00
da2178db66 Basic progress bar UI at the start of the game requested by Jan, so player is aware of and can cancel archive building.
(Note that the Esc key is now used here, so you'll have to use another
key ... Ctrl+F4/Alt+F4/Ctrl+Break to quick-kill the game.)

Also set Matei's StartProduction to use entity's creation time.

This was SVN commit r3556.
2006-02-23 18:22:30 +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
a4c10bba1e Quick fix to change to a "wait" hourglass cursor while the game is loading. Note that the placeholder icon has been ripped from AoM and should be replaced before we ship. :)
This was SVN commit r3551.
2006-02-23 04:23:35 +00:00
7a4aeb69ed Added production queue system and associated events. It might still need some extra features but it should be functional.
This was SVN commit r3547.
2006-02-22 22:45:16 +00:00
022c84f43d formation test1
This was SVN commit r3546.
2006-02-22 07:25:30 +00:00
acbed7a656 Vercingetorix, our first Celtic hero (minus his horse)
This was SVN commit r3545.
2006-02-21 10:56:02 +00:00
a40b3d38ae Mythos' lighting tweak.
This was SVN commit r3544.
2006-02-21 03:57:10 +00:00
e0fe2b7253 This was SVN commit r3538. 2006-02-19 02:42:52 +00:00
008d487d2c This was SVN commit r3537. 2006-02-19 02:40:40 +00:00
6d0a9c6d04 This was SVN commit r3536. 2006-02-19 02:39:49 +00:00
7396587f6e Fix scenario DTD
This was SVN commit r3517.
2006-02-15 05:49:14 +00:00
36fa5ec2bf * clean up CLightEnv a bit
* add CLightEnv::m_TerrainShadowTransparency
* shadows will let a fraction of diffuse light through
* added JS LightEnv objects, so the lighting environment can be changed
  from the console
* new element TerrainShadowTransparency supported in the scenario .xml
format,
  changed cantabrian_generated with an example

This was SVN commit r3513.
2006-02-15 00:45:16 +00:00
e3c3ac920f lighter shadows for cantabrian_generated.xml
This was SVN commit r3510.
2006-02-14 05:20:17 +00:00
7dee30e24c - Terrain self-shadows (only noticeable with a low angle of sun)
- explicitly split ambient and diffuse
- add renderer.shadowZBias to bias depths in the depth texture
  and avoid flickering artifacts caused by Z fighting
- cantabrian_generated uses new light values so that shadows aren't
pitch
  black

This was SVN commit r3508.
2006-02-13 14:18:20 +00:00
pyrolink
9c739099fc Various fixes to notifications and orders
Added escort--follow can be done by simply changing the default and
secondary actions from NOTIFY_ESCORT to NOTIFY_FOLLOW in
entityEventTargetchanged.

Bugs are: ranged units can't assist in attacking from some reason, and
when you tell a leading unit to run, the escorting unit doesn't.

This was SVN commit r3503.
2006-02-13 03:28:36 +00:00
b0e7b7d03e Fixed a bug that was causing resources to go to NaN when you killed something.
This was SVN commit r3502.
2006-02-13 02:06:57 +00:00
56d8d31cd0 This was SVN commit r3485. 2006-02-08 07:26:32 +00:00
51cbee9f39 Gave the fauna horse random textures
This was SVN commit r3484.
2006-02-08 02:25:30 +00:00
7397615b5b Reenabled shadows (it was misspelled as shadow=true instead of shadows=true).
This was SVN commit r3481.
2006-02-05 06:50:24 +00:00
pyrolink
54101c169f Queue binding
This was SVN commit r3477.
2006-02-05 03:42:05 +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
22be4ee0d6 temp ships with props
This was SVN commit r3455.
2006-02-01 10:53:10 +00:00
efc45aac23 This was SVN commit r3453. 2006-02-01 00:58:17 +00:00
79767e2e1b This was SVN commit r3452. 2006-02-01 00:57:44 +00:00
f5dec3e4ab This was SVN commit r3451. 2006-02-01 00:57:19 +00:00
6eb9bfa730 Reenabled shadows in system.cfg.
This was SVN commit r3445.
2006-01-29 23:54:29 +00:00
pyrolink
bbbb9e12af -hotkey for cinematic interface (not working)
This was SVN commit r3443.
2006-01-29 23:27:16 +00:00
Aeros
6699dc11c7 This was SVN commit r3435. 2006-01-29 03:59:32 +00:00
83ccd72798 Tiny fix to the "unit AI" in the damage event handler to make ranged units fight back when attacked.
This was SVN commit r3423.
2006-01-24 11:08:53 +00:00
72cc581c2e Renamed Decay to Corpse for all actor animations, and added extra animations to Basic Celt Infantry Spearman and Javelinist for testing purposes.
This was SVN commit r3419.
2006-01-23 16:16:59 +00:00
c29c222936 Fixed a JS error message when corpses were attacked (because they had no
armour).

This was SVN commit r3418.
2006-01-23 10:36:18 +00:00
1c541db46b Health regen fix for ranged attack.
This was SVN commit r3410.
2006-01-23 03:55:35 +00:00
cdd432ba46 updating the tips file to some latin
This was SVN commit r3409.
2006-01-23 03:38:45 +00:00
16341dd834 Fixed someone else's "fix"... The Celts don't get a wall tower, they get a wall turret, which is not the Scout Tower, which someone made it into. :) Sooooooo, I changed the actor in the entity back from the scout_tower to the wall_turret.
This was SVN commit r3408.
2006-01-23 03:20:28 +00:00
199550457d to entities that I'm adding to fix errors
This was SVN commit r3407.
2006-01-23 02:34:38 +00:00
d5a4c87dcc Fixes to the melee/ranged attack split.
This was SVN commit r3404.
2006-01-22 11:55:47 +00:00
pyrolink
b1537950e2 fixes
This was SVN commit r3400.
2006-01-22 11:08:27 +00:00
pyrolink
0e861e5ab1 Thank Stuart for the new attack properties (split into ranged and melee). Also, if running, the unit will use crush damage instead of melee.
This was SVN commit r3395.
2006-01-22 08:51:34 +00:00
Aeros
111b5cf42d This was SVN commit r3393. 2006-01-22 08:07:23 +00:00
c3b289ec0b new demetrius entity to test animations
This was SVN commit r3392.
2006-01-22 06:39:55 +00:00
5c5c6cd469 New actors to play with new animations
This was SVN commit r3391.
2006-01-22 06:37:51 +00:00
b32a8361e5 AI stance properties and extended animal templates.
This was SVN commit r3390.
2006-01-22 05:28:41 +00:00
bda61f8030 2 handed spear animations
This was SVN commit r3380.
2006-01-21 10:53:03 +00:00
pyrolink
5383104a4f Added health regen/decay with time delay, corrected continual run bug (once running, disregards reorders to walk until destination reached).
This was SVN commit r3377.
2006-01-21 11:01:08 +00:00
c85551a8b0 Renamed processAttack, entityEventAttack, entityDamage, etc to avoid confusion since several people didn't like the functions having different names than the properties of the entity object. Now the generic action handlers are called performAttack, performGather, etc and the damage function is simply called damage.
This was SVN commit r3374.
2006-01-20 21:37:45 +00:00
livingaftermidnight
5dd1dba521 This was SVN commit r3370. 2006-01-19 11:32:09 +00:00
30b83db67b Moved Run up to affect other units. Also added an Iberian house, which for some reason went AWOL during the entity revision.
This was SVN commit r3368.
2006-01-18 03:31:21 +00:00
cadbd77bc7 A temp Themistocles to test Wijit's cool new animations.
This was SVN commit r3367.
2006-01-17 08:12:10 +00:00
d6ec773887 Two-sworded Themistocles to test out Wijit's new "wild and crazy" animations.
This was SVN commit r3366.
2006-01-17 08:10:56 +00:00
pyrolink
01ff2fdf3b Secondary order script support; run order addition
This was SVN commit r3362.
2006-01-16 10:55:01 +00:00
2cc7221166 dual sword attack animations
This was SVN commit r3361.
2006-01-16 09:58:03 +00:00
98496f2434 Added Matei's instructions to add a new generic order to the entity script. Not much of a contribution, but every little helps, eh? :)
This was SVN commit r3360.
2006-01-16 02:01:24 +00:00
dafc496b6f Some sword attack animations and a few new deaths
This was SVN commit r3359.
2006-01-15 11:49:29 +00:00
thedrunkyak
052e08717e Updated Video Menu, Fixed Audio Menu, Started Game Options Menu
This was SVN commit r3358.
2006-01-14 13:54:49 +00:00
NoMonkey
cf224a6267 This was SVN commit r3357. 2006-01-13 05:00:55 +00:00
740d4ab616 Slight adjustments to options screen (fixed invalid style pgBorder, moved exit buttons to corners now that there's a Cancel, added floating tooltips). Looking good, though, Dan! (y)
This was SVN commit r3356.
2006-01-12 15:17:35 +00:00
thedrunkyak
19ad5a21e8 fixed small error in last commit.
This was SVN commit r3355.
2006-01-12 13:50:35 +00:00
thedrunkyak
da353cb16c Cosmetic changes:
Added areas for music, sound, ambient and voice control.
  Resolution added

This was SVN commit r3354.
2006-01-12 13:49:30 +00:00
thedrunkyak
0dd74bb25f Added Cancel button and cosmetic changes to options menu
This was SVN commit r3353.
2006-01-12 10:41:45 +00:00
NoMonkey
d261d33bab This was SVN commit r3352. 2006-01-12 10:15:20 +00:00
66d780eb49 Some fixes to the resource pool counters to make them dynamically lengthen based on caption length, and to adjust Housing / Population when buildings and units are created. (It probably doesn't yet deny creation of a unit if it would exceed population limit, though.) Also fixed a bug where an attempt to modify a resource value failed if it was zero.
This was SVN commit r3351.
2006-01-11 15:12:41 +00:00
9a7fb2d090 A few more manual fixes.
This was SVN commit r3348.
2006-01-09 15:58:42 +00:00
e45a9afaf0 run tweaks
This was SVN commit r3347.
2006-01-09 03:28:31 +00:00
5633336231 trying to test out the running stuff - deleting some old actors for the celts we no longer need
This was SVN commit r3346.
2006-01-09 03:13:45 +00:00
9da1e9e18b Property tree listing in manual using Philip's cunning recursion algorithm.
This was SVN commit r3345.
2006-01-08 23:50:11 +00:00
a08bf7b52e Fixed some glitches in my entityInit code. Changed erroneous UP references to XP and promotion.
This was SVN commit r3344.
2006-01-08 14:01:10 +00:00
0f2a1db46b Initial layout of F1 unit manual.
This was SVN commit r3343.
2006-01-08 13:39:05 +00:00
pyrolink
8f7202f00b Entities default to run speed = 0
Notification event

This was SVN commit r3340.
2006-01-08 08:23:59 +00:00
thedrunkyak
7720378f6c Added Mute function, fixed minor bug.
This was SVN commit r3335.
2006-01-07 11:42:59 +00:00
thedrunkyak
4026c15221 Changed the audio menu to allow disabling of the sound.
This was SVN commit r3334.
2006-01-07 10:34:06 +00:00
pyrolink
1c43192f2d All units start out with 0 run speed.
This was SVN commit r3330.
2006-01-05 06:16:35 +00:00
7cb9a4a084 Fixed the entity pointing to incorrect actor
This was SVN commit r3327.
2006-01-02 09:09:36 +00:00
0a3e9ec537 - Added pause game functionality.
- Removed CDamageType from the engine - damage is now handled only
within the entity script (easier to mod/modify).

This was SVN commit r3325.
2006-01-02 03:07:29 +00:00
b045cfd480 This was SVN commit r3324. 2006-01-01 02:29:04 +00:00
165e4aacb9 cliff texture fix
This was SVN commit r3323.
2005-12-31 22:44:14 +00:00
6dfe5b082b tartan fixes
This was SVN commit r3322.
2005-12-31 12:24:25 +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
ed86f34d20 Giving the Macedonian hero a sarissa. ;)
This was SVN commit r3320.
2005-12-31 03:32:18 +00:00
736aece049 This was SVN commit r3319. 2005-12-31 03:22:11 +00:00
Aeros
b961c4fd8c This was SVN commit r3318. 2005-12-31 02:14:36 +00:00
892ae838ef Fixing the phalanx stuff - new shields, and a walk animation
This was SVN commit r3317.
2005-12-31 02:09:18 +00:00
4f071bd979 some animation fixes for the sarrissa - new shield - and new attack
This was SVN commit r3316.
2005-12-30 23:42:49 +00:00
e2d6417c2f New animations - phalanx, celt taunts, and also a new woman walk and idle
This was SVN commit r3315.
2005-12-30 09:43:00 +00:00
9710f3ee72 This was SVN commit r3314. 2005-12-30 09:07:38 +00:00
991e1430cf Temp Actors of dead units to use in screenshots
This was SVN commit r3313.
2005-12-30 06:54:02 +00:00
0b6b971ee8 Generic orders data commit (changes to the entity scripts and XML's).
This was SVN commit r3310.
2005-12-29 08:43:38 +00:00
f8f81aa7d9 This was SVN commit r3297. 2005-12-28 14:03:30 +00:00
Aeros
2ed881c7c3 This was SVN commit r3296. 2005-12-28 11:25:38 +00:00
1c629470fd xmas screenshot map edit for CheeZification
This was SVN commit r3295.
2005-12-28 05:53:19 +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
9190ddf9ba fixed some collision radius issues
This was SVN commit r3290.
2005-12-27 00:27:07 +00:00
33e03fdf6d some player ownership changes for some combat testing
This was SVN commit r3289.
2005-12-27 00:00:22 +00:00
385e26b64f Made some changes to the map, per Jason the Wijitmaker.
This was SVN commit r3288.
2005-12-26 23:45:00 +00:00
f625290a39 Gave main-line Hellene spearmen the "standard" length spear.
This was SVN commit r3286.
2005-12-25 08:27:49 +00:00
91d5d9da28 Female updates
This was SVN commit r3285.
2005-12-24 13:15:50 +00:00
c74eff63f0 Some Map fixes - moving the ones that are no longer valid after the entity rename to the /old folder and updated the ken map.
This was SVN commit r3284.
2005-12-23 11:03:20 +00:00
b8f3adb225 Committed a screenshot I have been working on.
This was SVN commit r3283.
2005-12-23 10:16:08 +00:00
d8149fe9a1 Doh, one more fix for some history and naming updates for the celtic dock
This was SVN commit r3280.
2005-12-22 05:55:59 +00:00
75113dae35 few more tweaks to entities
This was SVN commit r3279.
2005-12-22 05:52:36 +00:00
c6c0e0422d Fixed some entities and added the missing greek ships
This was SVN commit r3278.
2005-12-22 05:35:35 +00:00
8f5b5b7b73 Added time parameter on infidelity aura (currently sheep convert instantly but female citizens take 10 seconds).
This was SVN commit r3271.
2005-12-18 07:30:11 +00:00
74b8c5b15f More Greek unit tweaks
This was SVN commit r3266.
2005-12-17 20:45:27 +00:00
1bedd9457a - Fixed the issue that was causing crashes when you tried to place one of them. They had 2 problems: first the template_structure_special whose parent was itself, as Phillip pointed out, but second also incorrect actor names. I also made the Carthaginian wall refer to the right parent template.
- Added a "dropsite" aura to mills, farmsteads and civil centers, and
modified the gathering code so you can only gather objects that have
this aura on them from one of these buildings. You can also add a
traits.supply.forageable tag to an entity to make it ignore the
requirement for dropsites and gather it wherever it is. I did this for
hunting, so you can hunt without being near a farmstead.

This was SVN commit r3265.
2005-12-17 09:28:26 +00:00
2d477a09cf Profiler: Shift+F11 to save profile data into logs/profile.txt
This was SVN commit r3263.
2005-12-17 02:33:57 +00:00
a40ee4bcbc Fixed the button flickering bug. It turns out that guiHide/guiUnHide were settings controls to hidden/unhidden each tick, which caused the C++ code to reset mouse interaction properties even if the thing went from unhidden to unhidden. I fixed it by making guiHide and guiUnHide check whether the control is already hidden/unhidden before changing it, though maybe we want different behaviour from the C++ code.
This was SVN commit r3262.
2005-12-17 00:24:43 +00:00
7af724889c Updated unit training to work with the new entities.
This was SVN commit r3261.
2005-12-16 22:52:10 +00:00
cf4c27f2a9 Changed the create lists for the Civ Centres so they'e no longer invalid (needs to point to the _b versions of CSes).
This was SVN commit r3260.
2005-12-16 16:21:40 +00:00
299248ec46 Entity fixes, new greek material
This was SVN commit r3259.
2005-12-16 13:03:53 +00:00
4de14f47f7 Sheep should no longer be overly fond of trees & rocks.
This was SVN commit r3258.
2005-12-16 07:22:40 +00:00
2d969da879 Removed some debug messages.
This was SVN commit r3257.
2005-12-16 07:19:47 +00:00
54194e49ec This was SVN commit r3256. 2005-12-16 07:13:13 +00:00
59eadae140 Fixed build buttons for new entities.Fixed command buttons for the new entities. Also fixed a bug where build buttons disappeared after you clicked a unit that couldn't build anything (there was a missing guiUnHide) and added infidelity aura to herdable animals.
This was SVN commit r3255.
2005-12-16 07:12:19 +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
96df45e83d This was SVN commit r3252. 2005-12-15 23:20:53 +00:00
6578c2c05c Added the new entities.
This was SVN commit r3251.
2005-12-15 22:58:31 +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
15be1474bc Archers should now be able to fire, though I don't know what exactly the problem was (it seems that you need the "event" parameter to be 0.5 and the "load" parameter to be 0 in the animation for it to work, and the animation is not completely right; not sure if this is intended).
This was SVN commit r3243.
2005-12-14 04:53:53 +00:00
213463fdfd update JS code to use new fade code. fix some indentation.
This was SVN commit r3242.
2005-12-13 23:19:15 +00:00
e4cf72e949 Rewrote InfidelityAura in a more correct way (if there are units from several players but none from your owner near you, you should switch to the player with the most units, not remain with your current owner; also, don't count other infidel things as units of your own player near you, so groups can be converted together).
This was SVN commit r3240.
2005-12-13 21:43:08 +00:00
0eb7108272 Added aura scripts and 3 auras: a Courage aura of 15 on Themistocles and 5 on Alexander, a Fear aura of 5 on Leonidas, and an Infidelity aura on female citizens.
This was SVN commit r3237.
2005-12-13 08:03:49 +00:00
8d3df809bb fixed some broken animations with the greek javelinists (though I still can't get either the elite javelinists for the celts or greeks to work properly)
This was SVN commit r3234.
2005-12-12 07:47:11 +00:00
2e5d310c56 Trees can no longer move.
This was SVN commit r3231.
2005-12-11 23:28:08 +00:00
Aeros
78cc73481c This was SVN commit r3228. 2005-12-11 04:11:08 +00:00
a5f9789940 Fixes to entity death and event handling (buildings should no longer be able to move, all units should be able to die).
This was SVN commit r3225.
2005-12-11 02:08:24 +00:00
14ecaf2f08 oops wrong material type - fixed
This was SVN commit r3224.
2005-12-11 02:04:09 +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
724477a0d9 Atlas build, and new toolbar icons.
This was SVN commit r3216.
2005-12-09 03:59:31 +00:00
Aeros
ce3bd33d76 grass clumps
This was SVN commit r3206.
2005-12-07 07:51:19 +00:00
9b1da42678 Atlas: Better toolbar.
This was SVN commit r3192.
2005-12-05 20:17:10 +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
e0aa4feb99 Fixed a few issues in Cantabrian Highlands.
This was SVN commit r3181.
2005-11-27 01:27:44 +00:00
b4e50e24ba This was SVN commit r3180. 2005-11-27 01:17:09 +00:00
e92c36bc36 Added new cantabrian_generated.
This was SVN commit r3178.
2005-11-27 01:10:10 +00:00
Aeros
760b915d54 bobby - added large oaks and tweaked scale on normal oaks
This was SVN commit r3169.
2005-11-22 07:22:09 +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
560e4d5077 Greek Siege Weapons
This was SVN commit r3153.
2005-11-19 11:22:57 +00:00
ae7303cce4 removal of the last of the .png files (except what is left over in your local screenshot folders)
This was SVN commit r3150.
2005-11-18 22:50:37 +00:00
c2b3157b8d test objects for the renderer
This was SVN commit r3147.
2005-11-18 12:57:31 +00:00
78af045795 Removing last remaining .png files
This was SVN commit r3140.
2005-11-18 04:15:31 +00:00
Aeros
bd7078161c Bobby - Forest Oak trees added and fixed the messed up poplar prop point that was giving people telephone poles. Moved the old oaks (since we already had an oak.xml) to oak_old.xml
This was SVN commit r3139.
2005-11-16 09:05:29 +00:00
f21b06e36a add DLLs from VC8 so that applications with manifests enabled run on systems without VC8 installed
This was SVN commit r3138.
2005-11-15 16:22:15 +00:00
Aeros
96aea16461 This was SVN commit r3137. 2005-11-14 00:54:41 +00:00
Aeros
7e16caf791 This was SVN commit r3136. 2005-11-14 00:52:14 +00:00
Aeros
a198cba9b7 This was SVN commit r3135. 2005-11-14 00:50:59 +00:00
c38352703e Greek horse cavalry stuff
This was SVN commit r3132.
2005-11-13 11:38:29 +00:00
pyrolink
139698ec1d Entity heal update.
This was SVN commit r3129.
2005-11-13 06:43:04 +00:00
f27cab84f8 Finishing of the last of the greek buildings for Milestone VII
This was SVN commit r3126.
2005-11-09 09:53:50 +00:00
Aeros
9305db42a2 Bobby - Lumbardy Poplar asset added to test new tree implimentation system ingame and to show to an impacient Michael ;)
This was SVN commit r3125.
2005-11-09 09:18:05 +00:00
9d3be5713b Work around what is apparently an ATI driver bug in the GLSL implementation
This was SVN commit r3113.
2005-11-06 22:47:26 +00:00
f160fe1469 instancing.xml doesn't need shlight.vs (thanks to Philip for pointing it out)
This was SVN commit r3108.
2005-11-06 17:36:58 +00:00
d3441f3f48 This was SVN commit r3082. 2005-11-03 00:07:13 +00:00
62c0dc6fc2 Another grass texture. Should be one of my last for a while. I think e now have a good variety of grasses to fill out most biomes.
This was SVN commit r3081.
2005-11-03 00:06:30 +00:00
32ee913936 Gallic Fortress
This was SVN commit r3077.
2005-11-02 02:04:10 +00:00
ab0afbb299 Celt special building
This was SVN commit r3076.
2005-11-01 10:33:09 +00:00
d41283ab52 This was SVN commit r3075. 2005-11-01 06:26:14 +00:00
f1877c0493 First draft of the celt turf wall - deletion of some old unused celt meshes.
This was SVN commit r3074.
2005-11-01 04:41:50 +00:00
9f7de4bd3a Celt wall entities
This was SVN commit r3073.
2005-11-01 04:43:35 +00:00
416c7fe4ba Get rid of errors (selection can have size 0).
This was SVN commit r3061.
2005-10-30 21:09:27 +00:00
5582e4b890 Added resetUpdateVars(), so that selection/property update handler is actually refreshed and so improves performance like it's meant to. ;) Thanks for spotting that, Philip.
This was SVN commit r3053.
2005-10-30 01:06:04 +00:00
875cb3bca1 Add ARB_vertex_shader specific functions to glext_funcs.h
Add an "instancing" model renderer to improve rendering of
non-transparent,
unanimated models. This renderer is used when the vertexshader path is
rendering path is used.

This was SVN commit r3052.
2005-10-30 00:22:22 +00:00
abee717a26 Few more updates for the celt buildings
This was SVN commit r3045.
2005-10-29 09:26:17 +00:00
e8540b29bd Celt Structure updates
This was SVN commit r3042.
2005-10-29 00:27:34 +00:00
b5c489e1d5 This was SVN commit r3040. 2005-10-28 06:00:02 +00:00
900cb559e1 Trying out some different stone textures.
This was SVN commit r3039.
2005-10-28 05:15:51 +00:00
271b66965d This was SVN commit r3038. 2005-10-28 05:14:44 +00:00
e56f8341dc This was SVN commit r3034. 2005-10-27 08:46:46 +00:00
b155861284 Made some new parched grass textures and actors
This was SVN commit r3033.
2005-10-27 08:45:59 +00:00
ae87ca51aa Celtic Fortress, and scale fix for the Celtic tower (to match the other towers in height)
This was SVN commit r3031.
2005-10-26 09:55:49 +00:00
582a8cceed This was SVN commit r3030. 2005-10-26 07:15:06 +00:00
95fb49053e This was SVN commit r3029. 2005-10-26 07:14:32 +00:00
65abf65da0 Deletion of the UI backup art - it has been moved to the ~art/guibackup now if needed
(down with the .png files!)

This was SVN commit r3028.
2005-10-26 02:32:11 +00:00
3ad3d32a82 Fortress fix for odd prop problem
This was SVN commit r3027.
2005-10-26 02:25:42 +00:00
2842098a49 portrait updates for the Celts and Greeks
This was SVN commit r3024.
2005-10-25 08:46:18 +00:00
409443d678 oops, wrong helmet
This was SVN commit r3023.
2005-10-25 07:02:14 +00:00
3548e09076 Themistocles update from Michaels request
This was SVN commit r3022.
2005-10-25 06:55:40 +00:00
2f341f5210 Sharpened up Themistocles' shield a bit.
This was SVN commit r3021.
2005-10-25 06:37:23 +00:00
724d072b1f This was SVN commit r3020. 2005-10-25 05:36:26 +00:00
4574c24a3a This was SVN commit r3019. 2005-10-25 05:15:09 +00:00
40e3ffa490 This was SVN commit r3018. 2005-10-25 05:13:50 +00:00
404dc10d6a This was SVN commit r3017. 2005-10-25 05:13:15 +00:00
7355310011 This was SVN commit r3016. 2005-10-25 05:12:40 +00:00
84ec0ac4a4 This was SVN commit r3015. 2005-10-25 05:11:50 +00:00
777fc4b7b5 The things CheeZy and I threw together for the Pond Battle screenshot.
This was SVN commit r3014.
2005-10-25 05:11:07 +00:00
11d6b08360 GUI updates converting from .png to .dds
This was SVN commit r3010.
2005-10-25 01:29:42 +00:00
d17e48ad99 Updated to fix .png to .dds changes
This was SVN commit r3008.
2005-10-25 01:12:59 +00:00
7cb003f18c Greek shield changes - yet again
This was SVN commit r3000.
2005-10-24 10:17:26 +00:00
52a8793450 Atlas: Bits of tool-related code.
Game: Large screenshots (with ctrl+alt+F2).

This was SVN commit r2994.
2005-10-24 01:53:03 +00:00
5bf15b107d Hero Thermistocles!
This was SVN commit r2989.
2005-10-23 05:26:49 +00:00
aba61336b7 Ooops forgot some xenophon files
This was SVN commit r2987.
2005-10-22 10:17:35 +00:00
c10b413f65 Hero Xenophon, Player colorized the Greek colored shields, Shield back for round greek shields.
This was SVN commit r2986.
2005-10-22 10:02:26 +00:00
c0eb742373 Changed player colors to be more consitant in terms of brightness and hue
This was SVN commit r2985.
2005-10-22 09:59:47 +00:00
011aadb3df Added a new dry grass actor.
This was SVN commit r2982.
2005-10-21 08:36:55 +00:00
1ff1045a7c Explicit minimap colours for each terrain, to improve loading times.
This was SVN commit r2978.
2005-10-19 23:03:44 +00:00
7b4b44eee0 Got tired of waiting for the "monkeys" so I made the granite stone actors myself. - Mythos
This was SVN commit r2960.
2005-10-18 03:40:22 +00:00
62c5e311f2 All fixed to include new 3D meshes
This was SVN commit r2953.
2005-10-16 21:35:27 +00:00
8c0da64fe1 This was SVN commit r2952. 2005-10-16 21:33:01 +00:00
80434a8a12 Updated with new meshes
This was SVN commit r2951.
2005-10-16 21:22:39 +00:00
bcca0722b4 New 3D meshes for large reeds and crops.
This was SVN commit r2950.
2005-10-16 21:13:21 +00:00
499c073873 This was SVN commit r2949. 2005-10-16 21:12:37 +00:00
0d5ce47915 Leonidas Hero
This was SVN commit r2943.
2005-10-15 04:15:02 +00:00
Fire Giant
e049e0a60d Fixed positioning of new LOS control (TODO: split into FoW and Reveal check boxes)
This was SVN commit r2938.
2005-10-14 02:06:51 +00:00
Fire Giant
39dbc65a19 Updated session setup screen and some minor changes in shell GUI layout.
This was SVN commit r2937.
2005-10-13 20:04:22 +00:00
7b31f0372b GameView: move camera lock params here
wsdl: add proper event queuing mechanism (no longer requires hacky
polling for changes and avoids WM_USER)
rename keys[] and mouse_buttons to g_keys and g_mouse_buttons
fix flipped mouse wheel direction; wsdl now sends up AND down event
(removed 'reset' hack in main.cpp)
main: clean up event handler and kill_mainloop

This was SVN commit r2934.
2005-10-13 18:05:55 +00:00
a6225ffa21 added a randomized texture
This was SVN commit r2931.
2005-10-13 09:10:43 +00:00
db4bb3a4d1 This was SVN commit r2930. 2005-10-13 09:09:47 +00:00
e95f2f4de4 New grass tall texture to randomize the grass
This was SVN commit r2929.
2005-10-13 08:53:09 +00:00
141c39ab91 Modified grass_field_lush_tall.xml to randomize a bit.
This was SVN commit r2928.
2005-10-13 08:52:31 +00:00
b950a98ffb pond-battle2.pmp and pond-battle2.xml are an update for the possible gamedev submission. This is for CheeZy to add his magic.
This was SVN commit r2927.
2005-10-13 07:44:42 +00:00
Dnas
82a8126002 Updated hele_[a-h]1.dds. and first commit! :-)
This was SVN commit r2926.
2005-10-13 07:29:35 +00:00
c153fb5c62 This was SVN commit r2925. 2005-10-13 07:25:37 +00:00
2cd06a66ae Fixed the hellenes/super_unit_1.xml actor to use the correct tunic mesh.
This was SVN commit r2924.
2005-10-13 01:56:53 +00:00
46c84a8b99 This was SVN commit r2923. 2005-10-13 01:44:05 +00:00
d30b9fdc23 This was SVN commit r2922. 2005-10-13 01:31:16 +00:00
2dae4ab373 This was SVN commit r2921. 2005-10-13 01:06:07 +00:00
0babbd8420 This was SVN commit r2920. 2005-10-13 00:46:04 +00:00
04654b4064 This was SVN commit r2918. 2005-10-12 21:32:10 +00:00
dff64f6b96 Fix some broken links to props in the persian house xml file
This was SVN commit r2912.
2005-10-12 08:38:08 +00:00
906d0f31fa update with Ken's map and fixes for some bad unit meshes
This was SVN commit r2911.
2005-10-12 07:56:17 +00:00
b53e236a02 Greek Archers completed, Trader completed, Super Unit 2 is completed
This was SVN commit r2908.
2005-10-12 04:33:02 +00:00
7e7e0cd052 Demo map for Ken featuring all the completed art work so far of structures/units
This was SVN commit r2901.
2005-10-12 00:37:05 +00:00
30b80c032d Alexander Hero (hopefully I included everything)
This was SVN commit r2900.
2005-10-11 11:59:26 +00:00
8d37fba12f This was SVN commit r2899. 2005-10-11 05:22:18 +00:00
868649d491 This was SVN commit r2890. 2005-10-10 08:17:17 +00:00
57b8886f63 This was SVN commit r2889. 2005-10-10 05:25:56 +00:00
e294e30c51 Added LOS setting to game setup screen.
This was SVN commit r2886.
2005-10-10 03:34:45 +00:00
575500169d This was SVN commit r2885. 2005-10-10 02:24:48 +00:00
84d47305ea This was SVN commit r2884. 2005-10-10 02:24:00 +00:00
3414e847be Updated the temporary Bireme so it inherited from the ship template instead of the Female Citizen (which was fairly disturbing).
This was SVN commit r2883.
2005-10-09 14:22:55 +00:00
f2862de50e few xml error fixes
This was SVN commit r2882.
2005-10-09 11:17:40 +00:00
7ebdefec4b Atlas: improved brushes
This was SVN commit r2875.
2005-10-09 03:26:16 +00:00
7fc8713794 Made the LOS properties slightly more realistic.
This was SVN commit r2874.
2005-10-09 03:00:03 +00:00
d4663954f2 Replaced the temporary ship with a new and improved bireme, stuck some units on the prop points for a sense of scale.
This was SVN commit r2873.
2005-10-09 01:21:31 +00:00
5070ced96f Properties for LOS for Matei: traits.vision.los (structures, units), traits.vision.permanent (structures, gaia).
This was SVN commit r2872.
2005-10-08 23:00:39 +00:00
Aeros
d3721d4491 This was SVN commit r2871. 2005-10-08 08:02:50 +00:00
Aeros
c15f69cb85 This was SVN commit r2870. 2005-10-08 07:58:04 +00:00
d2ee50031c Fix shlight.vs for ATI cards.
The NVidia shader compiler is not as strict as the ATI compiler.

This was SVN commit r2856.
2005-10-05 19:29:52 +00:00
f1ee2cd66d Add the notion of render paths and an appropriate configuration option.
Add Ogl_Shader and Ogl_Program handle types for shaders/programs loaded
from
files.
In the vertexshader render path, use a vertex program for lighting for
optimization.

This was SVN commit r2853.
2005-10-05 16:42:09 +00:00
539460abd8 This was SVN commit r2852. 2005-10-05 08:35:14 +00:00
7e8ab14139 This was SVN commit r2851. 2005-10-05 07:38:55 +00:00
639a1ee8cb This was SVN commit r2850. 2005-10-05 07:38:04 +00:00
932cab0da1 This was SVN commit r2849. 2005-10-05 07:37:34 +00:00
6859ce1e52 ooops missing texture I shouldn't have renamed
This was SVN commit r2848.
2005-10-05 05:23:17 +00:00
72d71ae3a9 renamed some shoreline textures, painted the terrain on the 0ad map, and fixed a bad link in the roman barracks entity
This was SVN commit r2847.
2005-10-05 05:03:21 +00:00
a181ef1fef This was SVN commit r2845. 2005-10-04 07:03:07 +00:00
57a9941176 This was SVN commit r2844. 2005-10-04 07:02:33 +00:00
7abf24b6c6 Possible speed optimisation for gaia entities (don't inherit the usual events and the entity script).
This was SVN commit r2842.
2005-10-03 20:57:10 +00:00
c8b3be282d This was SVN commit r2836. 2005-10-03 05:00:36 +00:00
f0542c9b45 This was SVN commit r2835. 2005-10-03 04:59:48 +00:00
9a527643ff This was SVN commit r2834. 2005-10-03 04:57:33 +00:00
fec54c7f0d This was SVN commit r2833. 2005-10-03 04:56:20 +00:00
9369ea0978 This was SVN commit r2832. 2005-10-03 04:55:55 +00:00
8bb6a6b56f This was SVN commit r2831. 2005-10-03 04:52:02 +00:00
17bc0a98df This was SVN commit r2830. 2005-10-03 04:49:09 +00:00
4054c13c1f This was SVN commit r2829. 2005-10-03 04:48:18 +00:00
e15bd16af4 This was SVN commit r2828. 2005-10-03 03:46:58 +00:00
c4c28360eb Roman CC, Barracks, Market - Thracian Peltasts
Set ignore .xmb files on several actor folders

This was SVN commit r2825.
2005-10-01 09:47:06 +00:00
ffd8630c45 Updated autobuilder to get the .pdb files from 'system'.
Deleted ps_test, since it isn't updated by the autobuilder and will be
out of date.
Removed console history file, since it doesn't need to be
version-controlled.

This was SVN commit r2823.
2005-10-01 04:26:12 +00:00
951789c6a6 This was SVN commit r2808. 2005-09-29 08:36:17 +00:00
14d1b28660 This was SVN commit r2807. 2005-09-29 08:35:49 +00:00
c4c9a46953 This was SVN commit r2806. 2005-09-29 08:12:34 +00:00
358abedde0 This was SVN commit r2805. 2005-09-29 08:11:52 +00:00
4863e84ee1 This was SVN commit r2804. 2005-09-29 08:09:56 +00:00
Aeros
14df805761 This was SVN commit r2802. 2005-09-29 04:50:21 +00:00
Aeros
788becefc8 This was SVN commit r2795. 2005-09-28 06:58:02 +00:00
Aeros
73e2e8ce00 This was SVN commit r2794. 2005-09-28 06:52:54 +00:00
Aeros
25be56b5a2 This was SVN commit r2793. 2005-09-28 06:02:14 +00:00
028292fd89 water textures to use object color properties
This was SVN commit r2785.
2005-09-27 21:53:32 +00:00
9e8a6d926e This was SVN commit r2782. 2005-09-27 18:15:19 +00:00
0bda64f8e4 renamed 'real world' to 0ad and while I'm at it, I figure I may as well, add more maps - so here are a few countries/regions to play with.
This was SVN commit r2778.
2005-09-27 09:59:16 +00:00
a4ab2be574 This is real world satelite data. Not to be confused with MTV real world ;)
This was SVN commit r2777.
2005-09-27 09:27:00 +00:00
Aeros
a4cdf8ee46 This was SVN commit r2776. 2005-09-27 09:24:59 +00:00
Aeros
1b805ebee7 This was SVN commit r2775. 2005-09-27 06:44:48 +00:00
5f81e5d336 World map draft 1
This was SVN commit r2774.
2005-09-27 05:20:02 +00:00
a88915825f Various GUI fixes (and probably some breakages ;D).
This was SVN commit r2768.
2005-09-26 23:08:06 +00:00
75b291931d Actor reorganisation
This was SVN commit r2763.
2005-09-23 03:54:51 +00:00
de6d43c290 Actor reorganisation
This was SVN commit r2762.
2005-09-23 03:31:41 +00:00
173b060668 Changed entity script to to allow Gaia units to be attacked (gather will still be higher priority though).
This was SVN commit r2753.
2005-09-19 01:20:23 +00:00
bc3949db1a Added a fairly primitive water plane. This includes several things:
- Hotkeys Q, A, Z to toggle, raise and lower the water plane
respectively.
- A unit trait, named anchor, that says whether it attaches to the
terrain or the water.
- Small changes to rendering code.

This was SVN commit r2744.
2005-09-18 03:16:12 +00:00
a98ee94af9 A ship for testing purposes.
This was SVN commit r2740.
2005-09-17 11:18:45 +00:00
6f90dec78f Added Neareastern Badlands map.
This was SVN commit r2733.
2005-09-15 02:57:09 +00:00
0d11643032 Fixed a bug that was causing the original resource values to be strings instead of numbers, resulting in string concatenation when you gathered a resource.
This was SVN commit r2731.
2005-09-15 02:03:01 +00:00
58fbafbbdd Command buttons can finally invoke the building painter or train units. Still plenty of glitches (particularly click-fest issues ... still an issue when updating the buttons directly rather than via hack, so it's probably due to constant onPress refresh). I've also had to disable the progress bar until I can make it work properly, but if you can get a unit in the queue it should eventually spawn. :)
This was SVN commit r2727.
2005-09-14 22:47:51 +00:00
2aca87419f This was SVN commit r2724. 2005-09-14 19:42:58 +00:00
4ab25c7274 * Fixed the "can't interact with the world" glitch. Turns out it was my fault. :)
* Restored the resource pool (and cleaned up the JS interface to it ...
array and counters are updated in one spot (wrapper functions to
add/deduct/define), without need for constant refresh).
* Added crude boxes in game setup to enter initial resource value.
* The command buttons still don't work when clicked (and clicking
continues to be erratic, only triggering if hammering the mouse button
... I think it's related to the return function() hack Philip set up),
but that's next on the list. :)
* Oh, and the command buttons don't currently realign to the different
corners with Alt+G, but all the rest should.

This was SVN commit r2715.
2005-09-14 00:50:25 +00:00
2766242181 This was SVN commit r2713. 2005-09-13 22:58:54 +00:00