Compare commits

417 Commits

Author SHA1 Message Date
historic_bruno 4c9cd2921d Replaces splash screen with fundraiser message
This was SVN commit r13796.
2013-09-01 23:56:50 +00:00
leper 53a5781c66 Increase simulation script runtime size again. Refs #1436, #1966 and #2035.
This was SVN commit r13794.
2013-09-01 23:29:21 +00:00
Mythos_Ruler 6070cd01fa Reduced "grazing" time for whales.
This was SVN commit r13793.
2013-09-01 22:06:23 +00:00
Mythos_Ruler c3dcde7e34 Alpha version number.
This was SVN commit r13792.
2013-09-01 20:47:02 +00:00
Mythos_Ruler 3774b2051d This was SVN commit r13790. 2013-09-01 04:22:28 +00:00
Enrique 4ac19dff05 fixed maur_struct
This was SVN commit r13789.
2013-08-31 22:08:48 +00:00
Mythos_Ruler 4dd1397e15 Mauryans and Britons now start with a cav skirm in addition to their special starting unit (Worker Elephant and War Dog respectively).
Fixed a unit availability thing for Macedonians.

This was SVN commit r13788.
2013-08-31 19:27:37 +00:00
Mythos_Ruler cc08c81faf Tweaks to barracks and blacksmith tips.
This was SVN commit r13787.
2013-08-31 19:23:16 +00:00
Mythos_Ruler 0bd22649f0 Tweaked Army Camp tip text.
Adjusted max gatherers for pyramid ruins.

New 'Blacksmith' loading tip.

This was SVN commit r13786.
2013-08-31 12:26:17 +00:00
Mythos_Ruler 66ab19086a Updated Stoa tip image.
Updated Persian Architecture tip text.

Adjusted upward the number of max gatherers for small mines and the
unfinished Greek temple ruin.

Tweaked Cycladic Archipelago 6 (fixed fish and treasure positions).

Tweaked Gold Oasis 1 (made it possible to build a civic center in the
middle of the "Gold Patches."

Adjusted the Spartan House history entry, based on text by contributor
Thorfinn the Shallow Minded.

This was SVN commit r13785.
2013-08-30 22:35:15 +00:00
stwf df190cbbd1 fix issues with menu mode and playlist, harden code and clear out ambient noises at game end, fixes #2066
This was SVN commit r13784.
2013-08-29 13:20:55 +00:00
Mythos_Ruler 3047470858 Reduced volume for fishing boat movement sound and construction hammering sounds.
This was SVN commit r13783.
2013-08-29 12:46:48 +00:00
wraitii de85408e3b Fix fishing boats not being able to gather from whales. Reported on the forums by Gildas.
This was SVN commit r13782.
2013-08-29 11:26:02 +00:00
Enrique 24ff1371b8 Upgraded greek temples an assigned one variation per civ.
This was SVN commit r13780.
2013-08-27 23:48:22 +00:00
historic_bruno 15586778bb Disables frame-pointer omission in VC++ 2008 projects, fixes stack dump in release build, fixes #2078
This was SVN commit r13779.
2013-08-27 02:42:56 +00:00
Enrique 56d535b7c5 Effects added to hellenic stoas. Only temples to go yay!
This was SVN commit r13778.
2013-08-27 00:04:05 +00:00
Enrique c6d361a76f added effects and upgraded greek docks for each greek civ
This was SVN commit r13777.
2013-08-26 23:19:35 +00:00
sanderd17 89e69af987 let maurian elephant corpse sink fast, temporary fix until there is a real corpse
This was SVN commit r13776.
2013-08-26 17:42:09 +00:00
sanderd17 e79c2aa953 make all Iberian buildings available in the sandbox map (add walls, blacksmith and fire ship)
This was SVN commit r13775.
2013-08-26 11:38:41 +00:00
Enrique 0b670f88af Updated spart syssiton, mace lybrary and helenic market with effects and little fixes
This was SVN commit r13774.
2013-08-26 08:29:18 +00:00
alpha123 89430de468 Okay, do what f5ab6255d0 was supposed to do.
This was SVN commit r13773.
2013-08-26 04:17:26 +00:00
alpha123 b10a01645f Revert f5ab6255d0. I accidentally somehow committed my whole working tree on this computer....
This was SVN commit r13772.
2013-08-26 04:15:36 +00:00
alpha123 f5ab6255d0 General scrollbar improvements. Patch by Josh. Fixes #2080.
- Don't show the scrollbar when the contents aren't overflowing the
visible area.
- Fix bugs in minimum bar sizing.
- Add capability to set a maximum bar size.
- Correct outdated/incorrect comments.

This was SVN commit r13771.
2013-08-26 03:06:08 +00:00
leper 2dc0c40ff0 Fix some errors.
This was SVN commit r13770.
2013-08-26 01:26:35 +00:00
Mythos_Ruler e75765faae Fixed some Greek corral prop problems.
Fixed Storehouses tip.

Fixed the names for ALL Iberian units and buildings.

Added a build restriction for the Iberian Monument.

This was SVN commit r13769.
2013-08-25 22:20:09 +00:00
leper ff6b3e5725 Properly fix #2079.
This was SVN commit r13768.
2013-08-25 22:05:41 +00:00
sanderd17 7a96a3161b fix whale altitude (no floating whales). See aa95f3420d.
This was SVN commit r13767.
2013-08-25 18:59:36 +00:00
Mythos_Ruler 035d33dc33 'Crop Rotation' tech for the Gallic Rotary Mill.
This was SVN commit r13766.
2013-08-25 17:57:20 +00:00
Mythos_Ruler 7c0dfc0d82 Fixed a couple tips.
This was SVN commit r13765.
2013-08-25 17:36:55 +00:00
Mythos_Ruler acf899bb47 Fixed some Corral errors.
Fixed some Persian building stuff.

This was SVN commit r13764.
2013-08-25 17:36:34 +00:00
Mythos_Ruler 292ce925c6 Cast Shadow flag enabled on this actor.
This was SVN commit r13763.
2013-08-25 11:04:14 +00:00
Enrique 2c66383461 Added effects to athen_prytaneion
This was SVN commit r13762.
2013-08-25 10:24:34 +00:00
wraitii 52f947fd77 Check that we still have build orders for our attack plan. Temporarily fixes #2082 for A14.
This was SVN commit r13761.
2013-08-25 08:20:40 +00:00
Enrique 589e8d2ae8 Updated and added effects to greek gymnasion, storehouse, corral and epic temple (athenian wonder parthenon)
This was SVN commit r13760.
2013-08-25 01:02:22 +00:00
Mythos_Ruler ce9432bf3d Proper selection ring for whales.
Edited Mauryan civ info.

Added preview image for Cycladic Archipelago 6.

This was SVN commit r13759.
2013-08-24 22:30:28 +00:00
Mythos_Ruler d49476ac8d Increased armor for promoted Skirmish Cavalry. Previously this was neglected or missed.
This was SVN commit r13758.
2013-08-24 21:11:59 +00:00
sanderd17 247e45a6b5 fix quinquereme splash damage
This was SVN commit r13757.
2013-08-24 16:07:03 +00:00
sanderd17 11f663d761 fix history description to match with in-game numbers. Reported by scythetwirerler. Part 2
This was SVN commit r13756.
2013-08-24 15:33:59 +00:00
sanderd17 087e5f9c3e fix history description to match with in-game numbers. Reported by scythetwirerler
This was SVN commit r13755.
2013-08-24 15:30:52 +00:00
Ykkrosh 14a73204dd Disable distance-sorting for most transparent objects
Distance-sorting of the alpha-blend pass of objects like trees and grass
is quite expensive (partly the cost of sorting, partly the cost of being
unable to batch efficiently), and the effect on visual quality is
typically very hard to see (the alpha-test pass does most of the work
for
objects that aren't fully translucent). That's not a good tradeoff, so
turn it off.

Leave distance sorting enabled for e.g. waterfalls since it might make a
more noticeable difference for them.

This was SVN commit r13753.
2013-08-24 14:48:02 +00:00
wraitii f106d7714a Fix a swap between reflections and refractions in config.cfg . Disabling "Render Reflections" now reverts to the skybox for better results.
Allows to oversaturate in Atlas' HDR settings.

This was SVN commit r13752.
2013-08-24 14:44:38 +00:00
leper 9d933087b3 Fix #2079.
This was SVN commit r13751.
2013-08-24 14:24:37 +00:00
wraitii 957c51727b Improve on-water shadows. Fix an issue with foam looking static. Add anisotropic filtering (x4) to the water normal texture for testing.
This was SVN commit r13750.
2013-08-24 14:12:39 +00:00
Mythos_Ruler aa95f3420d Cleaned up and fixed the whale templates. Still need a custom selection ring.
Made Carthaginian Sacred Band Infantry and Cavalry cost metal instead of
wood.

Updated Cycladic Archipelago 6.

This was SVN commit r13749.
2013-08-24 13:31:25 +00:00
sanderd17 40af0917ca let gaul and brit healers upgrade to their local templates instead of the generic celtic templates. Fix double-click to select all healers after one of the healers upgraded.
This was SVN commit r13748.
2013-08-24 13:09:53 +00:00
wraitii 630301918c Fix the command line -autostart-aidiff to default to 2 (new medium)
This was SVN commit r13746.
2013-08-24 09:55:06 +00:00
Enrique ced59bcfa1 Updated hellenic defense tower with new effects.
This was SVN commit r13745.
2013-08-24 00:19:52 +00:00
alpha123 6963f8c067 Adjust cavaly swordsmen advanced and elite stats. Change attack from 21 -> 12 and 22 -> 14 (since the basic rank's attack is 10), and change armor from 4 -> 6 and 6 -> 7 (since the basic rank's armor is 5).
This was SVN commit r13744.
2013-08-23 18:46:18 +00:00
Enrique 1544bad62a Updated greek theatron for all greek civs. (AO + normal + spec)
This was SVN commit r13743.
2013-08-23 18:05:56 +00:00
Enrique efda9d5e33 Updated greek farmstead
This was SVN commit r13742.
2013-08-23 12:36:04 +00:00
janwas c1dcbe4176 update TLB table
refs #2074

This was SVN commit r13741.
2013-08-23 06:42:48 +00:00
Enrique e19bffa88f hele fortress gate textures
This was SVN commit r13740.
2013-08-22 14:57:14 +00:00
Enrique 5050dcf261 Upgraded and cleaned up hellenic fortress. Shield props now displays depending on faction. (AO + normal + spec)
This was SVN commit r13739.
2013-08-22 14:56:11 +00:00
Mythos_Ruler 18c0b17126 Fixes #2069.
This was SVN commit r13738.
2013-08-22 13:10:38 +00:00
historic_bruno 0a0bd83cf0 Adds L4 cache detection for some new Haswell CPUs, fixes #2074
This was SVN commit r13736.
2013-08-21 23:18:35 +00:00
Enrique 3174d16256 Updated greek civs barracks, added ao, spec and normals
This was SVN commit r13735.
2013-08-21 22:58:31 +00:00
Ykkrosh deb64d36fc Fix rendering artifacts with novbo=true gentangents=true
glDrawRangeElements needs to know the range of vertexs that are used
by the index array. With VBOs it doesn't really matter if the range
is wrong (all the vertexes are in GPU memory anyway), but with CPU
vertex arrays the driver has to memcpy the given range of data, so
incorrect bounds will result in garbage data being rendered.

With gentangents, the rendered mesh can have more vertexes than the
original CModelDef, but was rendered with the CModelDef's vertex count.

Use the correct vertex count instead.

Refs #2050.

This was SVN commit r13734.
2013-08-21 21:01:32 +00:00
sanderd17 9c4801e107 add splash damage to quinquereme
This was SVN commit r13733.
2013-08-21 19:52:50 +00:00
Enrique 73773e61d0 Spart CC small fix
This was SVN commit r13732.
2013-08-21 17:48:59 +00:00
Mythos_Ruler 827ec20b1f Made the Cart trade ship avail in Village phase as a kind of "sea trade" bonus for them.
This was SVN commit r13731.
2013-08-21 17:27:28 +00:00
Enrique d94e1d8ed3 Spartan CC modified. Doric columns adjusted
This was SVN commit r13730.
2013-08-21 17:03:47 +00:00
Mythos_Ruler 70dfd1f803 Cavalry Swordsmen stats rebalanced.
This was SVN commit r13729.
2013-08-21 15:55:13 +00:00
Mythos_Ruler 081707039a Updated Cycladic Archipelago 6. Both sides now playable.
This was SVN commit r13728.
2013-08-21 15:20:27 +00:00
sanderd17 035542e76c revert wrong changes to support and female_citizen template
This was SVN commit r13727.
2013-08-21 09:55:42 +00:00
sanderd17 605852fccf Fix function that decides which units can have which formations, and remove formations for animals and the maurian worker elephant
This was SVN commit r13726.
2013-08-21 09:53:59 +00:00
historic_bruno 52d6a8036d This was SVN commit r13725. 2013-08-21 05:37:28 +00:00
historic_bruno f947fa6afe Fixes stack overflow in stack dump logic, by special-casing boost::unordered types, fixes #1813.
Adds INIT_HAVE_DISPLAY_ERROR init flag to correctly override
ah_display_error in Atlas (InitVfs was overriding it again), but don't
use it because it's ugly and broken, refs #1729

This was SVN commit r13724.
2013-08-20 21:07:42 +00:00
Enrique 3843ae6bb0 Greek houses upgrade. (eyecandy, ao, normal, spec)
This was SVN commit r13723.
2013-08-20 16:41:10 +00:00
sanderd17 c5296b9246 Fix maurian elephants being unable to build stuff. Caused by enlarging the elephant obstruction radius.
This was SVN commit r13721.
2013-08-20 09:39:01 +00:00
wraitii ee877a46c7 Switch X and Z loops in the foam generation, possible speed improvement.
This was SVN commit r13720.
2013-08-20 08:55:33 +00:00
historic_bruno e3b9f17c19 Removes useless "old maps" filter from match setup, refs #2071
This was SVN commit r13719.
2013-08-20 02:28:49 +00:00
historic_bruno 68822e3418 Adds more information to construction command debugging
This was SVN commit r13717.
2013-08-19 23:18:18 +00:00
leper 54bbbb9797 Boost 1.54 deprecates Boost.Signal. Use Boost.Signal2 for >= 1.54.
This was SVN commit r13716.
2013-08-19 22:11:54 +00:00
historic_bruno 0b4fe2ef94 Tweaks game speed dropdown more, refs #2046
This was SVN commit r13715.
2013-08-19 20:00:26 +00:00
Ykkrosh 1739a381c1 Fix crash when editing terrain near map edges.
The values in CMessageTerrainChanged can be overestimates that exceed
the normal map boundaries, and should be clamped before looping over
them.

This was SVN commit r13714.
2013-08-19 19:19:34 +00:00
leper 0ca841b92b Suppress unused local typedef warnings when including SpiderMonkey headers.
This was SVN commit r13713.
2013-08-19 18:26:44 +00:00
Mythos_Ruler 4d9b81f40e This was SVN commit r13712. 2013-08-19 18:09:09 +00:00
Mythos_Ruler 30c194a804 Starting units re-adjusted.
This was SVN commit r13711.
2013-08-19 15:42:46 +00:00
wraitii 3783d0e14c Fix flying unit not crashing in water when they should. Patch by scythewirler. refs #2067
This was SVN commit r13710.
2013-08-19 14:44:15 +00:00
leper 0c16980408 Fix tests.
This was SVN commit r13709.
2013-08-19 10:55:35 +00:00
wraitii 03bf727d9a Fix deactivation of HQ waviness causing the specular effect to go crazy.
This was SVN commit r13708.
2013-08-19 10:19:21 +00:00
historic_bruno b770c41f0b Removes shadow casting and receiving on preview entities, patch started by ericb, fixes #1771
This was SVN commit r13706.
2013-08-18 22:17:57 +00:00
Pureon 63a0b4ae98 projectile point for mauryan elephant archer
This was SVN commit r13705.
2013-08-18 20:42:42 +00:00
Enrique 2637540ce2 Spart CC centre upgrade with doric capitels +AO and effects
This was SVN commit r13704.
2013-08-18 18:02:18 +00:00
Enrique ab6d15c414 Macedonian CC mesh and AO fix
This was SVN commit r13703.
2013-08-18 16:16:53 +00:00
Ykkrosh 0888cf6c23 Fix Linux build
This was SVN commit r13701.
2013-08-18 11:28:52 +00:00
RedFox bf7cd1fcbd Undo-d the commit due to general panic about GLSL.
This was SVN commit r13700.
2013-08-18 11:15:29 +00:00
wraitii 29b5021f97 Fix my previous commit because obviously I had forgotten something.
This was SVN commit r13699.
2013-08-18 09:42:02 +00:00
wraitii a4707bcc16 Change the water manager so incremental updates to the water information is possible. Streamline a few things (and removes a not-really-used calculation to speed things up further). Fixes #2063 , refs #1743.
This was SVN commit r13698.
2013-08-18 09:27:11 +00:00
sanderd17 557c1fc067 fix (dis)allowing of garrisoning by other components. Refs #2067
This was SVN commit r13697.
2013-08-18 08:23:36 +00:00
historic_bruno 92f4391f51 Adds tech template support to checkrefs.pl
This was SVN commit r13696.
2013-08-18 02:52:05 +00:00
historic_bruno 791d392797 Fixes and improves terrain scanning of checkrefs.pl.
Removes some useless old actors.

This was SVN commit r13695.
2013-08-18 01:57:37 +00:00
alpha123 a18262e7b1 Make planes about 20% cooler. Fixes #2067.
This was SVN commit r13694.
2013-08-17 22:55:16 +00:00
historic_bruno abce308281 Renames confusing grass1_spring.png terrain texture, used for fancy grass effect, refs #2069
This was SVN commit r13693.
2013-08-17 22:16:01 +00:00
sanderd17 f25bbda672 fix typo for garrisoned archer classes. Reported by scythetwirler.
This was SVN commit r13692.
2013-08-17 20:34:28 +00:00
Enrique 90b75c95ea Macedonians CC upgraded with corinthian capitel + AO and normals
This was SVN commit r13691.
2013-08-17 18:32:41 +00:00
Mythos_Ruler a6c28ae461 Altered footprint of some elephant units.
This was SVN commit r13690.
2013-08-17 16:16:37 +00:00
Enrique fdc1f3a043 increased mauryan blacksmith size
This was SVN commit r13689.
2013-08-17 14:47:44 +00:00
Mythos_Ruler 3a2eec841c Adjusted max gatherers for these trees.
This was SVN commit r13688.
2013-08-17 14:26:43 +00:00
Mythos_Ruler 998dc21676 Removed old Aegis folder.
This was SVN commit r13687.
2013-08-17 14:12:25 +00:00
Enrique 42d77129cc rome blacksmith fix
This was SVN commit r13686.
2013-08-17 14:07:48 +00:00
Enrique 9763b9076c Upgraded roman blacksmith
This was SVN commit r13685.
2013-08-17 14:04:08 +00:00
sanderd17 a9c71e39a4 make new elevation tool more drastic + add RMB action
This was SVN commit r13684.
2013-08-17 14:02:18 +00:00
wraitii bcf7115b5c Fix Aegis to work properly for A14, also rename the folder from "qbot-wc" to "aegis" (thus apparent huge number of changes). Adds a "sandbox" difficulty setting that will never attack, collect resources 50% slower, and is pop-capped at 70 for beginners.
This was SVN commit r13683.
2013-08-17 13:59:53 +00:00
Mythos_Ruler 38b52f9ff0 Fixed a broken texture link.
This was SVN commit r13682.
2013-08-17 12:51:11 +00:00
Enrique 723a3ec8b5 Fixed kart_embassy_italiote.dae
This was SVN commit r13681.
2013-08-17 12:41:37 +00:00
Mythos_Ruler 2d4c3d72c6 Removed the old dds file from these actors.
This was SVN commit r13680.
2013-08-17 12:18:50 +00:00
Mythos_Ruler cdd2c74d44 Superfluous textures deleted.
This was SVN commit r13679.
2013-08-17 11:38:49 +00:00
RedFox 960615aa53 PreferGLSL = true as long as GenTangents = true.
This is for GLSL migration in the long run.

This was SVN commit r13678.
2013-08-17 11:13:36 +00:00
Mythos_Ruler b818a54b06 Tweaked some maps.
Updated some "tips" images.

Tweaked civ center radius and town phase radius boost.

Added some clarification language to the Farm Field tooltip.

This was SVN commit r13677.
2013-08-17 10:15:38 +00:00
sanderd17 b5888f4e45 generalise kill vs eject garrisoned entities on death of garrisonHolder
This was SVN commit r13676.
2013-08-17 09:26:17 +00:00
historic_bruno d37d3be5d0 Fixes Attack component schema
This was SVN commit r13674.
2013-08-17 06:02:31 +00:00
sanderd17 b820f6e6ae Add a pike elevation tool to make sharp pointed mountains. Fixes #2059
This was SVN commit r13672.
2013-08-16 14:46:54 +00:00
sanderd17 fe0ec1c720 fix coding style for buildingAI. Refs #2010
This was SVN commit r13671.
2013-08-16 12:17:18 +00:00
sanderd17 fd2245c53c Improved building AI. Refs #2010
This was SVN commit r13670.
2013-08-16 11:17:36 +00:00
Enrique cc0ba8e246 Missing maur blacksmith struct_b
This was SVN commit r13669.
2013-08-16 04:50:44 +00:00
sanderd17 d66edf5958 fix a bug that ignored resetting XZ rotation to zero, reported by sythetwirler
This was SVN commit r13668.
2013-08-15 22:16:51 +00:00
sanderd17 81b29bf18d fix line wrapping when big number of gatherers on one resource
This was SVN commit r13667.
2013-08-15 20:00:55 +00:00
sanderd17 675b3c40be fix bouncing projectiles, patch by Markus. Fixes #769
This was SVN commit r13664.
2013-08-15 19:01:10 +00:00
historic_bruno 7ff167e7de Removes more unused variables, based on patch by Markus, refs #1852.
Adds TODOs to use POT textures in fancy water rendering.

This was SVN commit r13663.
2013-08-15 18:25:32 +00:00
Enrique 6d3901faf7 Added mauryan blacksmith with AO. Updated mauryan struct textures
This was SVN commit r13662.
2013-08-15 17:17:25 +00:00
sanderd17 6b316f6ce1 fix tests breaking caused by 4421787281. Refs #2062
This was SVN commit r13661.
2013-08-15 08:56:14 +00:00
sanderd17 4421787281 interpollate y offset for smooth climbing and landing of flying objects. refs #2062
This was SVN commit r13660.
2013-08-15 08:44:06 +00:00
historic_bruno 1712b0f42d Increases simulation script runtime to 32 MB to reduce OOM errors, refs #1436, #1966, #2035
This was SVN commit r13659.
2013-08-15 05:15:54 +00:00
alpha123 4e709f2c9c Implement landing and go-around for UnitMotionFlying. Patch by scythetwirler. Fixes #2062.
This was SVN commit r13658.
2013-08-15 03:10:04 +00:00
sanderd17 b6fe589ae3 fix health regeneration for negative values (reported by Mythos_Ruler)
This was SVN commit r13657.
2013-08-14 08:33:29 +00:00
alpha123 2307509088 Remove the old diminishing returns formula (I accidentally left it as a comment). Also, I forgot to credit scythetwirler (who came up with the new formula) in the previous commit.
This was SVN commit r13656.
2013-08-14 05:16:09 +00:00
alpha123 cc02eabdd0 Change the formula for diminishing returns to something less flawed. Also add a lot of comments explaining how it works.
This was SVN commit r13655.
2013-08-14 05:14:20 +00:00
sanderd17 598c05e056 clean UnitAI move to attack range code + fix possible bug
This was SVN commit r13654.
2013-08-13 15:11:17 +00:00
Mythos_Ruler ba244b509c Fixed the portrait for this tech.
Adjusted water a little bit for these scenarios.

This was SVN commit r13653.
2013-08-13 00:55:47 +00:00
historic_bruno c709105355 Clarifies control group HotKeys
This was SVN commit r13652.
2013-08-12 23:50:18 +00:00
Mythos_Ruler 6925d493fe This was SVN commit r13651. 2013-08-12 23:40:24 +00:00
alpha123 d74ed3f1ae Increase farming speed by 46% for females and 42% for males. Combined with diminishing returns it was waaay too slow prior to this commit.
This was SVN commit r13650.
2013-08-12 23:17:30 +00:00
alpha123 3d1e693148 Enable diminishing returns for farms.
(Yeah yeah, somehow I forgot this when I committed the actual
functionality.)

This was SVN commit r13649.
2013-08-12 23:11:39 +00:00
Mythos_Ruler c44efe6c8c Spartan tech "Agoge" altered. Moved to Syssiton from Civ Center.
Unit tooltips cleaned up a bit. Made to look neater in-game.

This was SVN commit r13648.
2013-08-12 21:53:53 +00:00
sanderd17 1aaca7e6e3 health regeneration
This was SVN commit r13647.
2013-08-12 17:45:18 +00:00
alpha123 96cef624e3 Fix compiling tests on ARM. Patch by Josh.
This was SVN commit r13646.
2013-08-12 03:12:57 +00:00
historic_bruno 1ffb74b336 Adjusts session game speed dropdown, fixes #2046
This was SVN commit r13645.
2013-08-11 20:49:41 +00:00
Pureon 066c542e36 Template tweaks to palace
This was SVN commit r13644.
2013-08-11 12:09:10 +00:00
Pureon a552a3cb8b Persian Palace structure
This was SVN commit r13643.
2013-08-11 12:02:36 +00:00
Enrique b8fb2e1697 Added helle_struct_b parallax/normal map and specular. Applied on greek blacksmith. Improved helle_struct specular map
This was SVN commit r13642.
2013-08-11 08:49:15 +00:00
Mythos_Ruler 46f091a154 Added the Athenian civ bonus "Silver Owls" which gives them +10% metal gathering rates when upgrading phases.
Made "Delian League" (faster building ships) a team bonus. Need some new
code to make it apply to allies too.

Made farming slower.

This was SVN commit r13641.
2013-08-09 22:37:05 +00:00
Spahbod 3f0354943f Polishing thePolishing the Random Maps: Archipelago, English Channel, Islands, Lake, Lorraine Plain, Migration, Neareastern Badlands, Northern Lights, Oasis, Persian Highlands.
This was SVN commit r13640.
2013-08-09 12:30:59 +00:00
Mythos_Ruler c8b8dd24e6 This was SVN commit r13639. 2013-08-09 00:03:51 +00:00
Mythos_Ruler b0ceef39b9 Hellenic building bonus deleted from templates and moved to a tech.
Some updated portraits.

This was SVN commit r13638.
2013-08-08 23:55:13 +00:00
alpha123 93abbae435 Fix build issues on ARM. Patch by Josh. Fixes #2049.
This was SVN commit r13634.
2013-08-07 05:00:46 +00:00
leper dc722d76f3 Fix tests. Refs #1960.
This was SVN commit r13632.
2013-08-06 22:32:46 +00:00
Spahbod bff070c6cb Polishing the Random Maps: Gulf of Bothnia, Hyrcanian Shores, Islands, Kerala, Lake, Latium.
This was SVN commit r13630.
2013-08-04 12:31:43 +00:00
historic_bruno 4a805fb05c Updates keys.txt with new keynames, refs #2043
This was SVN commit r13628.
2013-08-03 20:39:15 +00:00
historic_bruno 5a1ddd7cf9 Improves hotkey support for non-QWERTY keyboards, patch by lsdh, fixes #2043
This was SVN commit r13627.
2013-08-03 20:09:29 +00:00
alpha123 8c74df2acd Give an elevation advantage to ranged units. Patch by sanderd17. Fix #1960.
This was SVN commit r13626.
2013-08-03 19:20:20 +00:00
Spahbod 3b294d3ad4 Revised Persian names.
This was SVN commit r13625.
2013-08-03 16:14:17 +00:00
Enrique 4f7ba84fd6 Modified athens CC to have Ionic columns and AO map.
Added normal and spec maps for several greek struct and props textures.

This was SVN commit r13624.
2013-08-02 23:03:55 +00:00
Mythos_Ruler c8830ea769 Specific Name for Mauryan blacksmith.
This was SVN commit r13623.
2013-08-01 22:00:20 +00:00
Spahbod 17fd4fab94 Polishing the Random Maps: Fortress, Gear, Guadalquivir River
This was SVN commit r13622.
2013-08-01 17:58:51 +00:00
leper 70d072577b ;
This was SVN commit r13621.
2013-07-31 22:25:24 +00:00
leper f6e0c4c5a4 Split up cheats into multiple files. Patch by lsdh/ldsh. Fixes #2019.
Replace buggy hasAllies with the inlined check if we have a team at all.
Fix setting of starting resources (broken in 58fa0c7c58).

This was SVN commit r13620.
2013-07-31 22:22:12 +00:00
Spahbod c438a1eb82 Polishing the Random Maps: Alpine Valley, Archipelago, Cantabrian Highlands, Canyon, Continent, Corinthian Isthmus, English Channel
This was SVN commit r13619.
2013-07-31 10:05:48 +00:00
Spahbod f3823847b0 Polishing the Random Maps: Archipelago, Ardennes Forest, Atlas Mountains, Cantabrian Highlands
This was SVN commit r13618.
2013-07-30 11:09:40 +00:00
Spahbod 477855fbf5 Polishing the Random Maps: Alpine Valley, Anatolian Plateau, Archipelago
This was SVN commit r13617.
2013-07-30 07:56:09 +00:00
alpha123 344a149a66 Infinite farms with diminishing returns (but no farmland). Refs #1318.
This was SVN commit r13616.
2013-07-30 06:04:53 +00:00
alpha123 857ae2dd3e - Fix a bug from 20e7d2224a where the player ID would always be set to 1.
- Make the developer overlay a tad taller.

This was SVN commit r13614.
2013-07-29 20:01:09 +00:00
Spahbod 70e67af87f Polishing the Random Maps: Alpine Valley
This was SVN commit r13613.
2013-07-29 14:22:54 +00:00
Spahbod 4dfe1d6df9 Polishing the Random Maps: Alpine Valley
This was SVN commit r13612.
2013-07-29 13:50:20 +00:00
Spahbod 992a8ee0b8 Polishing the Random Maps: Aegean Sea and Alpine Valley
This was SVN commit r13611.
2013-07-29 12:52:31 +00:00
Mythos_Ruler 629492625f Some touching up.
This was SVN commit r13610.
2013-07-29 12:35:05 +00:00
alpha123 f3b0417aac Don't try to interpret Enter as a mouse click in message boxes (makes it really annoying to chat at the end of a game).
This was SVN commit r13608.
2013-07-29 05:04:28 +00:00
Spahbod e3c42a204e Fixing a bug
This was SVN commit r13607.
2013-07-29 04:30:03 +00:00
alpha123 20e7d2224a Implement a developer overlay command to change the current player ID (very useful for AI development).
This was SVN commit r13606.
2013-07-29 00:53:44 +00:00
Spahbod 53074c7715 Polishing the random maps: Aegean Sea, Alpine Lakes
This was SVN commit r13605.
2013-07-28 16:58:09 +00:00
Mythos_Ruler 63f766bb2a Nerfed Hellenization a bit.
Changed the portraits of the Cart merc techs.

This was SVN commit r13604.
2013-07-28 16:21:43 +00:00
Mythos_Ruler 0774730e2f -Made starting units start at Elite rank (just for fun and testing).
-Some new tech portraits for Divine Offerings and Agoge.
-Fertility Festival technology increased cost.
-New special technology for all Hellenic factions: Hellenization,
researched at the Theatron, increases territory influence for all
buildings +50%. This is a temporary technology until the real
Hellenization effect can be implemented.
-New special technology for the Mauryan and Iberian blacksmiths: Woot
Steel and Toledo Steel respectively.

This was SVN commit r13603.
2013-07-28 13:38:04 +00:00
Enrique 28db824982 iberian, hellene, roman and celtic blacksmiths with AO maps added.
This was SVN commit r13602.
2013-07-28 13:14:42 +00:00
Mythos_Ruler f0310cce58 Reduced Food cost of cavalry from 100 to 80.
Reduced Food cost of elephants from 200 to 150.
Reduced Metal cost of elephants from 200 to 150.
Reduced Stone cost of Mauryan elephant stables from 300 to 200.
Reduced Metal cost of Persian chariot archers from 100 to 0.

This was SVN commit r13601.
2013-07-28 10:20:07 +00:00
Mythos_Ruler a146a8ad3b Fixed some things.
This was SVN commit r13600.
2013-07-27 18:52:28 +00:00
quantumstate fd428cf45b Fix bug when randomly picking a unit to attack for AI's. Fix from bmwiedemann.
This was SVN commit r13599.
2013-07-27 15:08:45 +00:00
Spahbod 0263f17bcc Polishing the random maps: Aegean Sea
This was SVN commit r13598.
2013-07-27 12:13:46 +00:00
historic_bruno a684f7646b Fixes crash when hotloading main menu while splash screen shown (don't alter GUI page stack in init functions), refs #2042
This was SVN commit r13597.
2013-07-26 01:35:01 +00:00
Pureon db5c54c7c6 Persian dock update
This was SVN commit r13596.
2013-07-25 23:02:51 +00:00
Mythos_Ruler 70a3c6c8b4 Supremely blue water on Cycladic Archipelago 2. Enable high graphics and take a look at the depth rendering and specular effect.
This was SVN commit r13595.
2013-07-25 17:45:40 +00:00
Mythos_Ruler 5bfff54bcb Unit promotion animation and invulnerability reduced from 4 seconds to 2.8 seconds.
This was SVN commit r13594.
2013-07-25 13:57:54 +00:00
wraitii e5a9b0eab4 And of course I forgot a file.
This was SVN commit r13593.
2013-07-25 08:58:15 +00:00
wraitii 1f55280fa2 AI-related changes to the AI interface and Command.js, to facilitate debugging of upcoming new version of Aegis.
This was SVN commit r13592.
2013-07-25 08:57:07 +00:00
Mythos_Ruler 0d8b9b15e1 All animals now visible in Fog of War (FOW). Should help a lot with hunting.
Hack armor increased for most buildings.

This was SVN commit r13591.
2013-07-24 18:11:03 +00:00
Mythos_Ruler 697b88562c Game Speeds adjusted.
This was SVN commit r13590.
2013-07-24 13:08:45 +00:00
leper 6ed814354e Fix the fix of the fix. Refs #1914.
This was SVN commit r13589.
2013-07-23 18:48:25 +00:00
Mythos_Ruler 9681606d05 Non civ center units that are available at the village phase barracks are now not available until Town phase.
House-trained females take 30 seconds to train now.

This was SVN commit r13588.
2013-07-23 15:39:24 +00:00
wraitii efc1a678ed Change my fix from revision [13586] to use something faster. Still Refs #1914
This was SVN commit r13587.
2013-07-23 10:37:43 +00:00
wraitii dc3c39fd93 Fix a rare issue where units could get stuck in Individual.Gather.Gathering state forever because of worker limits. Refs #1914 (might even fix it).
This was SVN commit r13586.
2013-07-23 09:46:49 +00:00
wraitii d01d58f70f Fake randomization of the ship sinking animation to make it look better with ship formations. Refs #1921
This was SVN commit r13584.
2013-07-22 10:17:00 +00:00
leper 86a8dd7e6f Small cleanup.
This was SVN commit r13583.
2013-07-21 23:25:15 +00:00
Mythos_Ruler bff7c53a14 Some new hero portraits.
This was SVN commit r13582.
2013-07-21 05:53:53 +00:00
Mythos_Ruler 3aa9e2f6e0 Technology research time tweaks, and fixes.
This was SVN commit r13581.
2013-07-21 02:16:45 +00:00
historic_bruno e0ea53a8ee Adds saved game descriptions and in-game save dialog, based on patch by Crynux, fixes #2030
This was SVN commit r13579.
2013-07-21 00:23:57 +00:00
Mythos_Ruler 311403d5ef Barracks buildable in Village Phase.
Fish can now be seen through the fog of war (but not in shroud of
darkness, of course).

This was SVN commit r13578.
2013-07-20 12:01:56 +00:00
Mythos_Ruler 9f7a0348bd New portraiture by LordGood.
This was SVN commit r13577.
2013-07-20 07:35:54 +00:00
historic_bruno f5e60157bf Optimizes GetPercentMapExplored by caching explored vertices per player, patch by scroogie, fixes #2012
This was SVN commit r13576.
2013-07-20 00:50:40 +00:00
Pureon fc9b19ab47 Pers corral and storehouse updates
This was SVN commit r13575.
2013-07-18 22:59:14 +00:00
Pureon 439603e3fd Persion civic ao update
This was SVN commit r13574.
2013-07-17 23:45:24 +00:00
Pureon 1a20d47cfb Updates to the Persian civ centre model
This was SVN commit r13573.
2013-07-17 23:26:40 +00:00
historic_bruno 38cdc38bba Fixes a build error with SDL2, refs #2041
This was SVN commit r13572.
2013-07-17 06:33:11 +00:00
historic_bruno 39c0498811 Changes terrain anchoring to use faster CalcExactNormal instead of CalcNormalFixed, refs #1988, #2039
This was SVN commit r13571.
2013-07-17 05:42:16 +00:00
Pureon 1cca648b6d Persian blacksmith building
This was SVN commit r13570.
2013-07-16 21:57:49 +00:00
leper 2ea7fb18ea Backport c011875c5a to the older APIs and allow for empty buildable entites token list.
This was SVN commit r13569.
2013-07-16 21:22:05 +00:00
wraitii df2458aa39 Allow setting of prop min/max height in the actor Edit. By sanderd17.
This was SVN commit r13568.
2013-07-16 13:13:41 +00:00
historic_bruno da4d1916dc Implements shared trade gain with allies, patch by mimo, fixes #1691
This was SVN commit r13567.
2013-07-16 05:59:48 +00:00
historic_bruno f302faf8e4 Implements entity terrain anchoring as a visual effect, based on patch by sanderd17, fixes #1988.
Sets cavalry and quadrupedal animals to 'pitch' anchoring. Cleans up
mine templates.

This was SVN commit r13565.
2013-07-16 03:46:30 +00:00
Pureon 9a0ab14cf3 Carthaginian blacksmith building
This was SVN commit r13564.
2013-07-16 00:00:57 +00:00
wraitii c011875c5a Fixes an issue with Aegis and the iberians
This was SVN commit r13563.
2013-07-15 19:47:59 +00:00
wraitii de5b584cbf Fixes #2037
This was SVN commit r13562.
2013-07-15 05:54:46 +00:00
historic_bruno 047992e61a Fixes possible memory leaks by only allocating wave vertex buffers once and only when needed, and releasing them before re-allocating (in case CreateSuperfancyInfo is called multiple times).
Checks if wave vertex buffers were allocated before rendering, fixes
#2017

This was SVN commit r13561.
2013-07-15 03:26:48 +00:00
Pureon 6d284e4e56 Applying stwf's sound attribute to ballista + pers fortress decals added
This was SVN commit r13560.
2013-07-14 15:41:49 +00:00
Mythos_Ruler c9193b0302 Fix a few templates and techs.
This was SVN commit r13559.
2013-07-14 15:01:22 +00:00
Pureon 5eb670ef82 Med Cove and Persian sandbox map tweaks
This was SVN commit r13558.
2013-07-14 13:58:36 +00:00
wraitii 595c964d77 Make water specular more visible and fixes a few cases where it would actually hardly appear when it should.
Adds the ability to access an element in a dropdown box by typing the
first letters (Refs #1532).

This was SVN commit r13556.
2013-07-14 12:17:07 +00:00
wraitii 408c30e061 Probably fixes #2021. Optimization for foam generation while I'm at it (it's faster now, but there's a new temporary array of the size of the map)
This was SVN commit r13555.
2013-07-14 08:06:07 +00:00
Mythos_Ruler 071c976693 Sahel. wide open 2v2 scenario.
This was SVN commit r13554.
2013-07-13 01:50:46 +00:00
historic_bruno 63c19af5dc Fixes assignment operator warning on MSVC by making CObjectEntry NONCOPYABLE, refs #2033
This was SVN commit r13552.
2013-07-12 03:46:40 +00:00
historic_bruno 5fb89ac6bc Fixes prop bugs due to uninitialized variables on MSVC build, refs #2033
This was SVN commit r13551.
2013-07-12 03:32:14 +00:00
leper 91effd1ad1 ...
This was SVN commit r13550.
2013-07-11 23:58:54 +00:00
leper d5897854be Allow terrain aligned props. Patch by sanderd17. Fixes #2033.
This was SVN commit r13549.
2013-07-11 22:53:31 +00:00
leper 6cffdacb40 Small cleanup.
This was SVN commit r13547.
2013-07-10 00:08:05 +00:00
leper d1af7ea0ef Include mod path in the cache path.
This was SVN commit r13546.
2013-07-10 00:08:01 +00:00
Pureon fb0c1e6cc6 Update to the Carthaginian wonder/mausoleum
This was SVN commit r13545.
2013-07-09 23:51:23 +00:00
leper 27086be9c3 Split skeleton definitions into multiple files, adds hotloading support for skeleton files. Fixes #190.
This was SVN commit r13544.
2013-07-08 20:25:06 +00:00
alpha123 041855e547 Allow building walls along the shore. Patch by sanderd17. Fix #1610.
This was SVN commit r13542.
2013-07-07 22:44:47 +00:00
alpha123 d479f373aa Display current/max gatherers or builders when a resource or foundation is selected. Based on a patch by mimo. Fix #1871.
This was SVN commit r13541.
2013-07-07 22:13:58 +00:00
alpha123 ed3afce81e - Round attack numbers in the GUI. Patch by scythetwirler. Fix #1997.
- Adjust the siege attack tech to add an integer instead of multiply by
a percentage.
- Fix the siege armor tech so the tooltip and the added value match up.

This was SVN commit r13540.
2013-07-07 21:04:36 +00:00
leper 93e8ccda64 Fix crash in VC++11 debug builds. Fixes #2028. Patch by RedFox.
This was SVN commit r13539.
2013-07-07 20:02:20 +00:00
Pureon efc6263cc4 Tech icon tweaks
This was SVN commit r13538.
2013-07-07 15:55:35 +00:00
Pureon 41f1485997 Fixing some missing texture links caused by 80b0106502
This was SVN commit r13537.
2013-07-07 15:36:27 +00:00
historic_bruno 8aa016a884 Changes graphics card name detection on Windows to use OpenGL, as a workaround for certain WMI related crashes on Nvidia Optimus and netbook systems. Fixes #1952, #1575
This was SVN commit r13536.
2013-07-06 18:30:29 +00:00
Mythos_Ruler 30f8d6dae2 Tweaks to some templates and tech portraits.
This was SVN commit r13534.
2013-07-06 03:35:03 +00:00
Pureon 3824b3f89d Silver shield tech icon
This was SVN commit r13533.
2013-07-05 22:26:34 +00:00
leper 4ab38f81f7 Remove player owned sheep when committing the foundation.
This was SVN commit r13531.
2013-07-05 15:33:39 +00:00
Pureon 453389b53a Generic shield icons
This was SVN commit r13530.
2013-07-04 22:40:02 +00:00
stwf 485bd75abe apply patch from ticket 1944 added sound attribute to animations to optionally differentiate sound starting point
This was SVN commit r13529.
2013-07-02 11:44:46 +00:00
Mythos_Ruler 377cae15f8 Technology to unlock female training at the house.
Sacred Band infantry is now a spearman instead of pikeman.

This was SVN commit r13528.
2013-07-02 07:11:01 +00:00
Mythos_Ruler cd7b56faa4 Updated the name of "Porus" on Punjab 1.
Updated some Blacksmith templates with histories.

Made a new "pikeman" template to use with pike units. Made pikemen have
extra high armor, but pretty low attack. Basically they'd be used as the
ultimate meat-shield.

Cleaned up some stuff.

Made us of Pureon's new technology portraits.

This was SVN commit r13527.
2013-07-02 00:04:05 +00:00
leper 24b6fb7c3e Clean up cheat handling a bit. Use setter and getter for cheatTimeMultiplier.
This was SVN commit r13526.
2013-07-01 23:46:03 +00:00
Pureon 78d4a24fba Hero tech icon
This was SVN commit r13525.
2013-07-01 23:42:51 +00:00
Pureon 40660606aa Corinthian crest helmet tech icon
This was SVN commit r13524.
2013-07-01 21:46:24 +00:00
historic_bruno 9565c60a14 Adds UI sounds for buttons, dropdowns, lists, and checkboxes, fixes #948
This was SVN commit r13521.
2013-07-01 04:15:09 +00:00
leper ef66f73a84 Recalculate trader gain when garrisoned entities change. Patch by mimo. Fixes #2018.
This was SVN commit r13520.
2013-06-30 22:19:41 +00:00
Pureon c04f887676 Mauryan civ uses Omri's track. Cart sandbox map update
This was SVN commit r13519.
2013-06-30 11:06:35 +00:00
Pureon 2a2daf84e0 Small boats move around quieter than large ships
This was SVN commit r13518.
2013-06-30 10:40:59 +00:00
OmriLahav d213f2ba91 This was SVN commit r13516. 2013-06-30 09:24:43 +00:00
historic_bruno 0933925d49 Adds JS implementations of Math.pow, exp, and log, by sanderd17, refs #1193.
Fixes #1990 (OOS caused by Math.pow).
Adds tests and documentation for Math functions.

This was SVN commit r13515.
2013-06-30 05:16:20 +00:00
historic_bruno d79ba004da Fixes OS X build failing to find Boost libs, refs #1938
This was SVN commit r13514.
2013-06-30 00:48:34 +00:00
historic_bruno 8bccecdb8d Updates Premake Windows binary
This was SVN commit r13513.
2013-06-29 23:36:56 +00:00
leper bbcfa93dc4 Use os.findlib to find boost. Patch by Markus. Fixes #1938. Refs #1518.
This was SVN commit r13512.
2013-06-29 22:25:50 +00:00
leper c6348538ea Show combined costs in the gate conversion tooltip. Based on patch by Jgwman. Fixes #1591.
This was SVN commit r13511.
2013-06-29 20:55:53 +00:00
historic_bruno 123d08eb82 This was SVN commit r13510. 2013-06-29 04:12:17 +00:00
Mythos_Ruler 4c22d4631a Carthaginians can now only build 1 embassy at a time.
Each embassy comes with new technology pairs. Metal Costs vs. Training
Time.

Structure pierce armor adjusted upward.

This was SVN commit r13509.
2013-06-29 02:17:33 +00:00
alpha123 2b02f983a6 Replace decimal with nonNegativeDecimal. Refs #1633
This was SVN commit r13508.
2013-06-29 01:59:46 +00:00
alpha123 37c8e77d8e Use floats for health. Fix #1633
This was SVN commit r13507.
2013-06-29 00:43:08 +00:00
Mythos_Ruler 4b3f4c0a1d This was SVN commit r13506. 2013-06-27 12:00:23 +00:00
leper 623f5d9a9f Small garrison code clean-up
This was SVN commit r13505.
2013-06-26 19:24:56 +00:00
leper 6cbdc13e08 Clarify usage of CheckPlacement. Check if the losRangeQuery exists before disabling it.
This was SVN commit r13504.
2013-06-26 18:41:06 +00:00
leper 5e289f51c2 Make attack type a property of the order.
This was SVN commit r13503.
2013-06-26 14:15:03 +00:00
leper d5e081d55f Fix inconsitency between AttackEntityInZone and ShouldAbandonChase for units in defensive stance. Patch by mimo. Fixes #1866.
This was SVN commit r13502.
2013-06-26 13:24:03 +00:00
leper 2fcd52b657 Let states execute their leave handlers on OnDestroy. Fixes #1999. Patch by mimo.
This was SVN commit r13501.
2013-06-25 21:49:54 +00:00
historic_bruno 49b3b0ee9a Reverts interpolation changes from a7bc7ab50c, 71ae5a19d8, 1778e685ac, c6043779f6, 8777f68aa0, 21f13f9683. Refs #1846, #1858, #1865, #1906
This was SVN commit r13500.
2013-06-25 01:09:43 +00:00
historic_bruno 699d5c5d79 Fixes possible overflow in terrain position/normal calculation, based on patch by sanderd17. Fixes #1986
This was SVN commit r13499.
2013-06-25 00:57:42 +00:00
historic_bruno a981890ab9 Fixes PSA converter to detect broken animations/skeletons.xml slightly better, based on patch by Markus. Fixes #1478
This was SVN commit r13498.
2013-06-23 22:58:17 +00:00
historic_bruno ce8457e195 Fixes map name in pathfinder performance test
This was SVN commit r13497.
2013-06-23 00:50:24 +00:00
historic_bruno 4fc15a9b08 Renames mill to storehouse
This was SVN commit r13496.
2013-06-22 02:28:54 +00:00
Mythos_Ruler e5c35beefe Blacksmith smoke.
Persian and Carth blacksmith actors.

This was SVN commit r13495.
2013-06-21 00:16:52 +00:00
Mythos_Ruler 5f78bb7318 For most civs, made it so that Champions are unlocked by default in the Fortress at City Phase, but then also available for training at the Barracks, but after they are unlocked with a tech.
Removed the minrange for all ranged units until minimum range bugs are
fixed. To fix it will require a multi-pronged approach that will need
discussed and Trac tickets created.

This was SVN commit r13494.
2013-06-21 00:14:00 +00:00
historic_bruno 14990ea390 Fixes another possible NaN when invulnerable units are attacked, refs #1881
This was SVN commit r13493.
2013-06-18 20:20:37 +00:00
Mythos_Ruler fca1f4c3a7 Persians and Carthaginians receive blacksmiths.
This was SVN commit r13492.
2013-06-18 14:20:15 +00:00
historic_bruno 1a5d5eb808 Sets remaining unit trained and building completed sounds to HeardBy owner only, refs #1965
This was SVN commit r13490.
2013-06-18 05:06:22 +00:00
historic_bruno a7bc7ab50c Fixes units not rotating correctly during e.g. attacks, patch by sbte, fixes #1906
This was SVN commit r13489.
2013-06-18 03:42:06 +00:00
historic_bruno 95b51188fa Fixes possible undefined value returned by CmpHealth, leading to a NaN and serialization test failure. Refs #1881
This was SVN commit r13488.
2013-06-18 03:26:08 +00:00
stwf 00e21a9898 change 'restricted' flag to 'heardby' in SoundGroup xml files
This was SVN commit r13487.
2013-06-17 15:46:28 +00:00
stwf 36dec0e789 add restricted flag to SoundGroup xml for sounds thatonly the owning player should hear
This was SVN commit r13486.
2013-06-17 02:30:40 +00:00
historic_bruno 02b98f3acd Fixes build with x11 and SDL2
This was SVN commit r13485.
2013-06-17 01:43:57 +00:00
leper f918c9b074 Prevent formation controllers from showing up in range queries. Fixes #1796.
This was SVN commit r13484.
2013-06-16 23:10:01 +00:00
historic_bruno 5f90371a1c Cleans up some float constants and math from #1921
This was SVN commit r13482.
2013-06-15 00:42:07 +00:00
alpha123 9d27cccbcd Fix Visual Studio build issues.
This was SVN commit r13481.
2013-06-15 00:20:40 +00:00
historic_bruno e75877b52f Adds comment about xorg-x11's glXGetProcAddress not returning NULL for unsupported functions, closes #171
This was SVN commit r13480.
2013-06-14 23:49:20 +00:00
leper c01c8fb2fc Stop generating VS2005 project files. Refs #1951.
This was SVN commit r13479.
2013-06-14 23:46:12 +00:00
alpha123 98cac1a10f Improve ship sinking. Patch by wraitii. Fix #1921
This was SVN commit r13478.
2013-06-14 19:19:13 +00:00
leper 9ea830c855 Handle empty token list gracefully.
This was SVN commit r13477.
2013-06-14 16:13:59 +00:00
stwf bcf99e2a13 make sound code return faster, code cleaner
This was SVN commit r13476.
2013-06-14 16:05:57 +00:00
stwf da17e4329b cleanup SOundManaer component
This was SVN commit r13475.
2013-06-14 00:24:51 +00:00
stwf 26dbac8d57 fixes to SoundManager external interface, clean up ifdef situation, and SoundGroup playin
This was SVN commit r13474.
2013-06-13 12:12:44 +00:00
historic_bruno b3653cfe16 Updates bundled Valgrind headers to 3.8.1 and fixes test build, patch by Markus, fixes #1971
This was SVN commit r13473.
2013-06-12 03:38:37 +00:00
leper 2567fee329 Write mod data correctly. Fixes #1940.
This was SVN commit r13472.
2013-06-11 20:50:09 +00:00
Mythos_Ruler 15e75cdfbd Updated some building tooltips.
Removed wall techs from Iberians for balance.

This was SVN commit r13471.
2013-06-11 16:28:42 +00:00
historic_bruno facd447d0f Hopefully fixes GCC warning about narrowing conversion in C++11, fixes #1851
This was SVN commit r13470.
2013-06-11 02:40:49 +00:00
leper b3391ebe39 Fix build warnings. Patch by Markus. Refs #1851.
This was SVN commit r13469.
2013-06-11 00:05:57 +00:00
Mythos_Ruler 2ed10ec033 Changed names and histories for Roman civ center and market.
Fixed elephant heroes.

This was SVN commit r13468.
2013-06-10 15:33:18 +00:00
stwf ada7702bec add UI sound channel, clean up external interface and javascript calls
This was SVN commit r13467.
2013-06-10 13:58:43 +00:00
leper 29549561e1 Add flag to VisualActor for entities that should only be visible in Atlas. Patch by KareemErgawy. Fixes #1411.
This was SVN commit r13465.
2013-06-09 23:18:21 +00:00
alpha123 5246e9a576 Update description of ESC key in the manual. Refs #1928.
This was SVN commit r13464.
2013-06-09 20:38:57 +00:00
alpha123 6f3a0e1378 Implement location hotkeys. Fix #1882.
This was SVN commit r13463.
2013-06-09 20:21:19 +00:00
Mythos_Ruler 356adb1216 Nicer looking particles for Roman Temple. Fixes #1498.
More shield and helmet stuff.

This was SVN commit r13462.
2013-06-09 17:28:46 +00:00
Mythos_Ruler 80b0106502 Brand new Macedonian/Ptolemaic shield patterns by Enrique.
This was SVN commit r13461.
2013-06-09 15:57:29 +00:00
historic_bruno b40a738c87 Adds Omnipresent flag to more alarm sounds
This was SVN commit r13460.
2013-06-08 22:46:26 +00:00
Mythos_Ruler d151a6a304 Fixed war elephants. They can attack walls now.
This was SVN commit r13459.
2013-06-08 13:42:49 +00:00
Mythos_Ruler 8eae65be2b Fixed elephants. Can now attack walls.
This was SVN commit r13458.
2013-06-08 12:51:15 +00:00
Mythos_Ruler 633eab6080 Median Oasis 6 & 7.
Updated blowing sand texture.

This was SVN commit r13457.
2013-06-06 14:47:50 +00:00
stwf 71b25d5bd4 big SoundManager checkin,futureproof javascript interface, isolate external calls to remove OpenAL references
This was SVN commit r13455.
2013-06-06 11:13:57 +00:00
historic_bruno 1341b88468 Adds VBO support to minimap entity rendering to improve performance, patch by kuranes. Refs #1923
This was SVN commit r13454.
2013-06-06 00:10:58 +00:00
leper d20849d1c4 Add some checks for the sound manager. Fixes the segfault when using -quickstart.
This was SVN commit r13453.
2013-06-05 22:10:11 +00:00
leper 5b1f5dd2c1 Display expected trading gain (GainMultiplier = 1) for market foundations when setting rally points. Fixes #1963.
This was SVN commit r13452.
2013-06-05 21:35:31 +00:00
historic_bruno b2f6a1260e Sets Distanceless flag on most selection sound groups.
Adds new sound groups for gates.

This was SVN commit r13451.
2013-06-04 03:17:46 +00:00
historic_bruno 43d2c8be8c Converts a bunch of stereo sound effects to mono, to fix sounds ignoring entity position, fixes #1956, refs #1929.
Will require sound group XML updates in some cases.

This was SVN commit r13450.
2013-06-03 21:42:48 +00:00
Mythos_Ruler 4d5187bf40 Building completion and unit training sounds are now ubiquitous, meaning you'll hear them even if they are off-screen.
This was SVN commit r13449.
2013-06-03 02:50:10 +00:00
leper 8026685a06 Don't display the rally point tooltip for trading for enemy markets.
This was SVN commit r13448.
2013-06-02 20:17:44 +00:00
historic_bruno 2ef6ec3f73 Rounds trader gain to avoid fractions with garrisoned traders in a merchant ship, patch by Markus, fixes #1954
This was SVN commit r13447.
2013-06-01 21:28:31 +00:00
Pureon eebe7972df Lighting tweaks to Mauryan emblem
This was SVN commit r13446.
2013-06-01 12:09:34 +00:00
stwf 5af503405f last bunch of ogg files not converted from wav correctly
This was SVN commit r13445.
2013-06-01 02:56:31 +00:00
Mythos_Ruler b6e0661b8f New BRASIDAS Spartan hero.
"The Agoge" tech for Spartans.

Fixed Leonidas' selection ring.

This was SVN commit r13444.
2013-06-01 02:33:58 +00:00
stwf 67b42210aa mono ogg sounds rendered from original wav files recommitted
This was SVN commit r13443.
2013-06-01 02:30:05 +00:00
stwf 004eaf9e75 log warning when stereo sounds are played at position
This was SVN commit r13442.
2013-06-01 01:52:05 +00:00
Mythos_Ruler 4882aac409 New techs for Carthage: Mercenary Captains, reduce metal costs for merc units, based on ethnicity.
Melee cav more starting pierce armor.

This was SVN commit r13441.
2013-05-31 02:52:06 +00:00
stwf 690619ce5e many fauna sounds in stereo converted to mono so the OpenAL can locate them
This was SVN commit r13440.
2013-05-31 02:50:47 +00:00
stwf b21de66e40 address issue 1929 Ubiquitous Sound Effects, fixes a bug in determining which units are onscreen, also plays distant items softly if at all
This was SVN commit r13439.
2013-05-31 01:03:07 +00:00
Mythos_Ruler d3e40792ff Added a "wooden structures" civ bonus for the Celtic civs. Their buildings are 20% weaker, but they construct 20% faster than other cultures.
Fixed health for "Greek" walls.

Adjusted "preferredclasses" stuff on some templates.

This was SVN commit r13438.
2013-05-30 00:58:07 +00:00
Mythos_Ruler 085e9c620d Tweaked armor stats for battering ram and siege tower.
Fixed "rollover" tag to "history".

This was SVN commit r13437.
2013-05-29 23:39:13 +00:00
historic_bruno 7a8c8e439b Fixes warning in VC2012 build (C4706: assignment within conditional expression)
This was SVN commit r13434.
2013-05-28 01:23:43 +00:00
historic_bruno d2b0d25457 Fixes macro redefinition of FACILITY_VISUALCPP in VC2012 (it's defined in winerror.h).
Removes obsolete hack for old Boost and VC2005 (broke VC2005 build with
modern Boost).

This was SVN commit r13433.
2013-05-28 01:14:41 +00:00
Mythos_Ruler 4a8c7e72b5 Lowered crush armor for these buildings.
This was SVN commit r13431.
2013-05-27 18:21:57 +00:00
stwf 93d0084266 incorporate patch from ticket 1937, fix memory leak in SoundManager
This was SVN commit r13430.
2013-05-27 13:36:17 +00:00
historic_bruno 88c4e5bdd0 Extends binary serializer to support some standard JS classes: Number, String, Boolean. Fixes #406.
Extends binary serializer to support typed arrays.
Extends binary serializer to support custom JS prototype objects in AIs,
fixes #407.
Allows full serialization of AIs (not yet implemented). Refs #1089,
#1886
Increases binary serializer script backref arena from 8 MB to 16 MB,
refs #1842

This was SVN commit r13429.
2013-05-26 21:57:24 +00:00
Mythos_Ruler e58fe92892 Tweaked Walls stats and costs.
Carthaginians' 'Triple Walls' civ bonus moved from wall templates to
auto-researching (free) tech. It just cleans things up quite a bit.

Changed sound groups for "special buildings."

This was SVN commit r13428.
2013-05-25 23:10:16 +00:00
Mythos_Ruler 97b28e7343 Some sound file changes to hopefully add more aural variation.
Cavalry blacksmith techs moved from City to Town.

Trying to give the female citizen the order_build soundgroup, but it
doesn't seem to work. The game seems to use order_repair for both
repairing and building. These are two different actions so should
support two different sound groups.

This was SVN commit r13427.
2013-05-25 18:07:29 +00:00
wraitii 2c52099ddd Fix previous commit because of course there was test code in there. Make Aegis build more farms because of recent changes.
This was SVN commit r13426.
2013-05-25 16:24:05 +00:00
wraitii f372f9184c Fix Aegis breaking the profiler after some time (Fixes #1945. Fix typo (Fixes #1947). Patches by Markus.
Also one other fix for something attack related (probably, code is old
and I can't recall).

This was SVN commit r13425.
2013-05-25 15:56:11 +00:00
historic_bruno 17bb997e0e Fixes memory leak in CVertexBuffer::Release, patch by Markus, fixes #1933
This was SVN commit r13423.
2013-05-23 23:16:36 +00:00
leper bc8d461b81 Display rally point lines when setting rally points using the minimap. Patch by TrinityDeath. Fixes #1848.
This was SVN commit r13422.
2013-05-23 20:34:15 +00:00
historic_bruno a8a968d32c Catch exceptions by reference (by convention), based on patch from Markus, refs #1852
This was SVN commit r13421.
2013-05-22 22:27:53 +00:00
historic_bruno 72a8b88b7d Fixes some unconventional assignment operators, patch by Markus, refs #1852.
Fixes typo in test_ShaderManager

This was SVN commit r13420.
2013-05-22 22:04:58 +00:00
historic_bruno 94c57085e9 Makes some classes NONCOPYABLE, based on patch by Markus, refs #1852
This was SVN commit r13419.
2013-05-22 21:40:56 +00:00
historic_bruno d7dcd3b26c Use prefix increment operator for iterators (for consistency), refs #1852, #1064
This was SVN commit r13418.
2013-05-22 18:41:13 +00:00
stwf 3ce14e3f4b fix memory leak in SoundManager, patch taken from ticket #1934
This was SVN commit r13417.
2013-05-22 12:13:21 +00:00
leper 56a4d6417c Small cleanup.
This was SVN commit r13416.
2013-05-21 23:50:42 +00:00
leper e5523754b3 Check if a building is already at full health when trying to repair it. Fixes #1930.
This was SVN commit r13415.
2013-05-21 23:45:20 +00:00
leper 4356badfa9 Pause production if the producing entity is garrisoned. Fixes #1931.
This was SVN commit r13414.
2013-05-21 23:01:53 +00:00
leper 3f00d4d997 Change some size() > 0 to Based on patches by kuranes and Markus. Refs #1852, #1923.
This was SVN commit r13413.
2013-05-21 22:11:47 +00:00
leper 013fc9558a Fix typo. Fixes #1935.
This was SVN commit r13412.
2013-05-21 22:11:15 +00:00
wraitii 136f1891c1 Fixes a fix about a fix on the waterManager. Fixes #1891
This was SVN commit r13411.
2013-05-21 08:55:49 +00:00
Mythos_Ruler 346df43a43 Persian Apadana build limit.
This was SVN commit r13410.
2013-05-19 08:24:36 +00:00
Mythos_Ruler 67d072108b Bloody dead camel.
New wall technologies (research at Wall Tower, since for now techs can't
be researched at wall segments).

Adjusted default BatchTrainModifier from 0.7 to 0.8 in all buildings
since the new training techs were making unit batches train insanely
fast.

Added 'Naval Architects' batch training tech to the Dock (and Carth
Super Dock).

Attempting to add "Apadana" build limit, with no success. Need help
here. I thought BuildRestrictions.js and EntityLimits.js were the files
I needed to change, but it's not working (there should be a build limit
of 1 for the Persian Apadana).

Tweaked the levy techs.

Fixed Hero elephant unit RequiredTechnology.

This was SVN commit r13409.
2013-05-19 08:19:16 +00:00
leper 09108e6a97 Some more vars
This was SVN commit r13408.
2013-05-16 16:17:37 +00:00
Mythos_Ruler 1ea0bac280 New train time techs. For most factions, you choose either faster training infantry or faster training cavalry (either one unlocks Conscription, which boosts batch training considerably). For Persians, you get to research both at the barracks and stables, which unlocks conscription techs for both buildings. For Persians, I also moved the champion unlock tech to their Palace (Apadana), which now unlocks the "Immortals" technology (the tech that makes the Anusiya train twice as fast).
This was SVN commit r13407.
2013-05-15 08:11:20 +00:00
Mythos_Ruler ccb4ecc9f2 Renamed this tech.
This was SVN commit r13406.
2013-05-15 04:07:07 +00:00
Mythos_Ruler 9ceab639f3 Bloody dead sheep.
Unlocking tech for champions.

Champions trainable in barracks (after unlocking tech).

Farm Field yield increased from 2000 food to 5000 food. Max gatherers: 5
per field.

This was SVN commit r13405.
2013-05-14 09:48:37 +00:00
leper de5d4491ab var-fare
This was SVN commit r13404.
2013-05-12 22:28:02 +00:00
Mythos_Ruler f5f0bc701a Completely changed the "Stockbreeding" tech.
Fixed the 'Conscription' tech. It should work as advertised now.

Added some classes to the structures.

Reduced archer bonus vs. cav spears by 50%.

Moves Iphicratean Reforms from the Athenian Trireme to the Athenian
Dock.

This was SVN commit r13403.
2013-05-12 21:30:01 +00:00
Mythos_Ruler 2aa3ab8b03 conscription tech fix
This was SVN commit r13402.
2013-05-12 16:59:54 +00:00
leper 3bec6ced85 Fix hero button for heroes without attack
This was SVN commit r13401.
2013-05-12 16:02:53 +00:00
Mythos_Ruler daf572eb43 Temporary Blacksmith structures for prototyping and playtesting.
Lots of new techs. Healing techs. Vision for outpost. "Conscription"
tech boosts batch training speed. Implemented Macedonian "Hellenistic
Metropolis" special tech.

Testing placing Champions in the barracks (unlocked with a tech). Try
this out with the Macedonians.

Reduced archer attack damage. Reduced cost of healer.

Lots of other stuff.

This was SVN commit r13400.
2013-05-12 07:23:05 +00:00
Mythos_Ruler 209d8c4fd4 Made death screams slightly quieter. We actually need new male death/battle sounds.
This was SVN commit r13399.
2013-05-09 16:36:49 +00:00
Mythos_Ruler eae28bad5a Gold Oasis 3. Iberians vs. Mauryans.
This was SVN commit r13398.
2013-05-06 00:40:40 +00:00
Mythos_Ruler 57644fba50 Some art stuff: Scaffolds to other foundations, tweaking some Mauryan animations, new turban for maiden guards, etc.
This was SVN commit r13397.
2013-05-05 21:07:40 +00:00
Mythos_Ruler d49cc6fc8b Some armor changes. Also adds hero training restriction to hero elephant template. Fixes #1927.
This was SVN commit r13396.
2013-05-05 19:25:33 +00:00
leper 47e9431d29 Check if one of the technologies in a pair is already in progress. Fixes #1820.
This was SVN commit r13395.
2013-05-05 13:54:00 +00:00
leper cb7964a1db Make some gather techs work.
This was SVN commit r13394.
2013-05-05 13:13:38 +00:00
leper 56fa123718 Fix error when constructing with the first selected entity being a building.
This was SVN commit r13392.
2013-05-04 21:44:32 +00:00
leper fc5e2d27c7 Cancel building placement or reset selection on Esc. Patch by Josh. Fixes #1928.
This was SVN commit r13391.
2013-05-04 21:02:11 +00:00
leper 0d09f290d9 Allow setting rally points for foundations. Patch by Josh. Fixes #902.
This was SVN commit r13390.
2013-05-02 20:29:22 +00:00
stwf bf959e1c46 fix build when using --without-audio
This was SVN commit r13389.
2013-05-02 13:58:28 +00:00
leper 683f22cdb1 Display entity limits for buildings. Patch by Josh. Fixes #1924.
This was SVN commit r13388.
2013-05-01 19:25:55 +00:00
leper f42b77919d Future-proof the code for civ specific non-peace tracks.
This was SVN commit r13387.
2013-05-01 16:48:55 +00:00
wraitii 9a0749f3c9 Make sure to actually prevent Atlas from trying to render coastal waves. Fixes #1925
This was SVN commit r13386.
2013-05-01 06:47:49 +00:00
stwf ac3e9d8bc7 clear peace tracks before reloading music from civ files
This was SVN commit r13385.
2013-05-01 01:51:30 +00:00
Mythos_Ruler 67ff52a07f More armor adjustments.
This was SVN commit r13384.
2013-04-30 08:36:47 +00:00
leper 181db44ab5 Enforce technology restrictions when training units.
This was SVN commit r13383.
2013-04-29 21:51:14 +00:00
Mythos_Ruler 35daf00336 Snuck through without armor changes. Fixed now.
This was SVN commit r13382.
2013-04-29 18:33:03 +00:00
Mythos_Ruler e0a2e5790d Exponential Armor patch by Alpha123, with new updated armor values.
Needs a ton of testing.

This was SVN commit r13381.
2013-04-29 07:51:51 +00:00
Mythos_Ruler 4493f2986f Wonder support for civs currently with Wonders.
This was SVN commit r13380.
2013-04-29 02:46:13 +00:00
Mythos_Ruler 0686c6a553 Resetting 'default' maps.
This was SVN commit r13379.
2013-04-29 02:36:57 +00:00
leper 5a88f0fce0 Fix entity limits for buildings.
This was SVN commit r13378.
2013-04-29 00:36:21 +00:00
Mythos_Ruler f4e0007733 Cavalry are a bit faster.
Attempting to add Wonders, but no success (need help). Adding files here
to see if someone can fix what I've started.

This was SVN commit r13377.
2013-04-28 22:51:08 +00:00
historic_bruno d9540ad7f6 Fixes MSVC build error and warning
This was SVN commit r13375.
2013-04-27 22:43:22 +00:00
wraitii 4233acfa36 Slight clean up of the water code. Uses vertex data instead of a texture for foam. Should be faster to generate and render. Still no Atlas support.
This was SVN commit r13374.
2013-04-27 12:20:42 +00:00
stwf 092108b304 Must notify sound manager sources are now available
This was SVN commit r13372.
2013-04-26 23:13:11 +00:00
stwf c30f7a40e0 no need to check errors after destroying context, clean up some OpenAL interface calls
This was SVN commit r13371.
2013-04-25 10:48:34 +00:00
stwf 8324e0f665 add missing music list files
This was SVN commit r13369.
2013-04-24 19:27:16 +00:00
stwf 71486bd57d SoundManager supports playlists
This was SVN commit r13368.
2013-04-24 12:03:42 +00:00
leper 6115c3fc13 Remove some duplication from ProcessCommand.
This was SVN commit r13367.
2013-04-22 17:50:25 +00:00
Mythos_Ruler 62f24af68d Some new portraits by LordGood.
This was SVN commit r13366.
2013-04-21 18:47:11 +00:00
leper 3758b64916 Remove hardcoding of path from desktop file and launcher script. Patch by vincent. Fixes #1424.
This was SVN commit r13365.
2013-04-21 16:47:36 +00:00
leper 75f332ce20 Stop hotkey. Patch by alpha123. Fixes #1870.
This was SVN commit r13364.
2013-04-18 19:20:29 +00:00
leper cd6a76bcaa Gates now handle allies made using diplomacy.
This was SVN commit r13363.
2013-04-18 18:18:34 +00:00
leper 18a2b7d093 Fix roman merchant ship trading distance. Fixes #1874.
This was SVN commit r13362.
2013-04-18 18:18:31 +00:00
leper dc9889c190 Display number of garrisoned units when trying to garrison. Patch by mimo. Fixes #1915.
This was SVN commit r13361.
2013-04-18 18:18:29 +00:00
leper a362b41029 Fix grouping of garrisoned units. Patch by mimo. Fixes #1918.
This was SVN commit r13360.
2013-04-18 18:18:24 +00:00
stwf 503b481468 handle initialization errors cleanly, clean stuff up
This was SVN commit r13359.
2013-04-18 03:24:20 +00:00
leper b22320a85f Fix tests. Refs #1807.
This was SVN commit r13358.
2013-04-14 00:52:00 +00:00
leper d0a695f7fb Allow mutual allies to garrison in each others buildings. Patch by mimo. Fixes #1807.
This was SVN commit r13357.
2013-04-14 00:34:14 +00:00
stwf 2a3f1cb412 eliminate most warnings produced by Cppcheck
This was SVN commit r13356.
2013-04-12 03:10:54 +00:00
leper 7562c79e89 Change target for all orders on EntityRenamed. Patch by mimo. Fixes #1903.
This was SVN commit r13355.
2013-04-10 22:48:02 +00:00
leper 95a10e7f42 Reduce duplicate GuiInterfaceCalls some more. Patch by sbte. Fixes #1878.
This was SVN commit r13354.
2013-04-10 21:05:46 +00:00
stwf 0cad19ecec double check that the sound manager has been created before using
This was SVN commit r13353.
2013-04-10 12:03:17 +00:00
stwf b301d5c84d fades music in and out when switching to background, also honors g_PauseOnFocusLoss
This was SVN commit r13352.
2013-04-10 11:51:42 +00:00
Mythos_Ruler 19ce9657bc This was SVN commit r13351. 2013-04-10 09:11:08 +00:00
Mythos_Ruler 3074b930cc Tech.
This was SVN commit r13350.
2013-04-08 08:27:30 +00:00
Mythos_Ruler 789991c5d2 New food gathering tech for village phase.
Adjusted some food gather rates.

Adjusted some tech costs.

This was SVN commit r13349.
2013-04-08 07:59:57 +00:00
Mythos_Ruler 5429052b06 Lots of normal maps and spec maps. Ongoing project.
Added camel death scream (lol) to camel units.

Added sheep sounds to sheep.

Changed over the Mauryan elephant unit actors.

This was SVN commit r13348.
2013-04-07 22:28:36 +00:00
stwf c9a5d5cee5 pause music and ambient sounds when game pauses
This was SVN commit r13347.
2013-04-07 04:13:15 +00:00
leper 555f06acbe Fix errors when the hero is garrisoned. Patch by alpha123. Refs #1802.
This was SVN commit r13346.
2013-04-06 19:32:07 +00:00
historic_bruno c71ddae359 Adds forgotten OpenLogsFolder.vbs to Windows uninstaller
This was SVN commit r13345.
2013-04-05 21:40:49 +00:00
historic_bruno 2af37c3590 Adds player color to rubble entities, thanks to ericb for the patch, fixes #1887
This was SVN commit r13344.
2013-04-05 02:52:01 +00:00
historic_bruno 161d6c1ba7 Improves SDL 2.0 support
This was SVN commit r13343.
2013-04-05 02:39:30 +00:00
historic_bruno 7f9b486a48 This was SVN commit r13341. 2013-04-03 23:28:29 +00:00
historic_bruno 16de5c75ac Adds game speed option to match setup, adds in-game control for single player games, fixes #785.
Refactors some GUI utility functions.

This was SVN commit r13340.
2013-04-03 23:24:22 +00:00
leper 62dc594a71 Hero button. Based on patch by Malcom and edits to that by alpha123. Fixes 1802.
This was SVN commit r13339.
2013-04-03 17:27:55 +00:00
Mythos_Ruler f2da77ff72 "Oh myyyyy" -- George Takei. Lots of stuff:
- Town Phase cost increased to 1000 Food, 1000 Wood (from 500 of each).
This makes Village Phase longer and more interesting. Still need to
test.

- Lots of new normal maps and spec maps (for a bunch of desert terrains
and cretan date palms). This is an ongoing project.

- Fixed some spec maps for being too 'bright.'

- Changed the attack of melee spear units from a combo of pierce and
hack to just hack. Per discussion with Quantumstate. Needs testing.

- Changed the Median Oasis 1 scenario to include Mauryans and
Carthaginians.

This was SVN commit r13338.
2013-04-03 06:48:38 +00:00
historic_bruno a317cd9cba Fixes memory leak and removes unused code in WaterManager, fixes #1891, refs #1852
This was SVN commit r13337.
2013-04-03 03:30:10 +00:00
leper f82adf3ef3 Don't call GetSimulationState too often. Patch by sbte. Fixes #1878.
This was SVN commit r13336.
2013-04-02 21:06:20 +00:00
Mythos_Ruler 3c693245bd Portraits for the Mauryan healer and Chanakya.
This was SVN commit r13335.
2013-04-02 17:06:15 +00:00
Mythos_Ruler edea5d04e7 Portraits for Mauryan healer and Chanakya.
This was SVN commit r13334.
2013-04-02 17:05:51 +00:00
Ykkrosh 74df28f952 Fix --without-pch build
This was SVN commit r13333.
2013-04-02 15:44:42 +00:00
2632 changed files with 43269 additions and 30089 deletions
+27 -3
View File
@@ -120,8 +120,7 @@ sound.mastergain = 0.9
sound.musicgain = 0.2
sound.ambientgain = 0.6
sound.actiongain = 0.7
sound.bufferCount = 50
sound.bufferSize = 98304
sound.uigain = 0.7
; Camera control settings
view.scroll.speed = 120.0
@@ -151,6 +150,9 @@ view.fov = 45.0 ; Field of view (degrees), lower is
view.height.smoothness = 0.5
view.height.min = 16
; How close do we have to be to the actual location in order to jump back to the previous one?
camerajump.threshold = 40
; HOTKEY MAPPINGS:
; Each one of the specified keys will trigger the action on the left
@@ -171,7 +173,7 @@ hotkey.silhouettes = "Alt+S" ; Toggle unit silhouettes
hotkey.showsky = "Alt+Z" ; Toggle sky
; > CAMERA SETTINGS
hotkey.camera.reset = "H" ; Reset camera rotation to default.
hotkey.camera.reset = "R" ; Reset camera rotation to default.
hotkey.camera.follow = "F" ; Follow the first unit in the selection
hotkey.camera.zoom.in = Plus, Equals, NumPlus ; Zoom camera in (continuous control)
hotkey.camera.zoom.out = Minus, NumMinus ; Zoom camera out (continuous control)
@@ -194,6 +196,26 @@ hotkey.camera.rotate.speed.increase = "Ctrl+Shift+R" ; Increase rotation
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
hotkey.camera.jump.1 = F5 ; Jump to position N
hotkey.camera.jump.2 = F6
hotkey.camera.jump.3 = F7
hotkey.camera.jump.4 = F8
;hotkey.camera.jump.5 =
;hotkey.camera.jump.6 =
;hotkey.camera.jump.7 =
;hotkey.camera.jump.8 =
;hotkey.camera.jump.9 =
;hotkey.camera.jump.10 =
hotkey.camera.jump.set.1 = "Ctrl+F5" ; Set jump position N
hotkey.camera.jump.set.2 = "Ctrl+F6"
hotkey.camera.jump.set.3 = "Ctrl+F7"
hotkey.camera.jump.set.4 = "Ctrl+F8"
;hotkey.camera.jump.set.5 =
;hotkey.camera.jump.set.6 =
;hotkey.camera.jump.set.7 =
;hotkey.camera.jump.set.8 =
;hotkey.camera.jump.set.9 =
;hotkey.camera.jump.set.10 =
; > CONSOLE SETTINGS
hotkey.console.toggle = BackQuote, F9 ; Open/close console
@@ -207,6 +229,7 @@ hotkey.cut = "Ctrl+X" ; Cut selected text and copy to the clipboar
hotkey.selection.add = Shift ; Add units to selection
hotkey.selection.milonly = Alt ; Add only military units to selection
hotkey.selection.remove = Ctrl ; Remove units from selection
hotkey.selection.cancel = Esc ; Un-select all units and cancel building placement
hotkey.selection.idleworker = Period ; Select next idle worker
hotkey.selection.idlewarrior = Comma ; Select next idle warrior
hotkey.selection.offscreen = Alt ; Include offscreen units in selection
@@ -243,6 +266,7 @@ hotkey.selection.group.add.9 = "Shift+9"
; > SESSION CONTROLS
hotkey.session.kill = Delete ; Destroy selected units
hotkey.session.stop = "H" ; Stop the current action
hotkey.session.attack = "Ctrl+Alt" ; Modifier to force attack instead of another action
hotkey.session.garrison = Ctrl ; Modifier to garrison when clicking on building
hotkey.session.attackmove = Ctrl ; Modifier to attackmove when clicking on a point
+11
View File
@@ -0,0 +1,11 @@
;
; Developer configuration file
;
; NOTE: This is not read by the config system currently.
;
; This file is used by the engine to decide which mods are mounted, and in what
; order. The precense of this file suppresses loading of mods in the user mod
; path (see http://trac.wildfiregames.com/wiki/GameDataPaths) if the same mod is
; present in binaries/data/mods. It also implies -noUserMod.
; This is done to make saved maps end up in the right mod folder (and in the
; game-relative data path) to commit them later on.
+100 -1
View File
@@ -1,4 +1,5 @@
## List of key names that can be used in .cfg files for specifying hotkeys:
## This file documents keynames that can be used in .cfg files for specifying hotkeys
## Note: the keynames are not actually configured or implemented here
Backspace, BkSp
Tab
@@ -146,3 +147,101 @@ Right Mouse Button, MouseRight
Middle Mouse Button, MouseMiddle
Mouse Wheel Up, WheelUp
Mouse Wheel Down, WheelDown
## Special keys for international and non-QWERTY keyboards:
World0, W0
World1, W1
World2, W2
World3, W3
World4, W4
World5, W5
World6, W6
World7, W7
World8, W8
World9, W9
World10, W10
World11, W11
World12, W12
World13, W13
World14, W14
World15, W15
World16, W16
World17, W17
World18, W18
World19, W19
World20, W20
World21, W21
World22, W22
World23, W23
World24, W24
World25, W25
World26, W26
World27, W27
World28, W28
World29, W29
World30, W30
World31, W31
World32, W32
World33, W33
World34, W34
World35, W35
World36, W36
World37, W37
World38, W38
World39, W39
World40, W40
World41, W41
World42, W42
World43, W43
World44, W44
World45, W45
World46, W46
World47, W47
World48, W48
World49, W49
World50, W50
World51, W51
World52, W52
World53, W53
World54, W54
World55, W55
World56, W56
World57, W57
World58, W58
World59, W59
World60, W60
World61, W61
World62, W62
World63, W63
World64, W64
World65, W65
World66, W66
World67, W67
World68, W68
World69, W69
World70, W70
World71, W71
World72, W72
World73, W73
World74, W74
World75, W75
World76, W76
World77, W77
World78, W78
World79, W79
World80, W80
World81, W81
World82, W82
World83, W83
World84, W84
World85, W85
World86, W86
World87, W87
World88, W88
World89, W89
World90, W90
World91, W91
World92, W92
World93, W93
World94, W94
World95, W95
@@ -3,5 +3,6 @@
<VisualActor>
<SilhouetteDisplay>false</SilhouetteDisplay>
<SilhouetteOccluder>false</SilhouetteOccluder>
<VisibleInAtlasOnly>false</VisibleInAtlasOnly>
</VisualActor>
</Entity>
@@ -4,6 +4,7 @@
<Actor>example</Actor>
<SilhouetteDisplay>false</SilhouetteDisplay>
<SilhouetteOccluder>false</SilhouetteOccluder>
<VisibleInAtlasOnly>false</VisibleInAtlasOnly>
</VisualActor>
<Selectable/>
<Position>
@@ -4,6 +4,7 @@
<Actor>example</Actor>
<SilhouetteDisplay>false</SilhouetteDisplay>
<SilhouetteOccluder>false</SilhouetteOccluder>
<VisibleInAtlasOnly>false</VisibleInAtlasOnly>
</VisualActor>
<Selectable/>
<Position>
@@ -24,6 +24,9 @@
<props>
<prop actor="props/units/blood_01.xml" attachpoint="root"/>
</props>
<textures>
<texture file="skeletal/animal_camel_dead.png" name="baseTex"/>
</textures>
</variant>
<variant name="Run">
<props>
@@ -12,7 +12,9 @@
<animation file="quadraped/sheep_death.dae" name="Death" speed="90"/>
</animations>
<mesh>skeletal/sheep.dae</mesh>
<textures><texture file="skeletal/animal_sheep_a.dds" name="baseTex"/></textures>
<textures>
<texture file="skeletal/animal_sheep_a.dds" name="baseTex"/>
</textures>
</variant>
</group>
<group>
@@ -21,6 +23,9 @@
<props>
<prop actor="props/units/blood_01.xml" attachpoint="root"/>
</props>
<textures>
<texture file="skeletal/animal_sheep_dead.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
@@ -19,7 +19,9 @@
</group>
<group>
<variant frequency="100" name="texture">
<textures><texture file="skeletal/animal_whale_fin.png" name="baseTex"/></textures>
<textures>
<texture file="skeletal/animal_whale_fin.png" name="baseTex"/>
</textures>
</variant>
</group>
<group>
@@ -30,4 +32,5 @@
</props>
</variant>
</group>
<material>basic_spec.xml</material>
</actor>
@@ -29,11 +29,33 @@
</group>
<group>
<variant frequency="1" name="Palm Fronds-a">
<textures><texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm Fronds-b">
<textures><texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm Fronds-c">
<textures>
<texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm Fronds-d">
<textures>
<texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
<material>trans_wind_parallax_spec.xml</material>
</actor>
@@ -11,17 +11,33 @@
</group>
<group>
<variant frequency="1" name="Palm Fronds-a">
<textures><texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm Fronds-b">
<textures><texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm Fronds-c">
<textures><texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm Fronds-d">
<textures><texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
<material>trans_wind_parallax_spec.xml</material>
</actor>
@@ -17,17 +17,33 @@
</group>
<group>
<variant frequency="1" name="Palm Fronds-a">
<textures><texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm Fronds-b">
<textures><texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm-Fronds-c">
<textures><texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/></textures>
<variant frequency="1" name="Palm Fronds-c">
<textures>
<texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm-Fronds-d">
<textures><texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/></textures>
<variant frequency="1" name="Palm Fronds-d">
<textures>
<texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
<material>trans_wind_parallax_spec.xml</material>
</actor>
@@ -20,17 +20,33 @@
</group>
<group>
<variant frequency="1" name="Palm Fronds-a">
<textures><texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm Fronds-b">
<textures><texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm Fronds-c">
<textures><texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
<variant frequency="1" name="Palm Fronds-d">
<textures><texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/></textures>
<textures>
<texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/>
<texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
<texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
<material>trans_wind_parallax_spec.xml</material>
</actor>
@@ -8,6 +8,7 @@
<texture file="gaia/slab_desert_metal.dds" name="baseTex"/>
<texture file="gaia/ao/geo_mineral_01_ao.png" name="aoTex"/>
<texture file="gaia/slab_savanna_metal_spec.png" name="specTex"/>
<texture file="gaia/slab_desert_metal_norm.png" name="normTex"/>
</textures>
</variant>
<variant name="Mineral Slab 02">
@@ -16,6 +17,7 @@
<texture file="gaia/slab_desert_metal.dds" name="baseTex"/>
<texture file="gaia/ao/geo_mineral_02_ao.png" name="aoTex"/>
<texture file="gaia/slab_savanna_metal_spec.png" name="specTex"/>
<texture file="gaia/slab_desert_metal_norm.png" name="normTex"/>
</textures>
</variant>
</group>
@@ -27,5 +29,5 @@
</props>
</variant>
</group>
<material>basic_trans_ao_spec.xml</material>
<material>basic_trans_ao_parallax_spec.xml</material>
</actor>
@@ -7,6 +7,8 @@
<textures>
<texture file="gaia/stonequarry_desert.png" name="baseTex"/>
<texture file="gaia/ao/geo_stonemine_large_ao.png" name="aoTex"/>
<texture file="gaia/stonequarry_desert_spec.png" name="specTex"/>
<texture file="gaia/stonequarry_desert_norm.png" name="normTex"/>
</textures>
</variant>
</group>
@@ -17,5 +19,5 @@
</props>
</variant>
</group>
<material>basic_trans_ao.xml</material>
<material>basic_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="Base">
<particles file="flame_firepit_1.xml"/>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="Base">
<particles file="flame_firepit_2.xml"/>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="Base">
<particles file="smoke_blacksmith.xml"/>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<group>
<variant name="Base">
<particles file="sparks.xml"/>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -4,8 +4,13 @@
<group>
<variant frequency="1" name="props a">
<mesh>props/hele_stoa2_props_new.dae</mesh>
<textures><texture file="props/hele_props_a.dds" name="baseTex"/></textures>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/hele_stoa_great.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -7,5 +7,5 @@
<textures><texture file="props/hele_props_b.dds" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>playercolor_spec.xml</material>
</actor>
@@ -4,7 +4,13 @@
<group>
<variant frequency="1" name="tiles">
<mesh>props/hele_stoa2_tiles.dae</mesh>
<textures><texture file="props/hele_tile_b.dds" name="baseTex"/></textures>
<textures>
<texture file="props/hele_tile_b.dds" name="baseTex"/>
<texture file="props/hele_tile_b_norm.png" name="normTex"/>
<texture file="props/hele_tile_b_spec.png" name="specTex"/>
<texture file="structural/ao/hele_stoa_great.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -7,4 +7,5 @@
<textures><texture file="gaia/prop_tree_cypess.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_ao.xml</material>
</actor>
@@ -4,8 +4,13 @@
<group>
<variant name="stoa_props_a">
<mesh>props/hele_stoa_props_a.dae</mesh>
<textures><texture file="props/hele_props_a.dds" name="baseTex"/></textures>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/hele_stoa.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -7,5 +7,5 @@
<textures><texture file="props/hele_props_b.dds" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>playercolor_spec.xml</material>
</actor>
@@ -4,8 +4,13 @@
<group>
<variant name="stoa_roof">
<mesh>props/hele_stoa_props_roof.dae</mesh>
<textures><texture file="structural/hele_struct.dds" name="baseTex"/></textures>
<textures>
<texture file="structural/hele_struct.dds" name="baseTex"/>
<texture file="structural/hele_struct_norm.png" name="normTex"/>
<texture file="structural/hele_struct_spec.png" name="specTex"/>
<texture file="structural/ao/hele_stoa.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="barracks props a">
<mesh>props/athen_barracks_decor.dae</mesh>
<textures>
<texture file="props/hele_decor.png" name="baseTex"/>
<texture file="props/hele_decor_norm.png" name="normTex"/>
<texture file="props/hele_decor_spec.png" name="specTex"/>
<texture file="structural/ao/athen_barracks.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="barracks props a">
<mesh>props/athen_barracks_props_a.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/athen_barracks.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="barracks prop shields">
<mesh>structural/helle_barracks_propsb.dae</mesh>
<textures><texture file="props/athen_prop_shields.png" name="baseTex"/></textures>
</variant>
</group>
<material>playercolor_spec.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="barracks props a">
<mesh>props/athen_barracks_shields.dae</mesh>
<textures>
<texture file="props/athen_prop_shields.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>playercolor_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="barracks props a">
<mesh>props/athen_barracks_struct_b.dae</mesh>
<textures>
<texture file="structural/hele_struct_b.dds" name="baseTex"/>
<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
<texture file="structural/ao/athen_barracks.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="barracks props a">
<mesh>props/athen_barracks_tile_c.dae</mesh>
<textures>
<texture file="props/hele_tile_c.dds" name="baseTex"/>
<texture file="props/hele_tile_c_norm.png" name="normTex"/>
<texture file="props/hele_tile_c_spec.png" name="specTex"/>
<texture file="structural/ao/athen_barracks.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/athen_cc_decor.dae</mesh>
<textures>
<texture file="props/hele_decor.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>default.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/athen_cc_decor.dae</mesh>
<textures>
<texture file="props/hele_decor.png" name="baseTex"/>
<texture file="props/hele_decor_norm.png" name="normTex"/>
<texture file="props/hele_decor_spec.png" name="specTex"/>
<texture file="structural/ao/athen_civic_centre.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/athen_cc_propsa.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/athen_cc_propsa.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/athen_civic_centre.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/athen_cc_shields.dae</mesh>
<textures>
<texture file="props/athen_prop_shields.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>playercolor_spec.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/athen_cc_shields.dae</mesh>
<textures>
<texture file="props/athen_prop_shields.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>playercolor_spec.xml</material>
</actor>
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/athen_cc_tiles_b.dae</mesh>
<textures>
<texture file="props/hele_tile_b.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>default.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/athen_cc_tiles_b.dae</mesh>
<textures>
<texture file="props/hele_tile_b.dds" name="baseTex"/>
<texture file="props/hele_tile_b_norm.png" name="normTex"/>
<texture file="props/hele_tile_b_spec.png" name="specTex"/>
<texture file="structural/ao/athen_civic_centre.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/athen_dock_decor.dae</mesh>
<textures>
<texture file="props/hele_decor.png" name="baseTex"/>
<texture file="props/hele_decor_norm.png" name="normTex"/>
<texture file="props/hele_decor_spec.png" name="specTex"/>
<texture file="structural/ao/athen_dock.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/athen_dock_fishboat.dae</mesh>
<textures>
<texture file="structural/hele_fishing_boat.dds" name="baseTex"/>
<texture file="structural/ao/athen_dock.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/athen_dock_props.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/athen_dock.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>structural/athen_dock_struct_b.dae</mesh>
<textures>
<texture file="structural/hele_struct_b.dds" name="baseTex"/>
<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
<texture file="structural/ao/athen_dock.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/athen_dock_tiles.dae</mesh>
<textures>
<texture file="props/hele_tile_c.dds" name="baseTex"/>
<texture file="props/hele_tile_c_norm.png" name="normTex"/>
<texture file="props/hele_tile_c_spec.png" name="specTex"/>
<texture file="structural/ao/athen_dock.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/athen_dock_pentekonter.dae</mesh>
<textures>
<texture file="structural/hele_pentekonter.png" name="baseTex"/>
<texture file="structural/ao/athen_dock.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_fortress_shields.dae</mesh>
<textures><texture file="props/athen_prop_shields.png" name="baseTex"/></textures>
</variant>
</group>
<material>playercolor_spec.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_fortress_up_shields.dae</mesh>
<textures><texture file="props/athen_prop_shields.png" name="baseTex"/></textures>
</variant>
</group>
<material>playercolor_spec.xml</material>
</actor>
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="gymnasion decor">
<mesh>props/athen_gym_decor.dae</mesh>
<textures>
<texture file="props/hele_decor.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="gymnasion decor">
<mesh>props/athen_gym_decor.dae</mesh>
<textures>
<texture file="props/hele_decor.png" name="baseTex"/>
<texture file="props/hele_decor_norm.png" name="normTex"/>
<texture file="props/hele_decor_spec.png" name="specTex"/>
<texture file="structural/ao/athen_gym.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="gymnasion props">
<mesh>props/athen_gym_propsa.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="gymnasion props">
<mesh>props/athen_gym_propsa.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/athen_gym.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="gymnasion shields">
<mesh>props/athen_gym_shields.dae</mesh>
<textures>
<texture file="props/athen_prop_shields.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="gymnasion shields">
<mesh>props/athen_gym_shields.dae</mesh>
<textures>
<texture file="props/athen_prop_shields.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>playercolor_spec.xml</material>
</actor>
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="gymnasion tiles">
<mesh>props/athen_gym_tileb.dae</mesh>
<textures>
<texture file="props/hele_tile_b.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="gymnasion tiles">
<mesh>props/athen_gym_tileb.dae</mesh>
<textures>
<texture file="props/hele_tile_b.dds" name="baseTex"/>
<texture file="props/hele_tile_b_norm.png" name="normTex"/>
<texture file="props/hele_tile_b_spec.png" name="specTex"/>
<texture file="structural/ao/athen_gym.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="gymnasion trees">
<mesh>props/athen_gym_trees.dae</mesh>
<textures>
<texture file="gaia/prop_tree_cypess.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="gymnasion trees">
<mesh>props/athen_gym_trees.dae</mesh>
<textures>
<texture file="gaia/prop_tree_cypess.dds" name="baseTex"/>
<texture file="structural/ao/athen_gym.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="athenian temple decor">
<mesh>props/athen_temple_decor.dae</mesh>
<textures>
<texture file="props/hele_decor.png" name="baseTex"/>
<texture file="props/hele_decor_norm.png" name="normTex"/>
<texture file="props/hele_decor_spec.png" name="specTex"/>
<texture file="structural/ao/athen_temple.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="athen temple props a">
<mesh>props/athen_temple_propsa.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/athen_temple.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="athenian temple tile c">
<mesh>props/athen_temple_tile_c.dae</mesh>
<textures>
<texture file="props/hele_tile_c.dds" name="baseTex"/>
<texture file="props/hele_tile_c_norm.png" name="normTex"/>
<texture file="props/hele_tile_c_spec.png" name="specTex"/>
<texture file="structural/ao/athen_temple.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="theatron decor">
<mesh>props/athen_theatron_decor.dae</mesh>
<textures>
<texture file="props/hele_decor.png" name="baseTex"/>
<texture file="props/hele_decor_norm.png" name="normTex"/>
<texture file="props/hele_decor_spec.png" name="specTex"/>
<texture file="structural/ao/athen_theatron.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="theatron marble">
<mesh>props/athen_theatron_marble.dae</mesh>
<textures>
<texture file="props/marble.png" name="baseTex"/>
<texture file="props/marble_norm.png" name="normTex"/>
<texture file="props/marble_spec.png" name="specTex"/>
<texture file="structural/ao/athen_theatron.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="theatron nature">
<mesh>props/athen_theatron_nature.dae</mesh>
<textures>
<texture file="props/structs_nature.png" name="baseTex"/>
<texture file="props/structs_nature_norm.png" name="normTex"/>
<texture file="props/structs_nature_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_trans_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="theatron props">
<mesh>props/athen_theatron_props_a.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/athen_theatron.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="theatron tiles">
<mesh>props/athen_theatron_tile_c.dae</mesh>
<textures>
<texture file="props/hele_tile_c.dds" name="baseTex"/>
<texture file="props/hele_tile_c_norm.png" name="normTex"/>
<texture file="props/hele_tile_c_spec.png" name="specTex"/>
<texture file="structural/ao/athen_theatron.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Props_a">
<mesh>structural/kart_blacksmith_props.dae</mesh>
</variant>
</group>
<group>
<variant>
<textures><texture file="props/palisade_main.png" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
@@ -4,11 +4,11 @@
<castshadow/>
<group>
<variant frequency="1" name="mill-props-a">
<mesh>props/kart_mill_a.dae</mesh>
<variant frequency="1" name="storehouse-props-a">
<mesh>props/kart_storehouse_a.dae</mesh>
</variant>
<variant frequency="1" name="mill-props-b">
<mesh>props/kart_mill_b.dae</mesh>
<variant frequency="1" name="storehouse-props-b">
<mesh>props/kart_storehouse_b.dae</mesh>
</variant>
</group>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="barrels">
<mesh>props/celt_blacksmith_armorstand_rome_csp_a.dae</mesh>
<textures>
<texture file="skeletal/rome_csp_a.dds" name="baseTex"/>
<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="barrels">
<mesh>props/celt_blacksmith_armorstand_struct.dae</mesh>
<textures>
<texture file="structural/celt_struct_1.dds" name="baseTex"/>
<texture file="structural/celt_struct_1_norm.png" name="normTex"/>
<texture file="structural/celt_struct_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="barrels">
<mesh>props/celt_blacksmith_barrels.dae</mesh>
<textures>
<texture file="props/celt_prop_1.dds" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="bucket">
<mesh>props/celt_blacksmith_bucket.dae</mesh>
<textures>
<texture file="props/celt_prop_1.dds" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="barrels">
<mesh>props/celt_blacksmith_bucket_water.dae</mesh>
<textures>
<texture file="structural/celt_struct_1.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_water.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="barrels">
<mesh>props/celt_blacksmith_props.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
<texture file="props/celt_prop_1_spec.png" name="specTex"/>
<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="barrels">
<mesh>props/celt_blacksmith_props_new.dae</mesh>
<textures>
<texture file="props/celt_props_new.dds" name="baseTex"/>
<texture file="structural/ao/celt_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -3,7 +3,7 @@
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/celt_mill_props.dae</mesh>
<mesh>props/celt_storehouse_props.dae</mesh>
<textures>
<texture file="props/celt_prop_1.png" name="baseTex"/>
<texture file="props/celt_prop_1_norm.png" name="normTex"/>
@@ -3,7 +3,7 @@
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/celt_mill_silo.dae</mesh>
<mesh>props/celt_storehouse_silo.dae</mesh>
<textures>
<texture file="structural/celt_broch.dds" name="baseTex"/>
<texture file="structural/celt_broch_norm.png" name="normTex"/>
@@ -3,7 +3,7 @@
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/celt_mill_shield.dae</mesh>
<mesh>props/celt_storehouse_shield.dae</mesh>
<textures><texture file="props/celt_props_new.dds" name="baseTex"/></textures>
</variant>
</group>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="barrel">
<mesh>props/hele_blacksmith_barrel_propsa.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/> <texture file="structural/ao/hele_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="barrel">
<mesh>props/hele_blacksmith_barrel_shield.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/> <texture file="structural/ao/hele_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="bucket">
<mesh>props/hele_blacksmith_bucket_propsa.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/> <texture file="structural/ao/hele_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="bucket">
<mesh>props/hele_blacksmith_bucket_water.dae</mesh>
<textures>
<texture file="structural/hele_struct_b.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_water.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="bucket">
<mesh>props/hele_blacksmith_props_a.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/hele_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="bucket">
<mesh>props/hele_blacksmith_rooftiles.dae</mesh>
<textures>
<texture file="structural/rooftiles_broken.png" name="baseTex"/> <texture file="structural/ao/hele_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>basic_trans_ao.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="bucket">
<mesh>props/hele_blacksmith_shield.dae</mesh>
<textures>
<texture file="props/hele_props_b.dds" name="baseTex"/> <texture file="structural/ao/hele_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="bucket">
<mesh>props/hele_blacksmith_shield1.dae</mesh>
<textures>
<texture file="props/hele_props_b.dds" name="baseTex"/> <texture file="structural/ao/hele_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="barrel">
<mesh>props/hele_blacksmith_shield_back.dae</mesh>
<textures>
<texture file="props/hele_props_b.dds" name="baseTex"/> <texture file="structural/ao/hele_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="bucket">
<mesh>props/hele_blacksmith_shields.dae</mesh>
<textures>
<texture file="props/hele_props_b.dds" name="baseTex"/> <texture file="structural/ao/hele_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="bucket">
<mesh>props/hele_blacksmith_spears_propsa.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/> <texture file="structural/ao/hele_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="bucket">
<mesh>props/hele_blacksmith_struct.dae</mesh>
<textures>
<texture file="structural/hele_struct.dds" name="baseTex"/>
<texture file="structural/hele_struct_norm.png" name="normTex"/>
<texture file="structural/hele_struct_spec.png" name="specTex"/>
<texture file="structural/ao/hele_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="bucket">
<mesh>props/hele_blacksmith_swords_propsa.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/> <texture file="structural/ao/hele_blacksmith.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -4,8 +4,12 @@
<group>
<variant frequency="1" name="hellenes_civic_centre_props_a">
<mesh>structural/hele_civic_props.dae</mesh>
<textures><texture file="props/hele_props_a.dds" name="baseTex"/></textures>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_parallax_spec.xml</material>
</actor>
@@ -4,8 +4,11 @@
<group>
<variant frequency="1" name="hellenes_civic_centre_round roof">
<mesh>structural/hele_civic_round.dae</mesh>
<textures><texture file="structural/hele_roof_round.dds" name="baseTex"/></textures>
<textures>
<texture file="structural/hele_roof_round.dds" name="baseTex"/>
<texture file="structural/hele_roof_round_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_spec.xml</material>
<material>basic_specmap.xml</material>
</actor>
@@ -4,8 +4,10 @@
<group>
<variant>
<mesh>structural/hele_civic_shields.dae</mesh>
<textures><texture file="props/hele_props_b.dds" name="baseTex"/></textures>
<textures>
<texture file="props/hele_props_b.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>playercolor_spec.xml</material>
</actor>
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1">
<mesh>props/hele_corral_doors.dae</mesh>
<textures><texture file="props/hele_props_a.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1">
<mesh>props/hele_corral_doors.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/hele_corral.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="farmstead hay">
<mesh>props/hele_corral_hay.dae</mesh>
<textures>
<texture file="props/wrld_hay_a.dds" name="baseTex"/>
<texture file="structural/ao/hele_corral.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="farmstead plants">
<mesh>props/hele_corral_nature.dae</mesh>
<textures><texture file="props/structs_nature.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1">
<mesh>props/hele_corral_roof.dae</mesh>
<textures><texture file="structural/rooftiles_broken.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1">
<mesh>props/hele_corral_roof.dae</mesh>
<textures><texture file="structural/rooftiles_broken.png" name="baseTex"/>
<texture file="structural/ao/hele_corral.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>basic_trans_ao.xml</material>
</actor>
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="bucket">
<mesh>props/hele_corral_water.dae</mesh>
<textures>
<texture file="props/structs_nature.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>player_water.xml</material>
</actor>
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="farmstead hay">
<mesh>props/hele_farmstead_hay.dae</mesh>
<textures><texture file="props/celt_prop_1.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="farmstead hay">
<mesh>props/hele_farmstead_hay.dae</mesh>
<textures><texture file="props/wrld_hay_a.dds" name="baseTex"/>
<texture file="structural/ao/hele_farmstead.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="farmstead plants">
<mesh>props/hele_farmstead_nature.dae</mesh>
<textures><texture file="props/structs_nature.png" name="baseTex"/>
</textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
@@ -1,10 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="farmstead props">
<mesh>props/hele_farmstead_props.dae</mesh>
<textures><texture file="props/hele_props_a.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="farmstead props">
<mesh>props/hele_farmstead_props.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/hele_farmstead.png" name="aoTex"/> </textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_fortress_up_gate.dae</mesh>
<textures><texture file="props/hele_gate.png" name="baseTex"/></textures>
</variant>
</group>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_fortress_up_gate.dae</mesh>
<textures>
<texture file="props/hele_gate.png" name="baseTex"/>
<texture file="props/hele_gate_norm.png" name="normTex"/>
<texture file="props/hele_gate_spec.png" name="specTex"/>
<texture file="structural/ao/hele_fortress.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_fortress_props.dae</mesh>
<textures><texture file="props/hele_props_a.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_fortress_props.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/hele_fortress.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_fortress_up_props.dae</mesh>
<textures><texture file="props/hele_props_a.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_fortress_up_props.dae</mesh>
<textures>
<texture file="props/hele_props_a.dds" name="baseTex"/>
<texture file="props/hele_props_a_norm.png" name="normTex"/>
<texture file="props/hele_props_a_spec.png" name="specTex"/>
<texture file="structural/ao/hele_fortress.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_fortress_shields.dae</mesh>
<textures><texture file="props/hele_props_b.dds" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_fortress_shields.dae</mesh>
<textures><texture file="props/hele_props_b.dds" name="baseTex"/></textures>
</variant>
</group>
<material>playercolor_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_fortress_up_tile_b.dae</mesh>
<textures>
<texture file="props/hele_tile_b.dds" name="baseTex"/>
<texture file="props/hele_tile_b_norm.png" name="normTex"/>
<texture file="props/hele_tile_b_spec.png" name="specTex"/>
<texture file="structural/ao/hele_fortress.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -4,8 +4,13 @@
<group>
<variant>
<mesh>structural/hele_gate_door.dae</mesh>
<textures><texture file="structural/hele_struct_b.dds" name="baseTex"/></textures>
<textures>
<texture file="structural/hele_struct_b.dds" name="baseTex"/>
<texture file="structural/hele_struct_b_norm.png" name="normTex"/>
<texture file="structural/hele_struct_b_spec.png" name="specTex"/>
<texture file="structural/ao/hele_wall_gate.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans.xml</material>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_house_a_decor.dae</mesh>
<textures>
<texture file="props/hele_decor.png" name="baseTex"/>
<texture file="props/hele_decor_norm.png" name="normTex"/>
<texture file="props/hele_decor_spec.png" name="specTex"/>
<texture file="structural/ao/hele_house_a.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/hele_house_a_nature.dae</mesh>
<textures>
<texture file="props/structs_nature.png" name="baseTex"/>
<texture file="props/structs_nature_norm.png" name="normTex"/>
<texture file="props/structs_nature_spec.png" name="specTex"/>
<texture file="structural/ao/hele_house_a.png" name="aoTex"/>
</textures>
</variant>
</group>
<material>basic_trans_ao_parallax_spec.xml</material>
</actor>
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="house a props">
<mesh>props/hele_house_a_props.dae</mesh>
<textures><texture file="props/hele_props_a.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>

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