Compare commits

..

724 Commits

Author SHA1 Message Date
Deiz ef2c9e338d LeaveFoundation should put formation members into a discrete state to avoid prematurely disbanding.
This was SVN commit r12636.
2012-09-04 23:27:06 +00:00
historic_bruno b3d85df2fd Adds notes about a few currently useless special buildings
This was SVN commit r12634.
2012-09-04 19:56:27 +00:00
Deiz 323d7b207e Completely hide deprecated AIs for now.
This was SVN commit r12633.
2012-09-04 17:41:46 +00:00
myconid 3efb235725 And re-enabling the stuff disabled for debugging 2
This was SVN commit r12632.
2012-09-04 17:30:01 +00:00
myconid 10101b138d And re-enabling the stuff disabled for debugging
This was SVN commit r12631.
2012-09-04 16:59:03 +00:00
Mythos_Ruler 3cdf49c75f Changing texture for this tree top.
This was SVN commit r12630.
2012-09-04 16:57:17 +00:00
myconid 8b10290f78 Disabling some LOD stuff to track down Deiz's bug (as a result, parallax also temporarily disabled)
This was SVN commit r12629.
2012-09-04 15:55:36 +00:00
myconid 1ba858bf6e More on that bug (warning: renderer temporarily slower)
This was SVN commit r12628.
2012-09-04 12:34:02 +00:00
myconid f92cda7a91 Testing something different in the hope it helps with a bug reported on the forums
This was SVN commit r12627.
2012-09-04 11:09:36 +00:00
Deiz 6adccf3660 Hide unusable AIs from the default match setup drop-down list.
This was SVN commit r12626.
2012-09-04 07:09:36 +00:00
Deiz 25f7012f0c Squished the match setup player display a bit, to better show longer names at low resolutions.
This was SVN commit r12625.
2012-09-04 07:01:11 +00:00
Deiz 0a0a49eb09 Explicitly store whether whether a unit is moving, as formation members don't finish moving as normal.
This was SVN commit r12624.
2012-09-04 03:57:22 +00:00
Mythos_Ruler 0eeb187609 Mauryan units can build elephant stables now.
This was SVN commit r12623.
2012-09-04 00:57:05 +00:00
Mythos_Ruler 3efc51b9f2 Clarified Worker Elephant tooltip.
Increased Worker Elephant builder speed.

This was SVN commit r12622.
2012-09-04 00:37:16 +00:00
Mythos_Ruler 88f1145368 Acropolis 1 now uses Aegis Bot.
This was SVN commit r12621.
2012-09-03 23:56:52 +00:00
Mythos_Ruler bf825ed41f This was SVN commit r12620. 2012-09-03 23:56:11 +00:00
Mythos_Ruler ca4a5238af Updated Punjab 1 map.
This was SVN commit r12619.
2012-09-03 23:54:51 +00:00
Mythos_Ruler becc13cf44 Tweaked color of building decals.
This was SVN commit r12618.
2012-09-03 23:29:31 +00:00
Mythos_Ruler 80e3efda02 Destruction smoke for Rotary Mill.
This was SVN commit r12617.
2012-09-03 22:37:31 +00:00
gregory 541c77168c Updated Roman market AO.
This was SVN commit r12616.
2012-09-03 21:08:08 +00:00
gregory 681713fe98 Re-committed celt_house_b.dae with the correct model.
This was SVN commit r12615.
2012-09-03 17:11:59 +00:00
gregory 89c87f2af2 This was SVN commit r12614. 2012-09-03 16:43:57 +00:00
Deiz d805c87249 Send messages when formation members hit fail to find a path or are obstructed.
This was SVN commit r12613.
2012-09-03 02:59:15 +00:00
gregory 66318d7011 Added/fixed dust prop points on one of the Celtic house variants and one of the defense tower variants.
This was SVN commit r12612.
2012-09-03 01:51:02 +00:00
historic_bruno 7d2e201332 Fixes some unreferenced formal parameter warnings
This was SVN commit r12611.
2012-09-02 23:07:16 +00:00
Mythos_Ruler a972ba900d Renamed qBot-experimental to something nicer. Can easily be changed to something else.
This was SVN commit r12610.
2012-09-02 22:16:41 +00:00
Mythos_Ruler c518ad6834 Commented out "USE_SELF_LIGHT" because the lack of an alpha channel in many specular textures may cause problems on some systems. Per discussion with historicbruno.
This was SVN commit r12609.
2012-09-02 21:36:28 +00:00
Mythos_Ruler b9efc49c88 These helmets now use the new specular helmet material. More to come.
This was SVN commit r12608.
2012-09-02 21:08:43 +00:00
Mythos_Ruler 0c2b69cb89 A spec map material for helmets. This makes the specular shinier for helmets that use this material for a more noticeable effect.
This was SVN commit r12607.
2012-09-02 20:46:17 +00:00
Mythos_Ruler 545db71a8c Adding missing material.
This was SVN commit r12606.
2012-09-02 20:32:33 +00:00
historic_bruno eedb25fedc Fixes invalid light model and overbrightness on some demo maps
This was SVN commit r12605.
2012-09-02 20:23:27 +00:00
Pureon 8e1a9bf89b Fixing celt defence tower prop points and adding foundation
This was SVN commit r12604.
2012-09-02 18:06:49 +00:00
Pureon cb83f6955c Fixing dust prop point errors. Celt house and tower
This was SVN commit r12602.
2012-09-02 14:55:53 +00:00
myconid fd400f111c Bugfix: a problematic decal in Hellenic Sandbox, ticket #1632
This was SVN commit r12601.
2012-09-02 12:11:27 +00:00
myconid 6548827ca2 Changed a few more decals
This was SVN commit r12600.
2012-09-02 09:10:59 +00:00
myconid 8a61f207f2 Changed a couple of misnamed materials, which were breaking some decals
This was SVN commit r12599.
2012-09-02 09:00:27 +00:00
Mythos_Ruler 766823f293 Made theatron available to all hellenic factions.
This was SVN commit r12598.
2012-09-02 05:12:06 +00:00
Mythos_Ruler f48883187d Spec and Normal maps for Tropical stone quarries and one of the tropical cliff terrains.
This was SVN commit r12597.
2012-09-02 03:30:14 +00:00
Mythos_Ruler 1a3a6a73ac Made the "default" maps Acropolis 1 (first map alphabetically in the list).
This was SVN commit r12596.
2012-09-02 03:03:53 +00:00
Mythos_Ruler 6e3127cb74 Album image for the game's music.
This was SVN commit r12595.
2012-09-02 02:55:25 +00:00
Deiz 38ea080d25 Increase the AI's js runtime size to 32 MB for the time being.
This was SVN commit r12594.
2012-09-02 01:50:16 +00:00
myconid ba3b6b9bb7 Attempting to rewrite fixed renderpath model rendering code to apply LOS to models.
This was SVN commit r12593.
2012-09-02 01:33:56 +00:00
Mythos_Ruler 18aa6e3320 Tweaked
This was SVN commit r12592.
2012-09-01 23:42:08 +00:00
stwf a6e1e6cec7 report errors opening sound files and hopefully revcover from them gracefully
This was SVN commit r12591.
2012-09-01 23:24:32 +00:00
gregory 453f4a8aa6 Deleted broken and unused fancy Mars temple.
This was SVN commit r12590.
2012-09-01 23:23:29 +00:00
gregory 0be2384297 Added shader maps to (hopefully) all the Celtic buildings.
This was SVN commit r12589.
2012-09-01 22:53:28 +00:00
myconid affe91b52c Fixed fixed renderpath: green water, broken minimap
This was SVN commit r12588.
2012-09-01 22:34:36 +00:00
historic_bruno d45a044445 Cleans up rogue printf
This was SVN commit r12587.
2012-09-01 22:16:53 +00:00
leper ccdb67c8f2 Fix non-pch build.
This was SVN commit r12586.
2012-09-01 22:12:28 +00:00
Mythos_Ruler 535065eb5c Fixed Spartan cc
This was SVN commit r12585.
2012-09-01 22:02:05 +00:00
Enrique a1e21449fb Fixed Athenian CC, added spartan and macedonian CC
This was SVN commit r12584.
2012-09-01 21:53:39 +00:00
Mythos_Ruler c185ac89bc Added teams to this map.
This was SVN commit r12583.
2012-09-01 20:59:28 +00:00
Mythos_Ruler c5713719a8 Adjusted the Maur CC footprint a bit.
This was SVN commit r12582.
2012-09-01 20:39:52 +00:00
egbert 4a06158fa5 This was SVN commit r12581. 2012-09-01 18:59:19 +00:00
egbert 9b453f086e This was SVN commit r12580. 2012-09-01 18:57:30 +00:00
egbert ecff938a6f This was SVN commit r12579. 2012-09-01 18:56:13 +00:00
egbert f59024b491 This was SVN commit r12578. 2012-09-01 18:55:06 +00:00
historic_bruno a29acce208 Adds some missing includes, refs #1614
This was SVN commit r12577.
2012-09-01 18:23:13 +00:00
Deiz 0cd7da8d0d A C-style for loop is needed for this to iterate as expected.
This was SVN commit r12576.
2012-09-01 10:43:05 +00:00
Spahbod 74364a3130 Changing the release name to "Alpha XI Kronos" before someone makes a package.
This was SVN commit r12575.
2012-09-01 05:45:14 +00:00
stwf 0133197dcd proper disposal of single buffer sounds
This was SVN commit r12574.
2012-09-01 02:41:48 +00:00
Deiz 9cc8a0a40b Enable rally points for corrals.
This was SVN commit r12573.
2012-08-31 19:52:58 +00:00
myconid 166afff098 Fixed zoot's shimmering rock problem
This was SVN commit r12571.
2012-08-31 19:46:40 +00:00
historic_bruno df96445284 missing files from 89c8bccbde
This was SVN commit r12570.
2012-08-31 19:26:29 +00:00
Deiz 0340cc2baa Shade and show an insufficient resources tooltip for unaffordable walls. Fixes #1641.
This was SVN commit r12569.
2012-08-31 19:20:16 +00:00
myconid 2ed11f6a84 Trying to clean up the old specularity code
This was SVN commit r12568.
2012-08-31 19:12:42 +00:00
Mythos_Ruler 7ce09c315b Athenian cc by Enrique (still needs projectile prop point).
Spec and Normal maps for Roman siege wall. Siege wall gate still needs
it, but currently there is a bug with using the new materials on
animated structures.

This was SVN commit r12567.
2012-08-31 19:10:35 +00:00
historic_bruno 89c8bccbde Sound system patch by stwf:
Fixes sound system to work with archives (use VFS files instead of
POSIX), fixes #1604.
Improves error handling and logging, refs #1594.
Allows sound to be disabled with -nosound/-quickstart runtime options or
--without-audio build option, fixes #1609, #1614.
Experimentally increases default buffer size to help prevent sound
stoppages.

This was SVN commit r12566.
2012-08-31 19:08:41 +00:00
myconid e8758b8bf1 Making sure LOS really is black after Reveal Map option is used...
This was SVN commit r12565.
2012-08-31 18:33:03 +00:00
Deiz ff2ffa384b Domestic animals should be unable to gather treasure.
This was SVN commit r12564.
2012-08-31 08:25:27 +00:00
Deiz 9fcb7cc738 Fixed formations so switching formation in-place doesn't leave entities in FORMATIONMEMBER.WALKING and short walk orders bring units into proper formation.
This was SVN commit r12563.
2012-08-31 08:20:36 +00:00
Deiz d98c62f00a Show the resource tooltips over the resource counter icons. Fixes #1636.
This was SVN commit r12562.
2012-08-30 20:36:40 +00:00
myconid ea11dee4fa Bugfix: made sure LOS is always thresholded to black
This was SVN commit r12561.
2012-08-30 20:29:39 +00:00
historic_bruno 5f88bf8a79 Displays error when converting a grayscale texture instead of possibly crashing, refs #1640
This was SVN commit r12560.
2012-08-30 19:24:24 +00:00
historic_bruno 0b832176d5 Replaces grayscale decal texture with RGB, refs #1640
This was SVN commit r12559.
2012-08-30 19:21:25 +00:00
Mythos_Ruler df531c90d7 Map previews for the height map import maps.
This was SVN commit r12558.
2012-08-30 18:24:11 +00:00
myconid 5fcbf01fcb Using even stricter GLSL typing to please even more compilers...
This was SVN commit r12557.
2012-08-30 14:13:28 +00:00
Spahbod afe65d7b76 Adjusting the scale of Northern Lights preview.
This was SVN commit r12556.
2012-08-30 11:21:42 +00:00
Deiz 221c7dacde Also try to strip the 'resource|' prefix when handling a GatherNearPosition order.
This was SVN commit r12555.
2012-08-30 08:18:43 +00:00
Deiz 8968df0554 Only have builders auto-gather if they received a forced order. Patch by picobyte, fixes #1511.
This was SVN commit r12554.
2012-08-30 02:23:36 +00:00
Deiz a563786b86 Only play selection sounds for Gaia entities or entities that the player can control.
This was SVN commit r12553.
2012-08-30 02:02:59 +00:00
myconid 2850476389 Using stricter GLSL typing to please some compilers
This was SVN commit r12552.
2012-08-30 00:29:10 +00:00
myconid 38c1a4c4a1 Modified sky, minimap and healthbar renderers to use shaders, to fix a bug reported by historic_bruno
This was SVN commit r12551.
2012-08-29 23:07:53 +00:00
Yves fcf09598d9 Temporarily disabling FAM for Alpha 11 because it can cause problems on Ubuntu and hotloading doesn't seem to work anyway at the moment.
Known problems with FAM:
- System hangs at shutdown
- Assertion failure at startup in debug mode

This was SVN commit r12550.
2012-08-29 21:22:57 +00:00
Deiz 833d79445e Allow immediate re-targeting if an attack target becomes invalid.
This was SVN commit r12549.
2012-08-29 21:13:50 +00:00
Deiz 781ad7d520 Don't always call FinishOrder when leaving a formation, as they may be in the idle state.
This was SVN commit r12548.
2012-08-29 19:54:29 +00:00
Spahbod eea0a62b64 This was SVN commit r12547. 2012-08-29 17:01:41 +00:00
Spahbod 776282b59d Updating random biome system to include autumn textures. adding another theme to "unknown".
This was SVN commit r12546.
2012-08-29 16:43:39 +00:00
Spahbod 0d0bc32736 Adding "Unknown" random map. Updating "Gulf of Bothnia".
This was SVN commit r12545.
2012-08-29 13:00:01 +00:00
Spahbod 95ccd432c8 Adding "Unknown" random map
This was SVN commit r12544.
2012-08-29 12:59:12 +00:00
Deiz 08a4b12f01 Added resource used counters that track all non-barter spending. Fixes #1605.
This was SVN commit r12543.
2012-08-29 05:13:45 +00:00
Deiz 96ee70b75b Enforce attack/heal repeat delay to prevent units from performing actions too often.
This was SVN commit r12542.
2012-08-28 20:02:03 +00:00
Deiz dd40cc023e Resource supply corpses won't have UnitAI and should never be in formations.
This was SVN commit r12541.
2012-08-27 23:14:10 +00:00
quantumstate 205792ddd3 Fix path to user.cfg on unix
This was SVN commit r12540.
2012-08-27 20:36:05 +00:00
Mythos_Ruler 05525a9c2a Fixed.
This was SVN commit r12539.
2012-08-27 17:46:21 +00:00
Mythos_Ruler e15ba08510 Added teams to this map.
This was SVN commit r12538.
2012-08-27 17:09:09 +00:00
Deiz b4ba09c8b3 Reduce maximum garrison icons to 12 so stances can be shown for siege rams, etc.
This was SVN commit r12537.
2012-08-27 16:56:58 +00:00
Deiz 9db71f5417 Only count civ centres as destroyed if they aren't foundations.
This was SVN commit r12536.
2012-08-27 07:16:21 +00:00
Deiz 6a7e6ca343 Clean up entity name formatting; always show generic names in tooltips.
This was SVN commit r12535.
2012-08-27 07:07:33 +00:00
Deiz 126db0097a Generic names should have parens only if a specific name is also present.
This was SVN commit r12534.
2012-08-27 06:17:52 +00:00
Deiz 2de4786240 UnitAI's CanGather should always return false if the target isn't a resource.
This was SVN commit r12533.
2012-08-27 01:35:53 +00:00
Deiz b462f2acfe Show generic names in unit garrison tooltips.
This was SVN commit r12532.
2012-08-26 19:58:25 +00:00
wraitii 2bdb8f75ff Check the length of the unit collection in started attack plans to avoid errors. Fixes #1620
This was SVN commit r12531.
2012-08-26 11:25:39 +00:00
Deiz 576761c05e Never allow entities to set a rally point on themselves.
This was SVN commit r12530.
2012-08-26 06:38:29 +00:00
ShieldBearer 3e40453bd2 This was SVN commit r12529. 2012-08-26 06:30:44 +00:00
Deiz dd2d1eb6ec Added name tooltips to the summary screen civ emblems.
This was SVN commit r12528.
2012-08-25 22:05:15 +00:00
Deiz c688f64699 Increased the verbosity of the FinishOrder error and made it generate a stack trace.
This was SVN commit r12527.
2012-08-25 21:55:53 +00:00
myconid 89cf2b26e3 Second attempt to fix a graphical glitch in ARB mode
This was SVN commit r12526.
2012-08-25 21:41:31 +00:00
Deiz cd0802294a Forced chase orders should override stance.
This was SVN commit r12524.
2012-08-24 23:32:26 +00:00
Deiz 1c06a17e87 EntityRenamed should be ignored if the old entity doesn't match.
This was SVN commit r12523.
2012-08-24 08:22:29 +00:00
Deiz d89e64cf49 Regular champions take 13 seconds to build, Persian Immortals shouldn't build 2.6x as fast.
This was SVN commit r12522.
2012-08-24 07:24:33 +00:00
Deiz a4ff4b92b7 Include the generic name in the tooltips when selecting multiple units.
This was SVN commit r12521.
2012-08-24 07:14:50 +00:00
gregory 870fe14391 Updated Roman structure normal and specular maps.
This was SVN commit r12520.
2012-08-24 07:08:23 +00:00
quantumstate 9c9cab1f89 Add a Foundation element to the Armour templates for structures.
This was SVN commit r12519.
2012-08-23 21:22:49 +00:00
Mythos_Ruler 9defa4150e Height map test maps.
This was SVN commit r12518.
2012-08-23 17:54:08 +00:00
Mythos_Ruler c8d509e574 Fixed some templates.
This was SVN commit r12517.
2012-08-23 17:38:19 +00:00
Deiz 8facd45803 s/IRC/Chat/, clarified tooltip.
This was SVN commit r12516.
2012-08-23 06:59:16 +00:00
myconid 5b218ca4b0 An extra heightmap and demo map
This was SVN commit r12515.
2012-08-23 06:04:23 +00:00
myconid 6de082abca Forgot a semicolon :P
This was SVN commit r12514.
2012-08-22 08:04:55 +00:00
myconid e50bf9e539 Sky toggling through config and with Alt+Z
This was SVN commit r12513.
2012-08-22 07:32:26 +00:00
Deiz 95585d1e15 Tweaked a few fishing-related templates, removed ugly workaround.
This was SVN commit r12512.
2012-08-22 06:53:22 +00:00
Deiz 7e382fc26f CCmpUnitMotion::MoveToPointRange should ignore unit radius, so it correctly returns false when called repeatedly for large units.
This was SVN commit r12511.
2012-08-22 06:13:23 +00:00
historic_bruno 58b3a88daa Fixes more overloaded-virtual warnings in clang.
This was SVN commit r12510.
2012-08-21 21:47:36 +00:00
historic_bruno 619dd95d5b Fixes an overloaded-virtual warning in clang.
This was SVN commit r12509.
2012-08-21 20:13:42 +00:00
Mythos_Ruler d73c589a04 Normal maps for decals.
This was SVN commit r12508.
2012-08-21 18:13:37 +00:00
myconid 7ba2b8947c Attempting to fix a graphical bug affecting ARB mode
This was SVN commit r12507.
2012-08-21 18:04:05 +00:00
historic_bruno 43eac32795 Fixes GCC warning about passing NULL to non-pointer argument
This was SVN commit r12506.
2012-08-21 16:44:54 +00:00
historic_bruno ddbc9e7d86 Disables useless MSVC warning in MikktspaceWrap. Cleans up a few inconsistencies
This was SVN commit r12505.
2012-08-21 16:40:07 +00:00
myconid 952385b21d Ticket 1612: Fixed overlay z-fighting in GLSL mode
This was SVN commit r12504.
2012-08-21 16:28:06 +00:00
Deiz 6cf4efbd01 Handle exit and return hotkeys in message boxes. Fixes #1319.
This was SVN commit r12503.
2012-08-21 06:30:30 +00:00
danschub 19fd2f8b9f Fixed streched UV on Badland's rock.
This was SVN commit r12502.
2012-08-21 01:03:41 +00:00
historic_bruno 0af34b1fcb Removes some unread variables reported by LLVM. Refs #1114
This was SVN commit r12501.
2012-08-20 23:59:50 +00:00
Deiz 70c317b1b0 Hunt all domestic animals, not just very weak animals (<= 10 health).
This was SVN commit r12500.
2012-08-20 23:37:19 +00:00
quantumstate 4a2ff9521f Added rounding to armour changes (thanks Deiz)
This was SVN commit r12498.
2012-08-20 20:22:48 +00:00
Deiz 89eef72f20 cmpFoundation won't exist when repairing finished buildings.
This was SVN commit r12497.
2012-08-20 19:53:08 +00:00
quantumstate e5df8d17e1 Weaken foundation armour to 1/5th of standard.
This was SVN commit r12496.
2012-08-20 19:52:26 +00:00
Deiz af005b00b2 Added AI handling for 'resource|' pseudo-templates.
This was SVN commit r12495.
2012-08-20 18:02:56 +00:00
Deiz ad63a1e60e Don't sed templates at 5 AM without testing.
This was SVN commit r12494.
2012-08-20 16:07:50 +00:00
Deiz 3cf726ffa8 Adjusted wall sets so that all wall segments have the same health. Gave gates 2/3 of wall segment health.
This was SVN commit r12493.
2012-08-20 08:48:03 +00:00
Deiz b624328a89 Reverted k776's not-suggestion from ca3886be20, per k776's suggestion.
This was SVN commit r12492.
2012-08-20 08:23:21 +00:00
Deiz ca3886be20 Made citizen-soldiers build 25% faster than female citizens, per k776's suggestion.
This was SVN commit r12491.
2012-08-20 07:48:48 +00:00
Deiz 4136512a90 Scale the build rate as 'builders^0.7' rather than 'builders' (linear).
This was SVN commit r12490.
2012-08-20 07:30:50 +00:00
Mythos_Ruler a1d16c2fbd Made ALL cliff terrains triplanar.
This was SVN commit r12489.
2012-08-20 03:32:11 +00:00
Mythos_Ruler 951e682f27 normal and spec mapping for Celtic "henge"
This was SVN commit r12488.
2012-08-20 02:39:03 +00:00
Deiz cebe8bed64 Removed unused 'remain' corpse logic from UnitAI.
This was SVN commit r12487.
2012-08-20 01:41:56 +00:00
Deiz 66012e2e2c Destroy dying 'remain' entities and replace them with visually-identical resources. Fixes #1600.
This was SVN commit r12486.
2012-08-20 01:38:39 +00:00
Mythos_Ruler 034212a554 Made Mace fortress use the new actor and meshes.
This was SVN commit r12485.
2012-08-20 01:30:09 +00:00
Mythos_Ruler 36f2781a38 A better Spartan hoplites tip pic.
This was SVN commit r12484.
2012-08-20 00:51:54 +00:00
quantumstate 141dfabf5b Removed stray cd from a template file.
This was SVN commit r12483.
2012-08-19 22:05:28 +00:00
historic_bruno d71f883d3e Adds warning when OS X users try to toggle fullscreen since it's disabled
This was SVN commit r12482.
2012-08-19 20:45:43 +00:00
historic_bruno 875ea8f440 Fixes some warnings in mikktspace and weldmesh
This was SVN commit r12481.
2012-08-19 20:28:00 +00:00
quantumstate edd882492b Fixed syntax error in new technology.
This was SVN commit r12480.
2012-08-19 20:20:37 +00:00
quantumstate 1c1486d74a Don't allow people to train heroes because they are not balanced.
This was SVN commit r12479.
2012-08-19 20:16:18 +00:00
historic_bruno a17ffaa0f2 Fixes weldmesh build on *BSD
This was SVN commit r12478.
2012-08-19 19:57:23 +00:00
historic_bruno a3f9da72a5 Removes yucky sed commands from update-workspaces.sh to avoid modifying the Premake makefiles. Adds new BSD and OS X-specific Makefiles instead (can be autogenerated by Premake). Fixes a few bugs and omissions in the Premake4 build configuration script.
This was SVN commit r12477.
2012-08-19 18:49:02 +00:00
Pureon af59e1d9ca Fixed rotation of hele tower models
This was SVN commit r12476.
2012-08-19 15:34:27 +00:00
ShieldBearer ca0b3efc3d Carthaginian buildings now showcase AO, spec and normal maps. Room for improvement, but usable.
This was SVN commit r12475.
2012-08-19 12:08:27 +00:00
ShieldBearer 142d6619a8 Fixed farmstead AO map and added specularity to the roof tiles.
This was SVN commit r12474.
2012-08-19 09:49:10 +00:00
gregory 8300113a3a Fixed some artifacts on the Broch wall.
This was SVN commit r12473.
2012-08-19 07:36:48 +00:00
myconid 6e326e2d2e Ticket 1603: Using GL extension defines to avoid compiler errors on older systems
This was SVN commit r12472.
2012-08-19 07:05:11 +00:00
gregory 1b9b7dc390 Added normal mapping to the Broch.
This was SVN commit r12471.
2012-08-19 04:13:43 +00:00
danschub 7a32e9d868 Small Badland rocks committed.
This was SVN commit r12470.
2012-08-19 02:12:46 +00:00
danschub 689a15d784 Committed Temperate_Small_stonemine.
This was SVN commit r12469.
2012-08-19 01:47:57 +00:00
Deiz 9216dc3924 Have toggleChat (enter by default) send a chat message if the input isn't empty.
This was SVN commit r12468.
2012-08-19 00:28:46 +00:00
Deiz c32d3ece44 Remove focus when closing the chat window via the escape key.
This was SVN commit r12467.
2012-08-18 21:35:52 +00:00
WhiteTreePaladin 0f94813aa9 Export stop.png in GIMP to fix strange crash
This was SVN commit r12466.
2012-08-18 21:07:21 +00:00
Deiz 0dfdf868b2 Set ownership to Gaia when units that remain on death are killed. Refs #1600.
This was SVN commit r12465.
2012-08-18 20:33:44 +00:00
historic_bruno e485fb9e2c Implements copy/paste for OS X using NSPasteboard including pre-10.6 API support. Fixes #1326
This was SVN commit r12464.
2012-08-18 19:47:55 +00:00
Deiz 9519635869 0-population units (e.g. sheep) should never have production blocked.
This was SVN commit r12463.
2012-08-18 18:44:20 +00:00
Deiz 77f26c454a Have UnitAI respect the LeaveFoundation order unless in combat. Fixes #1406.
This was SVN commit r12462.
2012-08-18 08:13:47 +00:00
ShieldBearer a08d55e603 Added AO, norm and spec maps for all Iberian buildings except the walls and the dock(couldn't find the AO texture from myconid's git trunk) and to a couple of Carthaginian buildings too.
This was SVN commit r12461.
2012-08-18 05:40:23 +00:00
historic_bruno 8e996cedab Adds sensible default sound gains, when the config file(s) omit them
This was SVN commit r12458.
2012-08-17 23:00:41 +00:00
Deiz bbed3ca69a Made player slot reassignment in the game setup screen swap slot contents instead of leaving the old slot empty.
This was SVN commit r12457.
2012-08-17 21:22:07 +00:00
historic_bruno fdb3995141 Adds UTF-8 BOM stripping to checkrefs.pl when using JSON files, patch by retrosnub. Refs #1556
This was SVN commit r12456.
2012-08-17 19:24:23 +00:00
quantumstate 37964d048e Added camera movement speed modifier keys.
This was SVN commit r12455.
2012-08-17 18:33:41 +00:00
Mythos_Ruler 592478eb67 Another height map demo map and image.
This was SVN commit r12454.
2012-08-17 18:26:03 +00:00
Enrique a6230497ba Committed updated theatron and updated gymnasion for athenians
This was SVN commit r12453.
2012-08-17 02:17:38 +00:00
danschub 55dc7cc553 This was SVN commit r12452. 2012-08-17 01:28:26 +00:00
danschub a18dd1a36d Fixed Spec for the Temperate Rock Formation. Added parallax mapping for terrain's decals. Added missing AO for scandiv rock.
This was SVN commit r12451.
2012-08-16 23:18:21 +00:00
historic_bruno d7532a1c77 This was SVN commit r12450. 2012-08-16 18:52:39 +00:00
historic_bruno 3d67aeeb71 Adds some debug output to OpenAL init
This was SVN commit r12448.
2012-08-16 17:01:15 +00:00
gregory 791b6fa741 Partially fixed artifacts on the wood pile on the Roman mill.
This was SVN commit r12447.
2012-08-16 03:58:27 +00:00
historic_bruno 065a3e093b Fixes incorrect test for command debugging
This was SVN commit r12446.
2012-08-16 02:29:08 +00:00
Deiz de38f9ef9a Prevent domestic animals from being manually deleted (killed). Patch by yakca. Fixes #1525.
This was SVN commit r12445.
2012-08-16 02:08:56 +00:00
historic_bruno 714426f761 Fixes unnecessary use of VfsPath pointers in sound system. Refs #1223
This was SVN commit r12444.
2012-08-16 01:41:45 +00:00
Deiz 78e9fecf92 Added support for ungarrisoning units by template name and for ungarrisoning from multiple entities at once. Fixes #910.
This was SVN commit r12443.
2012-08-16 01:15:04 +00:00
danschub b03df364ea Fixed VHQ Parallax for the new rocks.
This was SVN commit r12442.
2012-08-16 00:46:43 +00:00
danschub b54a7486da Added Parallax VHQ for the new rocks
This was SVN commit r12441.
2012-08-16 00:31:42 +00:00
quantumstate 3653fe5d3a Added support for putting technologies in folders. Fixes #1462.
This was SVN commit r12440.
2012-08-15 22:25:25 +00:00
Kimball 765d02716a Updated Mauryan isw textures.
This was SVN commit r12439.
2012-08-15 18:22:28 +00:00
ShieldBearer ee83c07184 This was SVN commit r12437. 2012-08-15 13:14:37 +00:00
wraitii 8256f691f4 Optimizations, and made qBot-xp destroy walls when Iberians (but not towers).
This was SVN commit r12436.
2012-08-15 09:06:45 +00:00
Kimball 3e29520326 Mauryan Swordsman body textures
This was SVN commit r12435.
2012-08-15 06:44:58 +00:00
gregory 56c15ae427 Updated Roman normal maps.
This was SVN commit r12434.
2012-08-15 03:22:01 +00:00
Deiz 851786b01a Band-aid fix for corpses responding to the stop order.
This was SVN commit r12433.
2012-08-15 02:51:48 +00:00
Deiz aa86664d8f Make sure to initialize the entity collection's cached length before modifying the actual object. Fixes #1535.
This was SVN commit r12432.
2012-08-15 01:31:53 +00:00
historic_bruno af62b5ad8a Adds <Distanceless> flag to a bunch of voice sound groups
This was SVN commit r12430.
2012-08-15 01:04:54 +00:00
gregory e3b8d9c38c Deleted AO textures that didn't get deleted by Gen.Kenobi.
This was SVN commit r12429.
2012-08-15 00:49:17 +00:00
historic_bruno 011ba8255e New sound system implementation by stwf, refs #1223, #961.
Enables audio on OS X, refs #685, #931.
Fixes music not playing after a game, refs #946.

This was SVN commit r12428.
2012-08-15 00:10:44 +00:00
danschub 2c260660e6 Created AO folder for
This was SVN commit r12427.
2012-08-15 00:02:58 +00:00
gregory a6945413c3 Added AO to rome_temple and rome_temple_mars.
This was SVN commit r12426.
2012-08-14 21:11:06 +00:00
Mythos_Ruler ba253d34d4 Normals and Specs for Persian city tile terrain.
This was SVN commit r12425.
2012-08-14 18:01:40 +00:00
Mythos_Ruler 927592aca9 This was SVN commit r12424. 2012-08-14 17:47:13 +00:00
Deiz 0c56dfe272 Forgot to add the new short, medium wall templates.
This was SVN commit r12423.
2012-08-14 17:10:55 +00:00
Deiz e83bebe02e Remove entities from selection groups when they become hidden. Fixes #1373.
This was SVN commit r12422.
2012-08-14 14:02:52 +00:00
Deiz d90e53d0a5 Show cost ranges in the wall construction tooltip, if possible.
This was SVN commit r12421.
2012-08-14 07:51:50 +00:00
Deiz 981db4c005 Stone wall segments now have costs dependent on length. Rebalanced gate/tower costs per IRC discussion.
This was SVN commit r12420.
2012-08-14 07:46:47 +00:00
historic_bruno 97de77c6b6 Adds alternative materials to reference checker
This was SVN commit r12419.
2012-08-14 02:31:54 +00:00
gregory 6031b0785f Organized materials XML a bit.
This was SVN commit r12418.
2012-08-14 02:31:11 +00:00
danschub 2d505a5015 Added new Pointy_StoneMines_Badlands by Gen.Kenobi. It has AO, normal and SpecMaps. Need to fix AO and Spec and add new shaders to desert_decals.
This was SVN commit r12417.
2012-08-14 02:22:37 +00:00
gregory 5366dd8388 Added VHQ (very high-quality) parallax to materials that were missing it.
This was SVN commit r12416.
2012-08-14 02:04:59 +00:00
historic_bruno 4138a78c7f Fixes infinite recursion error in UnitAI when hunting an animal with a unit that's standing ground
This was SVN commit r12415.
2012-08-14 00:44:36 +00:00
gregory a71d77b03e Fixed material levels of quality more.
Added AO to dock prop.

This was SVN commit r12414.
2012-08-13 21:39:45 +00:00
historic_bruno 7d86fc4c31 Gate conversion now maintains wall HP percentage instead of magically restoring to full health
This was SVN commit r12413.
2012-08-13 21:37:40 +00:00
gregory 93a3f77aaa Fixed basic_trans levels of quality.
This was SVN commit r12412.
2012-08-13 20:17:29 +00:00
historic_bruno 9f358abaed Adds particle and material files to reference checker
This was SVN commit r12411.
2012-08-13 19:39:09 +00:00
historic_bruno 9cb5d48ccf Reverts mistaken default config changes. Please DO NOT use default.cfg for personal settings and check before committing modifications to that file.
This was SVN commit r12410.
2012-08-13 19:09:11 +00:00
gregory 02f2c082cb This was SVN commit r12409. 2012-08-13 18:00:15 +00:00
gregory d6792c4e1b This was SVN commit r12408. 2012-08-13 17:54:39 +00:00
gregory f000fc6bbd This was SVN commit r12407. 2012-08-13 17:50:54 +00:00
gregory b42708a3f1 This was SVN commit r12406. 2012-08-13 17:45:48 +00:00
gregory 1129c2be0e This was SVN commit r12405. 2012-08-13 17:41:48 +00:00
wraitii 902fc4a541 Show a red overlay over training/construction... icons that cannot be afforded.
This was SVN commit r12404.
2012-08-13 16:47:10 +00:00
OmriLahav 9e35243976 This was SVN commit r12402. 2012-08-13 14:25:37 +00:00
wraitii 9e9e1e3b78 Optimize enemy watchers usage. This should avoid massive lag later in the game.
This was SVN commit r12401.
2012-08-13 08:06:20 +00:00
gregory 1f17407161 This was SVN commit r12400. 2012-08-13 05:11:12 +00:00
gregory dac4ae2716 More AO! ...and an updating rome_struct_2_norm.png.
This was SVN commit r12399.
2012-08-13 03:09:20 +00:00
Deiz 8c97458de7 Prevent healers from healing themselves.
This was SVN commit r12398.
2012-08-13 02:56:51 +00:00
gregory 61cf6a6040 This was SVN commit r12397. 2012-08-13 00:03:18 +00:00
Deiz cbddd53e47 Avoid an edge case when buildings are destroyed while researching, leaving techs stuck. Refs #1521.
This was SVN commit r12396.
2012-08-12 23:40:04 +00:00
historic_bruno 13d7867a58 Fixes checkrefs.pl for latest actor format.
Adds checking for map preview textures.
Adds checking for random map scripts.

This was SVN commit r12395.
2012-08-12 21:00:58 +00:00
quantumstate b1090d1a12 Use a linear interpolation to find the point where the parallax ray intersects the surface more accurately.
This was SVN commit r12394.
2012-08-12 14:50:56 +00:00
fcxSanya 3b704b12a9 Summary screen: separate barter info for each resource
This was SVN commit r12393.
2012-08-12 09:12:06 +00:00
Deiz 3acc855a2d Renamed /restrictteam to /team, added /enemy, /msg, /all. Fixes #1583.
This was SVN commit r12392.
2012-08-12 06:48:49 +00:00
gregory 6f9a44d220 Removed shaders from Roman wall gate so it won't give errors.
This was SVN commit r12391.
2012-08-12 05:36:59 +00:00
gregory a6909b677a Deleted unused material file.
This was SVN commit r12390.
2012-08-12 05:29:41 +00:00
gregory 2534b26b16 Added AO to Roman market.
This was SVN commit r12389.
2012-08-12 05:00:59 +00:00
gregory 40886d1b24 This was SVN commit r12388. 2012-08-12 04:51:50 +00:00
gregory d9531b78f9 This was SVN commit r12387. 2012-08-12 04:49:00 +00:00
gregory 740322c88d Renamed the Roman structure texture normal map.
This was SVN commit r12386.
2012-08-12 04:42:59 +00:00
gregory a02d32a7d1 More AO.
This was SVN commit r12385.
2012-08-12 03:49:27 +00:00
danschub 913770347b Resized decals for the new Stonemine
This was SVN commit r12384.
2012-08-12 03:04:46 +00:00
danschub 90521c49ff Extended Rock_Scandiv.
This was SVN commit r12383.
2012-08-12 02:56:17 +00:00
Mythos_Ruler 6f80824c48 This was SVN commit r12382. 2012-08-12 02:55:50 +00:00
Mythos_Ruler ab19bc233a Height Map import demo.
This was SVN commit r12381.
2012-08-12 02:55:28 +00:00
danschub b89d23d325 Added Smoothed stone mine :)
This was SVN commit r12380.
2012-08-12 02:33:40 +00:00
Mythos_Ruler 2a7f037e69 Reverting some mistaken changes.
This was SVN commit r12379.
2012-08-12 02:24:20 +00:00
Mythos_Ruler e735df4a7f New geo entity.
This was SVN commit r12378.
2012-08-12 02:16:50 +00:00
danschub e4eb394ca8 Fixed GreekFortress.
This was SVN commit r12377.
2012-08-12 02:13:22 +00:00
danschub c4c215d5e1 Added a new StoneMine for Temperate terrains and new terrain decals.
This was SVN commit r12376.
2012-08-12 01:56:53 +00:00
Mythos_Ruler 49b734336a Some "tips" text fixes.
Spec maps for more helmets.

This was SVN commit r12375.
2012-08-12 01:54:23 +00:00
gregory ed806b6a9a Added messed up normal maps for the Roman camp so a graphics programmer can look at them.
This was SVN commit r12374.
2012-08-12 01:17:32 +00:00
Mythos_Ruler e403c748f2 More cliff terrain spec and normal mapping.
More metal mine spec mapping.

This was SVN commit r12373.
2012-08-12 00:11:46 +00:00
danschub 277b637578 Updated Greek_Fortrees_Up entities and added foundation to the model.
This was SVN commit r12372.
2012-08-12 00:08:49 +00:00
Deiz 2eed26df09 Implemented two chat commands, /restrictteam and /me. Refs #1583.
This was SVN commit r12371.
2012-08-11 23:59:28 +00:00
gregory b1657b63b3 This was SVN commit r12370. 2012-08-11 21:10:36 +00:00
Mythos_Ruler dedd0ca792 Some spec and normal tests for terrain.
This was SVN commit r12369.
2012-08-11 19:29:28 +00:00
Mythos_Ruler dde8f5f57b This was SVN commit r12368. 2012-08-11 17:10:27 +00:00
gregory 7adecfebb3 Updated AO again.
This was SVN commit r12367.
2012-08-11 17:08:00 +00:00
gregory 483707f3c8 Darkened AO on three Roman buildings.
This was SVN commit r12366.
2012-08-11 16:57:48 +00:00
fcxSanya 7a7d7e5d0a Add trade/barter stats to the summary screen.
This was SVN commit r12365.
2012-08-11 16:38:01 +00:00
Mythos_Ruler 9bbfc3f808 Spec map for Savanna metal mine.
Adjusted spec/ao/norm for Scandinavian rock.

This was SVN commit r12364.
2012-08-11 16:35:46 +00:00
myconid abca51c1ae Fixed typo in config file
This was SVN commit r12363.
2012-08-11 16:20:32 +00:00
Mythos_Ruler 06d22af3dc Making all cliffs triplanar.
Adding spec maps to helmets.

Adjusted the rome_struct_2 spec map a little.

This was SVN commit r12362.
2012-08-11 16:11:23 +00:00
myconid 9c56092999 Added very high quality parallax; GPU-intensive, defaults to off; enabled through config
This was SVN commit r12361.
2012-08-11 15:25:00 +00:00
quantumstate 4890789d58 Added support for team chat in multiplayer. Team chat is default if you are on a team of size >1. Using the prefix g will make the message global. Fixes #1583.
This was SVN commit r12360.
2012-08-11 15:12:48 +00:00
wraitii 96534fc5ed Fix a problem with civilizations who didn't have advanced building defined.
This was SVN commit r12359.
2012-08-11 12:41:29 +00:00
wraitii 226738d447 Last batch of fix for qBot-xp for the day if all goes well.
This was SVN commit r12358.
2012-08-11 10:36:39 +00:00
wraitii 508994e4c8 Fix a typo.
This was SVN commit r12357.
2012-08-11 07:59:05 +00:00
wraitii dc916e7295 Fix bugs related to garrisoning, should fix the pathfinder sometimes choosing a path over water when unneeded.
This was SVN commit r12356.
2012-08-11 07:41:23 +00:00
gregory c5658edfca Improved AO on the Roman farmstead and fortress, and added it to the barracks.
This was SVN commit r12355.
2012-08-11 07:20:36 +00:00
gregory c573f4905c Fixed warning on farmstead model.
This was SVN commit r12354.
2012-08-11 06:32:38 +00:00
gregory 9d54763401 Added improved normal mapping, parallax mapping, specular mapping, and AO on the Roman buildings.
Created folder for AO textures.

This was SVN commit r12353.
2012-08-11 06:10:29 +00:00
danschub b926a5ee54 Added Spec and Normal Maps for the Roman Structures by Gen.Kenobi. (rome_struc_2 texture files) - What applies to the Barracks, Corral, Dock, Farmstead, Fortress, Houses, Mill, ScoutTower and Walls. Feature Warning: Alphas not working properly + Gate fails to render material.
This was SVN commit r12352.
2012-08-11 02:21:04 +00:00
quantumstate 8cb340ade0 Make roof tile shadowing consistent by flipping UV's
This was SVN commit r12351.
2012-08-10 23:58:59 +00:00
myconid eee04db56b Bugfix- changed GLSL particle shader to use modelview matrix instead of modelviewprojection
This was SVN commit r12350.
2012-08-10 21:40:50 +00:00
myconid d45379cc62 Bugfix- changed GLSL particle shader to look the same as ARB
This was SVN commit r12349.
2012-08-10 21:02:22 +00:00
quantumstate 9dc838bed5 Add support for cropped images in the GUI code and update game setup to use cropped map previews. Refs #1343.
This was SVN commit r12348.
2012-08-10 19:59:20 +00:00
quantumstate 5d2c0b466f Resize all map previews to be 512x512 by adding a black area of padding.
This was SVN commit r12347.
2012-08-10 19:56:58 +00:00
Mythos_Ruler 0f4acf7167 Bigger foundation for Brit fortress.
This was SVN commit r12346.
2012-08-10 18:18:14 +00:00
Mythos_Ruler d7140c4edf Helmet specular stuff.
This was SVN commit r12345.
2012-08-10 18:18:04 +00:00
myconid eb422bc4b3 Bugfix- changed GLSL particle shader to look the same as ARB
This was SVN commit r12344.
2012-08-10 18:14:42 +00:00
wraitii 07ea313ad6 Major update for qBot-xp, with slight changes to unitAI (that broke qBot, and fix for that).
This was SVN commit r12343.
2012-08-10 16:33:58 +00:00
Deiz 2b503e68f7 Fixed broken chat; improved cheat message handling.
This was SVN commit r12342.
2012-08-10 03:35:20 +00:00
OmriLahav 8009c88a81 This was SVN commit r12340. 2012-08-09 21:42:32 +00:00
Pureon 8b365ca96d New Celtic Broch fortress
This was SVN commit r12339.
2012-08-09 21:13:21 +00:00
Deiz 613f845095 Improve gate closing behaviour when locked or with no allies nearby. Fixes #1551.
This was SVN commit r12337.
2012-08-09 19:06:01 +00:00
myconid a89d131f2d Added specular mapping for units
This was SVN commit r12336.
2012-08-09 18:49:35 +00:00
Mythos_Ruler 8d59192410 A couple more materials.
Testing spec mapping with Iberian bull statue and Craterus unit.

This was SVN commit r12335.
2012-08-09 18:30:05 +00:00
myconid 97c97dc7e0 Bugfix- changed decal/terrain blending mode for the fixed renderpath
This was SVN commit r12334.
2012-08-09 16:22:49 +00:00
wraitii ef55e60d9b Prevent chickens from spawning in the obstruction area of the civil centre.
This was SVN commit r12333.
2012-08-09 15:24:11 +00:00
historic_bruno 3ef639c4bc Adds new texture names to actor editor choices
This was SVN commit r12332.
2012-08-09 04:02:49 +00:00
Deiz c5ce1b23ae Remove a bit of indirection in UnitAI.
This was SVN commit r12331.
2012-08-09 02:32:56 +00:00
danschub 388544abdb Committed AO Scandiv_formation textures & material.
This was SVN commit r12330.
2012-08-09 00:55:40 +00:00
gregory 66d026a498 This was SVN commit r12329. 2012-08-09 00:14:58 +00:00
Deiz 87b2346154 Condensed the sanity checks for the Gaia range query, per leper's suggestion.
This was SVN commit r12328.
2012-08-08 23:29:30 +00:00
Deiz 14df6cf1a2 Removed triple and trailing newlines from random map descriptions.
This was SVN commit r12327.
2012-08-08 23:11:09 +00:00
Deiz f210008b07 Put a warning about the AI into the description of naval maps.
This was SVN commit r12326.
2012-08-08 23:10:21 +00:00
myconid e046fc0a01 Bugfix- changed some decal materials and fixed decal blending mode
This was SVN commit r12325.
2012-08-08 19:08:56 +00:00
gregory 6afe17dbf1 This was SVN commit r12324. 2012-08-08 18:50:20 +00:00
Mythos_Ruler dcbe7d2e96 This was SVN commit r12323. 2012-08-08 18:30:20 +00:00
Mythos_Ruler d5f93396b6 Deccan Plateau map.
This was SVN commit r12322.
2012-08-08 18:27:47 +00:00
Mythos_Ruler af9da8e01e Fixed decals on Celt Tavern and Mill.
This was SVN commit r12321.
2012-08-08 18:16:50 +00:00
Mythos_Ruler fb012f14b9 Fixed some corral decals.
This was SVN commit r12320.
2012-08-08 17:40:25 +00:00
Deiz 166255b744 Remember scroll position when re-opening dropdown lists.
This was SVN commit r12319.
2012-08-08 17:22:52 +00:00
Deiz eadd24b64b Added a 'Stop' button to the GUI for immediately halting units.
This was SVN commit r12318.
2012-08-08 05:36:42 +00:00
Deiz 1120701351 Substantially rework how Gaia is handled by UnitAI, BuildingAI. Dangerous animals and combat units will be attacked like regular enemies.
This was SVN commit r12317.
2012-08-08 05:32:53 +00:00
Deiz 84305155de Seamlessly change a player's entities to be Gaia-owned when resigning.
This was SVN commit r12316.
2012-08-08 05:27:59 +00:00
Deiz 791752c7a4 Added a 'quiet' version of SetOwner() that doesn't send a message, to allow faux-atomic batch ownership changes.
This was SVN commit r12315.
2012-08-08 05:18:20 +00:00
danschub 28333ba92e Committed fixed Normal Maps and materials for the Rock ScandivFormation. Now the bump is much more noticeable, yet realistic.
This was SVN commit r12314.
2012-08-08 00:26:08 +00:00
OmriLahav 7666bfcbda This was SVN commit r12312. 2012-08-07 21:32:45 +00:00
OmriLahav 18930375e6 This was SVN commit r12310. 2012-08-07 21:16:25 +00:00
myconid c9abf6f68c Heightmap importing in Atlas
This was SVN commit r12308.
2012-08-07 18:49:46 +00:00
myconid e488eb4d6f Bugfix for smoothlos, a test routine was complaining because g_Renderer wasn't available in test mode.
This was SVN commit r12307.
2012-08-07 18:28:23 +00:00
myconid 88ab3f0f5b Terrain/decal materials (includes triplanar/normal/specular/emissive mapping); custom alphamaps
This was SVN commit r12306.
2012-08-07 18:21:16 +00:00
Deiz 780970d16a Avoid a rare error when a group has both renamed and deleted entities.
This was SVN commit r12305.
2012-08-07 00:41:57 +00:00
myconid 648e68e49c smooth LOS
This was SVN commit r12304.
2012-08-06 22:38:42 +00:00
danschub 4b119b9bd1 *Small Greek Fortress Fixes
*Added Scandinav-Rock formation by Gen.Kenobi (with spec&normal included
as a test)

This was SVN commit r12303.
2012-08-06 22:34:37 +00:00
Pureon 77346e6914 Adding some missing random map previews
This was SVN commit r12302.
2012-08-06 22:08:07 +00:00
myconid 47c2907f10 added licensing headers to some of the new files
This was SVN commit r12301.
2012-08-06 21:34:41 +00:00
myconid da8c673a0a ao/parallax/normal/specular/emissive mapping; windy trees; time manager; render queries; conditional defines
This was SVN commit r12300.
2012-08-06 19:10:47 +00:00
historic_bruno 8fc1fd2478 Fixes default map names, closes #1578
This was SVN commit r12299.
2012-08-06 18:09:22 +00:00
historic_bruno c0f522fd20 Use upper camel case for member variables
This was SVN commit r12298.
2012-08-06 16:46:54 +00:00
danschub 00aa354f8f Updated Greek Fortress by Gen.Kenobi. Finally fixed it. Enjoy!
This was SVN commit r12297.
2012-08-06 15:51:16 +00:00
wraitii 0f44c5b3fe Fix some mistakes with class definition for stone/palisade gates and wallsets.
This was SVN commit r12296.
2012-08-06 11:43:02 +00:00
danschub bfdd23997d Added new Rock-set-desert by Gen.Kenobi
They might need re-scaling.

This was SVN commit r12295.
2012-08-06 03:07:58 +00:00
Mythos_Ruler 11eb862bdb Map preview for Acropolis 7.
Made the status bar for trees a little easier to see.

This was SVN commit r12294.
2012-08-05 19:07:41 +00:00
Deiz 78cc29b591 Added a resign option (deletes all of a player's entities).
This was SVN commit r12293.
2012-08-05 18:07:56 +00:00
Deiz 0037bb8230 Slightly ugly fix for 'You has been defeated.' message in singleplayer.
This was SVN commit r12292.
2012-08-05 18:05:25 +00:00
Enrique 0a2449bf5f Added small_scaffold actor
This was SVN commit r12291.
2012-08-05 16:31:36 +00:00
Enrique 8291019fa1 Added scaffold_small.dae prop
This was SVN commit r12290.
2012-08-05 16:27:38 +00:00
Enrique 88aff0c501 Added new theatron version to athenians civ.
-Modified entity athen_theatron.xml to reference visual actor
"hellenes/theatre_new.xml"

This was SVN commit r12289.
2012-08-05 16:00:25 +00:00
Spahbod 959a897ec1 This was SVN commit r12288. 2012-08-05 15:24:26 +00:00
Spahbod 8f635b7e01 Fixing an issue.
This was SVN commit r12287.
2012-08-05 15:04:35 +00:00
Spahbod 6d633c9b18 Fixing a bug
This was SVN commit r12286.
2012-08-05 14:24:39 +00:00
Spahbod 7d62da8d2c This was SVN commit r12285. 2012-08-05 14:20:51 +00:00
Spahbod 202a02568b Cheats ... fixes #1555.
This was SVN commit r12284.
2012-08-05 14:01:05 +00:00
wraitii 36cc1766a4 General improvements to the attack plans and the defense manager. Slight econ improvements (better early game priorities, faster play, better farming, tentative to get qBot to crowd resources less, tweaking of dropsites variable). Many bugfixes, should be stable enough for alpha 11.
This was SVN commit r12283.
2012-08-05 11:19:31 +00:00
Deiz 4a1b085df0 Send chat notifications upon player defeat.
This was SVN commit r12282.
2012-08-05 05:41:19 +00:00
Deiz b86d39681f Reveal the map for defeated players.
This was SVN commit r12281.
2012-08-05 05:34:17 +00:00
Deiz 86db7b8a59 Show multiplayer names in the summary screen, rather than the map's defaults.
This was SVN commit r12280.
2012-08-05 02:18:44 +00:00
Mythos_Ruler d04eb12b83 Made cart walls considerably longer to build time.
This was SVN commit r12279.
2012-08-04 20:53:01 +00:00
historic_bruno 347c7d45cc Updates random map wall_builder with correct gate sizes, patch by FeXoR. Fixes #1576
This was SVN commit r12278.
2012-08-04 19:29:45 +00:00
wraitii 2eb49be1a3 Show shallows (walkable water) on the minimap in a lighter color.
This was SVN commit r12277.
2012-08-04 18:52:02 +00:00
Deiz 2c642fc68e Uninitialized variable was causing nondeterministic weirdness in Atlas.
This was SVN commit r12275.
2012-08-04 16:56:09 +00:00
Pureon 1b78b3cc20 Projectile actors for Mauryan defence structures
This was SVN commit r12274.
2012-08-04 08:41:02 +00:00
gregory 1e0ea4b963 This was SVN commit r12272. 2012-08-04 00:02:11 +00:00
Deiz 20d75a3880 Free cursors before shutting down SDL. Fixes #1355.
This was SVN commit r12271.
2012-08-03 16:48:02 +00:00
Deiz c5a0dabe8d Do a second check when trying to place wall pieces with two control groups. Fixes #1529.
This was SVN commit r12270.
2012-08-03 16:38:31 +00:00
Deiz be31d3a9e7 Added a function for finding colliding entities with identical control groups. Refs #1529.
This was SVN commit r12269.
2012-08-03 16:36:40 +00:00
wraitii 2ee61750b4 Forgot to fix a few things before committing.
This was SVN commit r12268.
2012-08-03 16:12:45 +00:00
wraitii 45ee419171 Adding an experimental version of qBot. This is half a crossover with my former Marilyn bot (defense manager, attack plans) and some improvements here and there that I believe could help improve the bot.
This was SVN commit r12267.
2012-08-03 15:52:18 +00:00
OmriLahav 0d5366fd7b This was SVN commit r12264. 2012-08-03 11:30:28 +00:00
OmriLahav 09d0def213 This was SVN commit r12263. 2012-08-03 10:55:45 +00:00
historic_bruno ddcdd5d2e8 Updates logs readme with link to Trac, to replace confusing outdated info
This was SVN commit r12261.
2012-08-02 19:41:50 +00:00
Deiz 4bb0ad46a5 Re-saved all maps with walls, sanitizing their obstruction groups.
This was SVN commit r12260.
2012-08-01 21:39:54 +00:00
Deiz 4c8907e30c Added the new ControlPersist XML element to wall tower templates.
This was SVN commit r12259.
2012-08-01 21:39:08 +00:00
Deiz 692795e56e Added engine-side obstruction group sanitizing, saving, and loading. Refs #1566
This was SVN commit r12258.
2012-08-01 21:38:13 +00:00
Deiz c22476eee2 Check for builders that can't place foundations (e.g. Mauryan worker elephants)
This was SVN commit r12257.
2012-08-01 19:22:45 +00:00
Mythos_Ruler d1d17b7222 Acropolis map updates.
This was SVN commit r12256.
2012-08-01 18:14:14 +00:00
Deiz 1e38b39021 Remove deleted props.
This was SVN commit r12255.
2012-08-01 17:09:52 +00:00
Deiz d9c36f1fcc Remove empty texture that was causing asserts.
This was SVN commit r12254.
2012-08-01 15:50:50 +00:00
Enrique aa00a845d1 Fixed helle_docks_pentekonter.dae normals problem. Added playercolor details on helle_docks_props.dae.
This was SVN commit r12253.
2012-08-01 13:33:41 +00:00
Deiz 8c5558895e Disable rally points for Celtic wall towers (which can't be garrisoned).
This was SVN commit r12252.
2012-08-01 04:53:17 +00:00
Mythos_Ruler 0f7f73be2c Balanced some Dock costs.
This was SVN commit r12251.
2012-07-31 17:43:12 +00:00
Mythos_Ruler 05d4b1eccf Scaffold test object by Enrique. Looks nice. No errors. Possible prototype for some kind of construction scaffolding for buildings.
This was SVN commit r12250.
2012-07-31 17:35:50 +00:00
Mythos_Ruler a012a8c231 New Hellenic dock by Enrique. Needs some fixes though.
This was SVN commit r12249.
2012-07-31 17:26:04 +00:00
wraitii a796800bb1 Add the
This was SVN commit r12248.
2012-07-31 15:59:36 +00:00
wraitii 8074f18d6d Slight updates to the Corsica map. Also trying my hands at this whole "commit" stuff.
This was SVN commit r12247.
2012-07-31 14:41:09 +00:00
Deiz 83ca7142b6 Fixed a minor bug in the research display; removed an unnecessary comma.
This was SVN commit r12246.
2012-07-31 03:39:35 +00:00
Deiz be3ca61d43 Updated the production queue buttons, putting the progress sliders inside the button border.
This was SVN commit r12245.
2012-07-31 03:37:04 +00:00
Deiz b8b6ebb6ec Properly re-initialize drop-down lists when the list items changes. Fixes #1558.
This was SVN commit r12244.
2012-07-31 03:34:09 +00:00
Deiz c708de489e Display in-progress technologies in the upper right of the screen. Fixes #1431.
This was SVN commit r12243.
2012-07-31 02:03:25 +00:00
Deiz 08505d9353 Include a note about the UDP port in the 'host game' tooltip.
This was SVN commit r12242.
2012-07-30 21:08:29 +00:00
Deiz 3c0bd23108 Slightly speed up actor rendering; have selectables properly handle fog of war, etc. Refs #1365.
This was SVN commit r12241.
2012-07-30 21:06:54 +00:00
Mythos_Ruler 10e8847b6f Some template changes. Moves Dock and Fishing Boat to Village Phase. Warships to later phases. Increases accuracy of basic ranged units slightly. Based on patch by gudo.
This was SVN commit r12240.
2012-07-30 06:11:26 +00:00
Deiz 4264166acf Detect when units aren't in the world and hide their selection rings. Based on patch by dvangennip. Refs #1365.
This was SVN commit r12239.
2012-07-30 04:45:33 +00:00
Mythos_Ruler 9e59f496f3 Tweaked NA elephant walk speed.
Map preview for Acropolis 1 map.

This was SVN commit r12238.
2012-07-30 04:37:47 +00:00
Mythos_Ruler f9a8280b81 More map renaming.
This was SVN commit r12237.
2012-07-30 04:22:11 +00:00
Mythos_Ruler a82e6ecdd9 Renamed a bunch of numbered maps for better sorting. :)
This was SVN commit r12236.
2012-07-30 04:17:24 +00:00
Mythos_Ruler bb8783d6eb New Acropolis 1 map.
Edited Acropolis 2's description.

This was SVN commit r12235.
2012-07-30 04:09:02 +00:00
gregory 008d361a5e This was SVN commit r12234. 2012-07-30 02:29:20 +00:00
Mythos_Ruler 39784d47b5 Some updated textures.
This was SVN commit r12233.
2012-07-30 02:15:56 +00:00
Mythos_Ruler e17b9c84eb More map preview pics. All default maps complete.
This was SVN commit r12231.
2012-07-29 23:22:00 +00:00
Deiz 48d871d870 Allow gate lock/unlock buttons and wall conversion icons to show simultaneously.
This was SVN commit r12230.
2012-07-29 23:08:15 +00:00
historic_bruno 2c8adb1aea Adds support for Boost.Filesystem v3, the only option in Boost 1.50. Fixes #1527. Refs #1360
This was SVN commit r12229.
2012-07-29 23:04:22 +00:00
Mythos_Ruler 0f5756f5fb Renamed the sandbox maps for better drop menu sorting.
Added map previews for the Oasis maps.

This was SVN commit r12228.
2012-07-29 22:23:30 +00:00
Deiz b172a89965 Give the Brythonic and Gallic gates the new Celtic gate footprint and obstruction.
This was SVN commit r12227.
2012-07-29 20:07:36 +00:00
Pureon b1ccaa020f Preview image for fortress RMS
This was SVN commit r12226.
2012-07-29 18:22:27 +00:00
Spahbod 01e7895521 Adding Northern Lights random map...
This was SVN commit r12225.
2012-07-29 17:59:46 +00:00
Spahbod 8946e2782f This was SVN commit r12224. 2012-07-29 17:58:53 +00:00
Spahbod 815178fa3d This was SVN commit r12223. 2012-07-29 17:54:49 +00:00
Spahbod 06f0212597 This was SVN commit r12222. 2012-07-29 17:53:06 +00:00
Deiz 16ef74d9fe Clicking on empty space only clears the selection if modifiers aren't held. Fixes #1561.
This was SVN commit r12221.
2012-07-29 17:42:35 +00:00
Spahbod 467195e712 Making the lake map circular
This was SVN commit r12220.
2012-07-29 03:00:33 +00:00
historic_bruno d1b2922f02 Fixes unnecessary linking of X11 on OS X.
This was SVN commit r12219.
2012-07-28 23:48:57 +00:00
Mythos_Ruler 7eb751fa83 Moar scenario map previews. Still a work in progress.
This was SVN commit r12218.
2012-07-28 22:32:09 +00:00
Pureon 42b12f6567 Missing actors, textures, meshes fixes
This was SVN commit r12217.
2012-07-28 18:08:48 +00:00
Mythos_Ruler 5fef0394cc Fixed music. :)
This was SVN commit r12216.
2012-07-28 17:44:39 +00:00
Pureon d5936938d0 Celt slope wall prop actor references
This was SVN commit r12215.
2012-07-28 17:42:09 +00:00
Pureon 2c56ad61bd Cleanup of audio xml files
This was SVN commit r12214.
2012-07-28 17:36:59 +00:00
Pureon 5383d7e40b A few fixes to the Hele scout tower model
This was SVN commit r12213.
2012-07-28 15:17:51 +00:00
OmriLahav f5d2924b66 This was SVN commit r12212. 2012-07-27 11:49:43 +00:00
OmriLahav 187d6fa12e This was SVN commit r12211. 2012-07-27 11:35:17 +00:00
OmriLahav 50711f7369 This was SVN commit r12210. 2012-07-27 11:32:51 +00:00
OmriLahav 5678c7f9cd This was SVN commit r12209. 2012-07-27 11:05:32 +00:00
OmriLahav b564f57990 This was SVN commit r12208. 2012-07-27 10:17:12 +00:00
OmriLahav abe1578d14 This was SVN commit r12207. 2012-07-27 07:15:51 +00:00
OmriLahav afeda27de0 This was SVN commit r12206. 2012-07-27 07:11:55 +00:00
historic_bruno c6a0d0b6f3 Fixes build error left out of c1a3b8f171. Refs #1497
This was SVN commit r12205.
2012-07-27 05:26:37 +00:00
gregory 4a1483231f This was SVN commit r12204. 2012-07-27 05:05:21 +00:00
gregory f49de6fb8b This was SVN commit r12203. 2012-07-27 01:54:56 +00:00
OmriLahav 34f0cc2449 This was SVN commit r12202. 2012-07-26 22:50:54 +00:00
Pureon 3f933e2944 Fix to Cart stone gate closing animation speed
This was SVN commit r12201.
2012-07-26 19:50:49 +00:00
Pureon 19bc3ea9ec Hele stone gate closing animation update
This was SVN commit r12200.
2012-07-26 19:44:40 +00:00
Mythos_Ruler 40c1f32eef Carth war ele uses Zaggy's new elephant.
This was SVN commit r12199.
2012-07-26 17:28:54 +00:00
historic_bruno 9b79ca5179 Fixes incorrect exclusion of rpath that broke shared lib loading. Refs #1421, #1516
This was SVN commit r12198.
2012-07-26 13:33:04 +00:00
gregory 3050cdc8c6 This was SVN commit r12197. 2012-07-26 09:25:31 +00:00
gregory 37b8bef3a8 Added prop points to the elephant.
This was SVN commit r12196.
2012-07-26 09:02:29 +00:00
gregory 9564de4f17 Added elephant death animation.
This was SVN commit r12195.
2012-07-26 02:17:44 +00:00
gregory 189eaefe7d This was SVN commit r12194. 2012-07-25 23:55:33 +00:00
gregory a3cb804ccb This was SVN commit r12193. 2012-07-25 23:38:01 +00:00
quantumstate bfcbcc7ba8 Preserve selection order when entities are 'renamed'. Patch by Deiz/F00. Fixes #1544.
e.g. If you have a long wall as primary selection and CC as secondary,
after the gate upgrade the wall (now gate) remains the primary
selection.

This was SVN commit r12192.
2012-07-25 22:20:57 +00:00
quantumstate 0dc1d2139e Make rally points work for trade. Patch from Deiz/F00. Fixes #1173.
This was SVN commit r12191.
2012-07-25 21:38:56 +00:00
gregory 006aa8ee21 Added elephant animations except the death animation. Contains no prop points currently.
This was SVN commit r12190.
2012-07-25 05:10:13 +00:00
Mythos_Ruler 56b83a3926 Fixed the grapes.
Gave Persian healer a run.

This was SVN commit r12189.
2012-07-24 17:45:30 +00:00
Spahbod a4cc749eca Committing the left out grapes.
This was SVN commit r12188.
2012-07-24 14:51:24 +00:00
historic_bruno 3d973b3554 Adds hotkey (Tab) for showing all player's entities' status bars at once, based on patch by Deiz/F00. Fixes #1187
This was SVN commit r12187.
2012-07-24 04:14:09 +00:00
historic_bruno c1a3b8f171 Updates to myconid's most recent multiple UV set patch. Refs #1497
This was SVN commit r12185.
2012-07-24 02:57:25 +00:00
quantumstate 1f15257987 Update actor editor for data driven textures. From zoot. Refs #1493.
This was SVN commit r12184.
2012-07-23 22:51:20 +00:00
quantumstate f598101c34 Add support for multiple UVs and data driven texture loading. From myconid's patches. Fixes #1493 and fixes #1497.
This was SVN commit r12183.
2012-07-23 22:49:46 +00:00
Mythos_Ruler 068fe0cbbb Added Omnri's new tracks to Macedonian and Athenian civ jsons.
Added "breath" creation sound for female citizen.

This was SVN commit r12182.
2012-07-23 16:38:50 +00:00
Mythos_Ruler 13759f3572 Helen of Troy, not Hellen of Troy. ;)
This was SVN commit r12181.
2012-07-23 16:34:34 +00:00
Mythos_Ruler 4cbbbe6b04 This was SVN commit r12180. 2012-07-23 16:33:53 +00:00
OmriLahav 8cf822c6c3 This was SVN commit r12177. 2012-07-23 10:44:03 +00:00
OmriLahav e8fae14a3f This was SVN commit r12176. 2012-07-23 10:36:16 +00:00
OmriLahav 31f4b17d54 This was SVN commit r12174. 2012-07-22 21:44:15 +00:00
historic_bruno 2f90e1eee7 Adds --minimal-flags option to Premake, for building only with essential flags (currently only a *nix option). Based on patch by leper. Refs #1516.
Updates Premake4.make to not include CFLAGS in CXXFLAGS (see
aab1cdf9d6).

This was SVN commit r12173.
2012-07-22 02:52:37 +00:00
Pureon 6bcb4455ef Animations for Celt stone wall gate
This was SVN commit r12172.
2012-07-21 22:56:56 +00:00
Pureon d8b89936b3 New palisade gate animations
This was SVN commit r12171.
2012-07-21 00:58:40 +00:00
Pureon 666c12a309 Animations for Athenian wall gate
This was SVN commit r12170.
2012-07-20 23:16:03 +00:00
Pureon 04a7b2becd Hele animated stone wall gates
This was SVN commit r12169.
2012-07-20 22:56:26 +00:00
Mythos_Ruler bccafceb09 Some map updates and map previews.
This was SVN commit r12168.
2012-07-20 18:37:54 +00:00
Mythos_Ruler a5f737b441 Fixed map description.
This was SVN commit r12167.
2012-07-20 05:02:51 +00:00
historic_bruno b8ec515234 Construction cost should be checked after everything else to avoid messy refunds.
This was SVN commit r12166.
2012-07-20 02:50:43 +00:00
historic_bruno a41432f73b Adds support for Cost/Resources and Cost/BuildTime tech modifications.
This was SVN commit r12165.
2012-07-20 01:54:24 +00:00
Pureon 1bf086fefb Animations for Carthaginian stone gate
This was SVN commit r12164.
2012-07-19 23:45:07 +00:00
historic_bruno 574e079d64 Wall and gate selection usability improvements by Deiz/F00. Refs #619.
Fixes bug where selecting multiple wall types could convert to
mismatching gates.

This was SVN commit r12163.
2012-07-19 21:46:35 +00:00
Pureon 512e3a01b6 Celt gate resized to the size of long wall
This was SVN commit r12162.
2012-07-19 20:47:30 +00:00
Mythos_Ruler c1c0fcc67a This was SVN commit r12161. 2012-07-19 18:28:02 +00:00
Mythos_Ruler 4c1ddd33c5 This was SVN commit r12160. 2012-07-19 05:53:36 +00:00
Spahbod 718e1dfad4 Updating fortress random map to use the new autumn textures.
This was SVN commit r12159.
2012-07-19 05:41:08 +00:00
Spahbod b6faac80ae Templates of the new trees.
This was SVN commit r12158.
2012-07-19 05:36:58 +00:00
Spahbod bdd04befd2 Actors of the new art assets.
This was SVN commit r12157.
2012-07-19 05:35:56 +00:00
Spahbod 563197a409 Meshes for the new art assets.
This was SVN commit r12156.
2012-07-19 05:31:14 +00:00
Spahbod c4d248c53c This was SVN commit r12155. 2012-07-19 05:29:58 +00:00
Spahbod 08022d87ca This was SVN commit r12154. 2012-07-19 05:29:19 +00:00
Spahbod c4a3c9045a This was SVN commit r12153. 2012-07-19 05:28:30 +00:00
Spahbod 47130edc74 This was SVN commit r12152. 2012-07-19 05:25:56 +00:00
Spahbod 940beaebfe Textures for new graphical assets.
This was SVN commit r12151.
2012-07-19 05:23:49 +00:00
Mythos_Ruler 575f0371e6 Specific names for elephant stables and worker elephant.
This was SVN commit r12150.
2012-07-19 05:21:28 +00:00
Spahbod 1c4302cf5d Autumn terrain textures
This was SVN commit r12149.
2012-07-19 04:53:34 +00:00
historic_bruno 89399e08e6 Implements always visible hero selection rings, based on patch by Deiz/F00. Fixes #1365
This was SVN commit r12148.
2012-07-19 04:45:01 +00:00
Pureon 380d15d6c0 Resized model of the Carthaginian gate. Same size as long wall.
This was SVN commit r12147.
2012-07-18 23:29:56 +00:00
historic_bruno 3a5b2159b7 Fixes broken test
This was SVN commit r12146.
2012-07-18 21:39:45 +00:00
Pureon 3c8c5757de Adding icons to wooden gates
This was SVN commit r12145.
2012-07-18 21:17:14 +00:00
Pureon f0d9b496bf Wooden gate icon for palisades and siege walls
This was SVN commit r12144.
2012-07-18 19:40:14 +00:00
Mythos_Ruler 0374570ac6 Fixed error.
This was SVN commit r12143.
2012-07-18 06:01:26 +00:00
Mythos_Ruler 5546fb4283 Fix dog errors.
This was SVN commit r12142.
2012-07-18 05:52:31 +00:00
Mythos_Ruler 9761ded603 Specific names for the Briton/Gaul gates based on Bruno's research.
This was SVN commit r12141.
2012-07-18 05:08:45 +00:00
historic_bruno 181b461e7b This was SVN commit r12140. 2012-07-18 03:57:45 +00:00
historic_bruno 9b6839ace4 Adds gate conversion to palisades and siege walls. Fixes bug that all player entities in a selection could be converted to gates. Cleans up templates slightly. Refs #619
This was SVN commit r12139.
2012-07-18 03:56:18 +00:00
historic_bruno 95dea8e097 Gate-related template cleanup and tweaking
This was SVN commit r12138.
2012-07-18 01:10:47 +00:00
Spahbod b186fc4e7e A small tweak.
This was SVN commit r12137.
2012-07-17 03:55:00 +00:00
Spahbod 65ac54c4dd This was SVN commit r12136. 2012-07-17 03:53:52 +00:00
Spahbod a1cc4e623e New map previews by luziferius.
This was SVN commit r12135.
2012-07-17 03:49:15 +00:00
historic_bruno c495b0bca1 Adds gate cost to tooltip and shows both gate lock actions, based on patch by Deiz/F00. Changes and renames lock icons. Fixes #1539
This was SVN commit r12134.
2012-07-16 23:49:19 +00:00
Pureon a26f230867 Roman siege wall gate animations
This was SVN commit r12133.
2012-07-16 21:10:43 +00:00
Pureon a700486cd3 Lock icons for gates
This was SVN commit r12132.
2012-07-16 18:04:23 +00:00
Mythos_Ruler 1202c2b2a3 Some preview images for these scenarios.
This was SVN commit r12131.
2012-07-16 17:18:16 +00:00
gregory db2bbc10ca Made model able to be imported into Blender.
This was SVN commit r12130.
2012-07-16 15:32:59 +00:00
Spahbod b444e3c435 Cleanup...
This was SVN commit r12129.
2012-07-16 05:52:43 +00:00
Mythos_Ruler f3d0aaeeb4 Waypoint and garrison flags for Mauryans.
This was SVN commit r12128.
2012-07-16 05:05:41 +00:00
historic_bruno 7726448a7d Adds --without-nvtt option to update-workspaces.sh so we don't attempt to build NVTT in that case, based on patch by pcpa. Refs #1427
This was SVN commit r12127.
2012-07-16 04:57:07 +00:00
Mythos_Ruler 39e0878b6e This was SVN commit r12126. 2012-07-16 04:43:12 +00:00
Mythos_Ruler 6d93492e54 Added Mauryans to Punjab 1.
This was SVN commit r12125.
2012-07-16 04:37:35 +00:00
Mythos_Ruler 3153829d45 Made the dust a little more transparent.
This was SVN commit r12124.
2012-07-16 04:28:00 +00:00
historic_bruno 9f5c7a5607 Fixes possible conflicts in unit command panel when selecting multiple entities, patch by Deiz/F00. Fixes #1524
This was SVN commit r12123.
2012-07-16 04:12:48 +00:00
historic_bruno 3a85fb7c48 Displays save game timestamps in local time rather than UTC, patch by Deiz/F00. Fixes #1530
This was SVN commit r12122.
2012-07-16 03:55:40 +00:00
historic_bruno 743f60b920 Handles gate upgrade case left out of previous commit.
This was SVN commit r12121.
2012-07-16 01:52:18 +00:00
historic_bruno b59c2d9e36 Adds lock/unlock gate icons, based on patch by F00.
This was SVN commit r12120.
2012-07-16 01:40:09 +00:00
Pureon 27a0bd6331 Gate lock and unlock icons
This was SVN commit r12119.
2012-07-15 23:40:49 +00:00
Pureon 8f0eb7318e Iberian gate animations
This was SVN commit r12118.
2012-07-15 22:34:49 +00:00
quantumstate 8d64c26db9 Decrease trader income to 20% of the previous and increase the cost of traders to 100f 80m.
This was SVN commit r12117.
2012-07-15 18:55:35 +00:00
Mythos_Ruler 937670a916 Lots of Mauryan unit stuff.
This was SVN commit r12116.
2012-07-15 07:09:26 +00:00
Spahbod 900affb9bf This was SVN commit r12115. 2012-07-15 06:41:41 +00:00
Spahbod 694619a984 Adds gates to Fortress random map by FeXoR. Fixes #1533
This was SVN commit r12114.
2012-07-15 04:28:57 +00:00
Pureon 3eafdcf6db Roman gate animations
This was SVN commit r12113.
2012-07-15 00:17:38 +00:00
Pureon 4ca8e679d6 Persian gate animations again
This was SVN commit r12112.
2012-07-15 00:06:25 +00:00
Mythos_Ruler e0f3add90e Mauryan basic spearman.
This was SVN commit r12111.
2012-07-14 23:13:53 +00:00
Spahbod 1fd00b5e3f Added Lorraine Plain random map.
This was SVN commit r12110.
2012-07-14 17:17:06 +00:00
Pureon 62f7c6e27a Trying to fix gate animation locking animations
This was SVN commit r12109.
2012-07-14 09:04:20 +00:00
Pureon 2cdc6c7dbf Persian gate opening and closing animations
This was SVN commit r12108.
2012-07-14 08:04:00 +00:00
historic_bruno 5e92aabe72 Increases maximum dropdown list size slightly, allowing up to 10 lines at a time (must be careful that it fits on 1024x768!). Refs #1532
This was SVN commit r12107.
2012-07-14 04:29:16 +00:00
Spahbod 8c9ef1139a This was SVN commit r12106. 2012-07-14 04:15:20 +00:00
Spahbod 1b7519be91 Fixing the random player selection
This was SVN commit r12104.
2012-07-14 03:10:35 +00:00
historic_bruno 1d677156fd Adds animation and sound support to wall gates. Uses temporary sounds for now. Adds new animation choices to actor viewer/editor. Refs #619
This was SVN commit r12103.
2012-07-14 03:08:21 +00:00
Badmadblacksad fd22b91138 Do not close a gate if some units are in the passRange.
This was SVN commit r12102.
2012-07-13 22:34:49 +00:00
Spahbod c908970c02 This was SVN commit r12101. 2012-07-13 04:37:04 +00:00
Spahbod 8cd2751131 This was SVN commit r12100. 2012-07-13 04:15:23 +00:00
Spahbod 1233323e79 A minor change.
This was SVN commit r12099.
2012-07-13 04:05:13 +00:00
Spahbod d0a1a3bd50 Fixed a bug.
This was SVN commit r12098.
2012-07-13 03:41:07 +00:00
Spahbod 2717e6d34f Adding previews for some random maps.
This was SVN commit r12097.
2012-07-13 03:10:15 +00:00
Spahbod c63074cabb New GUI changes.
This was SVN commit r12096.
2012-07-13 03:00:18 +00:00
Badmadblacksad 6eb71380aa Get the gate template name from the wall name and fixes two templates which caused errors.
This was SVN commit r12095.
2012-07-12 22:49:40 +00:00
Pureon 953606cfcf Roman wall gate animations
This was SVN commit r12094.
2012-07-12 22:27:59 +00:00
Badmadblacksad 51b9fa6186 Uses xml attributes instead of elements for obstructions shapes.
This was SVN commit r12093.
2012-07-12 20:00:38 +00:00
Mythos_Ruler 8f2ed2586f Fixed "specific name" for palisades, since they were taking "stone wall" from the defense_wall template.
This was SVN commit r12091.
2012-07-11 16:44:03 +00:00
Pureon 3edbe6490e Palisade gate opening and closing animations
This was SVN commit r12090.
2012-07-11 16:40:56 +00:00
Pureon f340c8be63 Skeletal setup for animated opening and closing gates
This was SVN commit r12089.
2012-07-11 15:36:00 +00:00
Pureon c8b024ec5f Updates to a few sounds
This was SVN commit r12087.
2012-07-10 20:16:29 +00:00
Mythos_Ruler 0ef77d550c Britons get the Kennl.
Gauls get the Rotary Mill.

This was SVN commit r12086.
2012-07-09 03:24:50 +00:00
Mythos_Ruler 1926a18354 Britons emblem.
This was SVN commit r12085.
2012-07-08 21:22:27 +00:00
Mythos_Ruler b7e6bbdf3f Fixes waypoint flags for Britons and Gauls.
This was SVN commit r12084.
2012-07-08 20:15:16 +00:00
Badmadblacksad e416b38811 Fix phases.
This was SVN commit r12083.
2012-07-08 20:12:36 +00:00
Badmadblacksad 2c5933912c Gates. Adds UI buttons, replaces wall section with a gate, defines and create obstruction shapes, detects friendly units and eventually disable door's "block movement" flag, allows us to lock / unlock the door by disabling "block pathfinding" flag. Needs icons, play sound, animations. Fixes #1385, refs #619.
This was SVN commit r12081.
2012-07-08 16:25:33 +00:00
Mythos_Ruler 9a3a6b9c2f Tweaked Mauryan sandbox.
This was SVN commit r12080.
2012-07-07 21:54:43 +00:00
Mythos_Ruler 68f44a74bd - Fig Tree: Gave it the "berry bush" selection sound to help drive home that it is a fruit-bearing tree.
- All Mauryan buildings: Removed the Persian structural health bonus, a
legacy from copying over from Persian templates.
- Mauryan Barracks: Added the Indian Light Cavalry to the training
roster. Removed the Persian Barracks portrait icon.

This was SVN commit r12079.
2012-07-07 21:38:48 +00:00
historic_bruno 4cd3a93ca4 Fixes inconsistent bow props on some Persian units, based on patch by dvangennip. Fixes #1523
This was SVN commit r12078.
2012-07-06 23:52:17 +00:00
Mythos_Ruler 54e24d9a43 Fixed costs for Carthaginian embassies.
This was SVN commit r12076.
2012-07-06 00:57:59 +00:00
Mythos_Ruler 80d6d8930e Alters tooltips for Town and City Phase upgrades for clarity. Closes #1447
This was SVN commit r12075.
2012-07-06 00:23:31 +00:00
quantumstate 463e62a514 Added checks to see if a resource is in another players territory and to mark a resource as inaccessible if a unit has spent too long trying to reach it.
This was SVN commit r12074.
2012-07-05 21:14:48 +00:00
historic_bruno 574f4db8ab Fixes font texture handling to use format auto-detection when possible, based on patch by Deiz/F00. Fixes #1508
This was SVN commit r12073.
2012-07-05 01:05:09 +00:00
quantumstate fba0730db9 Add a comment about maxDensity based on FeXoR's description. Refs #1522.
This was SVN commit r12071.
2012-07-04 18:59:11 +00:00
Spahbod 585a30e1f3 Added FeXoR's changes for deep forest. Fixes #1522 .
This was SVN commit r12070.
2012-07-04 17:25:18 +00:00
Ykkrosh 5abedde99a Don't enable -fpch-preprocess (which may interfere with ccache) unless we're actually building with PCH
This was SVN commit r12069.
2012-07-04 15:20:42 +00:00
historic_bruno 512854e30c Fixes log folder script on WinXP/2000. Moves script inside source/tools. Adds start menu shortcut to the installer. Updates README. Fixes #1438
This was SVN commit r12068.
2012-07-04 03:50:01 +00:00
Mythos_Ruler f845878039 Renamed.
This was SVN commit r12067.
2012-07-04 01:48:57 +00:00
Mythos_Ruler 2bf4cde60a This was SVN commit r12066. 2012-07-04 01:46:44 +00:00
Mythos_Ruler b26e6a442a - Updated Persian Stable and Barracks portraits.
- Updated Carth and Pers civ files.
- Updated some Carth structure templates.

This was SVN commit r12065.
2012-07-04 01:08:51 +00:00
Mythos_Ruler 56571f4934 Theban stuff.
This was SVN commit r12063.
2012-07-04 00:05:43 +00:00
Mythos_Ruler 835af18630 Civ jsons.
This was SVN commit r12062.
2012-07-03 23:04:58 +00:00
Spahbod 7cfbf43f5e This was SVN commit r12061. 2012-07-03 07:07:50 +00:00
historic_bruno 31a58e07c1 Fixes Builder component to allow repairers who can't place new foundations.
This was SVN commit r12060.
2012-07-03 03:15:39 +00:00
Mythos_Ruler e8f5f74f71 Trying to make Worker Elephant construct buildings, without listing a list of buildings in its UI.
This was SVN commit r12058.
2012-07-03 02:52:11 +00:00
Mythos_Ruler 292cb1d26a Adjusted splash damage for onagers. Adjusted stats for Mauryan houses. Added builder support for Mauryan Worker Elephant.
This was SVN commit r12057.
2012-07-03 02:38:24 +00:00
historic_bruno 99d04e93bb Implements global tech modification function. Fixes #1358, refs #1520.
Applies tech modifications to template data returned by GuiInterface.
Extends engine to load arbitrary global scripts, separates this from RNG
replacement. Refs #1193.
Loads global scripts for most script contexts for consistency.
Adds simulation tests for global scripts.

This was SVN commit r12056.
2012-07-03 02:16:45 +00:00
Spahbod db943341a8 Secretly adding Gear random map.
This was SVN commit r12055.
2012-07-02 13:11:02 +00:00
Spahbod 11ec25726a Bug fixes. Some suggested by wraitii.
This was SVN commit r12054.
2012-07-02 08:07:59 +00:00
Spahbod e4f9816166 This was SVN commit r12053. 2012-07-02 07:43:44 +00:00
Spahbod 45c5e991d7 Fixing the bug on Deep Forest random map by FeXoR. Fixes #1513.
This was SVN commit r12052.
2012-07-02 03:28:27 +00:00
Mythos_Ruler 130caac4f5 Smoke, less thick.
This was SVN commit r12051.
2012-07-01 19:19:31 +00:00
Spahbod f38ba1d91b Updated the Sahel Watering Holes map.
This was SVN commit r12050.
2012-07-01 04:15:02 +00:00
vts 0e4efdf100 Small correction -- building with both xelatex and pdflatex doesn't make sense :o)
This was SVN commit r12049.
2012-07-01 01:05:06 +00:00
vts 75b436e010 A more detailed explanation of how the slab method for OBB/ray intersection from Real-Time Rendering, Third Edition works.
This was SVN commit r12048.
2012-07-01 01:02:26 +00:00
Mythos_Ruler 2921694346 Long skirt for Mauryan female.
This was SVN commit r12047.
2012-06-30 21:40:42 +00:00
Mythos_Ruler 28fbc77c45 Updated Mauryan civ json.
This was SVN commit r12046.
2012-06-30 03:52:30 +00:00
Mythos_Ruler 4899144d8a This was SVN commit r12045. 2012-06-30 02:13:40 +00:00
Mythos_Ruler 9e1310fed5 This was SVN commit r12044. 2012-06-30 00:31:03 +00:00
Mythos_Ruler 730263fa5e Mauryan female citizen.
This was SVN commit r12043.
2012-06-30 00:25:30 +00:00
Mythos_Ruler 1dc74dc2d7 Fixed up some Mauryan entities.
This was SVN commit r12042.
2012-06-29 23:39:05 +00:00
Pureon 67e7953e3a Mauryan Elephant stables added
This was SVN commit r12041.
2012-06-29 19:16:13 +00:00
Pureon fe809e1deb Mauryan infantry archer template tweak
This was SVN commit r12040.
2012-06-29 18:32:12 +00:00
Spahbod 347eb964bd Fixed an error in description.
This was SVN commit r12039.
2012-06-29 04:14:06 +00:00
Spahbod c3082fab9a Added Sahel Watering Holes random map.
This was SVN commit r12038.
2012-06-29 03:52:14 +00:00
Spahbod 4f60ef63c2 Fixed the starting angle on Oasis.
This was SVN commit r12037.
2012-06-29 03:20:40 +00:00
Pureon aa11c5bd90 Territory decay rate tech for Outposts
This was SVN commit r12036.
2012-06-29 00:02:04 +00:00
Pureon 9536dbb898 Roman quinquereme ship animations
This was SVN commit r12035.
2012-06-28 21:10:59 +00:00
vts 78d90087a2 In RMS: Fix misaligned iberian bonus starting walls. Fix celt split civs errors. Add roads. Closes #1449.
This was SVN commit r12034.
2012-06-28 21:02:47 +00:00
Pureon c00abd4ab6 Update to Mauryan civ template and some new tech icons
This was SVN commit r12033.
2012-06-27 21:49:31 +00:00
Pureon 0b55844452 Mauryan support elephant
This was SVN commit r12032.
2012-06-27 19:53:16 +00:00
Spahbod d4a44a6128 Removes "demo" keyword from volcanic lands.
This was SVN commit r12031.
2012-06-27 10:45:09 +00:00
Spahbod 0c7a9d43d7 Prevents trees to block the view of players. Refs #1408.
This was SVN commit r12030.
2012-06-27 10:44:25 +00:00
Spahbod 4a1f417d40 Fixed a bug.
This was SVN commit r12029.
2012-06-27 10:22:05 +00:00
Spahbod e8a4f9ce4a This was SVN commit r12028. 2012-06-27 08:17:04 +00:00
Spahbod c2ecc0eae0 Templates for new tropical flora.
This was SVN commit r12027.
2012-06-27 08:16:25 +00:00
Spahbod 3cb07b95d1 Models and actors for new Tropical flora.
This was SVN commit r12026.
2012-06-27 08:15:55 +00:00
leper aab1cdf9d6 Don't add system CFLAGS to the CXXFLAGS. Refs #1516.
This was SVN commit r12025.
2012-06-26 20:48:06 +00:00
leper 98dea7eb03 Fix issues with civ specific victory/defeat music. Fixes #1370.
This was SVN commit r12024.
2012-06-26 18:44:52 +00:00
Spahbod a8dce674ce Some minor changes. Added the possibility of a frozen sea in gulf of bothnia.
This was SVN commit r12023.
2012-06-26 12:29:41 +00:00
Spahbod 2cd95cfe1b Added more wood to archipelago, islands and migration so that players can reach phase 2 to build a dock. Updated oasis to the current standard including ally placement and iberian wall. Replaced the polar cliff texture in random biome system.
This was SVN commit r12022.
2012-06-26 08:54:00 +00:00
leper ad3f543d2c Revert useless part of previous commit.
This was SVN commit r12021.
2012-06-25 22:27:00 +00:00
leper a60d01ee2e Display map name and size on summary screen. Based on patch by hapsky. Fixes #1333.
Play victory and defeat music.
Replace celts with gauls.

This was SVN commit r12020.
2012-06-25 22:11:47 +00:00
Pureon 622d6b9162 Crenelations tech new icon
This was SVN commit r12019.
2012-06-25 20:45:57 +00:00
leper ace4793086 Make menu disappear when interacting with the game world. Based on patch by Deiz. Fixes #1291.
This was SVN commit r12018.
2012-06-25 17:27:22 +00:00
WhiteTreePaladin 272efcc364 K776's minor GUI changes
This was SVN commit r12017.
2012-06-25 03:43:34 +00:00
Pureon 7476ce438d Sandbox map update
This was SVN commit r12016.
2012-06-24 21:58:17 +00:00
WhiteTreePaladin 975fec3af3 Fix incorrect font reference
This was SVN commit r12015.
2012-06-24 21:44:20 +00:00
leper ebe5b66ba3 Fix test failure caused by f660f834bf.
This was SVN commit r12014.
2012-06-24 21:03:46 +00:00
Pureon 03363fe085 Updates to some more Mauryan civ files
This was SVN commit r12013.
2012-06-24 20:58:21 +00:00
WhiteTreePaladin f814e532ae Remove player color from queue panel and center civ shield behind name
This was SVN commit r12012.
2012-06-24 19:38:58 +00:00
Pureon 01d9b0d4b9 Mauryan civ. Sandbox map showing placeholder units and buildings
This was SVN commit r12011.
2012-06-24 13:55:36 +00:00
Pureon c7d90ec644 Mauryan structure actor files
This was SVN commit r12010.
2012-06-24 13:16:21 +00:00
Pureon ef6f73fb89 Placeholder structure models for Mauryans
This was SVN commit r12009.
2012-06-24 12:44:18 +00:00
Pureon 51a87cc8c3 Unit actors folder for Mauryans
This was SVN commit r12008.
2012-06-24 12:40:11 +00:00
Pureon d62971ad29 Unit sim templates
This was SVN commit r12007.
2012-06-24 10:59:54 +00:00
Pureon adae2dd998 Mauryan placeholder struct texture and emblem
This was SVN commit r12006.
2012-06-24 10:32:25 +00:00
Pureon 6822e33c65 Mauryan structure templates
This was SVN commit r12005.
2012-06-24 09:54:52 +00:00
Mythos_Ruler 23d1879876 Fixed song name. Added it to Spartans civ json.
This was SVN commit r12004.
2012-06-24 04:14:46 +00:00
WhiteTreePaladin 63bdbcc67a Unbold generic name
This was SVN commit r12003.
2012-06-24 03:21:47 +00:00
WhiteTreePaladin b19d7268b8 Update settings text to use bold stroke 16
This was SVN commit r12002.
2012-06-24 03:17:54 +00:00
WhiteTreePaladin 941a8c014b Update fontbuilder with stroked and bold stroked 12, 13, and 16
This was SVN commit r12001.
2012-06-23 22:05:05 +00:00
WhiteTreePaladin a8e00a4a7f Add stroked 16 font
This was SVN commit r12000.
2012-06-23 22:04:04 +00:00
WhiteTreePaladin 94bae18389 Use bolded text for unit names
This was SVN commit r11999.
2012-06-23 21:58:58 +00:00
WhiteTreePaladin 859b568e9f Add new stroked 12 and 13 fonts and update session panels to use them
(non-bold used stroked 2 and bold used stroked 3)

This was SVN commit r11998.
2012-06-23 21:37:26 +00:00
vts f660f834bf Added default, arbitrary-sized Footprint component to actor entities. Makes their selection outlines show up in Atlas. Fixes #1477.
This was SVN commit r11997.
2012-06-23 21:12:51 +00:00
leper 0b57709d17 Make unit command buttons clickable again.
This was SVN commit r11996.
2012-06-23 13:28:19 +00:00
leper efb6ac808b Fix premake build on OS X by linking with the CoreServices framework. Fixes #1505.
Remove obsolete and unused parameters. Fixes #1179.

This was SVN commit r11995.
2012-06-21 22:55:07 +00:00
Mythos_Ruler b35bebbdbf This was SVN commit r11994. 2012-06-21 22:30:17 +00:00
leper 95a003edb8 Fix premake's os.getversion() to work with glibc. Refs #1322.
This was SVN commit r11993.
2012-06-21 22:01:39 +00:00
OmriLahav 76ada61960 This was SVN commit r11991. 2012-06-21 07:05:21 +00:00
WhiteTreePaladin de8dc92e49 widen experience bar
This was SVN commit r11990.
2012-06-19 02:53:43 +00:00
WhiteTreePaladin 2268fd3f0e Fix unit commands alignment
This was SVN commit r11989.
2012-06-18 23:59:02 +00:00
WhiteTreePaladin 3337949721 Fix player name
This was SVN commit r11988.
2012-06-18 23:53:16 +00:00
WhiteTreePaladin 9fb45928a1 Fix unit civ tooltip
This was SVN commit r11987.
2012-06-18 23:51:07 +00:00
WhiteTreePaladin 03d56edb1b Add more detailed shading to selections details
This was SVN commit r11986.
2012-06-18 23:47:36 +00:00
WhiteTreePaladin 80213bba5f Fix rank icon hiding
This was SVN commit r11985.
2012-06-18 22:45:10 +00:00
WhiteTreePaladin 033120e8d8 Shrink experience bar, add tooltip to rank icon, rework middle panel shading
This was SVN commit r11984.
2012-06-18 22:33:40 +00:00
WhiteTreePaladin a34232d71e Add black border around stats bars
This was SVN commit r11983.
2012-06-18 13:40:53 +00:00
WhiteTreePaladin 0c083f9a45 Fix stats bars on multi-select and shrink all stats bars from 8 to 7 px
This was SVN commit r11982.
2012-06-18 13:33:11 +00:00
historic_bruno 3ec1b88d2c Adds missing break statements, thanks to picobyte. Fixes #1503
This was SVN commit r11981.
2012-06-18 01:38:30 +00:00
vts 8f2b82fa8a Basic README.txt for fontbuilder.py to outline installation process of PyCairo on Win32
This was SVN commit r11980.
2012-06-17 23:01:37 +00:00
vts 821cfe8862 Removed reverse dependency on SOverlayTexturedLine from CTexturedLineRData; fixes dangling pointer dereference. Fixes #1495.
This was SVN commit r11979.
2012-06-17 03:40:35 +00:00
WhiteTreePaladin 972f28c6a7 Update unit experience display
This was SVN commit r11978.
2012-06-17 00:28:05 +00:00
WhiteTreePaladin b269dabe3b Fix stamina and generic name issues
This was SVN commit r11977.
2012-06-16 22:41:48 +00:00
WhiteTreePaladin b66d1716e7 Recenter GUI and update unit details section.
This was SVN commit r11976.
2012-06-16 20:55:33 +00:00
historic_bruno 5752863e6f Updates premake Windows binary and VS projects for 637c09b204.
This was SVN commit r11974.
2012-06-15 23:11:57 +00:00
historic_bruno 8dc36bed4e Fixes error in actor viewer caused by 962da61f12. Fixes #1499
This was SVN commit r11973.
2012-06-14 22:47:57 +00:00
Mythos_Ruler 744eb1a7d7 This was SVN commit r11972. 2012-06-14 21:44:59 +00:00
leper 20e9d70757 Link with boost_system as that is needed for Boost <= 1.43. Refs #1360.
This was SVN commit r11971.
2012-06-13 22:54:14 +00:00
leper 637c09b204 Add support for OpenBSD. Fixes #1463.
Backport os_getversion from premake4.4-beta4 and extend it to support
POSIX-compilant systems.
Add some missing newlines at the end of file as these cause warnings on
OpenBSD.
Update the config paths.

This was SVN commit r11970.
2012-06-13 20:43:56 +00:00
Mythos_Ruler f056b8f6f0 This was SVN commit r11969. 2012-06-13 00:19:26 +00:00
Mythos_Ruler c4b993075a Celts -> Britons or Gauls.
This was SVN commit r11968.
2012-06-13 00:12:18 +00:00
quantumstate 4ddd2a7fb1 Added IsInWorld check to attack code. Refs #1496
This was SVN commit r11967.
2012-06-12 12:13:24 +00:00
quantumstate f944649153 Fix the attack error due to no footprint. Refs #1496.
This was SVN commit r11966.
2012-06-12 12:04:55 +00:00
historic_bruno d97f8180d5 Removes unused Boost link dependencies with patch by fabio. Fixes #1360
This was SVN commit r11965.
2012-06-12 05:38:43 +00:00
ShieldBearer 306a9759d5 stats bar textures
This was SVN commit r11964.
2012-06-11 13:12:39 +00:00
WhiteTreePaladin d905e4c63a Split GUI out to bottom corners based on suggestions, and move barter icons down
This was SVN commit r11963.
2012-06-11 01:07:41 +00:00
leper 29a11e24d5 Fix NVTT build on OpenBSD based on patch by anthonyjbentley. Refs #1463.
This was SVN commit r11962.
2012-06-10 22:39:26 +00:00
WhiteTreePaladin 85f4702531 Hide stamina for now
This was SVN commit r11961.
2012-06-10 03:38:25 +00:00
WhiteTreePaladin bf81922c62 Fix resource label when type is a treasure and fix civ tooltip
This was SVN commit r11960.
2012-06-10 02:56:21 +00:00
WhiteTreePaladin aa58b6ccfa always show generic name for now
This was SVN commit r11959.
2012-06-10 02:39:16 +00:00
WhiteTreePaladin 87d415aca9 Update GUI selection details panel (single selections)
This was SVN commit r11958.
2012-06-10 02:05:40 +00:00
historic_bruno 4ac52a3c47 Fixes bug in percentage map explored calculation. Refs #1334
This was SVN commit r11957.
2012-06-09 23:04:27 +00:00
Mythos_Ruler fba599c847 This was SVN commit r11956. 2012-06-09 05:59:01 +00:00
Mythos_Ruler 82ca0243d7 This was SVN commit r11955. 2012-06-09 05:58:09 +00:00
Mythos_Ruler a00b92dcd5 Gauls.
This was SVN commit r11954.
2012-06-09 05:57:28 +00:00
Mythos_Ruler 67f306724a Britons json.
This was SVN commit r11953.
2012-06-09 01:17:49 +00:00
Mythos_Ruler 52af3369ba Britons.
This was SVN commit r11952.
2012-06-09 01:17:27 +00:00
leper 2243f699fc Fix test failure.
Fix entity placement on Phoenician Levant.

This was SVN commit r11951.
2012-06-08 19:17:31 +00:00
historic_bruno 962da61f12 Adds shared LOS for allied players, based on patch by Deiz/F00. Fixes #1334.
This was SVN commit r11949.
2012-06-08 04:41:39 +00:00
leper 659049eb1c Auto-gather all types of treasures. Fixes #1422. Patch by Deiz.
This was SVN commit r11948.
2012-06-07 21:56:29 +00:00
Mythos_Ruler 4d0aaa4bdb This was SVN commit r11947. 2012-06-06 22:59:36 +00:00
Mythos_Ruler 231b0cd5f6 Testing branching phases.
This was SVN commit r11946.
2012-06-06 21:38:17 +00:00
Pureon 8aaa6d06e2 Removing some large unused png image files
This was SVN commit r11945.
2012-06-06 19:40:16 +00:00
vts 6b50a660b9 Added elapsed real time (as opposed to elapsed simulation time) to MT_Interpolate messages. Fixes leftover TODO from #824. Refs #824.
This was SVN commit r11944.
2012-06-06 19:37:03 +00:00
gregory f9fa347a7f Fixed shark animation and skeleton.
This was SVN commit r11939.
2012-06-05 04:05:01 +00:00
Mythos_Ruler d020e02644 This was SVN commit r11938. 2012-06-05 02:05:41 +00:00
WhiteTreePaladin d271ca89cf Update GUI style for single object selections (based on quantumstate's mockup)
This was SVN commit r11937.
2012-06-05 00:36:35 +00:00
leper 0296323c9d Make FCollada compile on OpenBSD, based on patch by anthonyjbentley. Refs #1463.
This was SVN commit r11936.
2012-06-04 21:33:15 +00:00
historic_bruno 66194deedc Fixes player setup to set all diplomacy values (including self as ally).
Removes unnecessary checks from CmpPlayer diplomacy functions.
Fixes some inconsistent formatting.

This was SVN commit r11935.
2012-06-04 00:24:08 +00:00
leper 4ee4f16793 Stop rearranging formations for orders carried out individually. Fixes #1476.
This was SVN commit r11934.
2012-06-03 23:00:36 +00:00
vts da719b883c Split out code specific to textured overlay lines construction from OverlayRenderer into its own files.
This was SVN commit r11933.
2012-06-02 21:19:20 +00:00
Mythos_Ruler 210f0265b7 Updated Acropolis maps.
This was SVN commit r11932.
2012-06-02 06:00:45 +00:00
Mythos_Ruler 4c01de2100 Reduced accuracy for Basic-level ranged citizen units.
Portraits for Mace and Spart rams.

Lower XP requirements for cavalry promotion.

This was SVN commit r11931.
2012-06-02 05:57:57 +00:00
historic_bruno 8c848c2f45 Replaces info icon with higher quality version. Fixes #1469.
Uses add_color effect, so it's easier to change the theme.
Fixes some inconsistent whitespace.

This was SVN commit r11930.
2012-06-02 00:09:57 +00:00
Mythos_Ruler 98ee2bdf0a elongated raindrop.
This was SVN commit r11929.
2012-06-01 01:28:51 +00:00
vts 1c005b0c0e Fixed AABB to OBB transformation resulting in NaN basis vectors when the AABB size in one or more dimensions is zero. Fixes #1121.
This was SVN commit r11928.
2012-05-31 23:17:15 +00:00
Mythos_Ruler 9e798addf9 This was SVN commit r11927. 2012-05-31 17:49:26 +00:00
historic_bruno 73f9d984fe Fixes typo in crenellations tech.
This was SVN commit r11926.
2012-05-31 03:40:25 +00:00
Mythos_Ruler 9d619a673e A pair of tower technologies.
This was SVN commit r11925.
2012-05-30 05:55:55 +00:00
Mythos_Ruler 3009d463a6 Updated Savanna terrains.
This was SVN commit r11924.
2012-05-29 21:27:39 +00:00
Mythos_Ruler f876f2e747 Traders respond when tasked to trade.
This was SVN commit r11923.
2012-05-29 05:07:14 +00:00
fcxSanya d7752438fe Do not count domestic animals as units in statistics, based on patch by Deiz. Fixes #1439
This was SVN commit r11922.
2012-05-29 04:04:41 +00:00
leper 636896dd7f Pass template to gather-near-position. Fixes #1454.
Add order_trade sound.

This was SVN commit r11921.
2012-05-27 20:23:08 +00:00
Pureon f2e6194440 Lighting on some demo maps. No more maps use 'old' LightingModel
This was SVN commit r11920.
2012-05-26 13:57:44 +00:00
Pureon 48fd27a10a Second female unit voice. All phrases
This was SVN commit r11918.
2012-05-26 11:22:45 +00:00
Pureon 757c873a2e New death sounds added
This was SVN commit r11915.
2012-05-25 21:37:10 +00:00
Mythos_Ruler aec44da406 Bunch of different stuff.
This was SVN commit r11914.
2012-05-25 21:36:07 +00:00
Pureon 20125515f1 Removing changes to skeletons.xml that conflict with other skeletons
This was SVN commit r11913.
2012-05-25 21:20:28 +00:00
leper 5f6dea8455 Fix the size of the Units Demo map.
This was SVN commit r11912.
2012-05-25 20:42:24 +00:00
Pureon 1004864733 Siege ram for the Macedonians
This was SVN commit r11910.
2012-05-24 21:44:28 +00:00
leper 137b6dd338 Queued orders for rally points. Fixes #1053 and #1211.
This was SVN commit r11909.
2012-05-24 18:25:31 +00:00
gregory 4c974a49a4 This was SVN commit r11908. 2012-05-24 00:33:55 +00:00
gregory b0c3533b20 Added shark move animation.
This was SVN commit r11907.
2012-05-23 23:48:06 +00:00
Mythos_Ruler a69b2f796c Ranged infantry promotions now confer accuracy boosts instead of attack boosts. In the end, the accuracy boost ends up being an attack boost (in average damage per second).
This was SVN commit r11906.
2012-05-23 21:22:34 +00:00
Mythos_Ruler 6d96dd7137 Increased the size of the Units Demo map.
Fixed some things about the Celts sandbox map.

This was SVN commit r11905.
2012-05-23 21:17:18 +00:00
Mythos_Ruler c8d404eb25 Fixed errors when Celt walls die.
This was SVN commit r11904.
2012-05-23 20:31:11 +00:00
historic_bruno 0ce770f227 Disables Roman Quinquereme no sail variation.
This was SVN commit r11903.
2012-05-23 20:12:48 +00:00
Mythos_Ruler c6b53e1677 New Athenian emblem.
This was SVN commit r11902.
2012-05-22 23:15:33 +00:00
Mythos_Ruler e999289021 Kennel available in town phase.
This was SVN commit r11900.
2012-05-22 16:57:09 +00:00
Spahbod cab27587fd This was SVN commit r11899. 2012-05-22 15:28:21 +00:00
Mythos_Ruler 7b1ab20852 This was SVN commit r11898. 2012-05-22 07:14:26 +00:00
Spahbod 7559764fa6 Fixed some maps that caused errors and removed extra trees from some.
This was SVN commit r11897.
2012-05-22 06:38:07 +00:00
Ykkrosh dd072112d1 Improved shadow filtering, from eihrul.
This was SVN commit r11896.
2012-05-21 19:23:14 +00:00
Spahbod 16883b225b Gathers all the trees near the player start position near each other to make more room for players. Fixes #1408.
This was SVN commit r11895.
2012-05-21 16:14:51 +00:00
Spahbod 4b4d048967 Found a better name for Persian fishing boat.
This was SVN commit r11894.
2012-05-21 10:39:25 +00:00
Spahbod 088caa647f Fixed the bug in Hyrcanian Shores. Fixes #1388.
This was SVN commit r11893.
2012-05-21 09:35:05 +00:00
historic_bruno 8fd3fbc210 Fixes Attack.js error.
This was SVN commit r11892.
2012-05-20 22:51:51 +00:00
leper c4d6019599 Add garrison order sound and remove the old garrison sound.
Fix some map errors, tabs in templates and update docs.

This was SVN commit r11891.
2012-05-20 15:44:57 +00:00
Pureon 4cf3467819 New siege ram for the Spartans
This was SVN commit r11890.
2012-05-20 11:32:35 +00:00
EmjeR d5e3e975c8 This was SVN commit r11888. 2012-05-20 00:26:18 +00:00
quantumstate f72d820cd4 Added randomized arrow positions with hit detection when the missile lands and splash damage. Fixes #18.
This was SVN commit r11886.
2012-05-19 23:07:41 +00:00
leper 6cc98a6763 Add heal order sound.
This was SVN commit r11885.
2012-05-19 18:27:00 +00:00
Pureon 7be67fe6b7 Added new voice sounds to all female units. Recorded by khegarty
This was SVN commit r11884.
2012-05-19 16:02:16 +00:00
Mythos_Ruler 7ad6a6012f Persians: Cav techs to Stables. Infantry techs to Barracks.
This was SVN commit r11883.
2012-05-19 06:24:12 +00:00
Mythos_Ruler 7f3bd8fb48 Shiny Bactrian lancers.
This was SVN commit r11882.
2012-05-19 06:16:55 +00:00
Mythos_Ruler 97bf4df2a6 Some Athenian shields for their buildings.
This was SVN commit r11881.
2012-05-19 04:46:50 +00:00
Mythos_Ruler 5d59175953 Footprint sizes for these things.
This was SVN commit r11880.
2012-05-18 22:41:31 +00:00
quantumstate c2c0469472 Make qBot swap gatherers based on gathering speed and always deposit resources when switching resource.
Also added missing var's in for loops.

This was SVN commit r11879.
2012-05-18 22:27:08 +00:00
quantumstate d7faa813f4 Update territory bitmask and add a returnResource command for entities.
This was SVN commit r11878.
2012-05-18 22:10:56 +00:00
Mythos_Ruler 0d9dcac82a Changing the Greek civs on these maps.
This was SVN commit r11877.
2012-05-18 21:42:55 +00:00
leper 68d1cf167e Add repair order queueing to formations. Refs #592.
This was SVN commit r11876.
2012-05-18 21:31:57 +00:00
historic_bruno e7689342f8 Implements TerritoryDecay/HealthDecayRate and Promotion/RequiredXp tech modifications.
This was SVN commit r11875.
2012-05-18 03:58:37 +00:00
historic_bruno 8fba8097ce Reverts bfb7526bcf.
This was SVN commit r11874.
2012-05-17 23:24:12 +00:00
historic_bruno 786896bf8d Prevents fishing ship from attacking structures (docks).
This was SVN commit r11873.
2012-05-17 22:33:46 +00:00
Mythos_Ruler 862f6fb3e3 Update to Necropolis.
This was SVN commit r11872.
2012-05-17 13:43:15 +00:00
Mythos_Ruler fb44299104 This was SVN commit r11871. 2012-05-17 13:10:12 +00:00
historic_bruno 96b2c1e89b Makes territory_pull selectable in Atlas only.
This was SVN commit r11870.
2012-05-17 02:32:16 +00:00
Mythos_Ruler 5d72fa689e Updated spartan emblem.
This was SVN commit r11869.
2012-05-17 01:53:41 +00:00
Mythos_Ruler a4e701fcf9 Lightened up the shark textures.
This was SVN commit r11867.
2012-05-16 20:56:08 +00:00
Mythos_Ruler a5a7bf3c5d Spartan females can make palisades.
This was SVN commit r11866.
2012-05-16 17:57:56 +00:00
Mythos_Ruler cdafb50278 Selection groups for wall lengths.
This was SVN commit r11865.
2012-05-16 17:56:06 +00:00
Ykkrosh 04fe6d2363 Add reminders to keep alpha names in sync
This was SVN commit r11864.
2012-05-15 21:34:28 +00:00
5104 changed files with 54922 additions and 14101 deletions
-2
View File
@@ -1,2 +0,0 @@
cd /D "%appdata%\0ad\logs\"
start .
+3 -13
View File
@@ -28,7 +28,7 @@ Open the "binaries\system" folder.
To launch the game: Run pyrogenesis.exe
To launch the map editor: Run Atlas.bat
To launch the map editor: Run Atlas.bat or "pyrogenesis.exe -editor"
-----------------------------------
@@ -43,15 +43,5 @@ http://trac.wildfiregames.com/wiki/BuildInstructions
Reporting problems
------------------
Bugs should be reported on Trac: http://trac.wildfiregames.com/
On Windows: If the game crashes, it should generate 'crashlog' files that will
help us debug the problem. Run OpenLogsFolder.bat to find the files
("%appdata%\0ad\logs\"), and attach crashlog.txt and crashlog.dmp to the bug
report.
On Linux / OS X: If the game detects an error, it should generate crashlog.txt
in ~/.config/0ad/logs/ . If it doesn't, it should at least print some
information on stdout. Attach crashlog.txt or the other information to the
bug report. It might also help to run the game in gdb and copy the output of
the "bt full" command, if possible.
Bugs should be reported on Trac. For information on reporting problems
and finding logs, see http://trac.wildfiregames.com/wiki/ReportingErrors
+45 -5
View File
@@ -5,11 +5,15 @@
; * create a text file called "local.cfg" instead, and copy *
; * the lines from this file that you want to change. *
; * *
; * On Linux / OS X, create: *
; * ~/.config/0ad/config/local.cfg *
; * On Linux, create: *
; * $XDG_CONFIG_HOME/0ad/config/local.cfg *
; * (Note: $XDG_CONFIG_HOME defaults to ~/.config) *
; * *
; * On OS X, create: *
; * ~/Library/Application\ Support/0ad/config/local.cfg *
; * *
; * On Windows, create: *
; * %appdata%/0ad/config/local.cfg *
; * %appdata%\0ad\config\local.cfg *
; * *
; **************************************************************
@@ -36,6 +40,7 @@ shadowpcf = true
vsync = false
particles = true
silhouettes = true
showsky = false
nos3tc = false
noautomipmap = true
@@ -57,9 +62,27 @@ force_s3tc_enable = true
; but will reduce performance and features when a modern graphics card is available.
renderpath = default
; Prefer GLSL shaders over ARB shaders (not recommended)
;;;;; EXPERIMENTAL ;;;;;
; Prefer GLSL shaders over ARB shaders (not recommended). REQUIRES gentangents=true.
preferglsl = false
; Generate tangents for normal and parallax mapping. REQUIRES preferglsl=true. Incompatible with gpuskinning.
gentangents = false
; Use smooth LOS interpolation; REQUIRES preferglsl=true.
smoothlos = false
; Quality level of shader effects (set to 10 to display effects)
materialmgr.quality = 0.0
; Maximum distance to display parallax effect. Set to 0 to disable parallax.
materialmgr.PARALLAX_DIST.max = 150
; Maximum distance to display high quality parallax effect.
materialmgr.PARALLAX_HQ_DIST.max = 75
; Maximum distance to display very high quality parallax effect. Set to 30 to enable.
materialmgr.PARALLAX_VHQ_DIST.max = 0
;;;;;;;;;;;;;;;;;;;;;;;;
; Replace alpha-blending with alpha-testing, for performance experiments
forcealphatest = false
@@ -74,10 +97,16 @@ skycolor = "0 0 0"
; GENERAL PREFERENCES:
sound.mastergain = 0.5
sound.mastergain = 0.9
sound.musicgain = 0.2
sound.ambientgain = 0.6
sound.actiongain = 0.7
sound.bufferCount = 50
sound.bufferSize = 98304
; Camera control settings
view.scroll.speed = 120.0
view.scroll.speed.modifier = 1.05 ; Multiplier for changing scroll speed
view.rotate.x.speed = 1.2
view.rotate.x.min = 28.0
view.rotate.x.max = 60.0
@@ -85,12 +114,14 @@ view.rotate.x.default = 35.0
view.rotate.y.speed = 2.0
view.rotate.y.speed.wheel = 0.45
view.rotate.y.default = 0.0
view.rotate.speed.modifier = 1.05 ; Multiplier for changing rotation speed
view.drag.speed = 0.5
view.zoom.speed = 256.0
view.zoom.speed.wheel = 32.0
view.zoom.min = 50.0
view.zoom.max = 200.0
view.zoom.default = 120.0
view.zoom.speed.modifier = 1.05 ; Multiplier for changing zoom speed
view.pos.smoothness = 0.1
view.zoom.smoothness = 0.4
view.rotate.x.smoothness = 0.5
@@ -118,6 +149,7 @@ 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
hotkey.silhouettes = "Alt+S" ; Toggle unit silhouettes
hotkey.showsky = "Alt+Z" ; Toggle sky
; > CAMERA SETTINGS
hotkey.camera.reset = "H" ; Reset camera rotation to default.
@@ -137,6 +169,12 @@ hotkey.camera.left = A, LeftArrow ; Scroll or rotate lef
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
hotkey.camera.scroll.speed.increase = "Ctrl+Shift+S" ; Increase scroll speed
hotkey.camera.scroll.speed.decrease = "Ctrl+Alt+S" ; Decrease scroll speed
hotkey.camera.rotate.speed.increase = "Ctrl+Shift+R" ; Increase rotation speed
hotkey.camera.rotate.speed.decrease = "Ctrl+Alt+R" ; Decrease rotation speed
hotkey.camera.zoom.speed.increase = "Ctrl+Shift+Z" ; Increase zoom speed
hotkey.camera.zoom.speed.decrease = "Ctrl+Alt+Z" ; Decrease zoom speed
; > CONSOLE SETTINGS
hotkey.console.toggle = BackQuote, F9 ; Open/close console
@@ -203,9 +241,11 @@ hotkey.session.devcommands.toggle = "Alt+D" ; Toggle developer commands panel
hotkey.session.gui.toggle = "Alt+G" ; Toggle visibility of session GUI
hotkey.menu.toggle = "F10" ; Toggle in-game menu
hotkey.timeelapsedcounter.toggle = "F12" ; Toggle time elapsed counter
hotkey.session.showstatusbars = Tab ; Toggle display of status bars
; > HOTKEYS ONLY
hotkey.chat = Return ; Toggle chat window
hotkey.teamchat = "T" ; Toggle chat window in team chat mode
; > GUI TEXTBOX HOTKEYS
hotkey.text.delete.left = "Ctrl+Backspace" ; Delete word to the left of cursor
@@ -0,0 +1,4 @@
function GlobalSubtractionHelper(a, b)
{
return a-b;
}
@@ -0,0 +1,8 @@
function TestScript1_GlobalHelper() {}
TestScript1_GlobalHelper.prototype.GetX = function()
{
return GlobalSubtractionHelper(1, -1);
};
Engine.RegisterComponentType(IID_Test1, "TestScript1_GlobalHelper", TestScript1_GlobalHelper);
@@ -11,7 +11,7 @@
</group>
<group>
<variant name="texture">
<texture>gaia/prop_tree_cypess_big.dds</texture>
<textures><texture file="gaia/prop_tree_cypess_big.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
@@ -11,16 +11,16 @@
</group>
<group>
<variant frequency="1" name="palms a">
<texture>gaia/tree_palm_senegal_a.dds</texture>
<textures><texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="palms b">
<texture>gaia/tree_palm_senegal_b.dds</texture>
<textures><texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="palms c">
<texture>gaia/tree_palm_senegal_c.dds</texture>
<textures><texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="palms d">
<texture>gaia/tree_palm_senegal_d.dds</texture>
<textures><texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
@@ -11,8 +11,8 @@
</group>
<group>
<variant name="texture">
<texture>gaia/tree_cypress_b.png</texture>
<textures><texture file="gaia/tree_cypress_b.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>alphatest.xml</material>
</actor>
@@ -4,8 +4,8 @@
<group>
<variant name="decal_campaign_argolis">
<decal angle="45" depth="25" offsetx="0" offsetz="0" width="100"/>
<texture>campaigns/labels/greece_argolis.png</texture>
<textures><texture file="campaigns/labels/greece_argolis.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>terrain_base.xml</material>
</actor>
@@ -4,8 +4,8 @@
<group>
<variant name="decal_campaign_attica">
<decal angle="45" depth="25" offsetx="0" offsetz="0" width="100"/>
<texture>campaigns/labels/greece_attica.png</texture>
<textures><texture file="campaigns/labels/greece_attica.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>terrain_base.xml</material>
</actor>
@@ -4,8 +4,8 @@
<group>
<variant name="decal_campaign_boeotia">
<decal angle="45" depth="25" offsetx="0" offsetz="0" width="100"/>
<texture>campaigns/labels/greece_boeotia.png</texture>
<textures><texture file="campaigns/labels/greece_boeotia.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>terrain_base.xml</material>
</actor>
@@ -4,8 +4,8 @@
<group>
<variant name="decal_campaign_chalcis">
<decal angle="45" depth="25" offsetx="0" offsetz="0" width="100"/>
<texture>campaigns/labels/greece_chalcis.png</texture>
<textures><texture file="campaigns/labels/greece_chalcis.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>terrain_base.xml</material>
</actor>
@@ -4,8 +4,8 @@
<group>
<variant name="decal_campaign_corinthia">
<decal angle="45" depth="25" offsetx="0" offsetz="0" width="100"/>
<texture>campaigns/labels/greece_corinthia.png</texture>
<textures><texture file="campaigns/labels/greece_corinthia.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>terrain_base.xml</material>
</actor>
@@ -4,8 +4,8 @@
<group>
<variant name="decal_campaign_delphi">
<decal angle="45" depth="25" offsetx="0" offsetz="0" width="100"/>
<texture>campaigns/labels/greece_delphi.png</texture>
<textures><texture file="campaigns/labels/greece_delphi.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>terrain_base.xml</material>
</actor>
@@ -4,8 +4,8 @@
<group>
<variant name="decal_campaign_eretria">
<decal angle="45" depth="25" offsetx="0" offsetz="0" width="100"/>
<texture>campaigns/labels/greece_eretria.png</texture>
<textures><texture file="campaigns/labels/greece_eretria.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>terrain_base.xml</material>
</actor>
@@ -4,8 +4,8 @@
<group>
<variant name="decal_campaign_laconia">
<decal angle="45" depth="25" offsetx="0" offsetz="0" width="100"/>
<texture>campaigns/labels/greece_laconia.png</texture>
<textures><texture file="campaigns/labels/greece_laconia.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>terrain_base.xml</material>
</actor>
@@ -4,8 +4,8 @@
<group>
<variant name="decal_campaign_megara">
<decal angle="45" depth="25" offsetx="0" offsetz="0" width="100"/>
<texture>campaigns/labels/greece_megara.png</texture>
<textures><texture file="campaigns/labels/greece_megara.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>terrain_base.xml</material>
</actor>
@@ -4,7 +4,7 @@
<group>
<variant>
<mesh>props/campaigns/hele_trireme_sail.dae</mesh>
<texture>props/hele_sail_star_war.dds</texture>
<textures><texture file="props/hele_sail_star_war.dds" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
@@ -4,7 +4,7 @@
<group>
<variant>
<mesh>props/campaigns/hele_trireme_sideboard.dae</mesh>
<texture>campaigns/structures/hele_trireme.png</texture>
<textures><texture file="campaigns/structures/hele_trireme.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
@@ -4,7 +4,7 @@
<group>
<variant>
<mesh>props/campaigns/hele_trireme_water.dae</mesh>
<texture>campaigns/props/ocean_block.png</texture>
<textures><texture file="campaigns/props/ocean_block.png" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -15,7 +15,7 @@
<prop actor="campaigns/structures/hellenes/settlement_temple.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front_flame.xml" attachpoint="projectile"/>
</props>
<texture>structural/rome_struct_2.png</texture>
<textures><texture file="structural/rome_struct_2.png" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
@@ -4,7 +4,7 @@
<group>
<variant frequency="100" name="hele_curtain_wall_gates">
<mesh>structural/campaign_curtainwallgates_hele.dae</mesh>
<texture>structural/rome_struct_2.png</texture>
<textures><texture file="structural/rome_struct_2.png" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
@@ -4,7 +4,7 @@
<group>
<variant frequency="100" name="hele_curtain_wall_towers">
<mesh>structural/campaign_curtainwalltowers_hele.dae</mesh>
<texture>structural/rome_struct_2.png</texture>
<textures><texture file="structural/rome_struct_2.png" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
@@ -4,7 +4,7 @@
<group>
<variant>
<mesh>structural/campaigns/settlement_houses.dae</mesh>
<texture>structural/rome_struct_2.png</texture>
<textures><texture file="structural/rome_struct_2.png" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
@@ -4,7 +4,7 @@
<group>
<variant>
<mesh>structural/campaigns/settlement_houses2.dae</mesh>
<texture>structural/rome_struct_2.png</texture>
<textures><texture file="structural/rome_struct_2.png" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
@@ -4,7 +4,7 @@
<group>
<variant>
<mesh>structural/campaigns/settlement_temple.dae</mesh>
<texture>structural/rome_hc_01.png</texture>
<textures><texture file="structural/rome_hc_01.png" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
@@ -8,7 +8,7 @@
<props>
<prop actor="campaigns/props/structures/hele_trireme_sail.xml" attachpoint="root"/>
</props>
<texture>campaigns/structures/hele_trireme.png</texture>
<textures><texture file="campaigns/structures/hele_trireme.png" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
@@ -7,7 +7,7 @@
<props>
<prop actor="campaigns/units/mace_alexander.xml" attachpoint="soldier"/>
</props>
<texture>campaigns/units/pedestal_mace_1.png</texture>
<textures><texture file="campaigns/units/pedestal_mace_1.png" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -7,7 +7,7 @@
<props>
<prop actor="campaigns/units/mace_soldier.xml" attachpoint="soldier"/>
</props>
<texture>campaigns/units/pedestal_mace_1.png</texture>
<textures><texture file="campaigns/units/pedestal_mace_1.png" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -7,7 +7,7 @@
<props>
<prop actor="campaigns/units/spart_leonidas.xml" attachpoint="soldier"/>
</props>
<texture>campaigns/units/pedestal_mace_1.png</texture>
<textures><texture file="campaigns/units/pedestal_mace_1.png" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -4,7 +4,7 @@
<group>
<variant>
<mesh>skeletal/campaigns/alexander.dae</mesh>
<texture>campaigns/units/mace_alexander.png</texture>
<textures><texture file="campaigns/units/mace_alexander.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_spec.xml</material>
@@ -4,7 +4,7 @@
<group>
<variant name="army mace soldier">
<mesh>skeletal/campaigns/mace_soldier.dae</mesh>
<texture>campaigns/units/mace_soldier.png</texture>
<textures><texture file="campaigns/units/mace_soldier.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_spec.xml</material>
@@ -4,7 +4,7 @@
<group>
<variant frequency="100" name="army spartan hero leonidas">
<mesh>skeletal/campaigns/spart_leonidas.dae</mesh>
<texture>campaigns/units/spart_leonidas.png</texture>
<textures><texture file="campaigns/units/spart_leonidas.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_spec.xml</material>
@@ -8,7 +8,7 @@
</group>
<group>
<variant frequency="1" name="Fur-Brown">
<texture>skeletal/animal_bear_brown.dds</texture>
<textures><texture file="skeletal/animal_bear_brown.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -16,7 +16,7 @@
</group>
<group>
<variant frequency="100" name="texture">
<texture>skeletal/animal_boar.dds</texture>
<textures><texture file="skeletal/animal_boar.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -15,7 +15,7 @@
</group>
<group>
<variant frequency="100" name="texture">
<texture>skeletal/animal_camel.png</texture>
<textures><texture file="skeletal/animal_camel.png" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -19,10 +19,10 @@
</group>
<group>
<variant frequency="1" name="feathers-red">
<texture>skeletal/animal_chicken.dds</texture>
<textures><texture file="skeletal/animal_chicken.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="feathers-brown">
<texture>skeletal/animal_chicken_b.dds</texture>
<textures><texture file="skeletal/animal_chicken_b.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -4,7 +4,7 @@
<group>
<variant name="crocodile">
<mesh>skeletal/crocodile.dae</mesh>
<texture>null_gray.dds</texture>
<textures><texture file="null_gray.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -12,7 +12,7 @@
<animation file="quadraped/deer_attack_01.dae" name="melee" speed="20"/>
</animations>
<mesh>skeletal/deer_mesh.dae</mesh>
<texture>skeletal/animal_deer.dds</texture>
<textures><texture file="skeletal/animal_deer.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -17,7 +17,7 @@
<group>
<variant frequency="1" name="Fur">
<texture>skeletal/animal_deer.dds</texture>
<textures><texture file="skeletal/animal_deer.dds" name="baseTex"/></textures>
</variant>
</group>
@@ -6,7 +6,7 @@
<group>
<variant frequency="100" name="Base">
<mesh>gaia/temp_deer_2.dae</mesh>
<texture>skeletal/animal_deer.dds</texture>
<textures><texture file="skeletal/animal_deer.dds" name="baseTex"/></textures>
</variant>
</group>
@@ -6,7 +6,7 @@
<group>
<variant frequency="100" name="Base">
<mesh>gaia/temp_deer_3.dae</mesh>
<texture>skeletal/animal_deer.dds</texture>
<textures><texture file="skeletal/animal_deer.dds" name="baseTex"/></textures>
</variant>
</group>
@@ -9,7 +9,7 @@
<animation file="quadraped/donkey_walk_01.dae" name="walk" speed="15"/>
</animations>
<mesh>skeletal/donkey.dae</mesh>
<texture>skeletal/animal_donkey.dds</texture>
<textures><texture file="skeletal/animal_donkey.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -11,7 +11,7 @@
<group>
<variant frequency="100" name="texture">
<texture>skeletal/animal_dragon.dds</texture>
<textures><texture file="skeletal/animal_dragon.dds" name="baseTex"/></textures>
</variant>
</group>
@@ -11,10 +11,10 @@
<group>
<variant frequency="1" name="hide-brown">
<texture>skeletal/animal_elephant.dds</texture>
<textures><texture file="skeletal/animal_elephant.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="hide-gray">
<texture>skeletal/animal_elephant2.dds</texture>
<textures><texture file="skeletal/animal_elephant2.dds" name="baseTex"/></textures>
</variant>
</group>
@@ -4,7 +4,7 @@
<group>
<variant frequency="1" name="elephant_african_bush [infant]">
<mesh>skeletal/elephant_african_baby.dae</mesh>
<texture>skeletal/animal-elephant-base-baby.dds</texture>
<textures><texture file="skeletal/animal-elephant-base-baby.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -4,7 +4,7 @@
<group>
<variant frequency="1" name="elephant_african_bush [adult]">
<mesh>skeletal/elephant_african_bush.dae</mesh>
<texture>skeletal/animal-elephant-base.dds</texture>
<textures><texture file="skeletal/animal-elephant-base.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -3,8 +3,24 @@
<castshadow/>
<group>
<variant frequency="1" name="elephant_african_forest [adult]">
<animations>
<animation file="quadraped/elephant_african_idle_01.dae" name="Idle" speed="25"/>
<animation file="quadraped/elephant_african_idle_01.dae" name="Idle" speed="25"/>
<animation file="quadraped/elephant_african_idle_01.dae" name="Idle" speed="25"/>
<animation file="quadraped/elephant_african_idle_01.dae" name="Idle" speed="25"/>
<animation file="quadraped/elephant_african_idle_02.dae" name="Idle" speed="85"/>
<animation file="quadraped/elephant_african_idle_03.dae" name="Idle" speed="50"/>
<animation file="quadraped/elephant_african_idle_03.dae" name="Idle" speed="75"/>
<animation file="quadraped/elephant_african_idle_03.dae" name="Idle" speed="150"/>
<animation file="quadraped/elephant_african_walk.dae" name="Walk" speed="30"/>
<animation file="quadraped/elephant_african_walk.dae" name="Run" speed="35"/>
<animation file="quadraped/elephant_african_attack.dae" name="Attack" speed="100"/>
<animation file="quadraped/elephant_african_death.dae" name="Death" speed="100"/>
</animations>
<mesh>skeletal/elephant_african_forest.dae</mesh>
<texture>skeletal/animal-elephant-base.dds</texture>
<textures>
<texture file="skeletal/animal-elephant-base.dds" name="baseTex"/>
</textures>
</variant>
</group>
<group>
@@ -4,7 +4,7 @@
<group>
<variant frequency="1" name="elephant_asian [adult male]">
<mesh>skeletal/elephant_asian_male.dae</mesh>
<texture>skeletal/animal-elephant-base.dds</texture>
<textures><texture file="skeletal/animal-elephant-base.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -11,7 +11,7 @@
<group>
<variant frequency="100" name="texture">
<texture>skeletal/animal_fish.dds</texture>
<textures><texture file="skeletal/animal_fish.dds" name="baseTex"/></textures>
</variant>
</group>
@@ -13,7 +13,8 @@
</group>
<group>
<variant frequency="100" name="generic texture">
<texture>skeletal/animal_fish_generic.png</texture>
<textures><texture file="skeletal/animal_fish_generic.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_spec.xml</material>
</actor>
@@ -4,7 +4,7 @@
<group>
<variant name="Fox (Arctic)">
<mesh>skeletal/fox.dae</mesh>
<texture>skeletal/animal_fox_arctic.dds</texture>
<textures><texture file="skeletal/animal_fox_arctic.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -4,7 +4,7 @@
<group>
<variant name="Fox (Red)">
<mesh>skeletal/fox.dae</mesh>
<texture>skeletal/animal_fox_red.dds</texture>
<textures><texture file="skeletal/animal_fox_red.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -18,7 +18,7 @@
<props>
<prop actor="props/fauna/gazelle_horns.xml" attachpoint="antler"/>
</props>
<texture>skeletal/animal_gazelle_02.dds</texture>
<textures><texture file="skeletal/animal_gazelle_02.dds" name="baseTex"/></textures>
</variant>
<variant frequency="5" name="female">
<animations>
@@ -34,7 +34,7 @@
<animation name=""/>
</animations>
<mesh>skeletal/deer_mesh.dae</mesh>
<texture>skeletal/animal_gazelle_02.dds</texture>
<textures><texture file="skeletal/animal_gazelle_02.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -16,10 +16,10 @@
</group>
<group>
<variant frequency="1" name="Light">
<texture>skeletal/animal_giraffe.png</texture>
<textures><texture file="skeletal/animal_giraffe.png" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="Dark">
<texture>skeletal/animal_giraffeb.png</texture>
<textures><texture file="skeletal/animal_giraffeb.png" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -16,10 +16,10 @@
</group>
<group>
<variant name="Light">
<texture>skeletal/animal_giraffe.png</texture>
<textures><texture file="skeletal/animal_giraffe.png" name="baseTex"/></textures>
</variant>
<variant name="Dark">
<texture>skeletal/animal_giraffeb.png</texture>
<textures><texture file="skeletal/animal_giraffeb.png" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -8,10 +8,10 @@
</group>
<group>
<variant frequency="1" name="Hair-dark">
<texture>skeletal/animal_goat.dds</texture>
<textures><texture file="skeletal/animal_goat.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="Hair-light">
<texture>skeletal/animal_goat2.dds</texture>
<textures><texture file="skeletal/animal_goat2.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -8,13 +8,13 @@
</group>
<group>
<variant name="hawk a">
<texture>skeletal/animal_falcon_a.dds</texture>
<textures><texture file="skeletal/animal_falcon_a.dds" name="baseTex"/></textures>
</variant>
<variant name="hawk b">
<texture>skeletal/animal_falcon_b.dds</texture>
<textures><texture file="skeletal/animal_falcon_b.dds" name="baseTex"/></textures>
</variant>
<variant name="hawk c">
<texture>skeletal/animal_falcon_c.dds</texture>
<textures><texture file="skeletal/animal_falcon_c.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
@@ -14,22 +14,22 @@
</group>
<group>
<variant frequency="16" name="black">
<texture>skeletal/horse_black_a.dds</texture>
<textures><texture file="skeletal/horse_black_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="17" name="brown">
<texture>skeletal/horse_brown_a.dds</texture>
<textures><texture file="skeletal/horse_brown_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="16" name="chestnut">
<texture>skeletal/horse_chestnut_a.dds</texture>
<textures><texture file="skeletal/horse_chestnut_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="17" name="dun">
<texture>skeletal/horse_dun_a.dds</texture>
<textures><texture file="skeletal/horse_dun_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="17" name="gray">
<texture>skeletal/horse_gray_a.dds</texture>
<textures><texture file="skeletal/horse_gray_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="17" name="tan">
<texture>skeletal/horse_tan_a.dds</texture>
<textures><texture file="skeletal/horse_tan_a.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -4,7 +4,7 @@
<group>
<variant frequency="100" name="Base">
<mesh>skeletal/horse_new.dae</mesh>
<texture>null_white.dds</texture>
<textures><texture file="null_white.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -16,7 +16,7 @@
</group>
<group>
<variant frequency="100" name="texture">
<texture>skeletal/animal_lion.png</texture>
<textures><texture file="skeletal/animal_lion.png" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -16,7 +16,7 @@
</group>
<group>
<variant frequency="100" name="texture">
<texture>skeletal/animal_lioness.png</texture>
<textures><texture file="skeletal/animal_lioness.png" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -8,7 +8,7 @@
</group>
<group>
<variant frequency="100" name="texture">
<texture>skeletal/animal_muskox.dds</texture>
<textures><texture file="skeletal/animal_muskox.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -13,7 +13,7 @@
<animation file="quadraped/peacock_walk_feeding.dae" name="walk_feeding" speed="25"/>
</animations>
<mesh>skeletal/peacock.dae</mesh>
<texture>skeletal/animal_peacock.png</texture>
<textures><texture file="skeletal/animal_peacock.png" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -4,7 +4,7 @@
<group>
<variant frequency="100" name="Base">
<mesh>skeletal/pig.dae</mesh>
<texture>skeletal/animal_pig_a.dds</texture>
<textures><texture file="skeletal/animal_pig_a.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -8,7 +8,7 @@
<prop actor="particle/flame_catapult.xml" attachpoint="root"/>
<prop actor="particle/smoke.xml" attachpoint="root"/>
</props>
<texture>skeletal/animal_pig_a.dds</texture>
<textures><texture file="skeletal/animal_pig_a.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -4,7 +4,7 @@
<group>
<variant frequency="100" name="Base">
<mesh>gaia/temprabbit.dae</mesh>
<texture>skeletal/animal_rabbit_a.dds</texture>
<textures><texture file="skeletal/animal_rabbit_a.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -3,16 +3,20 @@
<castshadow/>
<float/>
<group>
<variant frequency="1" name="shark_big">
<variant frequency="1" name="shark_great_white">
<animations>
<animation file="quadraped/shark_walk.dae" name="walk" speed="10"/>
</animations>
<mesh>skeletal/shark_a.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="shark_light">
<texture>skeletal/animal_shark.dds</texture>
<textures><texture file="skeletal/animal_shark.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="shark_dark">
<texture>skeletal/animal_sharkdark.dds</texture>
<textures><texture file="skeletal/animal_sharkdark.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_spec.xml</material>
</actor>
@@ -12,7 +12,7 @@
<animation file="quadraped/sheep_death.dae" name="Death" speed="90"/>
</animations>
<mesh>skeletal/sheep.dae</mesh>
<texture>skeletal/animal_sheep_a.dds</texture>
<textures><texture file="skeletal/animal_sheep_a.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -4,7 +4,7 @@
<group>
<variant frequency="100" name="Base">
<mesh>gaia/temp_sheep2.dae</mesh>
<texture>gaia/ani_sheep_a.dds</texture>
<textures><texture file="gaia/ani_sheep_a.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -8,7 +8,7 @@
</group>
<group>
<variant frequency="100" name="texture">
<texture>null_orange.dds</texture>
<textures><texture file="null_orange.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -8,7 +8,7 @@
</group>
<group>
<variant frequency="100" name="texture">
<texture>skeletal/animal_walrus.dds</texture>
<textures><texture file="skeletal/animal_walrus.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -8,7 +8,7 @@
</group>
<group>
<variant frequency="100" name="texture">
<texture>skeletal/animal_whale.dds</texture>
<textures><texture file="skeletal/animal_whale.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -19,7 +19,7 @@
</group>
<group>
<variant frequency="100" name="texture">
<texture>skeletal/animal_whale_fin.png</texture>
<textures><texture file="skeletal/animal_whale_fin.png" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -11,7 +11,7 @@
</group>
<group>
<variant frequency="1" name="pelt">
<texture>skeletal/animal_wildebeest.dds</texture>
<textures><texture file="skeletal/animal_wildebeest.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -8,10 +8,10 @@
</group>
<group>
<variant frequency="1" name="fur-black">
<texture>skeletal/animal_wolf_black.dds</texture>
<textures><texture file="skeletal/animal_wolf_black.dds" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="fur-brown">
<texture>skeletal/animal_wolf_brown.dds</texture>
<textures><texture file="skeletal/animal_wolf_brown.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -8,7 +8,7 @@
</group>
<group>
<variant frequency="1" name="fur-white">
<texture>skeletal/animal_wolf_white.dds</texture>
<textures><texture file="skeletal/animal_wolf_white.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -11,7 +11,7 @@
<animation file="quadraped/zebra_death.dae" name="death" speed="100"/>
</animations>
<mesh>skeletal/zebra.dae</mesh>
<texture>skeletal/animal_zebra.dds</texture>
<textures><texture file="skeletal/animal_zebra.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -4,7 +4,7 @@
<group>
<variant>
<mesh>skeletal/horse.pmd</mesh>
<texture>skeletal/animal_zebra_2.png</texture>
<textures><texture file="skeletal/animal_zebra_2.png" name="baseTex"/></textures>
</variant>
</group>
</actor>
@@ -3,13 +3,13 @@
<castshadow/>
<group>
<variant frequency="2" name="Texture-Branches-1">
<texture>gaia/aleppo_pine.dds</texture>
<textures><texture file="gaia/aleppo_pine.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="Texture-Branches-2">
<texture>gaia/aleppo_pine_test.dds</texture>
<textures><texture file="gaia/aleppo_pine_test.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="Texture-Branches-3">
<texture>gaia/aleppo_pine_test2.dds</texture>
<textures><texture file="gaia/aleppo_pine_test2.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -23,5 +23,5 @@
<mesh>gaia/tree_pine_aleppo_3.dae</mesh>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -32,13 +32,13 @@
<group>
<variant frequency="1" name="trunk_texture_a">
<texture>gaia/trunk_deciduous_a.dds</texture>
<textures><texture file="gaia/trunk_deciduous_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="trunk_texture_b">
<texture>gaia/trunk_deciduous_b.dds</texture>
<textures><texture file="gaia/trunk_deciduous_b.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -8,14 +8,14 @@
</group>
<group>
<variant name="a-bloom">
<texture>gaia/tree_apple_bloom.dds</texture>
<textures><texture file="gaia/tree_apple_bloom.dds" name="baseTex"/></textures>
</variant>
<variant name="a-ripe">
<texture>gaia/tree_apple_a.dds</texture>
<textures><texture file="gaia/tree_apple_a.dds" name="baseTex"/></textures>
</variant>
<variant name="a-ripe2">
<texture>gaia/orchard_apple_a.dds</texture>
<textures><texture file="gaia/orchard_apple_a.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -8,14 +8,14 @@
</group>
<group>
<variant name="b-bloom">
<texture>gaia/tree_apple_bloom.dds</texture>
<textures><texture file="gaia/tree_apple_bloom.dds" name="baseTex"/></textures>
</variant>
<variant name="b-ripe">
<texture>gaia/tree_apple_a.dds</texture>
<textures><texture file="gaia/tree_apple_a.dds" name="baseTex"/></textures>
</variant>
<variant name="b-ripe2">
<texture>gaia/orchard_apple_a.dds</texture>
<textures><texture file="gaia/orchard_apple_a.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -8,14 +8,14 @@
</group>
<group>
<variant name="c-bloom">
<texture>gaia/tree_apple_bloom.dds</texture>
<textures><texture file="gaia/tree_apple_bloom.dds" name="baseTex"/></textures>
</variant>
<variant name="c-ripe">
<texture>gaia/tree_apple_a.dds</texture>
<textures><texture file="gaia/tree_apple_a.dds" name="baseTex"/></textures>
</variant>
<variant name="c-ripe2">
<texture>gaia/orchard_apple_a.dds</texture>
<textures><texture file="gaia/orchard_apple_a.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -8,14 +8,14 @@
</group>
<group>
<variant name="d-bloom">
<texture>gaia/tree_apple_bloom.dds</texture>
<textures><texture file="gaia/tree_apple_bloom.dds" name="baseTex"/></textures>
</variant>
<variant name="d-ripe">
<texture>gaia/tree_apple_a.dds</texture>
<textures><texture file="gaia/tree_apple_a.dds" name="baseTex"/></textures>
</variant>
<variant name="d-ripe2">
<texture>gaia/orchard_apple_a.dds</texture>
<textures><texture file="gaia/orchard_apple_a.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -37,7 +37,8 @@
</group>
<group>
<variant>
<texture>gaia/trunk_baobab.dds</texture>
<textures><texture file="gaia/trunk_baobab.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
@@ -8,14 +8,14 @@
</group>
<group>
<variant frequency="1" name="leaf-color-a">
<texture>gaia/tree_baobab_a.dds</texture>
<textures><texture file="gaia/tree_baobab_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="leaf-color-b">
<texture>gaia/tree_baobab_b.dds</texture>
<textures><texture file="gaia/tree_baobab_b.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="leaf-color-c">
<texture>gaia/tree_carob_c.dds</texture>
<textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -11,16 +11,16 @@
<group>
<variant frequency="1" name="leaf-color-a">
<texture>gaia/tree_carob_a.dds</texture>
<textures><texture file="gaia/tree_carob_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="leaf-color-b">
<texture>gaia/tree_carob_b.dds</texture>
<textures><texture file="gaia/tree_carob_b.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="leaf-color-c">
<texture>gaia/tree_carob_c.dds</texture>
<textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -11,16 +11,16 @@
<group>
<variant frequency="1" name="leaf-color-a">
<texture>gaia/tree_carob_a.dds</texture>
<textures><texture file="gaia/tree_carob_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="leaf-color-b">
<texture>gaia/tree_carob_b.dds</texture>
<textures><texture file="gaia/tree_carob_b.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="leaf-color-c">
<texture>gaia/tree_carob_c.dds</texture>
<textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -8,14 +8,14 @@
</group>
<group>
<variant frequency="1" name="leaf-color-a">
<texture>gaia/tree_carob_a.dds</texture>
<textures><texture file="gaia/tree_carob_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="leaf-color-b">
<texture>gaia/tree_carob_b.dds</texture>
<textures><texture file="gaia/tree_carob_b.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="leaf-color-c">
<texture>gaia/tree_carob_c.dds</texture>
<textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -41,7 +41,7 @@
</group>
<group>
<variant name="trunk-texture">
<texture>gaia/trunk_deciduous_b.dds</texture>
<textures><texture file="gaia/trunk_deciduous_b.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
@@ -56,4 +56,5 @@
</props>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
@@ -23,17 +23,17 @@
</group>
<group>
<variant frequency="3" name="leaf-texture-a">
<texture>gaia/tree_carob_a.dds</texture>
<textures><texture file="gaia/tree_carob_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="3" name="leaf-texture-b">
<texture>gaia/tree_carob_b.dds</texture>
<textures><texture file="gaia/tree_carob_b.dds" name="baseTex"/></textures>
</variant>
<variant frequency="3" name="leaf-texture-c">
<texture>gaia/tree_carob_c.dds</texture>
<textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="leaf-texture-d">
<texture>gaia/tree_carob_d.dds</texture>
<textures><texture file="gaia/tree_carob_d.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -4,8 +4,8 @@
<group>
<variant>
<mesh>gaia/cypress_test.dae</mesh>
<texture>gaia/tree_cypress_b.png</texture>
<textures><texture file="gaia/tree_cypress_b.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -8,10 +8,10 @@
<animations/>
<mesh>gaia/tree_dead_a_1.dae</mesh>
<props/>
<texture>gaia/tree_dead.dds</texture>
<textures><texture file="gaia/tree_dead.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -8,10 +8,10 @@
<animations/>
<mesh>gaia/tree_dead_a_2.dae</mesh>
<props/>
<texture>gaia/tree_dead.dds</texture>
<textures><texture file="gaia/tree_dead.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -8,10 +8,10 @@
<animations/>
<mesh>gaia/tree_deciduous_a_1.dae</mesh>
<props/>
<texture>gaia/oak-trees.dds</texture>
<textures><texture file="gaia/oak-trees.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -8,10 +8,10 @@
<animations/>
<mesh>gaia/tree_deci_a_1_la_100.dae</mesh>
<props/>
<texture>gaia/oak-trees.dds</texture>
<textures><texture file="gaia/oak-trees.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>
@@ -8,10 +8,10 @@
<animations/>
<mesh>gaia/tree_deci_a_1_la_50.dae</mesh>
<props/>
<texture>gaia/oak-trees.dds</texture>
<textures><texture file="gaia/oak-trees.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
<material>basic_trans_wind.xml</material>
</actor>

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