1
0
forked from 0ad/0ad
Commit Graph

944 Commits

Author SHA1 Message Date
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