mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 04:26:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: mirrors/0ad:a02
Branches Tags
mirrors/0ad:main
mirrors/0ad:v0.28.0 mirrors/0ad:v0.28.0-rc4 mirrors/0ad:v0.28.0-rc3 mirrors/0ad:v0.28.0-rc2 mirrors/0ad:v0.28.0-rc1 mirrors/0ad:v0.28.0-rc0 mirrors/0ad:a27.1-rc3 mirrors/0ad:a27.1 mirrors/0ad:a27.1-rc2 mirrors/0ad:a27.1-rc1 mirrors/0ad:a27 mirrors/0ad:a26 mirrors/0ad:a25b mirrors/0ad:a25 mirrors/0ad:a24 mirrors/0ad:a23b mirrors/0ad:a23 mirrors/0ad:a22 mirrors/0ad:a21 mirrors/0ad:a20 mirrors/0ad:a19 mirrors/0ad:a18 mirrors/0ad:a17 mirrors/0ad:a16 mirrors/0ad:a15 mirrors/0ad:a14 mirrors/0ad:a13 mirrors/0ad:a12 mirrors/0ad:a11 mirrors/0ad:a10 mirrors/0ad:a09 mirrors/0ad:a08 mirrors/0ad:a07 mirrors/0ad:a06 mirrors/0ad:a05 mirrors/0ad:a04 mirrors/0ad:a03 mirrors/0ad:a02 mirrors/0ad:a01
...
compare: mirrors/0ad:a03
Branches Tags
mirrors/0ad:main
mirrors/0ad:v0.28.0 mirrors/0ad:v0.28.0-rc4 mirrors/0ad:v0.28.0-rc3 mirrors/0ad:v0.28.0-rc2 mirrors/0ad:v0.28.0-rc1 mirrors/0ad:v0.28.0-rc0 mirrors/0ad:a27.1-rc3 mirrors/0ad:a27.1 mirrors/0ad:a27.1-rc2 mirrors/0ad:a27.1-rc1 mirrors/0ad:a27 mirrors/0ad:a26 mirrors/0ad:a25b mirrors/0ad:a25 mirrors/0ad:a24 mirrors/0ad:a23b mirrors/0ad:a23 mirrors/0ad:a22 mirrors/0ad:a21 mirrors/0ad:a20 mirrors/0ad:a19 mirrors/0ad:a18 mirrors/0ad:a17 mirrors/0ad:a16 mirrors/0ad:a15 mirrors/0ad:a14 mirrors/0ad:a13 mirrors/0ad:a12 mirrors/0ad:a11 mirrors/0ad:a10 mirrors/0ad:a09 mirrors/0ad:a08 mirrors/0ad:a07 mirrors/0ad:a06 mirrors/0ad:a05 mirrors/0ad:a04 mirrors/0ad:a03 mirrors/0ad:a02 mirrors/0ad:a01

398 Commits
a02 ... a03

Author SHA1 Message Date
Ykkrosh 11b767e235 Stop unit deletion prompt text overlapping the window border 
This was SVN commit r8832.
 2010-12-09 22:15:23 +00:00
Ykkrosh 89b294d536 Disable compression for more UI textures with noticeable artifacts 
This was SVN commit r8831.
 2010-12-09 22:06:11 +00:00
Ykkrosh 7a9e12613d Update release number 
This was SVN commit r8830.
 2010-12-09 18:46:56 +00:00
janwas ba2a9d7af3 improvements from work: [update-workspaces required] 
- split precompiled.h into several headers (simplifies reuse)
- enable additional warnings not in W4
- split ErrorReaction into ErrorReactionInternal - clarifies which
values can actually be returned by debug_DisplayError
- wsdl: slightly safer HDC usage via CS_OWNDC, avoid dipping into DC
cache via ValidateRect instead of BeginPaint; remove unused thread
create
- StdDeserializer - wasn't including byte_order => BYTE_ORDER was
undefined
- wsysdep: clean up error dialog message handling

This was SVN commit r8828.
 2010-12-09 11:16:21 +00:00
historic_bruno 78f2924f9c Changed default maps 
This was SVN commit r8827.
 2010-12-09 01:30:51 +00:00
Mythos_Ruler 76a67755bc Garrison flag for wall turret. 
This was SVN commit r8826.
 2010-12-09 00:03:19 +00:00
Mythos_Ruler c7a31987bb Moar garrison flag work. 
This was SVN commit r8825.
 2010-12-08 23:34:33 +00:00
Mythos_Ruler 5cf1995e2c Fixing up some garrison flag stuff and projectile stuff. 
This was SVN commit r8824.
 2010-12-08 23:10:24 +00:00
Mythos_Ruler 0b511e33a7 This was SVN commit r8823. 2010-12-08 21:26:50 +00:00
Mythos_Ruler be4b262919 Removed the dudes from the top of the wall gate. Made a bolt projectile for the Oxybeles. 
This was SVN commit r8822.
 2010-12-08 21:26:08 +00:00
evanssthomas 549a4fc51a Garrisoning bug fixes 
This was SVN commit r8821.
 2010-12-08 20:12:24 +00:00
Mythos_Ruler e486e6fefb Adjusted health/train time of the Corrals. 
This was SVN commit r8820.
 2010-12-08 19:41:12 +00:00
Mythos_Ruler a80b139a28 Building tooltip tweaks for Alpha III release. These tooltips will be updated as we add more relevant features. 
This was SVN commit r8819.
 2010-12-08 19:29:48 +00:00
Mythos_Ruler 2cfd3abf08 This was SVN commit r8818. 2010-12-08 19:16:49 +00:00
Ykkrosh e853dd1079 Display "garrisoned" prop on buildings containing units 
This was SVN commit r8817.
 2010-12-08 19:03:57 +00:00
Ykkrosh 2540e17f45 Fix non-PCH builds 
This was SVN commit r8816.
 2010-12-08 18:54:05 +00:00
Mythos_Ruler 3dc6ddc8de Garrison unload button. 
This was SVN commit r8815.
 2010-12-08 18:46:59 +00:00
Ykkrosh ac3e40fe8f Disable compression for some loading screen textures, to improve quality 
This was SVN commit r8812.
 2010-12-08 16:23:35 +00:00
Ykkrosh f04c2561b7 Various resource shuttling improvements. Fixes #672. 
This was SVN commit r8811.
 2010-12-08 16:12:04 +00:00
Ykkrosh 0b0b11d2e0 Fix occasional assertion failure in time warp mode 
This was SVN commit r8810.
 2010-12-08 16:09:53 +00:00
historic_bruno e710fd25b4 Minor tweaks to game setup layout: options are now properly aligned and "locked teams" defaults to yes (which is what they are). Fix team indices on one map. 
This was SVN commit r8809.
 2010-12-08 06:19:34 +00:00
Mythos_Ruler 76ac9e7f84 This was SVN commit r8808. 2010-12-06 23:24:07 +00:00
Mythos_Ruler 0f30f08da5 This was SVN commit r8807. 2010-12-06 23:22:54 +00:00
Mythos_Ruler b7240dc3fe This was SVN commit r8806. 2010-12-06 22:50:08 +00:00
Mythos_Ruler 1932f695c4 Fixes #699 
This was SVN commit r8805.
 2010-12-06 21:30:56 +00:00
Mythos_Ruler 4f67615774 Fixes #701 
This was SVN commit r8804.
 2010-12-06 21:27:35 +00:00
Ykkrosh 8ddef2fee0 Add fast-forward/rewind commands, to help with testing. 
This was SVN commit r8803.
 2010-12-06 19:58:06 +00:00
k776 c2f4f56ad6 Add the Demo keyword to one last map 
This was SVN commit r8802.
 2010-12-06 04:59:44 +00:00
historic_bruno 9714b5dd53 Keyword clean-ups 
This was SVN commit r8801.
 2010-12-06 04:34:26 +00:00
historic_bruno 6a20743dc3 Add new Keywords tag to maps. Add map list filtering API to game setup. Add some default filters that use map keywords. Cleaned up client game setup a bit. Removed deprecated GUI utility functions. 
This was SVN commit r8800.
 2010-12-06 02:51:21 +00:00
Mythos_Ruler 01f699b62d Too much stuff to itemize. I'm lazy. 
This was SVN commit r8799.
 2010-12-06 02:20:57 +00:00
historic_bruno 637b471769 Fixes bug in last change to input.js. Use target HP to determine attack possibility. Thus gaia buildings and animals are attackable, but not trees/mines/etc. 
This was SVN commit r8798.
 2010-12-05 22:00:07 +00:00
Ykkrosh f2e1443631 Fix playtest mode in Atlas. 
This was SVN commit r8797.
 2010-12-05 21:09:20 +00:00
Mythos_Ruler 4eb9c898ac Tropic Terrains completely redone. 
This was SVN commit r8796.
 2010-12-05 17:03:01 +00:00
Ykkrosh 1b9d3fc289 Fix F10 key to open session menu. 
This was SVN commit r8795.
 2010-12-05 16:02:15 +00:00
Mythos_Ruler 15a663b91c New Iberian Walls 
This was SVN commit r8794.
 2010-12-05 13:30:04 +00:00
Mythos_Ruler 62dae2279b Updated the map. 
This was SVN commit r8793.
 2010-12-05 12:10:03 +00:00
historic_bruno 1201956b93 Additional cleaning up of logging: removed LOG_CATEGORY macro definitions. 
This was SVN commit r8792.
 2010-12-05 08:50:33 +00:00
historic_bruno 19dbbb816d Changed all references from old CLogger API to use the new API. Removed old API. Fixes #247 
This was SVN commit r8791.
 2010-12-05 08:41:55 +00:00
historic_bruno 67f08751f9 Fixes bug where military units that can't collect resources would show an "attack" icon on hovering a resource - instead they should have a default icon 
This was SVN commit r8790.
 2010-12-05 06:34:57 +00:00
historic_bruno 95da3789cd Handle SDL_ACTIVEEVENT which notifies us of mouse focus change. If mouse focus is lost don't render cursor, reverting back to OS style. When focus is regained, render cursor again. Fixes #626 
This was SVN commit r8789.
 2010-12-05 05:17:28 +00:00
Ykkrosh 819bacd538 Automatically disable audio on OS X since it's stupid and broken. 
This was SVN commit r8788.
 2010-12-04 19:42:50 +00:00
Ykkrosh 5df240d97d Disable broken GUI error reporter on OS X 
This was SVN commit r8787.
 2010-12-04 19:09:41 +00:00
Ykkrosh 53b1447007 Fix what looks like miscompilation with GCC 4.0 on OS X 
This was SVN commit r8786.
 2010-12-04 19:06:13 +00:00
Ykkrosh 4575c26616 Disable compression of public.zip (fixes #671). 
This was SVN commit r8785.
 2010-12-04 15:57:55 +00:00
Ykkrosh 4b37898ab9 Fix tests. 
This was SVN commit r8784.
 2010-12-04 15:08:18 +00:00
Mythos_Ruler 1de0ce051f This was SVN commit r8783. 2010-12-04 00:12:51 +00:00
Ykkrosh 74114bf09a Handle XMB caching with the same system as texture caching. 
Fixes #694.

This was SVN commit r8782.
 2010-12-04 00:08:26 +00:00
WhiteTreePaladin 6e37762e3c fix some more issues with the loading tips 
This was SVN commit r8781.
 2010-12-03 23:52:11 +00:00
WhiteTreePaladin 83f297182e Fix tip loading issue with pre-converted textures 
This was SVN commit r8780.
 2010-12-03 23:31:02 +00:00
Mythos_Ruler 6662195f66 New desert plants! Updated Death Canyon with the new plants. 
This was SVN commit r8779.
 2010-12-03 21:33:45 +00:00
evanssthomas 238925f927 Minor garrisoning related tweaks 
This was SVN commit r8778.
 2010-12-03 20:25:21 +00:00
Mythos_Ruler 3b817d2162 Moved the sails from structural/ to props/ (which is what they are). 
This was SVN commit r8777.
 2010-12-03 19:22:56 +00:00
Mythos_Ruler cf2638da09 This was SVN commit r8776. 2010-12-03 14:42:19 +00:00
Mythos_Ruler 88a21a6e8a The Persian trireme was already in the Public mod and properly scaled. Ask next time before committing junk. 
This was SVN commit r8775.
 2010-12-03 02:37:09 +00:00
Ykkrosh 252d9b831b Revert bogus config changes 
This was SVN commit r8774.
 2010-12-03 01:21:49 +00:00
EmjeR c917a2d6a7 This was SVN commit r8773. 2010-12-03 00:42:27 +00:00
EmjeR c6593fd0ce This was SVN commit r8772. 2010-12-03 00:40:58 +00:00
EmjeR ef6cba9fe9 This was SVN commit r8771. 2010-12-03 00:40:40 +00:00
EmjeR e5792285ab This was SVN commit r8770. 2010-12-02 23:58:00 +00:00
EmjeR 4a66605e49 This was SVN commit r8769. 2010-12-02 23:46:28 +00:00
EmjeR b0dc3c72c9 This was SVN commit r8768. 2010-12-02 23:45:11 +00:00
EmjeR 8086433e2b This was SVN commit r8767. 2010-12-02 23:42:59 +00:00
EmjeR 6b0f06f839 This was SVN commit r8766. 2010-12-02 23:42:14 +00:00
EmjeR 88efdd5cbb This was SVN commit r8765. 2010-12-02 23:29:12 +00:00
EmjeR a7a858b9c0 This was SVN commit r8764. 2010-12-02 23:28:31 +00:00
EmjeR 11f7296188 Persian Trireme updated (added detail) 
This was SVN commit r8763.
 2010-12-02 21:51:37 +00:00
Mythos_Ruler da3fd69276 Iberian ship textures. 
This was SVN commit r8762.
 2010-12-02 20:08:29 +00:00
Ykkrosh ead65712eb Delete obsolete archbuild tool 
This was SVN commit r8761.
 2010-12-02 18:05:16 +00:00
Ykkrosh a6ca28ccf9 Fix reference to big screenshot key (see #627). 
This was SVN commit r8760.
 2010-12-02 17:44:18 +00:00
Mythos_Ruler f9fb602445 Iberian sail. 
This was SVN commit r8759.
 2010-12-01 18:29:24 +00:00
Mythos_Ruler 85d093eae1 Made a garrison flag. Added it to the Greek Civic Centre and scout Tower for testing. 
This was SVN commit r8758.
 2010-12-01 10:40:25 +00:00
Mythos_Ruler 1a7f927946 This was SVN commit r8757. 2010-12-01 07:33:26 +00:00
evanssthomas c09d6dcb83 Added garrison & repair button on the unit's command panel 
This was SVN commit r8756.
 2010-12-01 03:01:17 +00:00
Mythos_Ruler 1a1bed1294 This was SVN commit r8755. 2010-11-30 16:16:53 +00:00
Ykkrosh a58e7cfb4c Fix call to renamed function 
This was SVN commit r8754.
 2010-11-30 15:39:48 +00:00
Ykkrosh 6b4478209b Fix accidental use of hard-coded constant. 
Don't bother recomputing terrain speeds multiple times per turn.

This was SVN commit r8753.
 2010-11-30 14:48:04 +00:00
Ykkrosh ab186c2b16 Update UnitMotion logic, to partially simplify it. 
Do all pathfinding asynchronously.
Recalculate paths when the target has moved.
Fix vertex pathfinder start point heuristic, to avoid finding
zero-length paths.
When units fail to reach a resource to gather, look for another resource
of the same type.

This was SVN commit r8751.
 2010-11-30 12:31:54 +00:00
Ykkrosh 3401672887 Update pathfinding demo map for testing. 
This was SVN commit r8750.
 2010-11-30 12:28:51 +00:00
Ykkrosh e509887341 Complain better about invalid player IDs. 
This was SVN commit r8749.
 2010-11-30 12:27:38 +00:00
Ykkrosh 3b405efc6b Increase serializer reserved buffer space to cope with huge maps. 
This was SVN commit r8748.
 2010-11-30 12:24:46 +00:00
WhiteTreePaladin 89b0f3a9d7 New session tooltip styles 
This was SVN commit r8747.
 2010-11-30 04:27:04 +00:00
Mythos_Ruler 103aacd035 Misc stuff. 
This was SVN commit r8746.
 2010-11-29 22:00:57 +00:00
Mythos_Ruler f17d318359 Projectile for Celtic warship. 
This was SVN commit r8745.
 2010-11-29 20:19:05 +00:00
WhiteTreePaladin 6e602c15cd Renamed tips 
Shorted Spartan tip text

This was SVN commit r8744.
 2010-11-29 19:12:48 +00:00
Mythos_Ruler f60485be02 New Hellenes Mill. Deleted old mill assets. 
This was SVN commit r8743.
 2010-11-29 17:55:22 +00:00
Mythos_Ruler e4694b2d9c updated meshes 
This was SVN commit r8742.
 2010-11-29 15:01:11 +00:00
Mythos_Ruler 693425c716 New Greek corral by Amish. 
This was SVN commit r8741.
 2010-11-29 14:21:19 +00:00
Ykkrosh bee013b586 Define CONFIG_FINAL in Release builds, to enable better compression in codec_zlib.cpp 
This was SVN commit r8740.
 2010-11-29 12:51:45 +00:00
Mythos_Ruler 7ee0ba6e07 This was SVN commit r8739. 2010-11-29 12:12:46 +00:00
Mythos_Ruler 75d6eec95d This was SVN commit r8738. 2010-11-29 08:36:35 +00:00
Mythos_Ruler 9b9eaed50f This was SVN commit r8737. 2010-11-29 08:35:40 +00:00
Mythos_Ruler 28edb498d3 This was SVN commit r8736. 2010-11-28 19:03:23 +00:00
WhiteTreePaladin c922912ac5 Cleaned up loading files 
Changed single player start game text

This was SVN commit r8735.
 2010-11-28 17:27:00 +00:00
WhiteTreePaladin e53616f857 Fix non power-of-two middle progress bar section dimensions 
This was SVN commit r8734.
 2010-11-28 16:49:43 +00:00
Mythos_Ruler 8019ee8b5f This was SVN commit r8733. 2010-11-28 16:08:58 +00:00
Mythos_Ruler f06eba3da5 yet another awesome tip. :) 
This was SVN commit r8732.
 2010-11-28 14:35:48 +00:00
Mythos_Ruler 9ab58ce6e8 Another great "tip". 
This was SVN commit r8731.
 2010-11-28 14:22:42 +00:00
Mythos_Ruler 216eeea5c9 Updated the Celt ship portraits. Made an Iberian fishing boat. 
This was SVN commit r8730.
 2010-11-28 14:10:32 +00:00
Mythos_Ruler 31717a71ba Removed rally command from these buildings, since they neither have garrison capacity nor do they train anything. 
This was SVN commit r8729.
 2010-11-28 13:18:35 +00:00
Mythos_Ruler 1ebcd2e7e3 This was SVN commit r8728. 2010-11-28 11:56:15 +00:00
Mythos_Ruler 4cd93b6105 This was SVN commit r8727. 2010-11-28 09:17:43 +00:00
Mythos_Ruler 1f02df5abc Moved some things. Deleted other things. Updated a few maps. 
This was SVN commit r8726.
 2010-11-28 09:15:26 +00:00
Mythos_Ruler 7819c4707c Moving a lot of stuff. Deleting duplicate objects. 
This was SVN commit r8725.
 2010-11-28 08:19:41 +00:00
Mythos_Ruler 98687bfbf6 Removing duplicate and unnecessary textures. 
This was SVN commit r8724.
 2010-11-28 08:13:25 +00:00
Mythos_Ruler 1b0f3498fe Moved from Internal. 
This was SVN commit r8723.
 2010-11-28 07:54:13 +00:00
Mythos_Ruler 94aee121fd Removing duplicate or unnecessary textures 
This was SVN commit r8722.
 2010-11-28 07:53:16 +00:00
Mythos_Ruler 3de4ed7649 Added decals to the Greek buildings. 
Updated Saharan Oases.
New "underbrush" object.

This was SVN commit r8721.
 2010-11-28 06:46:45 +00:00
Mythos_Ruler 6ff423e45b changed tooltip 
This was SVN commit r8720.
 2010-11-28 04:24:25 +00:00
WhiteTreePaladin 9837f6207f New session dialog style 
This was SVN commit r8719.
 2010-11-28 01:39:31 +00:00
WhiteTreePaladin 2640f4c346 Changed victory/defeat dialogs to new session dialog style 
Changed title of exit game dialog
Only show resources carried when the quantity is greater than 1

This was SVN commit r8718.
 2010-11-27 21:58:19 +00:00
WhiteTreePaladin e486467430 Changed delete dialog text again (to make for easier translating later) 
This was SVN commit r8717.
 2010-11-27 20:11:42 +00:00
WhiteTreePaladin 961a50b0a2 Changed delete dialog text 
This was SVN commit r8716.
 2010-11-27 20:03:16 +00:00
WhiteTreePaladin 0b0cd938d5 Made settings and menu use new dialog 
Made chat and ESC hotkey interact better with the dialog
Made command icons reference individual icons rather than sheets
Removed menu object cache

This was SVN commit r8715.
 2010-11-27 19:46:12 +00:00
Mythos_Ruler bbe49141ec Lots of building stuff. 
This was SVN commit r8714.
 2010-11-27 17:18:29 +00:00
WhiteTreePaladin 3c318af2e0 Started work on new dialogs for session GUI style 
Resized quote area in loading screen

This was SVN commit r8713.
 2010-11-27 17:06:32 +00:00
Mythos_Ruler c1cc8d3a19 Updating the Cycladic Archipelago map. 
This was SVN commit r8712.
 2010-11-27 12:37:23 +00:00
Mythos_Ruler 6c793d6663 Slightly updated greek building texture. 
This was SVN commit r8711.
 2010-11-27 12:15:42 +00:00
Mythos_Ruler e30698c0c1 New Greek gymnasion by Amish. :) 
This was SVN commit r8709.
 2010-11-27 09:46:51 +00:00
WhiteTreePaladin bbd6f50af9 Resize quote area so that long quotes don't get cut off 
This was SVN commit r8708.
 2010-11-27 08:57:09 +00:00
WhiteTreePaladin 51312f84c4 Add gradient to tip image 
Resize tip images to fill out rectangle

This was SVN commit r8707.
 2010-11-27 08:44:03 +00:00
WhiteTreePaladin ed0fe5b47b Shrink space between tip title and message 
This was SVN commit r8706.
 2010-11-27 08:10:22 +00:00
Mythos_Ruler 1197d7872e Redone tips screenshots. New shadow overlay. 
This was SVN commit r8705.
 2010-11-27 08:02:54 +00:00
WhiteTreePaladin 9edd94f0fa Make tip image 512x384 (inside border dimensions) 
This was SVN commit r8704.
 2010-11-27 07:59:13 +00:00
WhiteTreePaladin 08bfe7b7f9 tweaked image sizes 
This was SVN commit r8703.
 2010-11-27 07:45:27 +00:00
Mythos_Ruler 55b6fbc669 4th tip. Made tip images use transparency. 
This was SVN commit r8702.
 2010-11-27 07:00:06 +00:00
Mythos_Ruler 8bcf6b782f tips 
This was SVN commit r8701.
 2010-11-27 06:09:55 +00:00
Mythos_Ruler 90b4e85b51 New Chinese ships for a mod some of the guys are working on. 
This was SVN commit r8700.
 2010-11-27 04:56:20 +00:00
WhiteTreePaladin db22548ecb New loading screen style (may need more polishing) 
This was SVN commit r8699.
 2010-11-27 03:07:48 +00:00
Mythos_Ruler 6d51c3a751 For Kimball, forever may he reign. 
This was SVN commit r8698.
 2010-11-26 14:13:08 +00:00
Mythos_Ruler ddd2f2a193 Made Units Demo map bigger to accommodate all the entities. 
This was SVN commit r8697.
 2010-11-26 10:39:56 +00:00
Mythos_Ruler e5d5a76384 This was SVN commit r8696. 2010-11-26 10:21:59 +00:00
Mythos_Ruler cc3d9de386 New berry bushes. Finished Cycladic Archipelago. 
This was SVN commit r8695.
 2010-11-26 07:08:18 +00:00
Mythos_Ruler 5f6dce1b6e Testing stuff for Bob. 
This was SVN commit r8694.
 2010-11-26 05:52:51 +00:00
Mythos_Ruler 710c32b712 New Persian sails. 
This was SVN commit r8693.
 2010-11-26 04:12:15 +00:00
Mythos_Ruler 959da16fdf New texture for the Roman Quinquereme (and remapped mesh). The ekdromos now slings his shield onto his back when he throws his spears. 
This was SVN commit r8692.
 2010-11-26 03:09:23 +00:00
Mythos_Ruler 35344e243e Wrinkles for the Celt sail textures. 
This was SVN commit r8691.
 2010-11-26 00:53:03 +00:00
fcxSanya 0d0af824e7 Treasures collected counter for summary screen 
This was SVN commit r8690.
 2010-11-25 18:01:23 +00:00
Ykkrosh f959390d0b Mostly fix hypothetical thread/fork interaction dangers 
This was SVN commit r8689.
 2010-11-25 16:11:16 +00:00
Mythos_Ruler 7820c51673 #New loading screen assets. 
This was SVN commit r8688.
 2010-11-25 06:51:01 +00:00
Ykkrosh 404f7d4caa Don't put 64-bit OS X code in the 32-bit-only file. Do put it in the 64-bit-only file. 
This was SVN commit r8687.
 2010-11-24 17:08:00 +00:00
Mythos_Ruler 8fe513aba5 1) Added decals to some Iberian buildings. 2) New Greek house variations. 3) skeleton eyecandy thing. 
This was SVN commit r8686.
 2010-11-24 06:04:03 +00:00
Mythos_Ruler 8148987e59 Added the "cheering" idle animations to the Celt super infantryman so people can see the animations that we could use for capturing buildings and leveling-up. 
Also added a skull eyecandy object. lol

This was SVN commit r8685.
 2010-11-24 03:09:16 +00:00
Ykkrosh 94dca529b1 Fix OS X build errors 
This was SVN commit r8684.
 2010-11-23 19:20:03 +00:00
Mythos_Ruler 5672275298 edited starting resources and teams. 
This was SVN commit r8683.
 2010-11-23 04:24:48 +00:00
Mythos_Ruler 180ab8a748 #New Celt ships. 
Some new siege engines. Caution: They need a lot of work.

This was SVN commit r8682.
 2010-11-23 02:54:38 +00:00
Ykkrosh f378a63d94 Add some tests for UnitAI. 
Fix said tests for UnitAI.
Hopefully fix #647 too.
Document HFSM interface a bit.
Add Engine.DumpSimState() console command for debugging.

This was SVN commit r8681.
 2010-11-22 20:12:04 +00:00
WhiteTreePaladin 78ae72d87a Message to let players know formations don't work yet 
This was SVN commit r8680.
 2010-11-22 00:07:38 +00:00
fcxSanya e4d356c3bf Map exploration counter for summary screen 
This was SVN commit r8679.
 2010-11-21 19:42:26 +00:00
Ykkrosh 333492b4a9 Add SetInterval to Timer. 
Add tests for Timer.

This was SVN commit r8678.
 2010-11-21 19:27:53 +00:00
evanssthomas fe5c7cb978 Buildings now target units randomly. Firing interval also made random 
This was SVN commit r8677.
 2010-11-21 18:41:13 +00:00
historic_bruno 47246c8155 Fixes #572. Changed MoveCameraToTarget so that for minimap scrolling it will ignore changes in Y position, to maintain previous zoom level as expected (constraint keeps the new view from being inappropriate) 
This was SVN commit r8676.
 2010-11-21 04:59:59 +00:00
historic_bruno 2963422173 Add screenshot location logging w/ rendered console message. Rendered messages are hidden before screenshot is taken. Fixes #675 
This was SVN commit r8675.
 2010-11-21 01:25:16 +00:00
historic_bruno e7b859b8a5 Add allied victory condition to EndGameManager, defaults to true for now because we can't change teams, but later it can be changed during setup 
This was SVN commit r8674.
 2010-11-21 00:35:08 +00:00
WhiteTreePaladin e1fa9cd22b Show resource subtype in GUI if main type is treasure 
This was SVN commit r8673.
 2010-11-20 22:36:04 +00:00
fcxSanya 68a63d62c8 Displaying civ icons on summary screen, moving "Civ centres built" and "Enemy civ centres destroyed" to new "Conquest" tab 
This was SVN commit r8671.
 2010-11-20 21:42:54 +00:00
fcxSanya 7e41f6d664 Changed treasures gathering: now units will gather treasures immediately, rather than carry resources from treasures to dropsites. 
This was SVN commit r8670.
 2010-11-20 21:37:31 +00:00
Ykkrosh 80888a7325 Avoid buffer overflow assertion failures when dumping stack trace on Windows. 
Try to be marginally less likely to get stuck in infinite recursion.

This was SVN commit r8669.
 2010-11-20 21:26:22 +00:00
Mythos_Ruler ed5d91e71f blood 
This was SVN commit r8668.
 2010-11-20 21:09:11 +00:00
Mythos_Ruler 35e43e133b This was SVN commit r8667. 2010-11-20 21:06:28 +00:00
Ykkrosh 1d8972a540 Add automatic 'root' prop point when loading old PMDs 
This was SVN commit r8666.
 2010-11-20 20:16:06 +00:00
Mythos_Ruler eeb9fc2145 Resized the Persian trireme a little. 
This was SVN commit r8665.
 2010-11-20 19:48:44 +00:00
Mythos_Ruler fee8668887 PMDs can't use 'root' prop point, so I removed the blood prop. 
This was SVN commit r8664.
 2010-11-20 19:48:10 +00:00
Ykkrosh c36fc2b8d7 Add script-based system for doing messy stuff based on system configuration. 
Display warning for certain broken NVIDIA drivers.

This was SVN commit r8663.
 2010-11-20 19:46:49 +00:00
WhiteTreePaladin 2925ab4ce4 Ghosted version labels in session GUI 
This was SVN commit r8662.
 2010-11-20 17:40:54 +00:00
Ykkrosh 74c19b5015 Add xmessage-based GUI dialog box for debug messages on Linux (fixes #663). 
Switch out of fullscreen before displaying dialog boxes.
Add Engine.DebugWarn for testing.

This was SVN commit r8661.
 2010-11-20 17:14:45 +00:00
Mythos_Ruler e971c85da5 map tweaks 
This was SVN commit r8660.
 2010-11-20 11:50:06 +00:00
Mythos_Ruler c6491b1916 Added blood to animal deaths. Muahahahahahahaha. 
This was SVN commit r8659.
 2010-11-20 09:31:14 +00:00
Mythos_Ruler 17e580ec42 Rate adjustment. 
This was SVN commit r8658.
 2010-11-20 07:09:20 +00:00
Ykkrosh 64bd264fc0 Attempt to fix GUI script interaction with JITs. 
Simplify some other GUI script interface code.

This was SVN commit r8657.
 2010-11-20 00:45:58 +00:00
Ykkrosh 2c8e683214 Fix toString on non-loaded sounds 
This was SVN commit r8656.
 2010-11-20 00:44:35 +00:00
Mythos_Ruler ab8bb65611 Adjusting rates 
This was SVN commit r8655.
 2010-11-19 23:07:07 +00:00
Mythos_Ruler a481209669 Updated the ship attacks map with the new ships. 
This was SVN commit r8654.
 2010-11-19 07:07:56 +00:00
Mythos_Ruler d95a87a5c6 New islands man, work in progress. 
This was SVN commit r8653.
 2010-11-19 05:32:25 +00:00
historic_bruno f20a6dcfc8 Fixed bug where players would not initialize resource counts properly from scenario 
This was SVN commit r8652.
 2010-11-19 05:05:45 +00:00
historic_bruno f236fb7bd1 Fixed bug where gaia was not treated as attackable (fences could not be destroyed) 
This was SVN commit r8651.
 2010-11-18 23:25:42 +00:00
Mythos_Ruler 21acf61d69 This was SVN commit r8650. 2010-11-18 07:40:57 +00:00
Mythos_Ruler ffd184fdd3 added name and description to map. 
This was SVN commit r8649.
 2010-11-18 07:09:29 +00:00
Mythos_Ruler 3d3720026a Updated Saharan Oases with some more starting treasures, teams, and lower starting resources. 
This was SVN commit r8648.
 2010-11-18 07:01:35 +00:00
historic_bruno aa9788a40e Fix team index bug in game setup GUI 
This was SVN commit r8647.
 2010-11-18 06:51:10 +00:00
Mythos_Ruler bf295edda6 shooting fortresses 
This was SVN commit r8646.
 2010-11-18 06:16:43 +00:00
Mythos_Ruler d8bc3635a2 Adjusted the desert stone. 
Adjusted costs and other things for defensive structures.
Continued work on the Saharan Oases map.

This was SVN commit r8645.
 2010-11-18 05:53:40 +00:00
Mythos_Ruler 12944d1fdc removed the Corinthian trireme entity (but not the actor). 
This was SVN commit r8644.
 2010-11-18 03:00:04 +00:00
Mythos_Ruler 1ea07fad83 Moved basket to the female's back. 
This was SVN commit r8643.
 2010-11-18 02:27:20 +00:00
Mythos_Ruler ee86e13be6 Deleted some overlapping textures. Moved Roman and Persian ships from Internal to Public. 
This was SVN commit r8641.
 2010-11-17 23:51:04 +00:00
Mythos_Ruler 23cb21ada4 1st of the new Greek houses. A bunch of other stuff, trying to get projectiles to work with towers. I propped a Celtic jav dude into one of the Celt towers to test propping. First graphics (borders) for a new loading screen. 
This was SVN commit r8640.
 2010-11-17 21:30:00 +00:00
evanssthomas f1f1a44031 Made changes to BuildingAI based on Philip's comments 
This was SVN commit r8639.
 2010-11-17 18:25:00 +00:00
Ykkrosh f0476b61fb Fix #476 (Use JS_New for ScriptInterface::CallConstructor) 
This was SVN commit r8638.
 2010-11-17 16:56:11 +00:00
evanssthomas 222095fa44 Added Building AI, and some small changes to GarrisonHolder 
This was SVN commit r8636.
 2010-11-17 07:30:25 +00:00
Ykkrosh 404456ee8e Fix int8_t redefinition errors in VC2010 
This was SVN commit r8635.
 2010-11-17 03:02:04 +00:00
Ykkrosh f286ce0b13 Fix crash when loading zero-length config files 
This was SVN commit r8634.
 2010-11-17 01:39:14 +00:00
Ykkrosh b13e6ae293 Fix script to rebuild SpiderMonkey properly 
This was SVN commit r8633.
 2010-11-17 00:58:10 +00:00
Ykkrosh 93861485fb Add a script to clean up broken builds of bundled libraries 
This was SVN commit r8632.
 2010-11-17 00:50:38 +00:00
Ykkrosh bd3bd084c0 Support new SpiderMonkey API. 
wposix: Define int8_t compatibly with SpiderMonkey.
Remove unused camera, lightenv JS interfaces.
Remove most of vector JS interface.
Remove some of the redundant JS string conversion functions.
Remove unneeded vmem, _lodBias functions.
Clean up some formatting.

This was SVN commit r8629.
 2010-11-16 23:00:52 +00:00
Ykkrosh 9c521ceb3b Add minimum range to range queries 
This was SVN commit r8627.
 2010-11-16 20:43:15 +00:00
Mythos_Ruler ccca9554c6 #Update for Saharan Oases. 
This was SVN commit r8626.
 2010-11-16 00:36:23 +00:00
Mythos_Ruler b7e4b197f2 Fixed meat gathering props for the Celt spearman. 
This was SVN commit r8625.
 2010-11-15 21:28:45 +00:00
WhiteTreePaladin efd0b14029 Make fishing ship not gather treasure 
This was SVN commit r8624.
 2010-11-15 21:25:22 +00:00
Mythos_Ruler 11cf570faf Fixed some ship problems. Edited cavalry. 
This was SVN commit r8623.
 2010-11-15 21:05:42 +00:00
Ykkrosh 13d2e44ff5 Run GC frequently in the simulation script context, to keep memory usage down 
This was SVN commit r8622.
 2010-11-15 15:03:40 +00:00
Mythos_Ruler 58a95ba95c fixed meat gathering animation 
This was SVN commit r8621.
 2010-11-15 05:11:39 +00:00
Mythos_Ruler 70019ed81c Made civ centres more expensive. 
This was SVN commit r8620.
 2010-11-15 04:00:55 +00:00
Mythos_Ruler 4328476b67 Actors variations for shuttling. 
This was SVN commit r8619.
 2010-11-15 03:48:28 +00:00
WhiteTreePaladin d65e47dda0 Properly center loaded resource text 
Add attack stats to "armour" icon

This was SVN commit r8618.
 2010-11-15 03:38:01 +00:00
Mythos_Ruler ce085e7930 Prop point testing for the wall gate. 
This was SVN commit r8617.
 2010-11-15 02:21:27 +00:00
Ykkrosh 6a74b798ab Support prop_ prefix in Collada files, as well as prop- 
This was SVN commit r8616.
 2010-11-15 02:18:49 +00:00
Ykkrosh 816c810791 Windows fix 
This was SVN commit r8614.
 2010-11-15 00:48:34 +00:00
Ykkrosh 4a1bc8e11a Optimise LOS visibility updates 
This was SVN commit r8613.
 2010-11-15 00:36:15 +00:00
Ykkrosh bfbd47ffec Fix initial unit separation in combat demo map 
This was SVN commit r8612.
 2010-11-15 00:34:34 +00:00
Mythos_Ruler e68900e5c4 New metal and stone shuttling. Test out on 'Resources Demo' map. Use spearman and cavjav. 
This was SVN commit r8611.
 2010-11-15 00:18:03 +00:00
historic_bruno 293e5e33ec Changed GUI mouse event handling so that button events use the mouse position at the time of the button state change. Fixed minimap message handling to respect out-of-order events. Fixes #669 
This was SVN commit r8610.
 2010-11-14 22:47:39 +00:00
Mythos_Ruler 6b444ea23b Testing a wall gate to see if static prop points will work. 
This was SVN commit r8609.
 2010-11-14 22:33:02 +00:00
WhiteTreePaladin 042972e298 Renamed "session_new" to "session" 
This was SVN commit r8608.
 2010-11-14 20:32:38 +00:00
Mythos_Ruler b0e9f7197b Once more. 
This was SVN commit r8607.
 2010-11-14 19:57:48 +00:00
Mythos_Ruler 577aebe467 This was SVN commit r8606. 2010-11-14 19:27:14 +00:00
Mythos_Ruler 51e10e185e And again. 
This was SVN commit r8605.
 2010-11-14 19:16:37 +00:00
Mythos_Ruler 1fde5cd4c7 Again, with feeling. 
This was SVN commit r8604.
 2010-11-14 19:11:24 +00:00
fcxSanya c1c8f64f0d Move statistics from GuiInterface.GetSimulationState to GuiInterface.GetExtendedSimulationState 
This was SVN commit r8603.
 2010-11-14 19:09:13 +00:00
Mythos_Ruler 15327ac40b Added projectile dummy object to the hele Scout tower for evan. 
This was SVN commit r8602.
 2010-11-14 18:53:36 +00:00
Mythos_Ruler 43a4667745 Tweaking treasures. Warships no longer gather treasures. Fishing and Merchant boats have greater capacities. 
This was SVN commit r8601.
 2010-11-14 05:50:30 +00:00
Mythos_Ruler 90d7c0a54f #Another prop for resource shuttling. 
This was SVN commit r8600.
 2010-11-14 04:21:39 +00:00
Mythos_Ruler eab9f540af Hacked the dock to be a dropsite. Will probably need looked at further by a programmer duder. 
This was SVN commit r8599.
 2010-11-14 02:27:54 +00:00
Mythos_Ruler cbbca4d3da Basket for shuttling grain. 
This was SVN commit r8598.
 2010-11-14 00:44:23 +00:00
Mythos_Ruler 62da7e1b37 The Celtic basic spearman now carries brontosaurus burgers when shuttling meat. 
This was SVN commit r8597.
 2010-11-14 00:10:23 +00:00
Mythos_Ruler acc229f367 new vase food.treasure. New vase meshes. A brontoburger slab. 
This was SVN commit r8596.
 2010-11-13 23:49:50 +00:00
WhiteTreePaladin 74ed8cf464 Adjusted size of resource icons 
This was SVN commit r8595.
 2010-11-13 22:19:17 +00:00
Ykkrosh 8798b7671c Use separate mode when carrying meat. 
Fix tests.

This was SVN commit r8594.
 2010-11-13 21:39:39 +00:00
historic_bruno f4b0b72aa8 Fixed bug introduced by recent change to input.js: diplomacy is properly read to determine enemy players for attacking 
This was SVN commit r8593.
 2010-11-13 20:49:58 +00:00
Ykkrosh 58b33af168 Support X mouse buttons on Windows 
This was SVN commit r8591.
 2010-11-13 19:51:15 +00:00
Ykkrosh 10820ae3f8 Add a map for some resource testing 
This was SVN commit r8590.
 2010-11-13 19:16:16 +00:00
Ykkrosh 4100a13e0a # Add resource shuttling. 
Add resource-carrying animations/props to an actor for testing.
Warn more quietly about invalid cursor names.

This was SVN commit r8589.
 2010-11-13 19:15:29 +00:00
Mythos_Ruler 6325a1eafe Adjusting build times. 
This was SVN commit r8588.
 2010-11-13 06:27:00 +00:00
WhiteTreePaladin 2b70b43086 Based selection groups off of a new tag which must contain a valid template name. 
<SelectionGroupName>unit_template_name_b</SelectionGroupName>

This was SVN commit r8587.
 2010-11-13 05:35:40 +00:00
Mythos_Ruler af4c2c091d Removed stone_light. Adjusted the footprint of the field entity. 
This was SVN commit r8586.
 2010-11-13 04:19:09 +00:00
Mythos_Ruler 6c7f9f7b8d #Treasure objects. 
This was SVN commit r8585.
 2010-11-13 03:44:38 +00:00
Mythos_Ruler 513ff50926 Food treasures. 
This was SVN commit r8584.
 2010-11-13 02:57:04 +00:00
historic_bruno 3cefbbe253 Modified UnitAI to respect diplomatic status of players, allies can no longer be attacked, and fixed some related bugs in player init 
This was SVN commit r8583.
 2010-11-13 02:36:53 +00:00
Ykkrosh 25cd781641 Support horizontal scroll wheels for camera rotation 
This was SVN commit r8582.
 2010-11-13 01:00:54 +00:00
Mythos_Ruler e1aaedcc32 Alternate Persian emblems. 
This was SVN commit r8581.
 2010-11-13 00:35:18 +00:00
Mythos_Ruler 490574bc03 Emblems 
This was SVN commit r8578.
 2010-11-12 23:37:56 +00:00
Mythos_Ruler 36d7ef65a6 Treasure/Ruins tweaks and additions. 
This was SVN commit r8577.
 2010-11-12 22:31:19 +00:00
fcxSanya 245f29b798 Summary screen. Closes #638. 
This was SVN commit r8576.
 2010-11-12 22:24:49 +00:00
Mythos_Ruler 6c3368886b Bigger Iberian emblem. 
This was SVN commit r8575.
 2010-11-12 19:05:30 +00:00
WhiteTreePaladin ff3c7b46f4 Added food.treasure, wood.treasure, stone.treasure, wood.ruins, stone.ruins 
Added placeholder cursor for ruins
Added entities for testing these types

This was SVN commit r8574.
 2010-11-12 18:58:33 +00:00
Mythos_Ruler 52ad8a836d New idle animation for the Greek archers. 
Some updated faction emblems.

A new Metal portrait.

This was SVN commit r8573.
 2010-11-12 05:33:12 +00:00
Mythos_Ruler 75eb6847af Shield tweaks. 
This was SVN commit r8572.
 2010-11-12 04:34:46 +00:00
Mythos_Ruler f3c5a2383b #Some cool new treasure objects. Lots of map tweaks as well. 
Added treasure gathering for ships. It would be cool to have
food.treasure, wood.treasure, and stone.treasure gathering types in
addition to the current metal.treasure.

This was SVN commit r8571.
 2010-11-12 03:08:23 +00:00
Mythos_Ruler 6cb66b7ef1 Moved from Internal 
This was SVN commit r8570.
 2010-11-12 01:08:53 +00:00
Mythos_Ruler 1a1f7caee1 Moved to Public. 
This was SVN commit r8569.
 2010-11-12 01:08:17 +00:00
Mythos_Ruler 46bde9969e Made a "poleis" branch emblem sprite. 
This was SVN commit r8568.
 2010-11-11 19:50:06 +00:00
Mythos_Ruler 4dc5766273 New Celt emblem 
This was SVN commit r8567.
 2010-11-11 19:39:48 +00:00
WhiteTreePaladin c5f0b5d7be Hide the lower session panel if nothing is selected 
This was SVN commit r8566.
 2010-11-11 16:00:53 +00:00
Ykkrosh 83285504cb Disable RTTI in test project, for consistency 
This was SVN commit r8565.
 2010-11-10 15:26:29 +00:00
Mythos_Ruler 8494a5bc4c Moar tweaking. 
This was SVN commit r8564.
 2010-11-10 02:58:33 +00:00
Mythos_Ruler 0036f1ce9c Map tweaks. 
This was SVN commit r8563.
 2010-11-10 02:48:33 +00:00
Mythos_Ruler f452c79e46 Fixed civ for Hellenic Buildings. Continued work on Belgian Bog. 
This was SVN commit r8562.
 2010-11-09 14:44:03 +00:00
WhiteTreePaladin 7d26b8eefd Roman civ sprite 
This was SVN commit r8561.
 2010-11-08 23:52:44 +00:00
Mythos_Ruler c03c2f0168 Fixed hoplite prop switching (heads) when gathering meat. 
Tweaked maps.
New "Bog" map, w.i.p.
Tweaked ship health.

This was SVN commit r8560.
 2010-11-08 23:40:45 +00:00
WhiteTreePaladin dde2cd38be Show Population Cost in unit training buttons 
Show Population Bonus in unit construction buttons

This was SVN commit r8559.
 2010-11-08 23:23:52 +00:00
janwas 6e74c53ee9 fix file/dir mode bits 
fixes #648
also fix self-test on ICC 12

This was SVN commit r8558.
 2010-11-08 15:02:05 +00:00
WhiteTreePaladin 0517d41275 Removed extraneous cancel button from multiplayer setup dialogs 
Adjusted the right side of the bottom panel in the session GUI
Renamed "dev console" to "dev overlay" in the chat message to be more
consistent

This was SVN commit r8557.
 2010-11-08 14:49:40 +00:00
janwas 6935a03743 remove no-longer needed GLU dependency; avoids delay-load warning. 
This was SVN commit r8555.
 2010-11-08 10:42:34 +00:00
janwas 24f1a00190 avoid setting executable bit in files/dirs we create 
thanks to fabio for reporting + a suggested fix.
fixes #648

This was SVN commit r8554.
 2010-11-08 10:39:52 +00:00
janwas 6b4d5091b3 fixes from work: use ICC bswap intrinsics instead of fallbacks; update UNUSED2 to work with ICC; update mahaf for Win7 
This was SVN commit r8553.
 2010-11-08 10:01:12 +00:00
Mythos_Ruler 9c53fda749 Misc. art stuff. 
This was SVN commit r8552.
 2010-11-08 00:36:34 +00:00
Mythos_Ruler 85fc7cae52 Cleaning up the props. 
This was SVN commit r8551.
 2010-11-08 00:23:06 +00:00
Mythos_Ruler 323cda17c3 cleaning 
This was SVN commit r8550.
 2010-11-07 23:57:04 +00:00
Mythos_Ruler ffa6c14a24 More cleaning. 
This was SVN commit r8549.
 2010-11-07 23:51:46 +00:00
Mythos_Ruler a7059092cb cleaning 
This was SVN commit r8548.
 2010-11-07 23:40:48 +00:00
Mythos_Ruler dafc0e6dbd This was SVN commit r8547. 2010-11-07 23:32:02 +00:00
Ykkrosh e43eb0c18b # Various hotkey fixes and cleanups. 
Support ctrl for removing entities from selection.
Move big screenshot hotkey to shift+F2.
Increase mouse wheel rotation speed.
Fix HotkeyIsPressed when a more specific hotkey was matched instead.
Support multiple hotkeys with the same binding.
Use hotkeys instead of raw key events in GUI.
Delete some obsolete hotkey definitions.
Remove unused broken EntitySelection toggle method.

This was SVN commit r8546.
 2010-11-07 20:42:52 +00:00
janwas a13836bd68 safely handle zero-sized XMB files ensuing from a crash while loading 
fixes #662

This was SVN commit r8545.
 2010-11-07 16:14:13 +00:00
Ykkrosh 644b9aedea # Add double-click and triple-click selection modes, based on patch by Christoph and evans. 
Fixes #515.

This was SVN commit r8544.
 2010-11-07 00:12:55 +00:00
janwas f45c74c368 thread-safety fixes to debug.cpp - most functions were already reentrant, just CAS-ified the assert suppression flags. 
(NB: the debug_filter stuff remains non-reentrant because it's usually
only called from main() or at least the main thread)
closes #654

This was SVN commit r8543.
 2010-11-06 19:14:16 +00:00
janwas 3407983e98 remove no-longer needed (and non-reentrant) MICROLOG as per today's meeting 
This was SVN commit r8542.
 2010-11-06 19:11:40 +00:00
Mythos_Ruler b4d6ad9f0b Template fixes and tweaks. Gave ships larger Health bars. Fixed some range things with ranged units. 
This was SVN commit r8541.
 2010-11-06 18:45:42 +00:00
Mythos_Ruler 43665f09c5 Fixed some template stuff. 
This was SVN commit r8540.
 2010-11-06 17:52:30 +00:00
WhiteTreePaladin 741477926c Make the minimap fit completely inside the border when in circular mode (to prevent units from sneaking around behind the rim) 
This was SVN commit r8539.
 2010-11-06 02:13:40 +00:00
WhiteTreePaladin e7b5f9eeb9 Allow up to 24 construction or training buttons 
Add tooltip of generic name back to the unit name
Move civ name to player name tooltip
Make player name colored with the player color again

This was SVN commit r8538.
 2010-11-06 01:55:29 +00:00
Mythos_Ruler c1daf9a9bc This was SVN commit r8537. 2010-11-05 13:22:06 +00:00
Mythos_Ruler 4f4c19be85 new portraits 
This was SVN commit r8536.
 2010-11-05 13:17:30 +00:00
Mythos_Ruler c2bafa78cb A bunch of stuff. 
This was SVN commit r8535.
 2010-11-04 23:51:42 +00:00
historic_bruno dbcd004844 Fix player assignments on map change (number of players may decrease, knocking assigned players out of a slot). Fixes #655 
This was SVN commit r8534.
 2010-11-04 20:34:29 +00:00
Mythos_Ruler 4a9ae1de17 Touched up Hellenised Egypt and Massacre of Delphi. Overhaul and completion of 'Median Oasis.' -- Check it out! 
This was SVN commit r8533.
 2010-11-04 20:30:13 +00:00
Mythos_Ruler 31f263d688 This was SVN commit r8532. 2010-11-04 01:07:00 +00:00
Mythos_Ruler b3f2363c2d Altered the "generic name" of the Cretan Archer from "Infantry Archer" to "Mercenary Infantry Archer" to emphasize the reason they cost only Metal. 
This was SVN commit r8531.
 2010-11-04 01:06:00 +00:00
Mythos_Ruler 3ebbd8a9ce tweaks on these buildings to make them buildable under certain circumstances. 
This was SVN commit r8530.
 2010-11-04 00:53:15 +00:00
Mythos_Ruler 0b48fc0484 Added costs to these buildings. 
This was SVN commit r8529.
 2010-11-03 23:42:41 +00:00
Ykkrosh 818ea52c3b Delete obsolete non-working i18n code 
This was SVN commit r8527.
 2010-11-03 17:52:07 +00:00
Ykkrosh ec5d4a9f9e Attempt to fix build error with intrinsics on 32-bit Linux 
This was SVN commit r8526.
 2010-11-03 02:06:38 +00:00
Ykkrosh 81f5e0ac5f Allow continuing playing when a client leaves a multiplayer game (fixes #620). 
Fix multiplayer autostart.
Make NETTURN_LOG syntax differently ugly.

This was SVN commit r8525.
 2010-11-03 00:21:52 +00:00
Mythos_Ruler 786279fb95 New minimap circle. 
This was SVN commit r8524.
 2010-11-02 17:08:50 +00:00
Mythos_Ruler 2186ac8e76 Tweaked blank giant map in Internal folder. Updated a few Mediterranean terrains. A Creative Commons object. A generic Gaia "field" object. Humpback Whale. 
This was SVN commit r8523.
 2010-11-02 16:26:06 +00:00
Mythos_Ruler 947ce01f68 Got rid of the whale entities giving an error. 
This was SVN commit r8522.
 2010-11-02 16:21:51 +00:00
janwas 383cf7b220 cleanup: 
use intrinsics for cpu_AtomicAdd and cpu_CAS, get rid of the
corresponding assembly implementations. (wrapper functions are necessary
at work because mere declarations aren't enough to export the functions
from DLL)
also remove no longer needed fminf

This was SVN commit r8521.
 2010-11-02 13:38:56 +00:00
Ykkrosh 540925aa32 Add a rubbish experimental FPS camera view 
This was SVN commit r8520.
 2010-11-01 21:40:29 +00:00
Mythos_Ruler 1b9f198520 Deleted the whale. It is an interesting experiment whose time has not come yet (needs some new attack code for units and possibly unitAI for attacking units). 
This was SVN commit r8519.
 2010-11-01 16:29:05 +00:00
Mythos_Ruler 6351102705 trying to create a 'whale' object that moves around and must be killed first (probably by warships). Then fishing boats can gather from it. I get an error though when I try to place it in Atlas. Can someone take a look at it for me? <3 
This was SVN commit r8518.
 2010-11-01 15:22:43 +00:00
janwas 52851faeb6 cleanup - remove old cpu_memcpy and cpu_i64FromDouble that are no longer needed 
This was SVN commit r8517.
 2010-11-01 11:09:03 +00:00
janwas b27d6d38e3 thread-safe timer monotonicity check. fixes #653 
(agree that DBL_EPSILON is an unnecessary hack, since division by
(t+eps)-(t) will yield a number not much more useful than infinity)

This was SVN commit r8516.
 2010-11-01 10:19:22 +00:00
janwas 657ec9aa45 WIP timer thread safety: 
CAS functions now implemented directly in external asm files (avoids
wrapper functions)
reinstated cpu_CAS64 (checking ARCH_IA32 at every call site is onerous)
(temporarily disable timer monotonicity check)

This was SVN commit r8515.
 2010-11-01 09:54:03 +00:00
janwas 2b9774aa05 fix: alt+enter -> resize window -> maximize window failed to generate a resize event 
This was SVN commit r8514.
 2010-11-01 09:04:55 +00:00
Ykkrosh aefc87f226 Windows fixes 
This was SVN commit r8513.
 2010-10-31 22:26:41 +00:00
Ykkrosh 602b99c397 Fix water rendering in "reveal map" mode. 
This was SVN commit r8512.
 2010-10-31 22:07:57 +00:00
Ykkrosh 5d764f1435 Run network server in a separate thread, to minimise latency. 
Make some parts of logger and console thread-safe.
Simplify console: remove special commands; remove prefix for script
commands.
Remove LOG_ONCE, to simplify logger.
Change some code to use the new logger interface.
Fix OOS when revealing map.
Clean up some formatting.

This was SVN commit r8511.
 2010-10-31 22:00:28 +00:00
Ykkrosh 034504f536 Remove misleading wposix declaration of unimplemented gettimeofday. 
This was SVN commit r8510.
 2010-10-31 21:58:30 +00:00
Mythos_Ruler 5b1f0b2b19 Tweaked the map description. 
This was SVN commit r8509.
 2010-10-31 18:47:51 +00:00
Mythos_Ruler 909d9d84cb Work in progress--Acropolis 256 Radius map. 
This was SVN commit r8508.
 2010-10-31 18:33:02 +00:00
Mythos_Ruler 94a57d141a This was SVN commit r8507. 2010-10-31 15:17:27 +00:00
Mythos_Ruler 491f4592a7 This was SVN commit r8506. 2010-10-31 15:00:28 +00:00
Ykkrosh 62c90b5dc4 Fix tests 
This was SVN commit r8504.
 2010-10-31 00:29:29 +00:00
feneur a952767f48 Changed the disabled state messages for some menu buttons, they were a bit rough for a public release imho 
This was SVN commit r8503.
 2010-10-31 00:16:33 +00:00
Ykkrosh 8dc7eca77a Autobuilder fixes 
This was SVN commit r8502.
 2010-10-30 20:39:23 +00:00
Ykkrosh 1840bb3507 Stop units walking outside the edges of circular maps. 
Switch the GUI between square/circular minimap automatically.

This was SVN commit r8500.
 2010-10-30 18:25:34 +00:00
historic_bruno 21b0504ca5 Adding the missing player_defaults.json for #590 
This was SVN commit r8499.
 2010-10-30 18:07:31 +00:00
Ykkrosh 10c5dbcba4 Fix Atlas and autostart. 
Fix non-POD in varargs.
Remove misleading max_players config variable (the engine doesn't care
about it, all the limits are hard-coded).
Remove civ-center-based player civ initialisation hack.
Add dummy player_defaults.json.
Clean up formatting a bit.

This was SVN commit r8498.
 2010-10-30 13:27:23 +00:00
Ykkrosh d6bf303740 Clean up line endings 
This was SVN commit r8497.
 2010-10-30 12:22:18 +00:00
historic_bruno 5567727bd1 New maps get player data per #590, and some minor bugfixes 
This was SVN commit r8496.
 2010-10-30 05:19:55 +00:00
historic_bruno 22672e69d9 Info icons for #590 
This was SVN commit r8495.
 2010-10-30 04:17:01 +00:00
historic_bruno 9ee44bd9b8 Game setup changes, including showing name, civ, team, and some options loaded from the scenarios. Civ data added. Civ info window to preview civs. Icon tooltips. Support for random map implementation. Fixes #590. 
This was SVN commit r8494.
 2010-10-30 04:02:42 +00:00
Mythos_Ruler 0b978d5e26 hacked in the attack for Persian trireme too. 
This was SVN commit r8493.
 2010-10-29 22:20:20 +00:00
Mythos_Ruler fcf9fbf10d Hacked in some ship ranged attacks to play with. 
This was SVN commit r8492.
 2010-10-29 22:18:25 +00:00
Ykkrosh 97019c3a5a Fix launching Atlas from the main menu 
This was SVN commit r8491.
 2010-10-29 21:04:59 +00:00
Mythos_Ruler 4f452eccde This was SVN commit r8490. 2010-10-29 20:14:37 +00:00
Mythos_Ruler 4b8fcaa135 Garrisoning for ships. This is only temporary for play-testing until final garrisoning code is implemented. 
This was SVN commit r8489.
 2010-10-29 20:14:09 +00:00
Mythos_Ruler 70cfff0f05 started work on Median Oasis. Fixed the fact that the Celtic special building cost zero (!) resources. A "slight" oversight. 
This was SVN commit r8488.
 2010-10-29 16:55:14 +00:00
Ykkrosh dd5ff36363 Fix Linux build error (fixes #651). 
This was SVN commit r8487.
 2010-10-29 15:48:46 +00:00
janwas 0c3d69ae29 fixes from work: clarify that cpu_MemoryBarrier has no runtime cost by renaming to COMPILER_FENCE and moving to code_annotation.h; fix 32-bit Parallel Studio 2011 warning. 
This was SVN commit r8486.
 2010-10-29 12:54:51 +00:00
Mythos_Ruler 8f532b81cd Fixed oasis map AGAIN. Fixed names of some units. Slave template. 
This was SVN commit r8485.
 2010-10-28 14:22:27 +00:00
janwas 825bbf8f51 parallel studio 2011 warning fixes 
This was SVN commit r8484.
 2010-10-28 12:22:11 +00:00
Mythos_Ruler af235da6f4 #Updated Greek trading ship with cargo. Split up 3 dozen UI icons into their individual files. Began testing an idea discussed in the irc chat room. 
This was SVN commit r8483.
 2010-10-28 12:22:04 +00:00
Mythos_Ruler 12bea99ea1 Fixed some purple blobs. 
This was SVN commit r8482.
 2010-10-28 06:19:50 +00:00
Mythos_Ruler c5b5fa8e6f Fixed the purple blobs. 
This was SVN commit r8481.
 2010-10-27 20:21:47 +00:00
Mythos_Ruler 6576b64ce0 Cleaning up the field entities. 
This was SVN commit r8480.
 2010-10-27 11:10:34 +00:00
Mythos_Ruler c6c1b2b549 This was SVN commit r8479. 2010-10-27 10:35:58 +00:00
Mythos_Ruler 93cd028616 Moar portrait stuff. Fixed the Persian Super Cavalry to align with the new Persian civ profile. Moved War Elephant to editor object. 
This was SVN commit r8478.
 2010-10-27 08:16:26 +00:00
Mythos_Ruler 7120014451 This was SVN commit r8477. 2010-10-27 06:22:29 +00:00
Mythos_Ruler 5db9465b25 A bunch of new portraits. The hero portraits are just temp until they are painted. 
This was SVN commit r8476.
 2010-10-27 05:49:04 +00:00
Mythos_Ruler 45a99a393d New Greek merchant ship. Model is not final though. 
This was SVN commit r8475.
 2010-10-27 02:16:45 +00:00
Mythos_Ruler 7d7127a1bb Scaled down the Roman Quinquereme. 
This was SVN commit r8474.
 2010-10-26 16:21:51 +00:00
Mythos_Ruler 728e03cee2 This was SVN commit r8473. 2010-10-26 11:34:34 +00:00
Mythos_Ruler 64b9824d5a tweaks 
This was SVN commit r8472.
 2010-10-26 11:31:33 +00:00
Mythos_Ruler f4b27e22b0 A bunch of new portraits. I fixed Waypoint Flag so that it floats on water. Edited Miletus map. 
This was SVN commit r8471.
 2010-10-26 09:46:05 +00:00
Ykkrosh 02aa8499ed Partial experimental version of circular maps 
This was SVN commit r8470.
 2010-10-25 21:59:52 +00:00
Mythos_Ruler 09b2a4ade8 #Starting some work on Carthage. 
This was SVN commit r8469.
 2010-10-25 17:09:23 +00:00
Mythos_Ruler b053bc846b Fixed a stat error. 
This was SVN commit r8468.
 2010-10-25 12:18:28 +00:00
Mythos_Ruler cb859d15da This was SVN commit r8467. 2010-10-25 12:10:11 +00:00
Mythos_Ruler 6a024a86b9 Rudimentary ship stats. 
This was SVN commit r8466.
 2010-10-25 11:07:29 +00:00
Mythos_Ruler ecf1e0556e This was SVN commit r8465. 2010-10-25 10:26:58 +00:00
Mythos_Ruler 4deaa14456 added descriptions to maps. 
This was SVN commit r8464.
 2010-10-25 10:25:55 +00:00
Mythos_Ruler 791c4f52fa Continued unit balancing. Edited actor projectiles animation times, etc. 
This was SVN commit r8462.
 2010-10-25 10:01:01 +00:00
Mythos_Ruler 504eb3b12b This was SVN commit r8461. 2010-10-25 04:29:15 +00:00
WhiteTreePaladin 7492f458e0 Allow garrisoning of siege weapons in the Fortress 
Civil Center can now hold 20 units
Temple can now garrison units (15)

This was SVN commit r8460.
 2010-10-25 04:21:18 +00:00
Mythos_Ruler b680e95e25 New epic Greek temple, primarily for eye candy. UV mapped by Amish. 
This was SVN commit r8459.
 2010-10-25 04:10:25 +00:00
WhiteTreePaladin 6373c2cfcb Made GUI always visible 
Adjusted size of icon buttons in the session GUI
Allowed support units to garrison in watch towers

This was SVN commit r8458.
 2010-10-24 23:40:09 +00:00
WhiteTreePaladin b100ba5a08 Show a 1 when only a single unit remains garrisoned (re-fixes #610) 
This was SVN commit r8457.
 2010-10-24 18:01:11 +00:00
Ykkrosh 2b2cac2a8d Fix tests 
This was SVN commit r8456.
 2010-10-24 12:37:55 +00:00
Mythos_Ruler dcd7211d34 Re-exported Greek Civic Centre to remove some of the vases (seemed cluttered before), and to make player color more prominent. Gave ships farther vision. 
This was SVN commit r8455.
 2010-10-24 10:05:28 +00:00
WhiteTreePaladin ec27e78e60 Clear out the displayed garrison quantity number if no units are garrisoned 
This was SVN commit r8454.
 2010-10-24 01:32:35 +00:00
WhiteTreePaladin 3521c8f51e Made garrisoning based on the quantity of units, not the population cost of those units. 
This was SVN commit r8453.
 2010-10-24 01:14:34 +00:00
WhiteTreePaladin 7f52ca875b Made Celtic heroes inherit from a specific type of hero, instead of a generic hero 
This was SVN commit r8452.
 2010-10-23 22:53:33 +00:00
WhiteTreePaladin 0aaddf62aa Garrisoning for buildings based on patch by Evans (fixes #610) 
This was SVN commit r8451.
 2010-10-23 22:43:15 +00:00
Ykkrosh bcc5c87045 Fix bandbox selection of out-of-world entities 
This was SVN commit r8450.
 2010-10-23 21:48:18 +00:00
Ykkrosh e13196e7a2 Fix serialization of most components 
This was SVN commit r8449.
 2010-10-23 19:59:40 +00:00
Ykkrosh 73286885d9 Fix race condition when enabling S3TC in Atlas 
This was SVN commit r8448.
 2010-10-23 19:58:45 +00:00
Mythos_Ruler 6d0e59c0a3 Fixed ownership of some trees. 
This was SVN commit r8447.
 2010-10-23 08:31:00 +00:00
Mythos_Ruler a6925ded91 Moar animal portraits. Stock or CC where possible. 
This was SVN commit r8446.
 2010-10-23 07:58:33 +00:00
Mythos_Ruler eb2e2c4244 Some updated portraits. 
This was SVN commit r8445.
 2010-10-23 07:49:31 +00:00
Ykkrosh 9e499cdec5 # Fix hotkey bugs. 
Simplify hotkey system to use strings consistently.
Restrict scope of GUI hotkey bindings to the associated page.
Avoid hard-coding list of hotkeys.
Clean up the code a little bit and fix some bugs.
Remove unused "!" prefix for key negation.
Fixes #567.

This was SVN commit r8444.
 2010-10-23 02:37:00 +00:00
Mythos_Ruler f6154b0d89 Temp portraits for public Roman units. 
This was SVN commit r8443.
 2010-10-23 01:28:35 +00:00
Mythos_Ruler cf2ce4870e This was SVN commit r8442. 2010-10-23 01:13:56 +00:00
Ykkrosh 9de72d1d19 Fix internal icons too 
This was SVN commit r8441.
 2010-10-22 23:28:57 +00:00
Ykkrosh 24fb9cd313 Split unit icon sheets into individual textures, for easier editing 
This was SVN commit r8440.
 2010-10-22 23:27:42 +00:00
Mythos_Ruler e8000c7a90 This was SVN commit r8439. 2010-10-22 10:52:35 +00:00
Mythos_Ruler 9227eeb5ec Block wall texture for giant Greek temple. 
This was SVN commit r8438.
 2010-10-22 10:10:43 +00:00
ShieldBearer 8ddb6f98a4 This was SVN commit r8437. 2010-10-22 10:06:10 +00:00
Mythos_Ruler 4a9292b2e3 This was SVN commit r8436. 2010-10-22 04:27:25 +00:00
Mythos_Ruler c15d777762 #Editing stats for Super Cavalry and special Roman units. 
This was SVN commit r8435.
 2010-10-22 04:02:48 +00:00
Mythos_Ruler eba84f32f6 Updating Super Infantry templates. 
This was SVN commit r8434.
 2010-10-22 02:32:03 +00:00
Ykkrosh 3eed24a338 Fix Mesa S3TC-enabling to work in Atlas 
This was SVN commit r8433.
 2010-10-21 23:44:54 +00:00
Mythos_Ruler 48121bcef6 Icon portraits at 128x128 please. 
This was SVN commit r8432.
 2010-10-21 23:09:44 +00:00
Ykkrosh eb8ca841cd Add special "colour:r g b a" sprite syntax to GUI. Fixes #616, based on patch from historic_bruno. 
This was SVN commit r8431.
 2010-10-21 21:22:40 +00:00
Ykkrosh e188683bab Preserve cursor-grabbing across alt-tabs on Windows (probably fixes #508). 
This was SVN commit r8430.
 2010-10-21 21:09:41 +00:00
Ykkrosh a596323ea6 Avoid bogus GCC warnings about uninitialised values 
This was SVN commit r8429.
 2010-10-21 20:33:27 +00:00
Ykkrosh c0a7a36f7a Use JSFastNative API in more places, for improved compatibility with future SpiderMonkey versions. 
Remove some unnecessary script-exposed functions, and move some more
into the Engine namespace.

This was SVN commit r8428.
 2010-10-21 19:54:59 +00:00
ShieldBearer 55741aed44 This was SVN commit r8427. 2010-10-21 15:11:26 +00:00
ShieldBearer 06b3457c5f This was SVN commit r8426. 2010-10-21 10:24:25 +00:00
Mythos_Ruler faacb80004 This was SVN commit r8425. 2010-10-21 10:20:56 +00:00
ShieldBearer c78c16d607 two new portrait icons 
This was SVN commit r8424.
 2010-10-21 10:12:17 +00:00
Mythos_Ruler d6720e00a4 Tweaked animation speeds for new Roman units. 
This was SVN commit r8423.
 2010-10-21 09:15:40 +00:00
Mythos_Ruler fdb002a334 This was SVN commit r8422. 2010-10-21 09:04:06 +00:00
Mythos_Ruler aade0de3b4 This was SVN commit r8420. 2010-10-21 09:00:30 +00:00
Mythos_Ruler 5e84f57a04 Moved 3 special Roman units from Internal to Public (hopefully this will quell the calls for more Roman material for a while). Made 2 new Super Unit templates for ease of balancing (more of these later, and more on this later). 
This was SVN commit r8419.
 2010-10-21 08:56:42 +00:00
Mythos_Ruler 2cd62a04d2 This was SVN commit r8418. 2010-10-21 08:24:00 +00:00
Mythos_Ruler c34aa82c5d This was SVN commit r8417. 2010-10-21 08:23:31 +00:00
Mythos_Ruler a99005976d Messing with stats. Made a roof tile texture for the giant Greek temple that will soon be coming. 
This was SVN commit r8416.
 2010-10-20 09:07:44 +00:00
Mythos_Ruler ceb5dd1dfd Wood texture looks less like chocolate cake. 
This was SVN commit r8415.
 2010-10-20 00:26:56 +00:00
Mythos_Ruler 4256055f58 #Brand new Celtic Market. Unit entity tweaks. Starting to re-balance units. New table and bench eyecandy objects. 
This was SVN commit r8414.
 2010-10-19 10:04:33 +00:00
1983 changed files with 24402 additions and 18112 deletions
Expand all files Collapse all files
binaries/data/config/default.cfg
+52 -107
View File
@@ -57,9 +57,6 @@ lodbias = 0
profile = default
; Language selection: (currently "english" or "pseudogreek")
language = english
; Font mappings:
font.console = console
@@ -69,9 +66,6 @@ font.misc = verdana16
; Colour of the sky (in "r g b" format)
skycolor = "0 0 0"
; Maximum number of players in a session (default 6).
max_players = 8
; GENERAL PREFERENCES:
sound.mastergain = 0.5
@@ -83,7 +77,7 @@ view.rotate.x.min = 20
view.rotate.x.max = 60
view.rotate.x.default = 30
view.rotate.y.speed = 2.0
view.rotate.y.speed.wheel = 0.1
view.rotate.y.speed.wheel = 0.45
view.rotate.y.default = 0.0
view.drag.speed = 0.5
view.zoom.speed = 256.0
@@ -104,53 +98,42 @@ view.rotate.y.smoothness = 0.3
; See keys.txt for the list of key names.
; > SYSTEM SETTINGS
hotkey.exit = "Alt+F4", "Ctrl+Break" ; Exit to desktop.
hotkey.leave = Escape ;End current game or Exit.
hotkey.pause = Pause ; Pause/unpause game.
hotkey.screenshot = F2 ; Take PNG screenshot.
hotkey.bigscreenshot = "Ctrl+Alt+F2" ; Take large BMP screenshot.
hotkey.togglefullscreen = "Alt+Return" ; Toggle fullscreen/windowed mode
hotkey.screenshot.watermark = "K" ; Toggle product/company watermark for official
hotkey.wireframe = "Alt+W" ; Toggle wireframe mode.
hotkey.archive.abort = "Alt+F4" ; Prematurely terminate the archive builder process.
hotkey.exit = "Alt+F4", "Ctrl+Break" ; Exit to desktop
hotkey.leave = Escape ; End current game or Exit
hotkey.pause = Pause ; Pause/unpause game
hotkey.screenshot = F2 ; Take PNG screenshot
hotkey.bigscreenshot = "Shift+F2" ; Take large BMP screenshot
hotkey.togglefullscreen = "Alt+Return" ; Toggle fullscreen/windowed mode
hotkey.screenshot.watermark = "K" ; Toggle product/company watermark for official screenshots
hotkey.wireframe = "Alt+W" ; Toggle wireframe mode
; > CAMERA SETTINGS
hotkey.camera.reset = "H" ; Reset camera rotation to default.
hotkey.camera.follow = "F" ; Follow the first unit in the selection
hotkey.camera.reset.origin = "Ctrl+H" ; Reset camera to origin.
hotkey.camera.zoom.in = Plus, Equals, NumPlus ; Zoom camera in.
hotkey.camera.zoom.out = Minus, NumMinus ; Zoom camera out.
hotkey.camera.zoom.wheel.in = WheelUp ; Zoom camera in (wheel speed).
hotkey.camera.zoom.wheel.out = WheelDown ; Zoom camera out (wheel speed).
hotkey.camera.rotate.wheel.cw = "Shift+WheelUp"
hotkey.camera.rotate.wheel.ccw = "Shift+WheelDown"
hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q
hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E
hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W"
hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S"
hotkey.camera.pan = MouseMiddle, ForwardSlash ; Scroll by moving mouse.
hotkey.camera.pan.keyboard = "~Shift+~Ctrl" ; = holding neither Ctrl nor Shift
hotkey.camera.left = A, LeftArrow ; Scroll or rotate left.
hotkey.camera.right = D, RightArrow ; Scroll or rotate right.
hotkey.camera.up = W, UpArrow ; Scroll or rotate up/forwards.
hotkey.camera.down = S, DownArrow ; Scroll or rotate down/backwards.
;camera.cinema.add = "L"
;camera.cinema.delete = "U"
;camera.cinema.delete.all = "R"
;camera.cinema.write = "O"
camera.cinema.queue = "I"
hotkey.camera.reset = "H" ; Reset camera rotation to default.
hotkey.camera.follow = "F" ; Follow the first unit in the selection
hotkey.camera.zoom.in = Plus, Equals, NumPlus ; Zoom camera in (continuous control)
hotkey.camera.zoom.out = Minus, NumMinus ; Zoom camera out (continuous control)
hotkey.camera.zoom.wheel.in = WheelUp ; Zoom camera in (stepped control)
hotkey.camera.zoom.wheel.out = WheelDown ; Zoom camera out (stepped control)
hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W" ; Rotate camera to look upwards
hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S" ; Rotate camera to look downwards
hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q ; Rotate camera clockwise around terrain
hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E ; Rotate camera anticlockwise around terrain
hotkey.camera.rotate.wheel.cw = "Shift+WheelUp", MouseX1 ; Rotate camera clockwise around terrain (stepped control)
hotkey.camera.rotate.wheel.ccw = "Shift+WheelDown", MouseX2 ; Rotate camera clockwise around terrain (stepped control)
hotkey.camera.pan = MouseMiddle, ForwardSlash ; Enable scrolling by moving mouse
hotkey.camera.left = A, LeftArrow ; Scroll or rotate left
hotkey.camera.right = D, RightArrow ; Scroll or rotate right
hotkey.camera.up = W, UpArrow ; Scroll or rotate up/forwards
hotkey.camera.down = S, DownArrow ; Scroll or rotate down/backwards
; > CONSOLE SETTINGS
hotkey.console.toggle = BackQuote, F9 ; Open/close console.
hotkey.console.copy = "Ctrl+C" ; Copy from console to clipboard.
hotkey.console.paste = Insert, "Ctrl+V" ; Paste clipboard to console.
hotkey.console.toggle = BackQuote, F9 ; Open/close console
hotkey.console.copy = "Ctrl+C" ; Copy from console to clipboard
hotkey.console.paste = "Ctrl+V" ; Paste clipboard to console
; > ENTITY SELECTION
hotkey.selection.add = Shift ; Add units to selection.
hotkey.selection.remove = Ctrl ; Remove units from selection.
hotkey.selection.add = Shift ; Add units to selection
hotkey.selection.remove = Ctrl ; Remove units from selection
hotkey.selection.group.0 = 0
hotkey.selection.group.1 = 1
hotkey.selection.group.2 = 2
@@ -161,70 +144,32 @@ hotkey.selection.group.6 = 6
hotkey.selection.group.7 = 7
hotkey.selection.group.8 = 8
hotkey.selection.group.9 = 9
hotkey.selection.group.add = Shift ; +group: Add units to group.
hotkey.selection.group.save = Ctrl ; +group: Save units to group.
hotkey.selection.group.snap = Alt ; +group: Check up on group.
hotkey.selection.snap = Home ; Centre view on selection.
hotkey.highlightall = O ; Show selection circle for all units on screen.
hotkey.killUnit = Delete
hotkey.selection.group.add = Shift ; +group: Add units to group
hotkey.selection.group.save = Ctrl ; +group: Save units to group
hotkey.selection.group.snap = Alt ; +group: Check up on group
hotkey.selection.snap = Home ; Centre view on selection
; > CONTEXT CURSOR
hotkey.contextorder.next = LeftBracket ; Cycle right through orders (context cursors).
hotkey.contextorder.previous = RightBracket ; Cycle left through orders (context cursors).
; > TESTING KEYS
hotkey.orbital.toggle = V ; Enable/disable ball arena.
hotkey.orbital.cheat = "LeftCtrl+Backslash" ; Freeze ball.
hotkey.dudemachine.random = "Ctrl+ForwardSlash" ; Create random Dude.
; > SESSION CONTROLS
hotkey.session.kill = Delete ; Destroy selected units
hotkey.session.garrison = Ctrl ; Modifier to garrison when clicking on building
hotkey.session.queue = Shift ; Modifier to queue unit orders instead of replacing
hotkey.session.batchtrain = Shift ; Modifier to train units in batches
hotkey.session.deselectgroup = Ctrl ; Modifier to deselect units when clicking group icon, instead of selecting
hotkey.session.rotate.cw = RightBracket ; Rotate building placement preview clockwise
hotkey.session.rotate.ccw = LeftBracket ; Rotate building placement preview anticlockwise
hotkey.timewarp.fastforward = Space
hotkey.timewarp.rewind = Backspace
; > OVERLAY KEYS
hotkey.fps.toggle = "Shift+F" ; Toggle frame counter.
hotkey.session.statuspane.toggle = "Shift+S" ; Toggle Status Orb.
hotkey.session.minimap.toggle = "Shift+M" ; Toggle Map Orb.
hotkey.resourcepool.toggle = "Shift+R" ; Toggle Resource Pool.
hotkey.grouppane.toggle = "Shift+G" ; Toggle Group Pane.
hotkey.teamtray.toggle = "Shift+T" ; Toggle Team Tray.
hotkey.session.ShowPlayersList = "Shift+P" ; Toggle Players List
hotkey.session.devcommands.toggle = "Shift+D"
; > SESSION ORIENTATION KEYS
hotkey.session.gui.flip = "Alt+G" ; Toggle GUI to top/bottom/left/right of screen.
hotkey.session.gui.toggle = "G" ; Toggle visibility of session GUI.
; (TEMPORARY)
hotkey.alwayson.toggle = "Shift+X" ; Toggle always ons (Exit Button, End Game Button).
; > SUBMENU KEYS
hotkey.menu.toggle = "F10" ; Toggle in-game menu.
hotkey.menu.resign = "Alt+X" ; End current game session and return to main menu.
hotkey.fps.toggle = "Shift+F" ; Toggle frame counter
hotkey.session.devcommands.toggle = "Shift+D" ; Toggle developer commands panel
hotkey.session.gui.toggle = "G" ; Toggle visibility of session GUI
hotkey.menu.toggle = "F10" ; Toggle in-game menu
; > HOTKEYS ONLY
hotkey.chat = Return ; Toggles chat window
hotkey.onlinehelp = "F1" ; Enable/disable online manual entry for current selection.
hotkey.music.toggle = "M" ; Enable/disable music.
hotkey.audio.toggle = "Ctrl+A" ; Enable/disable sound.
hotkey.chat = Return ; Toggle chat window
; > PROFILER
hotkey.profile.toggle = "F11" ; Enable/disable real-time profiler
hotkey.profile.save = "Shift+F11" ; Save current profiler data to "logs/profile.txt"
hotkey.profile.toggle = "F11" ; Enable/disable real-time profiler
hotkey.profile.save = "Shift+F11" ; Save current profiler data to logs/profile.txt
; UNMAPPED KEY/MOUSE REFERENCE:
; LMB ; select unit
; RMB ; issue order to selected units
; LMB-drag ; bandbox units
; LMB-doubleclick ; select all units of this type on screen
; LMB-tripleclick ; select all units of this type on map
; shift+mouse select ; add to selection
; ctrl+mouse select ; remove from selection
; #=(1...0) ; select group #, pressing again centres view
; shift+# ; add group # to selection
; ctrl+# ; save selection as group #
; alt+# (hold down) ; snap view to group # (while alt is held down)
; mouse on map edge ; scroll in this direction
binaries/data/config/keys.txt
+2 -2
View File
@@ -126,8 +126,8 @@ Right Alt, RightAlt
Left Alt, LeftAlt
Right Meta
Left Meta
Left Super, LeftWin
Right Super, RightWin
Left Super, LeftWin
Right Super, RightWin
Alt Gr, AltGr
Compose
binaries/data/mods/_test.sim/simulation/components/test-entityid.js
+8 -2
View File
@@ -2,8 +2,14 @@ function TestScript1A() {}
TestScript1A.prototype.GetX = function() {
// Test that .entity is readonly
delete this.entity;
this.entity = -1;
try {
delete this.entity;
Engine.TS_FAIL("Missed exception");
} catch (e) { }
try {
this.entity = -1;
Engine.TS_FAIL("Missed exception");
} catch (e) { }
// and return the value
return this.entity;
binaries/data/mods/_test.sim/simulation/components/test-serialize.js
+8 -2
View File
@@ -19,8 +19,14 @@ function TestScript1_entity() {}
TestScript1_entity.prototype.GetX = function() {
// Test that .entity is readonly
delete this.entity;
this.entity = -1;
try {
delete this.entity;
Engine.TS_FAIL("Missed exception");
} catch (e) { }
try {
this.entity = -1;
Engine.TS_FAIL("Missed exception");
} catch (e) { }
// and return the value
return this.entity;
binaries/data/mods/internal/art/actors/props/structures/chinese/merchant_sail.xml
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="chinese merchant sail">
<mesh>props/chin_merch_sail.dae</mesh>
<texture>props/chin_sail_dragon.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/props/structures/chinese/trireme_sail.xml
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="chinese trireme sail">
<mesh>props/chin_tri_sail.dae</mesh>
<texture>props/chin_sail_dragon.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/props/structures/iberians/dock_boat.xml
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/iber_dock_boat.dae</mesh>
<texture>structural/iber_ship.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/props/structures/iberians/gate_door_1.xml
+3 -11
View File
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="props-1">
<mesh>props/iber_gate_door_1.dae</mesh>
<mesh>props/iber_gate_door.dae</mesh>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
<group>
<variant>
<texture>props/iber_prop_a.dds</texture>
</variant>
</group>
</actor>
binaries/data/mods/internal/art/actors/props/structures/iberians/gate_shields.xml
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/iber_wallgate_shields.dae</mesh>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/props/structures/iberians/scout_tower.xml
+1 -9
View File
@@ -1,23 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="shields-a">
<mesh>props/iber_scout_tower.dae</mesh>
</variant>
<variant frequency="1" name="shields-b">
<mesh>props/iber_scout_tower_b.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>props/iber_prop_shields.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/props/structures/romans/quinquereme_oars.xml
-1
View File
@@ -14,7 +14,6 @@
<variant frequency="1" name="oars-down">
<mesh>props/rome_qui_oars2.dae</mesh>
</variant>
<variant frequency="1" name="oars-drawn"/>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/props/units/shields/pers_tower.xml
+1 -9
View File
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Mesh">
<mesh>props/shield/spara_a_f.pmd</mesh>
@@ -11,11 +9,7 @@
</props>
</variant>
</group>
<group>
<variant name="spara-texture-a">
<texture>props/shield/pers_rect_a.dds</texture>
</variant>
<variant name="spara-texture-b">
<texture>props/shield/pers_rect_b.dds</texture>
</variant>
@@ -26,7 +20,5 @@
<texture>props/shield/pers_rect_e.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/props/units/shields/pers_tower_e.xml
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Mesh">
<mesh>props/shield/spara_a_f.pmd</mesh>
<props>
<prop actor="props/units/shields/pers_tower_back.xml" attachpoint="back"/>
</props>
</variant>
</group>
<group>
<variant name="spara-texture-a">
<texture>props/shield/pers_rect_a.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/structures/carthaginians/trireme.xml
+4 -4
View File
@@ -8,10 +8,10 @@
<group>
<variant frequency="100" name="Base">
<mesh>structural/kart_tri.dae</mesh>
<!--<props>
<prop actor="props/structures/persians/trireme_oars.xml" attachpoint="root"/>
<prop actor="props/structures/persians/trireme_mast.xml" attachpoint="root"/>
</props>-->
<props>
<prop actor="props/structures/carthaginians/trireme_oars.xml" attachpoint="root"/>
<!--<prop actor="props/structures/persians/trireme_mast.xml" attachpoint="root"/>-->
</props>
<texture>structural/plac_kart.dds</texture>
</variant>
</group>
binaries/data/mods/internal/art/actors/structures/chinese/merchant_ship.xml
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant name="Chinese Merchant Ship">
<mesh>structural/chin_merch.dae</mesh>
<props>
<prop actor="props/structures/chinese/merchant_sail.xml" attachpoint="root"/>
</props>
<texture>structural/chin_ship.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/structures/chinese/trireme.xml
+16
View File
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant name="Chinese Trireme">
<mesh>structural/chin_tri.dae</mesh>
<props>
<prop actor="props/structures/chinese/trireme_sail.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<texture>structural/chin_ship.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/structures/iberians/barracks.xml
+2 -4
View File
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/iber_barracks.dae</mesh>
<props>
<prop actor="props/structures/iberians/barracks.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
binaries/data/mods/internal/art/actors/structures/iberians/civil_centre.xml
+2 -5
View File
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/iber_civic_centre.dae</mesh>
<props>
<prop actor="props/structures/iberians/civil_centre.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
</props>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/structures/iberians/dock.xml
+4
View File
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="1" name="Iberian Dock">
<mesh>structural/iber_dock.dae</mesh>
<props>
<prop actor="props/structures/iberians/dock_boat.xml" attachpoint="root"/>
</props>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
binaries/data/mods/internal/art/actors/structures/iberians/farmstead.xml
+2 -4
View File
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/iber_farmstead.dae</mesh>
<props>
<prop actor="props/structures/iberians/farmstead_hay.xml" attachpoint="root"/>
<prop actor="props/structures/decals/farmstead_mud.xml" attachpoint="root"/>
</props>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
binaries/data/mods/internal/art/actors/structures/iberians/fortress.xml
+3
View File
@@ -4,6 +4,9 @@
<group>
<variant frequency="100" name="base">
<mesh>structural/iber_fortress.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
</props>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
binaries/data/mods/internal/art/actors/structures/iberians/house.xml
+5 -4
View File
@@ -1,31 +1,32 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="10" name="House A">
<mesh>structural/iber_house_a.dae</mesh>
<props>
<prop actor="props/structures/iberians/house_a.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
</props>
</variant>
<variant frequency="10" name="House B">
<mesh>structural/iber_house_b.dae</mesh>
<props>
<prop actor="props/structures/iberians/house_b.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
</props>
</variant>
<variant frequency="10" name="House C">
<mesh>structural/iber_house_c.dae</mesh>
<props>
<prop actor="props/structures/iberians/house_c.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
binaries/data/mods/internal/art/actors/structures/iberians/market.xml
+2 -5
View File
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/iber_market.dae</mesh>
<props>
<prop actor="props/structures/iberians/market_01.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/structures/iberians/mill.xml
+2 -4
View File
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/iber_mill.dae</mesh>
<props>
<prop actor="props/structures/iberians/mill.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
binaries/data/mods/internal/art/actors/structures/iberians/sb_1.xml
+2 -4
View File
@@ -1,17 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="base">
<mesh>structural/iber_sb_mon_1.dae</mesh>
<props>
<prop actor="props/structures/iberians/sb_1_a.xml" attachpoint="root"/>
<prop actor="props/structures/iberians/sb_1_b.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
</props>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
binaries/data/mods/internal/art/actors/structures/iberians/scout_tower.xml
+2 -4
View File
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/iber_scout_tower.dae</mesh>
<props>
<prop actor="props/structures/iberians/scout_tower.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
</props>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
binaries/data/mods/internal/art/actors/structures/iberians/temple.xml
+2 -4
View File
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/iber_temple.dae</mesh>
<props>
<prop actor="props/structures/iberians/temple.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
</actor>
binaries/data/mods/internal/art/actors/structures/iberians/wall.xml
+14 -9
View File
@@ -1,15 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="base">
<mesh>structural/iber_wall.dae</mesh>
<texture>structural/iber_struct_a.dds</texture>
<variant frequency="1" name="wall long">
<mesh>structural/iber_wall_long.dae</mesh>
</variant>
<variant frequency="1" name="wall med">
<mesh>structural/iber_wall_med.dae</mesh>
</variant>
<variant frequency="1" name="wall short">
<mesh>structural/iber_wall_short.dae</mesh>
</variant>
</group>
<group>
<variant>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/structures/iberians/wall_gate.xml
+4 -8
View File
@@ -1,18 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="base">
<mesh>structural/iber_wall_gate.dae</mesh>
<mesh>structural/iber_wall_gate_new.dae</mesh>
<props>
<prop actor="props/structures/iberians/gate_door_1.xml" attachpoint="root"/>
<prop actor="props/structures/iberians/gate_shields.xml" attachpoint="root"/>
</props>
<texture>structural/iber_struct_a.dds</texture>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/structures/iberians/wall_tower.xml
+3 -7
View File
@@ -1,15 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="base">
<mesh>structural/iber_wall_tower.dae</mesh>
<texture>structural/iber_struct_a.dds</texture>
<mesh>structural/iber_wall_turret.dae</mesh>
<texture>structural/iber_struct.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/structures/persians/farmstead.xml
+4 -5
View File
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/pers_farmstead.dae</mesh>
<props>
<prop actor="props/structures/decals/farmstead_mud.xml" attachpoint="root"/>
</props>
<texture>structural/pers_struct.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/structures/romans/mill.xml
+4 -5
View File
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/rome_mill.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<texture>structural/rome_struct.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/structures/romans/quinquereme.xml
+8 -12
View File
@@ -1,33 +1,29 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<float/>
<group>
<variant frequency="100" name="Base">
<mesh>structural/rome_qui.dae</mesh>
<texture>structural/rome_qui.dds</texture>
</variant>
</group>
<group>
<variant frequency="1" name="sail">
<props>
<prop actor="props/structures/romans/quinquereme_oars.xml" attachpoint="root" />
<prop actor="props/structures/romans/quinquereme_props.xml" attachpoint="root" />
<prop actor="props/structures/romans/quinquereme_mast.xml" attachpoint="root" />
<prop actor="props/structures/romans/quinquereme_oars.xml" attachpoint="root"/>
<prop actor="props/structures/romans/quinquereme_props.xml" attachpoint="root"/>
<prop actor="props/structures/romans/quinquereme_mast.xml" attachpoint="root"/>
<prop actor="props/units/weapons/rock.xml" attachpoint="projectile"/>
</props>
</variant>
<variant frequency="1" name="no-sail">
<props>
<prop actor="props/structures/romans/quinquereme_oars.xml" attachpoint="root" />
<prop actor="props/structures/romans/quinquereme_props.xml" attachpoint="root" />
<prop actor="props/structures/romans/quinquereme_oars.xml" attachpoint="root"/>
<prop actor="props/structures/romans/quinquereme_props.xml" attachpoint="root"/>
<prop actor="props/units/weapons/rock.xml" attachpoint="projectile"/>
</props>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/structures/romans/scout_tower.xml
+2 -5
View File
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<mesh>structural/rome_scout_tower.dae</mesh>
<props>
<prop actor="props/structures/romans/scout_tower.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_2x2.xml" attachpoint="root"/>
</props>
<texture>structural/rome_struct.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/temp/testing.xml
+51
View File
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations>
<animation file="infantry/sword/attack/isw_s_off_05.psa" name="Idle" speed="1"/>
<animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
<animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="8"/>
<animation event="0.5" file="infantry/sword/attack/isw_s_em_04.psa" name="Attack" speed="120"/>
<animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="Attack" speed="150"/>
<animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Attack" speed="145"/>
<animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
<animation file="infantry/general/death/inf_02.psa" name="death" speed="420"/>
<animation file="infantry/general/death/inf_06.psa" name="death" speed="200"/>
<animation file="infantry/general/death/inf_07.psa" name="death" speed="200"/>
</animations>
<mesh>skeletal/m_tunic_a.pmd</mesh>
<props>
<prop actor="props/units/heads/hele_hoplite_e.xml" attachpoint="helmet"/>
<prop actor="props/units/heads/head_hele_h.xml" attachpoint="head"/>
<prop actor="props/units/weapons/xiphos.xml" attachpoint="r_hand"/>
<prop actor="props/units/shields/hele_round_e.xml" attachpoint="shield"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="spartan">
<texture>skeletal/hele_spartitiate.dds</texture>
</variant>
<variant frequency="1" name="hoplite-f">
<texture>skeletal/hele_isp_e_f.dds</texture>
</variant>
<variant frequency="1" name="hoplite-g">
<texture>skeletal/hele_isp_e_g.dds</texture>
</variant>
<variant frequency="1" name="isp_a">
<texture>skeletal/hele_isp_a.dds</texture>
</variant>
<variant frequency="1" name="xenophon">
<texture>skeletal/hele_xenophon.dds</texture>
</variant>
<variant frequency="1" name="pez-1">
<texture>skeletal/hele_pezhetairoi.dds</texture>
</variant>
<variant frequency="1" name="pez-2">
<texture>skeletal/hele_pezhetairoi_2.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/units/carthaginians/healer.xml
+24
View File
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<animations>
<animation file="female/f_idle_01.dae" name="Idle" speed="200"/>
<animation file="female/f_walk_01.dae" name="Walk" speed="30"/>
<animation file="female/f_walk_01.dae" name="Run" speed="45"/>
<animation file="female/f_death_01.dae" name="Death" speed="100"/>
</animations>
<props>
<prop actor="props/units/heads/head_kart_priestess.xml" attachpoint="head"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="Peplos-DarkBrown">
<mesh>skeletal/f_dress.dae</mesh>
<texture>skeletal/kart_fem_01.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/units/carthaginians/super_unit_1.xml
+3 -9
View File
@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<animations>
<animation file="biped/not used/inf_phalanx_b.psa" name="Idle" speed="200"/>
<animation file="biped/inf_phalanx_walk_a.psa" name="Walk" speed="17"/>
<animation file="biped/inf_phalanx_walk_a.psa" name="run" speed="18"/>
<animation file="biped/inf_phalanx_walk_a.psa" name="Walk" speed="140"/>
<animation file="biped/inf_phalanx_walk_a.psa" name="run" speed="200"/>
<animation event="0.5" file="biped/inf_phalanx_atk_a.psa" name="melee" speed="350"/>
<animation file="infantry/general/dude/dudedeath_sword.psa" name="death" speed="165"/>
<animation file="infantry/general/death/inf_06.psa" name="death" speed="200"/>
</animations>
<props>
@@ -21,7 +18,6 @@
</props>
</variant>
</group>
<group>
<variant frequency="1" name="Carth-Sacred Band-ShortSleeve">
<mesh>skeletal/m_tunic_short.dae</mesh>
@@ -44,7 +40,5 @@
<texture>skeletal/kart_su1_sacredband_5.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/units/iberians/hero_variato.xml
+10 -9
View File
@@ -4,15 +4,16 @@
<group>
<variant frequency="1" name="Base">
<animations>
<animation file="infantry/sword/attack/isw_s_def_06.psa" name="idle" speed="1"/>
<animation file="biped/dudewalk_swordshield.psa" name="walk" speed="18"/>
<animation file="infantry/sword/move/run/isw_s_off_01.psa" name="run" speed="8"/>
<animation file="infantry/general/death/inf_01.psa" name="death" speed="200"/>
<animation file="infantry/general/death/inf_02.psa" name="death" speed="200"/>
<animation file="infantry/general/death/inf_06.psa" name="death" speed="200"/>
<animation file="infantry/general/death/inf_07.psa" name="death" speed="200"/>
<animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="melee" speed="160"/>
<animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="110"/>
<animation file="biped/inf_sword_ready_e.dae" name="idle" speed="100"/>
<animation file="biped/inf_sword_ready_e.dae" name="idle" speed="90"/>
<animation file="biped/walk_spearshield.psa" name="walk" speed="120"/>
<animation file="infantry/sword/move/run/isw_s_off_01.psa" name="run" speed="40"/>
<animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="100"/>
<animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="melee" speed="100"/>
<animation file="infantry/general/death/inf_01.psa" name="death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="death" speed="700"/>
<animation file="infantry/general/death/inf_06.psa" name="death" speed="500"/>
<animation file="infantry/general/death/inf_07.psa" name="death" speed="400"/>
</animations>
<props>
<prop actor="props/units/heads/head_iber_hero_1.xml" attachpoint="head"/>
binaries/data/mods/internal/art/actors/units/iberians/trader.xml
+15 -24
View File
@@ -1,24 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations>
<animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
<animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
<animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
<animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
</animations>
<mesh>skeletal/m_pants_celt.dae</mesh>
<props>
<prop actor="props/units/heads/head_iber_adv.xml" attachpoint="head"/>
</props>
<texture>skeletal/iber_trader_1.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>skeletal/celt_trader.pmd</mesh>
<props>
<prop actor="units/iberians/trader_r.xml" attachpoint="trader"/>
<prop actor="units/celts/trader_h.xml" attachpoint="donkey"/>
</props>
<texture>null_white.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/units/iberians/trader_r.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations>
<animation file="biped/inf_pack_idle.dae" name="Idle" speed="200"/>
<animation file="biped/inf_pack_walk.dae" name="Walk" speed="20"/>
<animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
</animations>
<mesh>skeletal/m_pants_celt.dae</mesh>
<props>
<prop actor="props/units/heads/head_iber_adv.xml" attachpoint="head"/>
<prop actor="props/units/backpack_celt.xml" attachpoint="back"/>
</props>
<texture>skeletal/iber_trader_1.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/units/persians/infantry_spearman_a.xml
+21 -1
View File
@@ -27,7 +27,6 @@
</animations>
<mesh>skeletal/m_pants_celt.dae</mesh>
<props>
<prop actor="props/units/heads/head_pers_tiara_y.xml" attachpoint="head"/>
<prop actor="props/units/shields/pers_tower.xml" attachpoint="shield"/>
<prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
</props>
@@ -35,14 +34,35 @@
</group>
<group>
<variant frequency="1" name="Clothing-red-stripes">
<props>
<prop actor="props/units/heads/head_pers_tiara_y.xml" attachpoint="head"/>
</props>
<texture>skeletal/pers_isp_a_1.dds</texture>
</variant>
<variant frequency="1" name="Clothing-blue-stripes">
<props>
<prop actor="props/units/heads/head_pers_tiara_y.xml" attachpoint="head"/>
</props>
<texture>skeletal/pers_isp_a_2.dds</texture>
</variant>
<variant frequency="1" name="Clothing-gold-stripes">
<props>
<prop actor="props/units/heads/head_pers_tiara_y.xml" attachpoint="head"/>
</props>
<texture>skeletal/pers_isp_a_3.dds</texture>
</variant>
<variant frequency="1" name="Clothing-emerald">
<props>
<prop actor="props/units/heads/head_pers_tiara.xml" attachpoint="head"/>
</props>
<texture>skeletal/pers_isp_e_1.dds</texture>
</variant>
<variant frequency="1" name="Clothing-gold">
<props>
<prop actor="props/units/heads/head_pers_tiara.xml" attachpoint="head"/>
</props>
<texture>skeletal/pers_isp_e_2.dds</texture>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
binaries/data/mods/internal/art/actors/units/persians/infantry_spearman_e.xml
+13 -9
View File
@@ -4,8 +4,8 @@
<group>
<variant frequency="100" name="Base">
<animations>
<animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
<animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="101"/>
<animation file="biped/inf_sword_ready_e.dae" name="Idle" speed="100"/>
<animation file="biped/inf_sword_ready_e.dae" name="Idle" speed="95"/>
<animation file="biped/walk_spearshield.psa" name="Walk" speed="18"/>
<animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Melee" speed="100"/>
<animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="100"/>
@@ -27,18 +27,16 @@
</animations>
<mesh>skeletal/m_pants_celt.dae</mesh>
<props>
<prop actor="props/units/heads/head_pers_tiara.xml" attachpoint="head"/>
<prop actor="props/units/shields/pers_tower.xml" attachpoint="shield"/>
<prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
<prop actor="props/units/shields/pers_tower_e.xml" attachpoint="shield"/>
<prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
<prop actor="props/units/heads/thracian_cap_01.xml" attachpoint="helmet"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="Clothing-emerald">
<texture>skeletal/pers_isp_e_1.dds</texture>
</variant>
<variant frequency="1" name="Clothing-gold">
<texture>skeletal/pers_isp_e_2.dds</texture>
<variant frequency="1" name="scale mail">
<texture>skeletal/pers_iar_e_2.dds</texture>
</variant>
</group>
<group>
@@ -55,6 +53,7 @@
<prop actor="" attachpoint="shield"/>
<prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
<prop actor="" attachpoint="r_hand"/>
<prop attachpoint="helmet"/>
</props>
</variant>
<variant name="gather_grain">
@@ -62,6 +61,7 @@
<prop actor="" attachpoint="shield"/>
<prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
<prop actor="" attachpoint="r_hand"/>
<prop attachpoint="helmet"/>
</props>
</variant>
<variant name="gather_fruit">
@@ -70,6 +70,7 @@
<prop actor="" attachpoint="l_hand"/>
<prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
<prop actor="" attachpoint="r_hand"/>
<prop attachpoint="helmet"/>
</props>
</variant>
<variant name="gather_stone">
@@ -77,6 +78,7 @@
<prop actor="" attachpoint="shield"/>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop actor="" attachpoint="r_hand"/>
<prop attachpoint="helmet"/>
</props>
</variant>
<variant name="gather_metal">
@@ -84,6 +86,7 @@
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
<prop attachpoint="shield"/>
<prop attachpoint="helmet"/>
</props>
</variant>
<variant name="Build">
@@ -91,6 +94,7 @@
<prop actor="" attachpoint="shield"/>
<prop actor="" attachpoint="l_hand"/>
<prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
<prop attachpoint="helmet"/>
</props>
</variant>
</group>
binaries/data/mods/internal/art/actors/units/persians/super_unit_1.xml
+12 -16
View File
@@ -6,33 +6,29 @@
<animations>
<animation file="biped/inf_sword_ready_e.dae" name="Idle" speed="100"/>
<animation file="biped/inf_sword_ready_e.dae" name="Idle" speed="95"/>
<animation file="biped/walk_spearshield.psa" name="Walk" speed="17"/>
<animation file="biped/walk_spearshield.psa" name="Walk" speed="110"/>
<animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="120"/>
<animation event="0.5" file="infantry/sword/attack/isw_s_def_01.psa" name="Melee" speed="100"/>
<animation file="infantry/sword/attack/isw_s_def_06.psa" name="Melee" speed="100"/>
<animation event="0.5" file="infantry/sword/attack/isw_s_def_01.psa" name="Melee" speed="80"/>
<animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Melee" speed="80"/>
<animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="Melee" speed="80"/>
<animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="6"/>
<animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="8"/>
<animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="8"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
<animation file="infantry/general/death/inf_03.psa" name="Death" speed="200"/>
<animation file="infantry/general/death/inf_04.psa" name="Death" speed="200"/>
<animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
<animation file="infantry/general/death/inf_07.psa" name="Death" speed="200"/>
<animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_03.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_06.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
</animations>
<mesh>skeletal/m_pants_celt.dae</mesh>
<props>
<prop actor="props/units/heads/head_pers_tiara.xml" attachpoint="head"/>
<prop actor="props/units/shields/gerron_b.xml" attachpoint="shield"/>
<prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
<prop actor="props/temp/quiver.xml" attachpoint="back"/>
<prop actor="props/units/pers_quiver_back.xml" attachpoint="back"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="ChainMail-Bronze">
<texture>skeletal/pers_su1_anusiya.dds</texture>
<texture>skeletal/pers_su1_anusiya_iron.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
binaries/data/mods/internal/art/actors/units/persians/super_unit_2.xml
+31 -38
View File
@@ -1,52 +1,45 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Mesh">
<variant frequency="1" name="Base">
<animations>
<animation file="quadraped/elephant_idle_01.dae" name="Idle" speed="100"/>
<animation file="quadraped/elephant_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/elephant_walk_01.dae" name="walk" speed="20"/>
<animation file="quadraped/elephant_run_01.dae" name="run " speed="30"/>
<animation file="quadraped/elephant_attack_03.dae" name="melee" speed="100"/>
<animation file="quadraped/elephant_attack_02.dae" name="melee" speed="100"/>
<animation file="quadraped/elephant_attack_01.dae" name="melee" speed="100"/>
<animation file="quadraped/elephant_death_01.dae" name="death" speed="300"/>
<animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
<animation file="quadraped/horse_attack_a.psa" name="Idle" speed="70"/>
<animation file="quadraped/horse_attack_b.psa" name="Idle" speed="48"/>
<animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
<animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
<animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="45"/>
<animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="60"/>
<animation file="quadraped/horse_death.psa" name="death" speed="230"/>
</animations>
<mesh>skeletal/elephant_asian.dae</mesh>
<mesh>skeletal/horse.pmd</mesh>
<props>
<prop actor="units/persians/super_unit_2_mahout.xml" attachpoint="rider1"/>
<prop actor="units/persians/super_unit_2_raja.xml" attachpoint="rider2"/>
<prop actor="units/persians/super_unit_2_r.xml" attachpoint="rider"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="elephant-hide-gray-1">
<texture>skeletal/pers_su2_ele_01.dds</texture>
<variant frequency="1" name="horse-texture-1">
<texture>skeletal/horse_pers_csp_e_3.dds</texture>
</variant>
<variant frequency="1" name="elephant-hide-brown-1">
<texture>skeletal/pers_su2_ele_02.dds</texture>
</variant>
<variant frequency="1" name="elephant-hide-gray-2">
<texture>skeletal/pers_su2_ele_03.dds</texture>
</variant>
<variant frequency="1" name="elephant-hide-brown-2">
<texture>skeletal/pers_su2_ele_04.dds</texture>
</variant>
<variant frequency="1" name="elephant-hide-gray-3">
<texture>skeletal/pers_su2_ele_05.dds</texture>
</variant>
<variant frequency="1" name="elephant-hide-gray-4">
<texture>skeletal/pers_su2_ele_06.dds</texture>
</variant>
<variant frequency="1" name="elephant-hide-brown-4">
<texture>skeletal/pers_su2_ele_07.dds</texture>
<variant frequency="1" name="horse-texture-2">
<texture>skeletal/horse_pers_csp_e_4.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
<group>
<variant frequency="1" name="horse-color-black">
<colour>41 41 41</colour>
</variant>
<variant frequency="1" name="horse-color-biege">
<colour>247 213 111</colour>
</variant>
<variant frequency="1" name="horse-color-gray">
<colour>253 253 253</colour>
</variant>
<variant frequency="1" name="horse-color-brown">
<colour>211 123 44</colour>
</variant>
</group>
<material>objectcolor.xml</material>
</actor>
binaries/data/mods/internal/art/actors/units/persians/super_unit_2_r.xml
+29
View File
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Base">
<animations>
<animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
<animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
<animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
<animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
<animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="100"/>
<animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
</animations>
<mesh>skeletal/m_pants_armor.dae</mesh>
<props>
<prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
<prop actor="props/units/heads/hele_hoplite_b.xml" attachpoint="helmet"/>
<prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
<prop actor="props/units/cape_olivegreen.xml" attachpoint="shoulders"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="Elite-Rider-Texture-01">
<texture>skeletal/pers_csp_e_1.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/actors/units/persians/super_unit_2_mahout.xml → binaries/data/mods/internal/art/actors/units/persians/super_unit_3_mahout.xml
View File
binaries/data/mods/internal/art/actors/units/persians/super_unit_2_raja.xml → binaries/data/mods/internal/art/actors/units/persians/super_unit_3_raja.xml
View File
binaries/data/mods/internal/art/actors/units/persians/war_elephant.xml
+47
View File
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Mesh">
<animations>
<animation file="quadraped/elephant_idle_01.dae" name="Idle" speed="100"/>
<animation file="quadraped/elephant_idle_02.dae" name="Idle" speed="100"/>
<animation file="quadraped/elephant_walk_01.dae" name="walk" speed="20"/>
<animation file="quadraped/elephant_run_01.dae" name="run " speed="30"/>
<animation file="quadraped/elephant_attack_03.dae" name="melee" speed="100"/>
<animation file="quadraped/elephant_attack_02.dae" name="melee" speed="100"/>
<animation file="quadraped/elephant_attack_01.dae" name="melee" speed="100"/>
<animation file="quadraped/elephant_death_01.dae" name="death" speed="300"/>
</animations>
<mesh>skeletal/elephant_asian.dae</mesh>
<props>
<prop actor="units/persians/super_unit_3_mahout.xml" attachpoint="rider1"/>
<prop actor="units/persians/super_unit_3_raja.xml" attachpoint="rider2"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="elephant-hide-gray-1">
<texture>skeletal/pers_su2_ele_01.dds</texture>
</variant>
<variant frequency="1" name="elephant-hide-brown-1">
<texture>skeletal/pers_su2_ele_02.dds</texture>
</variant>
<variant frequency="1" name="elephant-hide-gray-2">
<texture>skeletal/pers_su2_ele_03.dds</texture>
</variant>
<variant frequency="1" name="elephant-hide-brown-2">
<texture>skeletal/pers_su2_ele_04.dds</texture>
</variant>
<variant frequency="1" name="elephant-hide-gray-3">
<texture>skeletal/pers_su2_ele_05.dds</texture>
</variant>
<variant frequency="1" name="elephant-hide-gray-4">
<texture>skeletal/pers_su2_ele_06.dds</texture>
</variant>
<variant frequency="1" name="elephant-hide-brown-4">
<texture>skeletal/pers_su2_ele_07.dds</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/internal/art/meshes/props/chin_merch_sail.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/props/chin_tri_sail.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/props/iber_dock_boat.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/props/iber_gate_door.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/props/iber_scout_tower.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/props/iber_scout_tower_b.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/props/iber_wallgate_shields.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/props/pers_tri_mast.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/props/pers_tri_oars.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/props/rome_qui_mast.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/props/rome_qui_oars.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/props/rome_qui_oars2.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/props/rome_qui_props.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/skeletal/deer_mesh.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/skeletal/deer_mesh_skeleton.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/structural/chin_merch.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/structural/chin_tri.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/structural/iber_dock.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/structural/iber_scout_tower.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/structural/iber_wall_gate.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/structural/iber_wall_gate_new.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/structural/iber_wall_long.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/structural/iber_wall_med.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/structural/iber_wall_short.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/structural/iber_wall_turret.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/structural/kart_tri.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/structural/pers_tri.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/meshes/structural/rome_qui.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/backpack_trader_celt.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/cape_a.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/cape_alexander.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/cape_b.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/cape_hele_ijv_e_1.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/celt_wall_stump.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/chin_sail_dragon.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/collar_a.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/collar_b.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/dude_head.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/dudette_head.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/floppyboot.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/hele_horse_detail.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/oar.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/pers_trireme_sail.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/pers_trireme_sail_b.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/plac_head_celt.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/plac_head_hele.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/plac_head_iber.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/plac_head_kart.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/plac_head_pers.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/plac_head_rome.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/plac_helmet_a.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/internal/art/textures/skins/props/plac_helmet_e.dds
LFS
BIN
View File
Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More