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

Compare commits

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

592 Commits
a19 .. a20

Author SHA1 Message Date
Itms 3f1b30a8e3 Update Translators credits and add texane to the list of contributors (refs #3863). 
This was SVN commit r17964.
 2016-03-28 00:23:04 +00:00
Itms a517184150 Update the creditTranslators script for the A20 languages. 
This was SVN commit r17963.
 2016-03-28 00:18:13 +00:00
elexis d3255168b9 enet backward-compatibility fix, refs #2854. Patch by texane, fixes #3863. 
This was SVN commit r17960.
 2016-03-27 23:27:37 +00:00
Itms 373107898c Update the list of included languages for A20: Bulgarian, Hungarian and Swedish get in the team! 
This was SVN commit r17959.
 2016-03-27 22:08:25 +00:00
elexis ad34950780 Add a missing check to 347ffabaeb as the previous one throws errors in case a dead sheep lies in the selection rectangle. 
Thanks bb for reporting, refs #2407.

This was SVN commit r17957.
 2016-03-27 12:46:18 +00:00
Itms 6b2a3bb549 Translate the "Observer" choice in the observer mode player selection dropdown. 
This was SVN commit r17956.
 2016-03-26 19:19:49 +00:00
Itms c777e34cba Properly fix the typo mentioned in 91ed318f0d. The ++i in the for loop already increments i so doing it once more is not wanted. 
Fixes #3854.

This was SVN commit r17955.
 2016-03-26 13:25:51 +00:00
sanderd17 6b212dc6ad Fix promotion of barrack champions for the Macedonians. Fixes #3853. Patch by fatherbushido. 
This was SVN commit r17954.
 2016-03-26 11:21:49 +00:00
mimo b0c74fdaa0 petra: fix a misbehaviour spotted by sanderd17, when the defenseManager tries to rescue units performing an attack 
This was SVN commit r17953.
 2016-03-25 18:21:13 +00:00
elexis c5ede78373 Require players to own a wonder for 10minutes (instead of 5) before declaring them the winner of wonder-victory games. 
This was SVN commit r17952.
 2016-03-25 18:05:19 +00:00
sanderd17 6f0d0ff8f4 Round max hp of units in simulation. Refs #3855 
This was SVN commit r17951.
 2016-03-25 12:51:48 +00:00
Itms e8decfbd2b Amend fdf7dabe18: the foundation component won't exist for a mirage (foundation inside the fog-of-war) so the miraged interface to it should be queried. 
Fixes #3849.

This was SVN commit r17949.
 2016-03-24 21:48:15 +00:00
elexis aa64a92d1a Ignore production hotkeys for observers instead of throwing errors on press. 
This was SVN commit r17948.
 2016-03-24 21:26:34 +00:00
elexis 350422dcae Fix whitespace (leading mixed whitespace, trailing whitespace and missing newlines). 
Remove three unused variables area, ix and iz.
Thanks mimo for reporting.

This was SVN commit r17947.
 2016-03-24 15:53:53 +00:00
elexis 66267cb714 Remove a check for an edge case where the entrance of a bluff would be cutoff by the players territory. 
Instead, reserve some space at the bottom of the slope for an entrance.
Finetune the terrain textures of bluffs depending on the biome.
Patch by _kali, refs #3455.

This was SVN commit r17946.
 2016-03-24 15:34:36 +00:00
elexis 6312b71911 Improve the resource distribution on the map "Ambush" and maps using bluffs in general. Based on patch by _kali, refs #3455. 
Bluffs:
Cover half instead of most of the area of bluffs with forests (to allow
placing CCs / forts there).
Proportionally reduce the likelyhood of placing metal/stone on bluffs.
Compensate the absence of forests on the savanna biome with more
straggler trees.

Ambush:
Place forests also on the mainland (so that players are not immediately
forced to expand to bluffs).
Reduce the amount of berries and animals a bit following 91e8248273.

This was SVN commit r17945.
 2016-03-24 14:54:47 +00:00
elexis ebfd214a19 Return Infinity instead of undefined in BuildingAI.GetMaxArrowCount. Refs #3196, #3846 and 82fa9d8f5b. 
Notice the previous check `if (count > this.GetMaxArrowCount())`
implicitly relied on
numerical comparisons returning false if one of the two arguments is
undefined.

This was SVN commit r17944.
 2016-03-24 13:25:47 +00:00
elexis 58d3425ad4 Reduce the number of lobby gamelist updates by roughly 60-80% by eliminating duplicate packets, refs #3847. 
This was SVN commit r17943.
 2016-03-24 12:08:00 +00:00
Itms 572847ddd4 Revert 1f34a004e5. 
It breaks the Windows build by using time_t and it changes too many
things to the way lobby messages are processed to be entirely safe to
commit now.
Refs #3832.

As a side effect it reverts e514aca599, refs #3350.

This was SVN commit r17941.
 2016-03-23 21:58:23 +00:00
elexis c58bbfaa14 Select observer for defeated players, but keep the current player selected on win. 
This was SVN commit r17940.
 2016-03-23 13:49:59 +00:00
sanderd17 82fa9d8f5b Fix counting issue with previous commit 
This was SVN commit r17939.
 2016-03-23 10:01:27 +00:00
sanderd17 63d276b73b Fix counting of arrows in buildings: don't remove entities twice from the garrisonholder. Fixes #3846 
This was SVN commit r17938.
 2016-03-23 09:04:02 +00:00
elexis e7deb587bb Random-map-script cleanup. 
Use constants when checking for the biome type.
Remove unused code for nonexistent biomeID 0 from gaia.js.

This was SVN commit r17937.
 2016-03-23 03:05:39 +00:00
elexis cfb8a6e30e Fix confusion between concat and push in map Frontier, patch by _kali. 
This was SVN commit r17936.
 2016-03-23 02:06:06 +00:00
sanderd17 fc14e733bd Change an Object into a Map, this should stop the deserializer of reordering the keys in some cases and stop an OOS on rejoining. Refs #3375 
This was SVN commit r17935.
 2016-03-22 20:57:27 +00:00
mimo c43ce2ca55 cleanup of missing semicolon 
This was SVN commit r17934.
 2016-03-21 20:33:05 +00:00
elexis 1a02684cf7 Check for GUID, as the playerIndex doesn't distinguish between observers. Refs #1767. 
(Avoid private messages where sender and addressee are identical).

This was SVN commit r17933.
 2016-03-21 18:58:52 +00:00
mimo f8d05ed5c3 fix petra serialization (add two variables forgotten, and remove two useless ones) 
This was SVN commit r17932.
 2016-03-21 18:15:39 +00:00
sanderd17 820846b56b Completely initialise Auras even before ownership is set. Fixes #3843 
This was SVN commit r17931.
 2016-03-21 16:22:40 +00:00
elexis 0448a3de73 Lobby cleanup. 
Make sense of the spammonitor by using an object instead of an array and
introducing a global constant instead of using magic numbers.

This was SVN commit r17930.
 2016-03-21 14:29:41 +00:00
elexis e514aca599 Display chat-timestamps in the lobby in the correct timezone, refs #3350. 
This was SVN commit r17929.
 2016-03-21 13:53:22 +00:00
elexis 1f34a004e5 Add timestamps to the GUI/chat-notifications sent from XmppClient, even if it's not a historical message. 
Correct spammonitor behavior for historical messages and when returning
to the lobby from a game.
Patch by Josh, fixes #3832.

This was SVN commit r17928.
 2016-03-21 13:48:22 +00:00
elexis 86a309ad76 Show replay path in commandline interface. 
This was SVN commit r17927.
 2016-03-21 12:09:21 +00:00
LordGood f8a09cf5c1 Seleucid barracks model, actor, AO 
This was SVN commit r17926.
 2016-03-21 10:25:01 +00:00
elexis 8f4daa9dd0 Lobby performance improvement. 
Since 8b437a0b1c, updatePlayerList() is called everytime a muc-message
is received, calling playersBox.SelectionChange(), calling
displayProfile() which requests the profile from the server again.
Similar cases should be handled in #3840.

This was SVN commit r17924.
 2016-03-21 03:44:01 +00:00
elexis cfe169d2bc Reduce lobbybot load by only requesting a ratinglist when actually opening the leaderboard (as suggested by scythetwirler). 
This was SVN commit r17923.
 2016-03-21 01:51:05 +00:00
elexis 9e338f4461 Barter component cleanup. Replace deprecated for-each. 
This was SVN commit r17922.
 2016-03-21 00:45:32 +00:00
elexis 10b6022557 Convert string to int conversion in the lobby-leaderboard. 
This was SVN commit r17921.
 2016-03-21 00:38:31 +00:00
elexis 91e8248273 Make "Lion's Den" and "Empre" default maps. 
Add more animals/berries to "Ambush".
Improve placing of initial resources on all of _kali's maps.

* Increase distance from chickens to CC from `7` to `9` (to account for
roman CCs, refs #3836)
* Increase number of initial trees from `5` to `25` (ensuring players
have enough wood to build a new CC)
* Avoid resource collisions by increasing the minDistance from `2` to
`4` (when not using angles)
* Ensure that initial resources are placed (by first placing mines and
adding retry-loops for the other resources)
  Notice The loop can't be moved to `createObjectGroup` since
    * the parameters (like `mAngle`) also need to randomized again
    * we need to place initial resources in range of the actual
playerbase

This was SVN commit r17920.
 2016-03-20 19:03:43 +00:00
Itms b84b9a374a Improve some strings based on translators' feedback. 
This was SVN commit r17919.
 2016-03-20 18:58:59 +00:00
mimo 81948477df fix the test when changing markets, fixes #3838 
This was SVN commit r17918.
 2016-03-20 14:00:49 +00:00
scythetwirler 3025b4b8e3 Reduce query time of rating sorts. 
This was SVN commit r17917.
 2016-03-20 05:17:15 +00:00
sanderd17 01b963b259 Update version names to A20 
This was SVN commit r17915.
 2016-03-19 08:21:00 +00:00
elexis d5059e8e23 Don't use that variable outside of scope. 
This was SVN commit r17913.
 2016-03-18 17:54:22 +00:00
elexis 31fe2770f6 Update credits, refs #3234. 
This was SVN commit r17912.
 2016-03-18 14:58:13 +00:00
elexis 5c6ba10626 Remove blood from skeletons, refs #3455. 
This was SVN commit r17911.
 2016-03-18 14:02:47 +00:00
elexis 3337adcbbe Remove unused variables, duplicate comments and trailing whitespace from volcanic lands. 
This was SVN commit r17910.
 2016-03-18 12:04:17 +00:00
elexis b623a3a9ff Ensure initial trees are placed on volcanic lands and add missing semicolons. Patch by niektb, refs #3808. 
This was SVN commit r17909.
 2016-03-18 11:56:00 +00:00
sanderd17 0a8ed799f1 Revert tech applying to auras due to issues. Patch by fatherbushido. Fixes #3830 
This was SVN commit r17907.
 2016-03-17 08:25:13 +00:00
sanderd17 d44c4fd5c6 Update manual to mention skirmish maps 
This was SVN commit r17906.
 2016-03-17 08:13:52 +00:00
Itms f7045b23ce Fix some errors reported by translators on Transifex. 
This was SVN commit r17905.
 2016-03-16 23:27:17 +00:00
Itms 19a218cd48 Change the language names for translation credits to the names in the original language. 
This removes the loophole in our release process, fixes #3827.

This was SVN commit r17904.
 2016-03-16 23:04:10 +00:00
Itms 6d52a71d4a Include some new random maps by kali! Style updates by elexis and map previews by niektb. 
Refs #3455

This was SVN commit r17903.
 2016-03-16 22:59:10 +00:00
sanderd17 94f9100ba1 Limit the length of error strings to prevent crashes when logging long strings 
This was SVN commit r17902.
 2016-03-16 18:24:32 +00:00
mimo 29e0a23c8e fix gui for non-sharable dropsites 
This was SVN commit r17901.
 2016-03-16 16:13:18 +00:00
sanderd17 d033038d69 Also translate specific name in strucTree (translations already exist) 
This was SVN commit r17900.
 2016-03-16 12:22:23 +00:00
mimo c3324765d2 improved icon from niektb 
This was SVN commit r17899.
 2016-03-15 20:22:19 +00:00
mimo 0863f20722 cleanup 
This was SVN commit r17898.
 2016-03-15 18:27:17 +00:00
elexis 62f6aa07d0 Add missing round to the armor tooltip. Patch by fatherbushido, fixes #3817. 
This was SVN commit r17897.
 2016-03-15 05:12:22 +00:00
elexis 518ae4fcb2 Lock diplomacy for all players if the locked-teams setting is enabled, fixes #3702. 
GUI fix in 17e6b316fa, simulation fix here.

Remove quadruplicated code!
Check in Commands.js as this one handles user input.
Don't check in Player.js as the function should be versatile enough to
change diplomacy from all components, even if teams are locked or
ceasefire active.

This was SVN commit r17896.
 2016-03-15 04:53:13 +00:00
elexis d61e315f4d Fix few style issues remarked by leper. 
Add a unit (seconds) to the network-timeout warning.
Rename isChatAddressee to parseChatAddressee as it changes the message.
Early return for EnableOOSLog to avoid printing duplicate messages.

This was SVN commit r17895.
 2016-03-15 04:37:41 +00:00
elexis a2ecee4168 Rest of the previous commit, refs #3743. 
This was SVN commit r17894.
 2016-03-15 04:08:07 +00:00
elexis d7fe1b6002 Allow observers to follow the commands and attacks of the currently viewed player, fixes #3743. 
If enabled, the camera focuses on the affected units (source and target)
and selects them.

This was SVN commit r17893.
 2016-03-15 04:02:15 +00:00
Itms f1d99a9450 Fix a typo which made the "Exit" button in the in-game menu look weird. Thanks niektb for noticing! 
This was SVN commit r17892.
 2016-03-14 19:47:34 +00:00
mimo dd07241ef7 Petra: fix a bug in attackPlan spotted by leper 
This was SVN commit r17891.
 2016-03-14 18:08:51 +00:00
elexis c4f607f6e0 Random Map cleanup. 
Remove unneeded braces and comments.
Use ++i instead of i++.
Use foo.bar instead of foo["bar"].
Fix a comment.

This was SVN commit r17890.
 2016-03-14 18:00:09 +00:00
sanderd17 87da09bf1b Fix tests broken in 028e573759 
This was SVN commit r17889.
 2016-03-14 17:50:56 +00:00
elexis bedce1e617 Observer fix for shared-dropsites, refs #3791. 
This was SVN commit r17887.
 2016-03-14 01:23:09 +00:00
elexis 541a5567d8 Show the attack-notification to observers. 
Allow adding entities to the selection if they are owned by the observed
player.

This was SVN commit r17886.
 2016-03-14 00:35:37 +00:00
Itms a7b31398b0 Revert dbbc600dc3, refs #3745, refs #3823 
This was SVN commit r17885.
 2016-03-13 22:18:31 +00:00
mimo f7ea533ab9 better icon from niektb, refs #3791 
This was SVN commit r17884.
 2016-03-13 17:38:23 +00:00
Itms 9238fc8713 Fix oversight in dbbc600dc3: GetExtendedEntityState is far too demanding for performance, and it is not needed. 
Refs #3745

This was SVN commit r17883.
 2016-03-13 17:06:12 +00:00
Itms d84ad7799a Limit arrows on certain buildings and ships. Patch by sanderd17, fixes #3196. 
Balancing by elexis, reverts fcf7344537 in favor of the new total arrow
limit.

This was SVN commit r17882.
 2016-03-13 17:02:18 +00:00
elexis 042c9a9334 Allow hosting matches with 8 players and up to 16 observers, fixes #3254. 
The host can change the number of allowed observers in running games.

Make sure that joining observers won't take the "slot" of disconnected
players, fixes #3671.

Send clients a new disconnect reason "Server full" instead of letting
them timeout.

This was SVN commit r17881.
 2016-03-13 16:52:00 +00:00
Itms dbbc600dc3 Workaround for the multiple-selection commands problem in the case of the back-to-work button. In this case a fix is really needed, as long as the system for handling the selection is not improved. 
Also fix the wrong documentation for some functions.

Patch by svott, fixes #3745.

This was SVN commit r17880.
 2016-03-13 16:44:21 +00:00
elexis 369ca4d012 Allow RMS authors to set the biomeID explicitly or to randomize excluding some biomes. 
Add missing semicolon for random_sky.
Fix some scope whitespace issues.

This was SVN commit r17879.
 2016-03-13 14:13:38 +00:00
mimo 2022aad5d1 decrease the hack armour of fields to favor rushes 
This was SVN commit r17878.
 2016-03-13 14:09:52 +00:00
elexis 6c8004c206 Player component cleanup. 
Fat-arrow.
Whitespace fixes for some selected objects.
Newlines to make it more readable.
++i instead of i++.

This was SVN commit r17877.
 2016-03-13 13:49:37 +00:00
elexis 2e5969c395 Thanks Guuts for #3606 and the other patches you have worked on! 
This was SVN commit r17876.
 2016-03-13 13:36:25 +00:00
mimo 028e573759 allow the use of allied dropsites using tech, fixes #3791 
This was SVN commit r17875.
 2016-03-13 13:33:21 +00:00
Itms bcfa626bc4 Improve 27b4df0978. 
This was SVN commit r17874.
 2016-03-12 22:20:15 +00:00
Itms 26488bd892 Fix ugly all-bold tooltip for the multiple details area capture bar (reported by bb who has a good eyesight!) 
This was SVN commit r17871.
 2016-03-12 18:36:28 +00:00
Itms c9cecab0be Remove libjpeg. Fixes #2828. 
Based on patch by dalerank, tested on Windows, might need to be amended
for OSX.

This was SVN commit r17870.
 2016-03-12 18:15:04 +00:00
sanderd17 753a79ff67 Fix messages.json 
This was SVN commit r17868.
 2016-03-12 17:48:16 +00:00
Itms b2f0544215 Delete some broken actor and art files, listed by stanislas69, refs #2524 
This was SVN commit r17867.
 2016-03-12 15:46:26 +00:00
Itms a4a1bcab94 Remove the now useless UnitMotion planning, and cleanup of CCmpUnitMotion.cpp (unused variables, whitespace). Fixes #3790. 
This should have a noticeable impact on performance (in the good way!)

Thanks mimo for noticing something was off with the planning system!

This was SVN commit r17866.
 2016-03-12 13:44:51 +00:00
Itms 27b4df0978 Improve some aura and technology descriptions where there was a confusion between speed and time. 
Patch by Palaxin, fixes #3600

This was SVN commit r17865.
 2016-03-12 13:18:32 +00:00
mimo 2546eecbf3 fix modifications (by tech or aura) of garrison and formation auras, fixes #3799, patch by fatherbushido 
This was SVN commit r17863.
 2016-03-10 21:46:37 +00:00
elexis 18829e17c2 Fix comment following e0a9dfd5a2. 
This was SVN commit r17862.
 2016-03-10 17:11:36 +00:00
elexis e0a9dfd5a2 Allow changing the late-observer flag in a running game, fixes #3669. 
Remove it from the game-attributes, since it is not used in the
simulation, nor are they supposed to change in running games.

This was SVN commit r17861.
 2016-03-10 11:35:43 +00:00
elexis 2305218d9f Optionnames are in lower case, refs #3604. 
This was SVN commit r17860.
 2016-03-10 11:16:15 +00:00
elexis b71e7e3538 Petra chathelper cleanup. 
Inline variables used only once.

This was SVN commit r17859.
 2016-03-10 10:44:52 +00:00
elexis aa1e3f6d06 Session cleanup 
Simpler errorhandling when fetching GUIInterface-notifications.

This was SVN commit r17858.
 2016-03-10 10:15:23 +00:00
Itms 4b636fc407 Add a precision to the instructions included in default.cfg. 
This was SVN commit r17857.
 2016-03-09 21:48:41 +00:00
mimo 212d8e7dd0 cleanup of 98b4fe6d00 
This was SVN commit r17856.
 2016-03-09 21:45:14 +00:00
elexis 04586c9e8b Adapt the number-of-players GUI objects of the lobby to support 10 and more clients. 
This was SVN commit r17855.
 2016-03-09 21:30:53 +00:00
mimo 98b4fe6d00 fixes confusion between markets when doing trade, fixes #3812, patch by leper and fatherbushido 
This was SVN commit r17854.
 2016-03-09 19:54:12 +00:00
elexis 7409fe4bec Defeated players are not supposed to do stuff. 
Not sending resources on defeat also gives an incentive to completely
defeat players.
Patch by fatherbushido, refs #3265.

This was SVN commit r17853.
 2016-03-09 16:11:55 +00:00
elexis 2fea95530f Quit if the user requested that while loading the replay list. Fixes #3446. 
This was SVN commit r17852.
 2016-03-09 16:06:41 +00:00
elexis f2ed0098ee Make the playername-deduplication ("User" -> "User (2)") optional. 
Have it disabled by default to fix #3604.
Prevents players from rejoining as late-observers in case they timed-out
on the client-side but not on the server-side.

This was SVN commit r17851.
 2016-03-09 15:02:38 +00:00
elexis c0f321b52e Add svott (refs #3736) and fpre (refs #3205) to the contributors. 
This was SVN commit r17850.
 2016-03-09 14:33:41 +00:00
mimo 7c33658fdd ships can be garrisoned in cart superDock with a heal rate, fixes #3810, patch by fatherbushido 
This was SVN commit r17849.
 2016-03-08 21:50:37 +00:00
mimo a1c6d9149b fix typo from 8725c3ae7a 
This was SVN commit r17848.
 2016-03-08 18:49:06 +00:00
elexis c7c8d9a5c7 Map previews for 3 random maps and some selected demo maps. Patch by yoreei, fixes #3798. 
This was SVN commit r17847.
 2016-03-08 17:29:18 +00:00
elexis 52bf894c50 Remove naval-tag from flood. 
(It can be played without any ships and naval maps are not offered by
default).
Thanks yoreei for reporting.

This was SVN commit r17846.
 2016-03-08 14:00:44 +00:00
elexis c511e9c4ec To avoid unintentional joins, ask lobby users if they want to late-join the game as an observer before attempting to do so. Refs #3739. 
Add selectedGame() to simplify some checks.
Add linebreaks to hostGame().

This was SVN commit r17845.
 2016-03-08 00:18:21 +00:00
elexis ea73e6b3b4 New random map script "Flood". Created by _kali and niektb, refs #3455. 
This was SVN commit r17844.
 2016-03-07 23:13:52 +00:00
elexis 35a13c5080 Remove trailing whitespace. 
This was SVN commit r17843.
 2016-03-07 17:28:31 +00:00
elexis f3ba295593 Add new contributor _kali to the randommap-script credits. 
Add existing contributors niektb and Stan to the map-section for the new
maps in alpha 20.

This was SVN commit r17842.
 2016-03-07 17:12:34 +00:00
elexis dd5cc3d02e Gamesetup cleanup. 
Inline initializaiton of g_ServerName and fix a typo in e05c8263c5.

This was SVN commit r17841.
 2016-03-07 15:05:16 +00:00
elexis fc0f496e3d Fix indentation, refs #3803. 
This was SVN commit r17840.
 2016-03-07 11:44:03 +00:00
elexis e827ebeb5c Multiplayer-gamesetup cleanup. 
Eliminate deprecated for-each.
Quote object keys.
Remove unneeded sprintf from error() calls.
Remove unneeded comments.
Add linebreaks.

This was SVN commit r17839.
 2016-03-07 11:42:52 +00:00
Itms 05bf260838 Fix the garrisoning flag for some Seleucid buildings, patch by stanislas69. Fixes #3631 
This was SVN commit r17838.
 2016-03-07 11:38:00 +00:00
elexis 49c30ae4b8 Give credit to three awesome contributors, refs #3802. 
This was SVN commit r17837.
 2016-03-07 10:24:38 +00:00
elexis 231586f2fa Aura cleanup. 
Eliminate deprecated for-each.
Remove unused variable auraNames.
Use array-filter instead of for-loop.
Fix whitespace.
Don't use affectedPlayers outside of scope.

This was SVN commit r17835.
 2016-03-06 14:57:39 +00:00
elexis b1cacacff1 Fix the test of the Player-component following c9b0db7f5f. Patch by fatherbushido, fixes #3803, refs #3522. 
This was SVN commit r17834.
 2016-03-06 14:02:34 +00:00
elexis b155a28698 Immediately set the fog-of-war instead of waiting for session.js to load, refs #3168. 
This was SVN commit r17832.
 2016-03-06 13:56:07 +00:00
mimo 5a8d7d1a58 petra cleanup 
This was SVN commit r17831.
 2016-03-05 16:20:49 +00:00
Itms bcf2c75513 New in-game Credits page, fixes #3744. 
This was SVN commit r17830.
 2016-03-05 11:52:08 +00:00
Itms 1504115c14 I shouldn't rename things. 
This was SVN commit r17829.
 2016-03-05 11:43:14 +00:00
Itms dfbf874d8b Some string fixes. 
This was SVN commit r17828.
 2016-03-05 11:30:27 +00:00
mimo 6451a4c3c1 Petra: improve choice of workers, fixes #3586, patch from otero 
This was SVN commit r17827.
 2016-03-04 17:08:45 +00:00
mimo 6b19eefdcb cleanup of some foreach 
This was SVN commit r17826.
 2016-03-04 16:51:52 +00:00
mimo 9d2b8a74b7 petra: do not let the ai build too much towers or fortresses 
This was SVN commit r17824.
 2016-03-03 18:38:13 +00:00
mimo d3e9aa2101 petra: complete changes started in 8d0223d6aa + some cleanup" 
This was SVN commit r17823.
 2016-03-03 16:18:12 +00:00
mimo 7403b92785 petra cleanup: use some arrow functions for sort 
This was SVN commit r17822.
 2016-03-02 17:10:26 +00:00
mimo 8d0223d6aa petra: do not anymore assume that workers are necessarily builders and gatherers 
This was SVN commit r17821.
 2016-03-02 16:58:02 +00:00
elexis 8725c3ae7a Diplomacy-manager cleanup. 
Move resource-tributing button code to a custom function.
Shorten comment.
Reuse RESOURCES.
Inline tributeResource.

This was SVN commit r17820.
 2016-03-02 16:56:44 +00:00
elexis ed1afbebfc Diplomacy-manager cleanup. 
Move the text setup to a custom function.
Reuse colorizePlayernameByID.
Add newlines.

This was SVN commit r17819.
 2016-03-02 16:44:57 +00:00
elexis 17e6b316fa Diplomacy manager cleanup. 
Move the diplomatic stance button initialization to a custom function.
Always hide the button if locked-teams is enabled, refs #3702.
Inline setDiplomacy.

This was SVN commit r17818.
 2016-03-02 16:38:05 +00:00
mimo 23d37f188a cleanup of some missing tabs 
This was SVN commit r17817.
 2016-03-02 16:25:14 +00:00
elexis e99e7e33ba Diplomacy manager cleanup. 
Split openDiplomacy into four smaller functions, starting with
diplomacyFormatAttackRequestButton in this commit.
Hide the button if the user has no allies and after defeat/win.

This was SVN commit r17816.
 2016-03-02 16:23:46 +00:00
elexis af396c9bf9 Player-component cleanup. 
Remove deprecated for-each and inline a variable.

This was SVN commit r17815.
 2016-03-02 15:00:24 +00:00
elexis 458b4a6567 Prohibit user-initiated diplomacy-changes in the simulation while ceasefire is active, refs #2749. 
This was SVN commit r17814.
 2016-03-02 14:43:18 +00:00
elexis 012b686e7c Two early returns. Refs #3265. 
This was SVN commit r17813.
 2016-03-02 13:42:47 +00:00
mimo 163af24a6c cleanup in petra, patch by otero 
This was SVN commit r17812.
 2016-03-01 17:57:19 +00:00
mimo 9c6082ec23 fix garrison aura from heros, patch by fatherbushido 
This was SVN commit r17811.
 2016-03-01 17:19:16 +00:00
mimo 04c94da3cb add some missing spaces in previous commit 
This was SVN commit r17810.
 2016-03-01 17:12:38 +00:00
mimo c9b0db7f5f Techs can now modify an aura 
Wonder population bonus is now an aura (reverted when the wonder is
destroyed) with 10 pop (wonder) with an additionnal +40 with the tech
patch by fatherbushido

This was SVN commit r17809.
 2016-03-01 17:10:42 +00:00
mimo b88fd4fe09 fix typo from 8a3bbdf4db 
This was SVN commit r17808.
 2016-02-29 17:21:35 +00:00
mimo ba0700f612 garrisoning only works between mutual allies 
This was SVN commit r17806.
 2016-02-28 12:58:52 +00:00
Itms ae309ed550 Replace the inscription on the altar in the main menu background. 
The new inscription fits better with the scene, set in Sparta, and is
the Greek original epitaph written on the Cenotaph of Thermopylae,
according to Herodotus:
"Go, tell the Spartans, stranger passing by, that here, obedient to
their laws, we lie."

The previous inscription was apparently a fraction of a sentence and was
about Spartan foreign policy in Ionia.

Suggestion and research by Danny, art by wowgetoffyourcellphone.

This was SVN commit r17805.
 2016-02-27 21:31:59 +00:00
elexis c2fad862d8 Correct a typo in 2b0c40d7b2, thanks fede for reporting, fixes #3794. 
This was SVN commit r17804.
 2016-02-26 22:40:22 +00:00
mimo 652ec4f8e5 fix some resetting of gatherer walk animation 
This was SVN commit r17802.
 2016-02-24 18:57:23 +00:00
mimo ec43274e2b drop carried resources when finishing to build a dropsite 
This was SVN commit r17801.
 2016-02-24 18:49:28 +00:00
mimo 05cf535c58 do not drop resources when garrisoning in allied structure 
This was SVN commit r17800.
 2016-02-24 17:45:13 +00:00
elexis 632901043e Give the mauryan pillar of ashoka a trade speed bonus, fixes #3639. 
This was SVN commit r17799.
 2016-02-23 23:30:42 +00:00
elexis 4ebcae8fa6 Highlight unassigned players in the player-assignments dropdown. Sort by player index. Based on patch by dalerank, fixes #3508. 
This was SVN commit r17798.
 2016-02-23 22:40:43 +00:00
elexis 8b85b72dfc Fix water-terrain painting following 6cc00f6a82. Based on patch by niektb. 
This was SVN commit r17797.
 2016-02-23 17:47:55 +00:00
elexis 2b0c40d7b2 Translate some untranslated strings, refs #3665. 
Add a chat message if the control-all units cheat was used, refs #2676.

This was SVN commit r17796.
 2016-02-23 17:29:39 +00:00
elexis df42b9caba Commands.js cleanup. 
This was SVN commit r17795.
 2016-02-23 15:51:09 +00:00
elexis e10ff35869 Commands.js cleanup. Remove unneeded characters of all sorts and use "early-continues". 
This was SVN commit r17794.
 2016-02-23 15:04:28 +00:00
elexis b60c6f6b15 Commands.js cleanup - fix whitespace. 
This was SVN commit r17793.
 2016-02-23 14:52:20 +00:00
elexis 8a3bbdf4db Commands.js cleanup. Fix remaining for-each loops and increment operators. 
This was SVN commit r17792.
 2016-02-23 14:49:03 +00:00
elexis e953ca23ba Commands.js cleanup. Replace deprecated for-each. 
This was SVN commit r17791.
 2016-02-23 14:36:50 +00:00
elexis 3a502c0d21 Commands.js cleanup, use fat-arrows. 
This was SVN commit r17790.
 2016-02-23 14:13:46 +00:00
elexis 844566c787 Translate the developer-overlay notification at the receiving end, fixes #3304. 
This was SVN commit r17789.
 2016-02-23 12:27:34 +00:00
elexis 7a5d75be11 Better placement for initial resources on Island Stronghold, based on patch by niektb, refs #3455. 
First place all starting entities before placing initial resources to
avoid placing them on each other.
Don't place initial mines near the territory of allies.

This was SVN commit r17788.
 2016-02-23 11:51:16 +00:00
elexis c6804aad35 Small RMS library style improvement. 
This was SVN commit r17787.
 2016-02-23 10:46:32 +00:00
elexis fc298eb3f5 Show time-notifications to observers, refs #3168. 
This was SVN commit r17786.
 2016-02-22 22:53:48 +00:00
elexis b68654b52d Inlining this is not possible due to the closure. 
This was SVN commit r17785.
 2016-02-22 17:23:46 +00:00
elexis 97c3a166a8 Don't shoot an undocumented arrow from UnitAI if the entity also has a BuildingAI component shooting arrows. Fixes #3763. 
Instead, add the arrow to the affected unit templates (except bireme and
trireme, refs #3196).

This was SVN commit r17784.
 2016-02-22 17:01:16 +00:00
elexis 94ccb153a6 BuildingAI style fixes, refs #3763. 
Remove a duplicate targetUnits-, some useless length-checks and unneeded
comments.

This was SVN commit r17783.
 2016-02-22 16:44:57 +00:00
elexis 8f630789e6 Add/move the Mercenary tag to VisibleClasses, so that all mercenaries are influenced by auras and techs. 
Patch by fatherbushido, fixes #3770.

This was SVN commit r17782.
 2016-02-22 11:13:31 +00:00
elexis 6006edf031 Revert approach to detect offline players without remembering disconnect messages, since it doesn't work for entities of unassigned players. Refs #3677. 
Remove unused AIManager.
Inline playerData.

This was SVN commit r17780.
 2016-02-20 17:37:19 +00:00
mimo 6e9fd4ccf2 fix the ungarrison-all command from allied structures 
This was SVN commit r17779.
 2016-02-20 15:04:00 +00:00
elexis 7918347342 Hide the offline-hint for gaia, refs #3677. 
Inline some variables.

This was SVN commit r17777.
 2016-02-19 14:36:36 +00:00
elexis a32ed75bff Fix a race-condition when two games have been started simultaneously and attempt to create the same replay directory, refs #3255. 
Instead of triggering a debug-breakpoint, print a warning to stdout and
succeed in the N'th retry when having started N processes
simultaneously.
Previously the problem had been addressed by using the processID in the
directory name.

This was SVN commit r17776.
 2016-02-19 11:22:32 +00:00
elexis 4cda0b7040 Don't show the offline hint for AI-assigned players, refs #3677. 
This was SVN commit r17774.
 2016-02-18 14:46:45 +00:00
elexis 6cc00f6a82 Reduce base-height of the random map island stronghold, so units don't walk too far into the water. Patch by niektb, refs #3455. 
This was SVN commit r17773.
 2016-02-18 13:50:10 +00:00
elexis 2e7e1c0b2b Prevent the local client of the host from becoming disconnected in case of lag, fixes #2854. 
This was SVN commit r17772.
 2016-02-18 13:10:59 +00:00
elexis f8b20d181d Add chat-addressee dropdown, refs #1767. 
Add observer-only chat and allow private messages from observer to
observer.
Prevent defeated players from using the team-chat, fixes #3441.

This was SVN commit r17771.
 2016-02-18 01:09:56 +00:00
elexis 365cbf5b64 Apply auras to resource costs of buildings. Fix some broken loops over a Map. Patch by fatherbushido, fixes #3769. 
This was SVN commit r17770.
 2016-02-17 23:27:36 +00:00
mimo 6289251b3b Improve unitMotion in the final step before reaching the target, 
which decreases the proportion of units going back and forth around the
target

This was SVN commit r17769.
 2016-02-17 19:00:34 +00:00
mimo 4584a81656 be less restrictive with fix for #3785 
This was SVN commit r17768.
 2016-02-17 18:31:01 +00:00
elexis 5aa7a232a4 Ceasefiremanager cleanup. 
Let instead of var.
Remove unneeded comments.
Remove trailing whitespace.

This was SVN commit r17767.
 2016-02-16 16:23:40 +00:00
mimo 41d7e64271 prevent short pathfinder to go into impassable region, fixes #3785 
This was SVN commit r17765.
 2016-02-15 21:24:27 +00:00
mimo a9376eeebb update goal before pathing when moving target refs #3472 and improve unitMotion overlay 
This was SVN commit r17764.
 2016-02-15 19:30:17 +00:00
elexis c3ac6cf7fc Save target-nodes (lookAt-coordinates) for cinematic-camera paths. Patch by Vladislav, refs #3301. 
This was SVN commit r17763.
 2016-02-15 17:18:59 +00:00
elexis badc75b0ad Show wall-aura in the construction tooltip. Patch by s0600204, fixes #3766. 
This was SVN commit r17762.
 2016-02-15 16:18:57 +00:00
elexis 5998d13442 Use date and sequential ID for replay-directorynames, fixes #3255. 
Save replays in userdata (screenshots, savegames)  and create one
subdirectory for every release.

This was SVN commit r17761.
 2016-02-15 15:57:23 +00:00
elexis ab57951198 Don't lose the player-offline hint on diplomacy change. Patch by dalerank, fixes #3677. 
Also remove the "disconnected" property which has apparently never been
used since its introduction in 81f5e0ac5f.

This was SVN commit r17760.
 2016-02-15 15:38:56 +00:00
elexis 5485f50948 Defeat the player if the only building owned is an athenian theatron. Patch by fatherbushido, refs #3229. 
This was SVN commit r17759.
 2016-02-15 13:08:59 +00:00
elexis 9ec4f35959 Improve and fix some wrong observer-checks that didn't take defeated players into account. Refs #3168, #3215. 
Introduce isPlayerObserver to easily cover that case.
Move some checks and updates into selectViewPlayer and eliminate
setObserverMode.
Initialize the music before changing the perspective.

This was SVN commit r17758.
 2016-02-15 12:53:06 +00:00
elexis e3bd2e3fa8 Session cleanup, some simplifications. 
This was SVN commit r17757.
 2016-02-15 11:39:02 +00:00
elexis 823fe17dd4 Entity selection cleanup. 
Replace deprecated for-each and remove trailing whitespace.

This was SVN commit r17755.
 2016-02-14 23:25:28 +00:00
mimo cb4f8989f1 add a small vision range for aggressive/violent animals, refs #3783 
This was SVN commit r17754.
 2016-02-14 17:08:55 +00:00
mimo ecb65cd58d petra cleanup 
This was SVN commit r17753.
 2016-02-13 16:28:23 +00:00
elexis 2695e7c77b Remove trailing whitespace, refs #3586. 
This was SVN commit r17752.
 2016-02-13 11:44:46 +00:00
elexis 3244d91add Don't render a selection box instead of crashing due to ENSURE when elements are removed from a dropdownlist 
(while the list is rendered and the last element being selected).

This was SVN commit r17751.
 2016-02-12 16:38:25 +00:00
mimo 07133ceb8c fix sound options not propagated to sound manager when reverting/resetting options 
This was SVN commit r17749.
 2016-02-09 19:00:10 +00:00
Itms 4ad601a301 Sorry for the surprise fix but that really hurts my eyes :p 
This was SVN commit r17748.
 2016-02-09 16:12:52 +00:00
elexis cd9106b664 Fix / finish previous commit. 
This was SVN commit r17747.
 2016-02-09 14:34:59 +00:00
elexis ca9d06d6ad Correct handling of replays with no turns or only turn 0. 
Add a comment for 3ec3f0b160.
Some style fixes.

This was SVN commit r17746.
 2016-02-09 12:09:17 +00:00
elexis 4ac89001f4 Fix compile error for gcc 4.6, refs #3168. 
This was SVN commit r17745.
 2016-02-08 22:44:23 +00:00
mimo ca19d42a68 fix typos in renderer's initialization, refs #3737 
This was SVN commit r17744.
 2016-02-08 18:27:56 +00:00
elexis ac1f935bad Split GUI updates from onSimulationUpdate. 
This was SVN commit r17743.
 2016-02-08 14:01:21 +00:00
mimo a9de2bf397 cleanup of 971d70fa99 
This was SVN commit r17741.
 2016-02-07 19:06:15 +00:00
mimo 971d70fa99 allows the user to restore the default game options, refs #3737 
This was SVN commit r17739.
 2016-02-07 15:10:44 +00:00
mimo 43f358563c when saving an option to file, write only that value and not all the content of the user configDB, refs #3737 
This was SVN commit r17738.
 2016-02-07 11:31:23 +00:00
mimo 26f7a3df96 init configDB with renderer initial values, refs #3737 
This was SVN commit r17737.
 2016-02-07 11:24:09 +00:00
elexis a2f7d4d82a Show fog of war in observermode, fixes #3168. 
This was SVN commit r17735.
 2016-02-06 12:56:41 +00:00
elexis 875a774da9 New random map "Island Stronghold" by _kali, reworked by niektb. Refs #3455. 
This was SVN commit r17734.
 2016-02-06 12:30:40 +00:00
elexis b973eebeda Add color indicator to the playerselection in observermode, refs #3168. 
This was SVN commit r17733.
 2016-02-06 12:19:02 +00:00
elexis 22f5b00fce Implement network-warnings, fixes #3264. 
Shows a notification if the local client or other players connections
timeout or have bad latency.

This was SVN commit r17730.
 2016-02-04 17:14:46 +00:00
mimo 4d41bd9622 reorganize options, adding dependences, refs #3737 
This was SVN commit r17729.
 2016-02-02 21:50:00 +00:00
elexis 6052716a78 Random-map-script cleanup. 
Move duplicate code of the area- and object-group placing methods to
retryPlacing and two coordinate-randomization functions.
Remove three unused functions (println obsolete since 0e0ed94926,
chooseRand and its helper argsToArray since before 34f1817869).
Inline local calls to GetMapSize() and IsCircularMap(). Keep unused
isCircularMap for API access. Cache variables when retrying.
Map-generation can finish 2% faster.

This was SVN commit r17728.
 2016-02-02 16:33:36 +00:00
elexis fdc67768f0 Random random-map-script cleanup. 
Simplify sortPlayers.
Use [] instead of new Array.
Remove unneeded braces.
Use JSDoc comments.
Use let instead of var.

This was SVN commit r17727.
 2016-02-02 13:35:03 +00:00
elexis b1fbc5b6bd Add newlines, remove unneeded braces. 
This was SVN commit r17726.
 2016-02-02 11:23:01 +00:00
elexis 254f6357f6 Fix a typo (terreins -> terrains). 
This was SVN commit r17725.
 2016-02-02 10:56:39 +00:00
mimo d8b0404281 petra: some tweaks to be able to better deal with maps like the Migration scenario 
i.e. maps with a small starting island, no initial population and no
initial gathering food

This was SVN commit r17723.
 2016-01-29 19:41:34 +00:00
mimo 30bd2baeeb fix Migration scenario map 
This was SVN commit r17722.
 2016-01-29 18:53:09 +00:00
mimo b65f2a338c petra cleanup 
This was SVN commit r17720.
 2016-01-28 19:44:18 +00:00
mimo c46e64c4d2 fix dropdown option 
This was SVN commit r17719.
 2016-01-28 18:44:50 +00:00
mimo 30d0bcd350 petra remove some useless code 
This was SVN commit r17718.
 2016-01-28 18:30:39 +00:00
mimo 75d91c6a26 petra: fix account of foundation popbonus when checking if new houses are needed 
This was SVN commit r17717.
 2016-01-27 18:30:49 +00:00
mimo 06eadf2bc4 petra cleanup + some tweaks 
This was SVN commit r17716.
 2016-01-27 18:17:55 +00:00
mimo 564941c477 fix wall buildings after f34dc412b6, refs #3647 
This was SVN commit r17715.
 2016-01-26 19:04:29 +00:00
mimo 91ed318f0d fix typo 
This was SVN commit r17714.
 2016-01-26 18:36:59 +00:00
mimo 08d326cef5 clone the rallypoint data from cmd, fixes #3751 
This was SVN commit r17713.
 2016-01-26 18:03:06 +00:00
elexis 090f2ccfe5 Don't modify the command object. Refs #3647. 
This was SVN commit r17712.
 2016-01-26 17:58:15 +00:00
mimo bb8ceba632 completes f34dc412b6 for non visual replays, refs #3751 
This was SVN commit r17711.
 2016-01-25 20:37:26 +00:00
elexis ab16ddb256 Show a more specific disconnect-message in case the host closed the server. Refs #3264, #3570. 
This was SVN commit r17710.
 2016-01-25 12:56:30 +00:00
elexis 3ec3f0b160 Stop the animations at the end of visual replays, refs #3581. 
This was SVN commit r17709.
 2016-01-25 10:23:03 +00:00
elexis e683751b4f Delete code which became obsolete with 56bb858802. 
This was SVN commit r17708.
 2016-01-25 09:57:33 +00:00
elexis 68f87cb556 Proportionally adapt cost for civ-specific fortresses since the generic template was changed in 6b9b863747. 
Thanks Hannibal Barca for reporting.

This was SVN commit r17706.
 2016-01-25 00:38:33 +00:00
mimo 4a58c7f8b6 petra: improve performance of docks positioning (was really slow) + some cleanup 
This was SVN commit r17705.
 2016-01-24 20:43:27 +00:00
elexis 7c6f35b2c0 Update the unit selection for observers, refs #3168. 
Don't disable the deselect button.

This was SVN commit r17704.
 2016-01-24 12:33:34 +00:00
Yves 199d38dfec Work around clang bug to fix compiling. 
This was SVN commit r17703.
 2016-01-24 10:34:38 +00:00
historic_bruno 4bff1ef1a9 Disables MSVC build warning C4003 "not enough actual parameters for macro", introduced by changes in Boost 1.57 
This was SVN commit r17700.
 2016-01-24 01:03:39 +00:00
elexis aa8541e8ce 2-player skirmish map "Golden Island". Created by scythetwirler and updated by niektb. 
This was SVN commit r17697.
 2016-01-23 23:02:25 +00:00
Yves 1a66f510d0 Use const T& for parameters of some types in script-exposed native functions 
Using references matches the C++ coding style better and should improve
performance a bit in theory. It avoids 2 copies of T in case of the
functions registered with RegisterFunction (mainy used in the GUI). It
should also avoid one or two copies in case of
DEFINE_INTERFACE_METHOD_X, which is used in the simulation, but I
haven't bothered to count it there exactly.
It is now predefined which types have to be passed by const reference
and which are passed by value. Note that references can't be used as
out-parameters (to return multiple values to JS). This hasn't worked
before either and probably never will.

This was SVN commit r17696.
 2016-01-23 15:17:56 +00:00
Yves 5f86beea6f Replace HandleWrapper and avoid repoint function 
JS::Handle<T>::repoint gets removed with SpiderMonkey 38, so the
existing solution has to be replaced. The new approach should also be a
bit clearer. Named Return Value Optimization (NRVO) should avoid a
superfluous temporary for the return value in the generic template
function implementation of AssignOrFromJSVal.

Refs #3708

This was SVN commit r17695.
 2016-01-23 14:42:59 +00:00
historic_bruno b9f1125010 Fixes memory leak in TestPreprocessor. When using CPreprocessor::Parse "you must free() the result string only if the returned address is not inside the source text" 
This was SVN commit r17693.
 2016-01-23 03:48:00 +00:00
elexis 27d04d0165 Close previously opened dialogs before opening a new one. Fixes #3535. Also remove many duplicate calls. 
This was SVN commit r17692.
 2016-01-23 03:40:31 +00:00
elexis 4fbd550cda Correct z-ordering issue for chat panel and input form. Patch by dalerank, refs #3535. 
This was SVN commit r17691.
 2016-01-23 03:24:00 +00:00
elexis c97a91f7bd Change displayed string instead of throwing errors in case of unspecified civs in replays. 
This was SVN commit r17690.
 2016-01-23 02:41:35 +00:00
elexis 5747619c39 Don't create replays without commands in case of running non-visual replay or an atlas simulation. 
Remove trailing whitespace.

This was SVN commit r17689.
 2016-01-23 01:02:57 +00:00
mimo dd7287c1c8 additionnal petra cleanup 
fix a case with foundation access not defined

This was SVN commit r17688.
 2016-01-22 19:46:51 +00:00
mimo c955d74330 petra cleanup (thanks to leper's suggestion) 
This was SVN commit r17687.
 2016-01-22 18:45:28 +00:00
mimo fdf7dabe18 check that the target can be built or repaired inside the canRepair function 
This was SVN commit r17685.
 2016-01-21 20:49:57 +00:00
mimo edb16dafbb petra cleanup 
This was SVN commit r17684.
 2016-01-21 20:38:56 +00:00
mimo df7da846ad some cleanup in ai api 
This was SVN commit r17683.
 2016-01-21 20:23:19 +00:00
elexis b5cb62ffa2 Remove error messages from the CinemaManager, since not having a GameView is expected in non-visual replay. Patch by Vladislav, refs #3301. 
This was SVN commit r17682.
 2016-01-21 13:07:52 +00:00
mimo cccd33e7fe petra cleanup 
This was SVN commit r17679.
 2016-01-20 19:45:47 +00:00
mimo 87886b7b03 fix the AI for the switch to the Repairable component 
This was SVN commit r17678.
 2016-01-20 19:04:38 +00:00
mimo dd545bdbf1 petra cleanup 
This was SVN commit r17677.
 2016-01-19 23:19:40 +00:00
elexis 0a64bf25cd Sort globals, add JSDoc comments, remove trailing whitespace. 
This was SVN commit r17676.
 2016-01-19 18:09:34 +00:00
elexis 5308b95aa8 Let observers change perspective. Refs #3168. 
Disable the controls for observers (unless the developer-option is
enabled).
Don't check for g_IsObserver, since observers should be able to use the
developer overlay as well.
Update all GUI elements when changing the perspective using
onSimulationUpdate().
Enable observermode for defeated players.

This was SVN commit r17675.
 2016-01-19 17:23:16 +00:00
elexis 0e48b7df75 Update the idle-worker-button onSimulationUpdate. Patch by svott, fixes #3736. 
This was SVN commit r17674.
 2016-01-19 16:04:59 +00:00
leper f34dc412b6 Deep freeze simulation commands to prevent accidental updates. Fixes #3647. 
This was SVN commit r17673.
 2016-01-18 22:24:50 +00:00
elexis e035e3e985 Restore the replay selection after deletion. Based on patch by dalerank, fixes #3473. 
This was SVN commit r17672.
 2016-01-18 20:16:45 +00:00
mimo a6f8b3b3d7 rename the Close button, refs #3737 
This was SVN commit r17671.
 2016-01-18 19:44:48 +00:00
elexis a59833102f Specify the default column sorting order in XML instead of JS. 
Ref #2405, #3473.

This was SVN commit r17670.
 2016-01-18 19:23:14 +00:00
mimo 9481c168bd petra cleanup 
This was SVN commit r17669.
 2016-01-18 19:20:09 +00:00
elexis 69f4614768 Don't use two different default values ("name" and "") in JS for the default lobby sorting order in b8fce56821, refs #2405. 
Supplement a variable g_GameStatusOrder missing in 66ec6dbf12.

This was SVN commit r17668.
 2016-01-18 18:29:16 +00:00
fabio f8941ac668 boost_signals was removed in 940868398c. 
This was SVN commit r17667.
 2016-01-18 16:46:32 +00:00
fabio 5d00d0ff8b Update libpng to 1.6.21 + comments cleanup. 
This was SVN commit r17666.
 2016-01-18 16:42:54 +00:00
elexis 7c40c67efa Fix a bug in b8fce56821 which prevented the replaylist from being sorted correclty on init, refs #2405, #3473. 
The default column argument is given in XML and applied in
COList::SetupText() but it hasn't been stored, preventing JS from
knowing the selected column.

This was SVN commit r17665.
 2016-01-18 14:45:13 +00:00
elexis 8827db201a Remove the virtual keyword since this is a helper-function not used by the interface. Refs #3215. 
This was SVN commit r17663.
 2016-01-18 03:41:00 +00:00
elexis 8d2a73bf52 Show the aura of city walls in the structure tree. Patch by s0600204, refs #3655. 
This was SVN commit r17662.
 2016-01-18 03:24:26 +00:00
historic_bruno 48ba4d9cb4 Updates precompiled win32 SDL libs to 2.0.4 from libsdl.org. 
Fixes windows build with SDL 2.0.4, fixes #3138, #3225

This was SVN commit r17658.
 2016-01-17 23:11:37 +00:00
mimo c20ee2ad5e add dropdown capacity for options, fixes #2596 
remove use of eval for function execution

This was SVN commit r17657.
 2016-01-17 21:50:54 +00:00
mimo dc9d1fff11 restore sorting in template, refs #3741 
This was SVN commit r17656.
 2016-01-17 15:44:38 +00:00
leper cfb2216b8c Remove JSDebugger. Closes #2419, #2973. Refs #410, #2348, #3708. 
https://bugzilla.mozilla.org/show_bug.cgi?id=1069694

This was SVN commit r17655.
 2016-01-17 00:34:33 +00:00
mimo b4d11cf747 let farms have the terrain ownership, fixes #3741 
This was SVN commit r17654.
 2016-01-16 12:47:33 +00:00
mimo c4d9b64fe5 fix undef var when in petra debug 
This was SVN commit r17653.
 2016-01-15 19:12:34 +00:00
leper 0d33ec31cc Pass cmd to TryTransformWallToGate as that is used when debugging commands. Patch by dalerank. Fixes #3694. 
This was SVN commit r17651.
 2016-01-14 16:21:05 +00:00
elexis 327c0d0d00 Remove trailing whitespace. Refs #118. 
This was SVN commit r17650.
 2016-01-14 00:04:32 +00:00
elexis 419453e212 Allow randommap-scripts to set a custom fail-limit when placing objects. Patch by Stan, fixes #3567. 
This was SVN commit r17649.
 2016-01-13 23:51:46 +00:00
elexis ad7c53e65a Adapt the template for corrals to the limitation in UnitAI.CanGarrison. Refs #3412. 
This was SVN commit r17648.
 2016-01-13 23:33:08 +00:00
leper c33d1e3741 Remove commented out code and comments invalid since 9542ecdd7e. 
This was SVN commit r17647.
 2016-01-13 22:39:09 +00:00
mimo aa7ef01105 rename reload to revert 
This was SVN commit r17646.
 2016-01-13 22:32:42 +00:00
mimo 5c61f68600 Rework the logics of options loading to allow more flexibility (i.e. adding a min or max value for number inputs) 
Fix some problems when reloading saved options, refs #3511
Add the material quality option, refs #3737
Reload and Save buttons are only enabled when some options have changed.

This was SVN commit r17645.
 2016-01-13 22:01:36 +00:00
elexis cd22f9f722 Display all auras in the tooltips (even if there are some with an identical name). Patch by s0600204, fixes #3655. 
Add an aura tooltip to the construction panel.
Remove duplicate tooltip code for the training panel.
Eliminate for-each and use the aura ID in GetTemplateDataHelper, since
only that is a unique identifier.
Change the name from "Hero Aura" to "Garrisoned Capture Aura" for that
aura that every hero has.

This was SVN commit r17644.
 2016-01-13 19:32:17 +00:00
elexis c9a22ec7c3 Show the population bonus of buildings in the structure tree. Patch by s0600204, fixes #3738. 
Also fix a newline in the tooltip.

This was SVN commit r17643.
 2016-01-13 18:44:30 +00:00
leper fb92761c92 Use explicit types instead of auto. 
This was SVN commit r17642.
 2016-01-13 00:42:55 +00:00
leper 27fab6bf1e Constify Spatial.h a bit. 
While there don't check for null when delete-ing since that is a no-op,
use the proper type instead of auto, always swap when removing a single
element (instead of comparing .size() to 1), and clean up includes.

foobar

This was SVN commit r17641.
 2016-01-13 00:20:22 +00:00
leper e6a8cd8c5e Do not redeclare a variable. 
This was SVN commit r17640.
 2016-01-12 20:04:33 +00:00
elexis ee6a5fd915 Extend defensive-stance tooltip and add quotes to object keys. 
This was SVN commit r17639.
 2016-01-12 18:32:30 +00:00
elexis a02f797169 Add unit-stance tooltips. Patch by bb, fixes #3385. 
Reorder cases, correct indentation, remove unneeded variable and
sprintf.

This was SVN commit r17638.
 2016-01-12 16:19:43 +00:00
leper 4107c2abb9 Fix link to documentation. 
This was SVN commit r17637.
 2016-01-11 23:56:51 +00:00
mimo 83efc8363e fix old typos in sound config 
This was SVN commit r17636.
 2016-01-11 22:39:03 +00:00
leper 2ec4d87abf Use .assign instead of operator=. 
This was SVN commit r17634.
 2016-01-11 20:57:03 +00:00
leper f4898c18d8 SpiderMonkey 38 removes the JS_LookupProperty{,ById} API. Refs #3708. 
Use JS_GetProperty{,ById} instead.
Ensure that we break if someone tries to serialize a getter by using
something similar to what we used pre 47a03c3397.
https://bugzilla.mozilla.org/show_bug.cgi?id=1094176

This was SVN commit r17633.
 2016-01-11 20:03:33 +00:00
leper 39eb7fb243 Fix JS_SetGCZeal call. 
https://bugzilla.mozilla.org/show_bug.cgi?id=650978
https://bugzilla.mozilla.org/show_bug.cgi?id=742570

This was SVN commit r17632.
 2016-01-11 20:03:31 +00:00
leper 775f856421 Use .assign instead of operator=. 
This was SVN commit r17631.
 2016-01-11 20:03:28 +00:00
leper d08044c8ad JS_DumpHeap is removed in SpiderMonkey 38, since we have nothing using it remove it. Refs #3708. 
https://bugzilla.mozilla.org/show_bug.cgi?id=1105069
https://bugzilla.mozilla.org/show_bug.cgi?id=1122842

This was SVN commit r17630.
 2016-01-11 20:03:09 +00:00
leper 785acdb1c6 Fix test failure on Windows. 
This was SVN commit r17629.
 2016-01-11 20:03:01 +00:00
mimo f0fc36138d cleanup of previous patches 
This was SVN commit r17627.
 2016-01-10 22:46:37 +00:00
mimo 3246b02cda make easy AI levels easier and hard levels harders by also applying the bonus/malus to trade, fixes #3722 
add some info on AI levels in the AI config window

This was SVN commit r17626.
 2016-01-10 21:57:01 +00:00
mimo 7fa2962c45 allows changing options for one session without having to save them, fixes #3511 
changes on text or number options are now detected without any need of
typing Return, fixes #2451
graphic options (using the renderer type) are now properly saved when
changed
sound options (using the function type) are still not saved

This was SVN commit r17625.
 2016-01-10 21:41:34 +00:00
elexis e9511d21d5 Fix bug in d4d05c6236. 
This was SVN commit r17624.
 2016-01-10 17:25:40 +00:00
elexis 8c7b6dceaa Show status-bars of all players to observers, fixes #3215. 
This was SVN commit r17623.
 2016-01-10 16:47:57 +00:00
elexis 8859f33b38 Rename PickFriendlyEntitiesOnScreen to PickPlayerEntitiesOnScreen. 
Rename PickFriendlyEntitiesInRect to PickPlayerEntitiesInRect.
Rename PickSimilarFriendlyEntities to PickSimilarPlayerEntities.
Add comment.
Refs #3215.

This was SVN commit r17622.
 2016-01-10 14:47:09 +00:00
fabio 4a9d6d2e5f Update all OS X libraries to their latest versions (exlcuding currently unused libjpeg, see #2828). Some also include security fixes. Fixes #3721. 
Also disable unused wxwidgets features. Patch by trompetin17, refs
#2924.
Tested by wraitii.

This was SVN commit r17621.
 2016-01-10 13:23:25 +00:00
elexis 893ca29723 Allow 10 clients to conncet to the server by default (allows 8 players and 2 observers). Refs #3254. 
This was SVN commit r17620.
 2016-01-10 01:06:07 +00:00
elexis ead85b1572 Update the control-all-units checkbox when changing the perspective and onSimulationUpdate so that it always shows the correct value. 
This was SVN commit r17619.
 2016-01-10 00:59:28 +00:00
elexis 9a623a8e00 Style fixes. 
This was SVN commit r17618.
 2016-01-09 23:01:07 +00:00
elexis 6b710f35b0 Show the selection panels to observers / in replays, fixes #3731. 
This allows observers to see the training queue, researched techs, unit
stance, constructable buildings, garrisoned units, market prices etc.
for all players without changing the perspective.
All buttons are disabled if the user isn't allowed to control the
affected player.
Notice updateUnitCommands() fills out the panel differently in case of
selecting an allied building.
Extends the GUIInterface methods "GetNeededResources",
"CheckTechnologyRequirements" and "IsTechnologyResearched" to optionally
take a different player-argument.

This was SVN commit r17617.
 2016-01-09 22:01:08 +00:00
Itms 9b922ebadd Remove invisible character introduced in deaa224785. 
This was SVN commit r17616.
 2016-01-09 12:12:42 +00:00
Itms 629e73a768 Fix a compiler warning. 
This was SVN commit r17615.
 2016-01-09 09:52:51 +00:00
leper 491cba314a Translate some notification messages. Refs #3665. 
This was SVN commit r17614.
 2016-01-08 23:22:45 +00:00
leper caa81a1d31 Remove garrison code duplication. 
This was SVN commit r17613.
 2016-01-08 23:02:26 +00:00
Itms deaa224785 Fix some Gallic leader names, based on historic_bruno's suggestions. Fixes #3675 
This was SVN commit r17612.
 2016-01-08 20:12:25 +00:00
leper 87a93b2498 Add version command line option. Fixes #2965. 
This was SVN commit r17611.
 2016-01-08 19:35:33 +00:00
elexis b4f187b8d4 Defeat the player if he/she has no more units, nor buildings that can train units. Fixes #3229. 
This was SVN commit r17610.
 2016-01-08 12:21:40 +00:00
elexis 5b60f2d1f6 Display the buildrate of foundations in the tooltip. Patch by bb, fixes #3395. 
This was SVN commit r17609.
 2016-01-08 11:53:48 +00:00
fabio e1e4a00ad7 Enable sky by default. This is usually not needed during gameplay (no sky visible), but it is with cinematic, committed in 89aef0b6eb, where camera can point to the sky. 
Can still be disabled in game options menu.
Refs: #3301.

This was SVN commit r17607.
 2016-01-07 12:38:43 +00:00
elexis 1cc1ba2b17 Fix non-visual replaymode. Refs #3301 (cinematic camera). Patch by Vladislav. Bug reported by eternaf. 
This was SVN commit r17606.
 2016-01-06 21:40:59 +00:00
mimo a7743e95b9 cleanup of unused counters 
This was SVN commit r17605.
 2016-01-06 21:15:58 +00:00
elexis e0a1e2beb1 Session cleanup. 
Don't send the simstate as an argument of reportGame().
Eliminate a for-each loop.
Remove some superfluous comments.

This was SVN commit r17604.
 2016-01-05 03:02:59 +00:00
leper b18cd3254c Test FixedVector{2,3}D script conversions, and test calling functions of the prototypes. 
Also ENSURE that the given value identifier is actually present in the
cache instead of creating one if it is not.

This was SVN commit r17603.
 2016-01-04 21:41:40 +00:00
mimo 4c4beb8450 cleanup 
This was SVN commit r17602.
 2016-01-04 18:10:04 +00:00
elexis 9f334036ef Do not align object properties. 
Do not construct objects if they only contain two atomic elements.
Revert getDisconnectReason so as to have a custom message for the error
case. Add a warning.

This was SVN commit r17601.
 2016-01-04 17:59:12 +00:00
leper ab4668ac79 Remove legacy error codes from strings. 
This was SVN commit r17600.
 2016-01-04 17:58:28 +00:00
leper 7a3f011587 Fix a typo. 
This was SVN commit r17599.
 2016-01-04 17:05:43 +00:00
leper 5033fd6cbf Some const and fix the indentation. 
This was SVN commit r17598.
 2016-01-04 17:05:39 +00:00
mimo 24b14fe201 allow the AI to build near walls (but not gates), fixes #3725 
This was SVN commit r17596.
 2016-01-03 21:04:23 +00:00
Yves 89aef0b6eb Cinematic camera core functionality. Patch by Vladislav Belov. 
Based on existing code that was still around from an old(not working)
implementation.
Supports basic control from trigger scirpts (queue, start and stop
camera paths) and works in multiplayer.

This was SVN commit r17594.
 2016-01-03 12:41:04 +00:00
Yves d313a1934a Code style cleanups for CinemaPath in preparation for the cinematic camera patch. 
Refs #3301

This was SVN commit r17593.
 2016-01-02 20:14:14 +00:00
mimo a32aa3b6cf petra: use the proper attack number when deserializing, refs #3720 
This was SVN commit r17592.
 2016-01-02 18:16:50 +00:00
elexis 036f985017 Add missing semicolons. 
Update timestamp.

This was SVN commit r17591.
 2016-01-02 18:12:02 +00:00
mimo 8773d816ae add specific regeneration when idle, fixes #3606, patch by Guuts 
This was SVN commit r17590.
 2016-01-02 18:10:10 +00:00
mimo 1d00164b6b petra: make better use of the new fishing tech 
This was SVN commit r17589.
 2016-01-02 17:50:56 +00:00
leper d5d60d53ed Replace JS_ASSERT (which is renamed to MOZ_ASSERT in SpiderMonkey 38) with TS_ASSERT, since the former was used for no apparent reason. 
This was SVN commit r17588.
 2016-01-01 21:28:25 +00:00
JoshuaJB 9281aaf25e Map more specific messages from the Gloox documentation to registration results and stanza errors in the lobby code. Also, don't request translation of more arcane errors. Fixes #3047 
This was SVN commit r17587.
 2016-01-01 18:38:50 +00:00
mimo 371a41c216 seems that line was missing, with the result that garrisoned units sent a TerritoryPositionChanged message each turn 
This was SVN commit r17586.
 2016-01-01 17:45:53 +00:00
mimo 7c89cfb3ba fix typo in petra debug outputs 
This was SVN commit r17585.
 2016-01-01 17:41:49 +00:00
JoshuaJB 9f9db45a03 Fix broken feedback display logic and broken error handling from ccb534259d. Additionally, streamline logic in prelobby.js and remove an unexplained check in lobby.js added by 76a1a84a58. 
This was SVN commit r17584.
 2016-01-01 17:18:17 +00:00
elexis ccb534259d Major lobby cleanup. 
Create an object holding the handling of all netmessage types.
Display private messages sent by moderators.

Details:
 Switch back the second and third argument of CreateSimpleMessage, so it
relates again to the switch/object.
 Reduce the dimension/nesting of the object/switch from three to two.
 Hence remove the useless "standard" and "internal" value send in the
text field.
 Rename CreateSimpleMessage to CreateGUIMessage
 Use the property "level" instead of "text" for "connect" and
"disconnect".
 Remove the handling of the "connect" event in lobby.js, since it is
never called.
 Translate the disconnect event.
 Add comments and explicit checks to handleMessage and handleMUCMessage
to make obvious where they differ.
 Remove the "message" property from those GUI messages, since it should
just use "text".
 Move the login-fail handling to JS.
 Remove useless sprintf calls from warning messages.
 Inline some variables.
 Add missing semicolons.

This was SVN commit r17581.
 2015-12-31 17:08:23 +00:00
elexis 2bf194134b Repairrate cleanup. Refs #3395, patch by bb. 
Rename ratio to rate.
Simplify translation.
Round in GUI, not simulation.
Check for div/0.
Fix wrong variable name in test_GuiInterface.js.

This was SVN commit r17580.
 2015-12-31 15:20:12 +00:00
elexis 75eed7cc79 Missing semicolons, two wrong commata, jshint ftw. 
This was SVN commit r17579.
 2015-12-31 14:02:59 +00:00
Yves a144ec7e08 Indentation corrections and other code style fixes in preparation for the cinematic camera patch. 
Refs #3301

This was SVN commit r17578.
 2015-12-31 13:40:56 +00:00
elexis 460f17e6f7 Fix mauryan pillar of ashoka GUI panel bug. Refs #3639. 
It can only be built while ashoka is alive.
Previously the structure was selectable from the panel but not placable
while he was absent.

This was SVN commit r17577.
 2015-12-31 12:19:45 +00:00
elexis f7a262fa4a Remove trailing whitespace. Based on patch by otero, refs #3268. 
This was SVN commit r17576.
 2015-12-31 11:45:13 +00:00
Yves 8d9cfd66b8 Reorganize code in different files in prepartion for the cinematic camera patch (by Vladislav Belov). 
Refs #3301

This was SVN commit r17575.
 2015-12-30 21:16:35 +00:00
fabio 969008befd Add shebang to ease running the script as a program. 
Update replay command adding needed -mod=public.

This was SVN commit r17574.
 2015-12-30 14:29:28 +00:00
mimo 36c08193ba optimizes range queries, fixes #3717 
This was SVN commit r17573.
 2015-12-30 13:44:51 +00:00
elexis 082a32802b Refresh the diplomacy and trade window in case the playerselection (change perspective) has changed. 
This was SVN commit r17572.
 2015-12-30 12:10:11 +00:00
elexis aa8e0159a0 Only regain health while idle (Battlefield Medicine tech). Fixes #3606, patch by Guuts. 
This was SVN commit r17571.
 2015-12-30 11:37:50 +00:00
elexis 6cdd99474a Fix fail. 
This was SVN commit r17570.
 2015-12-30 11:17:50 +00:00
elexis 7648b4f482 Gamesetup and session cleanup. 
Convert network commands to an object and simplify the formating of
system chat messages.

This was SVN commit r17569.
 2015-12-29 15:29:24 +00:00
elexis 46a42c04ef Gamesetup message cleanup. 
Transform switch-statements into objects.
Make them more consistent, in particular the kick/ban and
ready-messages.
Also colorizes the playername in disconnect messages.
Fix a wrong comment in the network code and remove a duplicate check
(AIs).

This was SVN commit r17568.
 2015-12-29 14:45:53 +00:00
elexis 9f65e90b60 Fix wrong errormessage in case of encountering a broken replay. 
This was SVN commit r17567.
 2015-12-29 14:00:30 +00:00
elexis f8ec158116 Session cleanup. 
Transform trivial switch-statements to objects.
Move removeOldChatMessage right below addChatMessage, since it is only
used there.

This was SVN commit r17566.
 2015-12-28 23:16:33 +00:00
elexis 2e8d5aa2c8 Session chat cleanup. 
Unify switch-statement using objects.
Do not parse recursively, but do a linear 2-step process. Remove msg.me
property and move "/me" parsing out of that function.
Early return instead of using msg.hide.
Add observer-checks for private messages to impede abuse and fix #3270.
Remove the "/all" command, since it doesn't add functionality but
complexity.
Remove a TODO as displaying multiple contexts ("/team /allies text"?) is
not useful currently and made the previous code error-prone.

This was SVN commit r17565.
 2015-12-28 22:16:21 +00:00
mimo 2a0d403b4b let promotion improve a bit the capture strength of citizen 
This was SVN commit r17564.
 2015-12-28 18:51:49 +00:00
elexis 6182385626 Session cleanup. 
Remove variable action.
Close diplomacy and trade window on disconnect.

This was SVN commit r17563.
 2015-12-28 17:19:29 +00:00
mimo 543472b77b Optimization of isBoxVisible + cleanup, fixes #3712 
This was SVN commit r17561.
 2015-12-28 16:27:31 +00:00
mimo 82c215de49 prevent thousands of calls per turn of calculeTerritories which would exit immediately 
This was SVN commit r17560.
 2015-12-28 16:23:06 +00:00
mimo 704c08d2b0 petra: fixes placement of dock when on the border of the map 
fixes attack path computation when change of target during
preparation
       fixes #3710

This was SVN commit r17557.
 2015-12-26 13:14:13 +00:00
elexis 0d41806e99 Session cleanup. 
Move formating of resource-amounts to new function
translateResourceAmounts.
Rename player/player1 to sourcePlayer/targetPlayer.
Inline colorizedPlayername.

This was SVN commit r17556.
 2015-12-26 01:40:50 +00:00
elexis 5d56ee0449 Session cleanup. 
Move new objects to globals, which makes the code easier to read,
changable for mods and saves performance.
Move cheat functions below variable declarations.

Remove old function formatClientList, which for any reason didn't make
it into last commit.

This was SVN commit r17555.
 2015-12-26 00:42:52 +00:00
elexis a280cb87db Colorize playernames when using the /list command in the gamesetup/session. 
Add two missing semicolons and remove an unnecessary one.
Eliminate formatClientList, message, formattedUsername and
formattedUsernamePrefix.
Move four hardcoded colors to globals.

This was SVN commit r17554.
 2015-12-25 23:49:28 +00:00
elexis 5f95bca6b0 Session cleanup (trading dialog text). 
Move the code to update the idle-traders text to two new simplified
functions.
Eliminate all if-statements (including quadruple-nested ones).

This was SVN commit r17553.
 2015-12-25 19:35:14 +00:00
elexis 0fb87496e7 Display the correct AI name instead of "Unknown Player" in case an AI sends a formatted chat message (introduced in 03adf0111a). 
Thanks Evulant (AlThePhoenix) for reporting.

This was SVN commit r17552.
 2015-12-25 18:07:16 +00:00
elexis b154056266 Those globals were removed in 5aae5ee55a. 
This was SVN commit r17550.
 2015-12-24 20:54:47 +00:00
elexis 5aae5ee55a Session menu cleanup. 
Replace for-each with for-of.
Remove duplicate code from updateMenuPosition.
Eliminate three unneeded globals.
Rename savedGameData to g_SavedGameData.
Remove unneeded braces.

This was SVN commit r17549.
 2015-12-24 14:59:03 +00:00
elexis 39ffb0a6bd Session menu cleanup. 
Rename globals to g_Foo.
Remove unused variable playerID from updateTimeNotifications which
became obsolete in fe9eeedd66.
Use let instead of var.
Add some missing semicolons.
Fix whitespace, quote object keys.

This was SVN commit r17548.
 2015-12-24 02:53:18 +00:00
elexis 7a75f22f9f Session cleanup. 
Transform switch-statement in handleNetMessage to object of fat-arrow
functions.

Also add missing check to colorizePlayernameByGUID.

This was SVN commit r17547.
 2015-12-24 01:46:06 +00:00
elexis 7caaa278d6 Session cleanup. 
Move code from switch-statement to handlePlayerAssignmentsMessage.
Inline updatePlayerDataAdd and updatePlayerDataRemove as they are tiny
and only used here.
Remove comments, early return, eliminate for-each.

This was SVN commit r17546.
 2015-12-24 01:06:01 +00:00
elexis f276791069 Session cleanup. 
Transform netstatus switch-statement to an object consisting of a
fat-arrow function per message type.

This was SVN commit r17545.
 2015-12-23 23:51:18 +00:00
elexis 3dcf51c466 Session chat cleanup. 
Remove duplicate code by transforming getUsernameAndColor to
colorizePlayername.
Notice the previous function getUsernameAndColorByGUID didn't work with
unassigned players.

This was SVN commit r17544.
 2015-12-23 19:06:48 +00:00
mimo 48f72aacc9 petra: some defense tweaks + cleanup 
This was SVN commit r17543.
 2015-12-23 16:17:05 +00:00
elexis 4eedfac0ca Refactor session chat. 
Show chatmessages for diplomacy-changes and tributed resources to
observers/in replays. Fixes #3379.

This was SVN commit r17542.
 2015-12-23 15:48:06 +00:00
elexis 03adf0111a Session chat cleanup 
Remove g_PlayerAssignments from calls to findGuidForPlayerID, since the
argument was removed in ae92736b02.
Simplify formatChatMessage by moving playercolor-detection to
formatDefeatMessage and formatChatCommand.

This was SVN commit r17541.
 2015-12-22 21:45:09 +00:00
leper cf7b8329fb Use var instead of let, since this variable is defined with var in this function already. 
This was SVN commit r17540.
 2015-12-22 20:43:17 +00:00
leper 3fd4d07ca1 Test \0 in object property names for serializing. 
This was SVN commit r17539.
 2015-12-22 19:01:18 +00:00
mimo 67b7366528 petra: remove hyphen in file names 
This was SVN commit r17538.
 2015-12-22 18:21:37 +00:00
elexis ae92736b02 Session chat cleanup. 
Use .property instead of ["property"].
Use if (object.property) instead of if ("property" in object).
Use array- and fat-arrow functions.

This was SVN commit r17537.
 2015-12-22 17:37:22 +00:00
mimo 3ba50b4ed4 decrease the repair rate of walls, refs #3707 
This was SVN commit r17536.
 2015-12-22 17:37:00 +00:00
leper 6970ebba16 Test non-ASCII string conversions. 
This was SVN commit r17535.
 2015-12-22 17:30:05 +00:00
elexis ef7c01ee4c Don't error out when selecting maps with non-existent civs. 
This was SVN commit r17534.
 2015-12-22 17:04:57 +00:00
mimo 385101bbe7 petra: cleanup of defenseManager 
This was SVN commit r17533.
 2015-12-22 16:58:53 +00:00
elexis dca07f9ddd Fix e9bc3e2089. 
This was SVN commit r17532.
 2015-12-22 16:44:27 +00:00
elexis 4212777334 Session chat cleanup. 
Correct indentation.

This was SVN commit r17531.
 2015-12-22 16:05:27 +00:00
elexis e9bc3e2089 Session chat cleanup. 
Split formatChatMessage into smaller functions.
Correct the indentation with the next commit.

This was SVN commit r17530.
 2015-12-22 16:02:25 +00:00
elexis 0e40273c28 Session chat cleanup. 
Move code from addChatMessage to a new function formatChatMessage.

This was SVN commit r17529.
 2015-12-22 15:29:03 +00:00
elexis 57af0ac8b4 Session chat cleanup. 
Remove duplicate call to parseChatCommands.
Rename msg.action to msg.me, as it only applies to the "/me" chat
command.
Remove some duplicate checks.
Remove unused variable userTag.
Also fix a wrong space in the loading screen.

This was SVN commit r17528.
 2015-12-22 14:56:30 +00:00
leper 848efb56b3 Make a method const. 
This was SVN commit r17527.
 2015-12-22 14:08:32 +00:00
elexis bd35b097e2 Session chat cleanup. 
Process the "system" case first.
Move shared variable to colorizedPlayername.
Remove trailing whitespace.

This was SVN commit r17526.
 2015-12-22 13:38:38 +00:00
elexis b790403c87 Strip trailing whitespace from network code. 
This was SVN commit r17524.
 2015-12-21 13:58:32 +00:00
elexis 72dcd7422d Loading screen cleanup. Patch by Stan, refs #2087. 
Use let instead of var.
Use g_ prefix for globals.
Remove trailing whitespace.

This was SVN commit r17523.
 2015-12-20 23:02:18 +00:00
elexis 41fa85a34b Map cleanup. 
Remove the "Seed" attribute as it is a relict of Atlas and not used
anywhere.
Also remove the author-tag of Forest Battle (4) as it's the only map
that has it.

This was SVN commit r17522.
 2015-12-20 21:48:48 +00:00
mimo 0dda3b579c drop resources before switching to next queued order, fixes #1670 
This was SVN commit r17521.
 2015-12-20 21:30:34 +00:00
elexis d4d05c6236 Session cleanup. Patch by Stan. 
Eliminate the deprecated for-each.

This was SVN commit r17520.
 2015-12-20 21:20:05 +00:00
mimo 423d26890a fix cases where changes in unitai orders were not transmitted to the ai 
This was SVN commit r17519.
 2015-12-20 21:07:47 +00:00
elexis bacedf18bc Show the repair-ratio in the tooltip of buildings. Patch by bb, refs #3395. 
This was SVN commit r17518.
 2015-12-20 20:40:42 +00:00
elexis eb8e381934 GuiInterface Cleanup 
Remove trailing whitespace.

This was SVN commit r17517.
 2015-12-20 19:18:39 +00:00
elexis fab9327a14 GuiInterface cleanup. Refs #3395. 
Simplify GetAverageRangeForBuildings and GetFormationInfoFromTemplate.
Use let instead of var.
Quote object keys.
Remove unneeded braces and variables.
Remove unused variable cmpMirage in L414 and numCleared in L1096.
Add missing semicolon in L637.
Use fat-arrow function.

This was SVN commit r17516.
 2015-12-20 19:05:57 +00:00
elexis c2b74197e0 Cleanup tooltips and selection details. Refs #3395. 
Use let instead of var.
Quote object keys.
Prefix globals with g_.
Remove some unneeded variables.
Use ternary operator and fat arrow functions.

This was SVN commit r17515.
 2015-12-20 17:15:21 +00:00
scythetwirler eea104748d Adjusts female citizen HP cost correctly using relative templates. Fixes #3510. Patch by Palaxin. 
This was SVN commit r17514.
 2015-12-19 22:57:28 +00:00
leper 509028d738 CompileOptions::setFileAndLine does not copy the string, so create a copy for it. 
This was SVN commit r17512.
 2015-12-19 02:55:30 +00:00
leper 332096e4ed SpiderMonkey 38 removes JS_AllocateArrayBufferContents. 
Users required the returned buffer to be passable to free(), so replace
it by malloc().
https://bugzilla.mozilla.org/show_bug.cgi?id=1037358

This was SVN commit r17511.
 2015-12-19 02:49:46 +00:00
leper 190f9176df SpiderMonkey 38 removes JS_NewPropertyIterator, use JS_Enumerate instead. 
https://bugzilla.mozilla.org/show_bug.cgi?id=1081660

This was SVN commit r17510.
 2015-12-19 02:21:22 +00:00
elexis e80e37cb21 Fix whitespace. 
This was SVN commit r17509.
 2015-12-19 02:03:30 +00:00
leper 753936e7df SpiderMonkey 38 removes JS_Evaluate{,UC}Script, use JS::Evaluate. 
https://bugzilla.mozilla.org/show_bug.cgi?id=1100579

This was SVN commit r17508.
 2015-12-19 01:58:03 +00:00
elexis 56bf37a54e Simulation cleanup (Attack.js) 
Use let instead of var.
Do not redeclare timeToTarget and cmpTimer.
Remove unused variable graphicalPosition.
Fix some whitespace issues.

This was SVN commit r17507.
 2015-12-19 01:48:11 +00:00
leper 2239fe338c The jschar typedef is removed in SpiderMonkey 38. 
Since it already is char16_t in 31 replace it by that.
https://bugzilla.mozilla.org/show_bug.cgi?id=1063962

This was SVN commit r17506.
 2015-12-19 01:29:55 +00:00
leper 69ab2bae5b Some ctors were made explicit in SpiderMonkey 38, so call them where needed. 
https://bugzilla.mozilla.org/show_bug.cgi?id=1013663

This was SVN commit r17505.
 2015-12-19 01:13:56 +00:00
leper efda359acc Use new when calling the builtin typed array constructor. 
The current code will be forbidden in ES6.

This was SVN commit r17504.
 2015-12-19 01:10:13 +00:00
elexis 825a2fcc34 Summary screen cleanup. Based on patch by bb, fixes #3518. 
This was SVN commit r17503.
 2015-12-19 01:00:32 +00:00
elexis a381334976 Gamesetup cleanup 
Unify the gameattributes-update of checkboxes.

This was SVN commit r17502.
 2015-12-18 22:40:56 +00:00
elexis 9cf9695d8d Graceful exit in case of trying to replay a directory. Fixes #3427. 
Also remove unneeded variable ran_atlas.

This was SVN commit r17501.
 2015-12-18 21:16:08 +00:00
elexis abce6cb737 Pathfinder optimization, fixes #3541. 
Simplify the math of Geometry::TestRayAASquare.

This was SVN commit r17500.
 2015-12-18 15:05:33 +00:00
elexis 659606b83e Revert the removal of setting the defaults in updateGUIObjects in b1e754c9b1 (until a better solution is found). 
Add comments for the unsuspecting.

This was SVN commit r17499.
 2015-12-18 12:48:04 +00:00
elexis 2d34b198df Remove a wrong tag from two skirmish maps. 
This was SVN commit r17497.
 2015-12-17 21:10:20 +00:00
elexis d31afada25 Gamesetup cleanup 
Move assignments of dropdownlist functions from XML to JS, so they are
all defined in one place.
Rename a function.

This was SVN commit r17496.
 2015-12-16 23:13:59 +00:00
mimo dca32228b5 fix dead tree actor, patch by stanislas69, fixes #3705 
This was SVN commit r17495.
 2015-12-16 20:45:08 +00:00
mimo 3196df663f some petra cleanup 
This was SVN commit r17494.
 2015-12-16 17:57:39 +00:00
mimo 6c4598fe16 increase a bit the loot xp of fauna_hunt, refs #3701 
This was SVN commit r17493.
 2015-12-16 17:54:00 +00:00
elexis 58cf3cb266 Correct two wrong references to variables in 5ccee7ade1. Patch by bb, fixes #3703. 
This was SVN commit r17492.
 2015-12-16 17:15:16 +00:00
fabio c1b97e4709 Improve indentation of 'case' statements updated after SDL1 removal (thanks leper). 
Also update other 'case' statements in the same file for consistency.

This was SVN commit r17491.
 2015-12-16 15:36:56 +00:00
elexis 7e9d105401 Toggle the session menu with the hotkey. Patch by Vladislav, fixes #3661. 
This was SVN commit r17490.
 2015-12-16 02:05:29 +00:00
elexis 1c6baed8e3 Gamesetup cleanup 
Move creation of game-description to a separate function.

This was SVN commit r17489.
 2015-12-16 01:37:43 +00:00
elexis b1e754c9b1 Gamesetup cleanup 
Remove all remaining variables referencing GUI objects in
updateGUIObjects.
Do more simple checks and insert new calls at more coherent places.

This was SVN commit r17488.
 2015-12-16 00:42:26 +00:00
elexis 6873a5e5a9 Gamesetup cleanup 
Unify switch-statement and remove unused variables.

This was SVN commit r17487.
 2015-12-15 23:57:45 +00:00
elexis f99de00779 Fix an operator precedence bug in the previous commit. 
This was SVN commit r17486.
 2015-12-15 23:19:01 +00:00
elexis 78cc57c16b Gamesetup cleanup (loadPersistMatchSettings, updateGUIObjects) 
Move GUI updates from loadPersistMatchSettings to updateGUIObjects.
Simplify updateGUIObjects and use setGUIBoolean.
Move SetRankedGame from updateGUIObjects to handleGamesetupMessage.
Early return in handleGamesetupMessage.

This was SVN commit r17485.
 2015-12-15 18:25:32 +00:00
elexis df25d425dd Gamesetup cleanup (loadPersistMatchSettings) 
Remove duplicate GUI updates which are done in initMapNameList and
updateGUIObjects.
Remove the g_IsInGuiUpdate line as the variable will be overwritten with
the next statement.

This was SVN commit r17484.
 2015-12-15 17:16:35 +00:00
elexis ffc70a2390 Gamesetup cleanup. 
Don't copy the label from the dropdownlist, but create it from
g_MapFilters.
Move placeholder items to g_RandomMap and g_RandomCiv.

This was SVN commit r17483.
 2015-12-15 15:40:34 +00:00
elexis ab053fef3e Gamesetup cleanup 
Remove 4 duplicate GUI updates in updateGUIObjects.
mapSelectionBox is updated in initMapNameList, the other three are done
80 lines below.
Inline finding of the selected map.

This was SVN commit r17482.
 2015-12-15 14:57:06 +00:00
elexis a960958379 Gamesetup cleanup. 
Abort in case a client tries to update the gamesettings.

Rename onGameAttributesChange to updateGUIObjects.
Move a check to sendRegisterGameStanza().

This was SVN commit r17481.
 2015-12-15 14:14:52 +00:00
elexis 8354adb74a Gamesetup cleanup 
Deobfuscate mapfilter code. Remove unneeded, peculiar functions.
Construct g_MapFilters in-place and mark as const.

In initMapNameList, load "all" maps if no mapfilter is specified.

This was SVN commit r17480.
 2015-12-15 12:23:39 +00:00
fabio 5a7c2ec2db Cleanup after SDL1 removal. 
Remove the "sdl1" option from premake4.lua (thanks historic_bruno).
Improve isUnprintableChar indentation, resolve two defines, change SDL*
to SDL2 in premake (thanks leper).

This was SVN commit r17479.
 2015-12-15 08:53:24 +00:00
elexis 931f5f752b Gamesetup cleanup. 
Resolve if-statements in initMultiplayerSettings.

This was SVN commit r17478.
 2015-12-15 00:21:27 +00:00
mimo 5a7a56da41 more cleanup on petra 
This was SVN commit r17477.
 2015-12-14 21:17:22 +00:00
mimo 0ed4a4c102 update the XP loot points of animals, fixes #3701, and remove the outdated and not used elephant template 
This was SVN commit r17476.
 2015-12-14 20:49:04 +00:00
elexis 636cc34a13 Gamesetup cleanup & translation fix 
The caption of mapSelectionText (mapname-label visible to clients)
showed "random" instead of a translated "Random".
Move hardcoded "orange" color to a global const.

Simplify loadMapData.
Rename saveGameAttributes() to savePersistMatchSettings().

This was SVN commit r17475.
 2015-12-14 18:47:41 +00:00
elexis a8ac537ebc Limit the number of units spawned when using cheats to prevent freezing the game. Based on patch by Stan, fixes #3545. 
This was SVN commit r17474.
 2015-12-14 17:10:55 +00:00
elexis da9ec4f325 Session cleanup. 
Remove unused and useless ambientsound code. The ambient actually stops
with EndGame.

This was SVN commit r17473.
 2015-12-14 16:47:45 +00:00
elexis 5df6a0182a Gamesetup cleanup. 
Use hideControl for playerdropdowns.
Remove some superfluous checks and  comments.
Simplify using logical or, math and ternary operator.

This was SVN commit r17472.
 2015-12-14 15:37:58 +00:00
elexis acde954f8d Gamesetup cleanup. 
Use let in function scope too.

Though spider monkey doesn't support let fully yet, it might be able to
detect some more reference errors in the code with later versions.
For example if a let variable is referenced before being defined
(temporal dead zone).
Besides, it is an easier rule to follow (let in functions, var for
globals) and makes the code more coherent.

This was SVN commit r17471.
 2015-12-14 14:32:43 +00:00
fabio 9a2d0f803e Remove disabled by default SDL1 support. 
Refs #2041.

This was SVN commit r17470.
 2015-12-14 10:52:21 +00:00
elexis 7665a9ee31 Session cleanup. 
The usual suspects:
Move all constants to the top.
Rename all globals to g_Foo.
Use let for all local variables (except in the for-each parts which will
be updated later).
Quote object keys.
Ternary operator.
Fat-arrow functions.
Whitespace issues.

This was SVN commit r17468.
 2015-12-14 05:37:34 +00:00
elexis 25e6136786 Clear g_ChatTimers too in case the new /clear command is used from the session. Refs #3396. 
This was SVN commit r17467.
 2015-12-14 04:14:58 +00:00
elexis 4dbc9b8b1d Cleanup color.js 
Move some shared color-code to color.js.
Remove shuffleArray() as it's unused since bbc325fb5a.
Add JSdoc comments and use let.

This was SVN commit r17466.
 2015-12-14 03:53:48 +00:00
elexis 6e80288d30 Add a chat-command to clear all messages. Works for lobby, gamesetup and session. Patch by ruiRanger, fixes #3396. 
This was SVN commit r17465.
 2015-12-14 03:12:26 +00:00
elexis f776e06044 Session messages/notification cleanup. 
Rename globals, use const, let, JSdoc comments.
Rename host to guid for coherency.
Don't use for-each.

This was SVN commit r17464.
 2015-12-14 03:08:53 +00:00
mimo 45c7d1681f petra cleanup, mainly renaming stuff for better readability 
This was SVN commit r17463.
 2015-12-13 22:04:09 +00:00
elexis 5864447d92 Don't resurrect dead units when trying to promoting them while they die. Patch by karamel, fixes #3544. 
This was SVN commit r17461.
 2015-12-13 18:09:56 +00:00
wraitii b87b3ff3dc Left some debug code in. 
This was SVN commit r17460.
 2015-12-13 17:39:19 +00:00
elexis a7a6b3316c GUI cleanup. 
Moves cropping of the mappreview image to a common function
setMapPreviewImage.
Also avoids magic numbers by using the actual formula.

This was SVN commit r17459.
 2015-12-13 17:09:41 +00:00
wraitii 1e504cd64c Fix the actoreditor menu bar on OSX. Patch by trompetin17. Fixes #1554. 
This was SVN commit r17458.
 2015-12-13 16:53:35 +00:00
wraitii 909b8d4369 Allow multiple special sprites, to facilitate cases where we want to add an overlay to a sprite. 
"color" can make use of the sprite's alpha texture, and the "add_color"
effect will now take the original image's alpha into account.
Remove the no longer needed "unaffordableMask" images on a variety of
panels.

Somewhat based on a patch by BoeseRaupe. Fixes #2421 and #3688.

This was SVN commit r17456.
 2015-12-13 16:03:17 +00:00
elexis 88d6f35126 Summary screen cleanup. 
Rename panelsData and teamMiscHelperData to g_Foo.
Use let instead of var everywhere except for globals.
Quote object keys, add some spaces.

This was SVN commit r17455.
 2015-12-13 13:20:54 +00:00
elexis 5ccee7ade1 Summary screen cleanup. Patch by bb, refs #3518. 
Renames globals to g_Foo.
Uses let instead of for in loops.
Fixes indentation and some whitespace issues.

This was SVN commit r17453.
 2015-12-13 12:42:58 +00:00
Enrique 160b6e60cd Added new tree acacia and variations. 
Upgraded aleppo pines.
New Oaks and dead oaks variations.
New generic dead trees.
Upgraded grapes texture by Stanislas69. Thanks Stan!

This was SVN commit r17452.
 2015-12-12 22:44:39 +00:00
elexis 5c36a4ab22 Gamesetup cleanup. 
Unify calls to hideControl which were duplicated per maptype.

This was SVN commit r17451.
 2015-12-12 21:43:32 +00:00
elexis 59b9a7a0db Gamesetup cleanup. 
Introduce a GUI function to set checkboxes and their label-counterpart
in one line.
Replace code that is duplicated for every maptype.
Fix a typo "ExporeMap" from e05c8263c5.

This was SVN commit r17450.
 2015-12-12 20:29:54 +00:00
elexis 745b1aae8d Correctly hide the mapsize-description (see 0b4308bbc8). 
This was SVN commit r17449.
 2015-12-12 18:07:39 +00:00
mimo 47a23904e5 adding more diversity in petra warnings 
This was SVN commit r17448.
 2015-12-12 15:45:02 +00:00
elexis 0b4308bbc8 Gamesetup cleanup (simplify GUI calls) 
Make a hidden function globally available and use it everywhere to
simplify the hiding/showing of GUI elements.
Use strings instead of the references to the actual GUI objects, so that
the code doesn't rely on variables anymore.
Use a default argument so we can reuse it with regards to other
conditions like scenario maps or multiplayer.
Notice the JS variables have the same name as the GUIObjects, so the
replacement is simple.

This was SVN commit r17447.
 2015-12-12 15:35:52 +00:00
elexis 2e54fee44d Fix oversight in 3006904403. 
This was SVN commit r17446.
 2015-12-12 15:27:07 +00:00
elexis 96003e8812 Correct the order of JSDoc arguments in so many places and use @returns instead of @return. 
Remove some unneeded comments.

This was SVN commit r17445.
 2015-12-12 14:53:28 +00:00
elexis 89f74d2528 Fix a playerassignment-bug in the gamesetup where the game couldn't be started if a player has rejoined the gamesetup while the host reduced the number of players. 
The previous code failed at it as it looped over g_PlayerAssignments
instead of all slots.

Based on patch by Pilzschaf, fixes #3602.

This was SVN commit r17444.
 2015-12-12 12:00:18 +00:00
elexis a939b49de7 Fix #3607 by assigning new players to unused slots instead of assuming that the n'th slot is available. 
This was SVN commit r17443.
 2015-12-12 10:48:59 +00:00
elexis 3006904403 Gamesetup cleanup. 
Split handleNetMessage into five smaller functions.
Besides improving the readability a bit, it allows adding new variables
without declaring them in the scope of other messagetypes.

This was SVN commit r17442.
 2015-12-12 10:31:06 +00:00
mimo ead4caaa41 do mot modify the cmd object, refs #3467 
This was SVN commit r17441.
 2015-12-11 20:15:10 +00:00
elexis bdc028fe09 Include award-winning skirmish map Forest Battle (4). Map created by Stan and reworked by niektb. Fixes #3618. 
See Mapping Contest 16 hosted by the Council of Modders.

This was SVN commit r17440.
 2015-12-11 19:36:03 +00:00
leper 71abb9cbed Use same resource translations as are used in the GUI already. Refs #3691. 
This was SVN commit r17439.
 2015-12-11 19:11:37 +00:00
mimo eacbdd4dfb cleanup in the petra queueManager 
This was SVN commit r17438.
 2015-12-11 18:45:03 +00:00
mimo 489822e384 some cleanup in the ai common-api 
This was SVN commit r17437.
 2015-12-11 18:35:01 +00:00
elexis 925b2910fe Fix whitespace and remove the placeholder functions initHostControls and initFinalize (see previous commit). 
This was SVN commit r17436.
 2015-12-11 18:33:09 +00:00
elexis 7b9c1e23db Major gamesetup cleanup. 
Split the 280-line function initGUIObjects (former initMain) into
sixteen short functions.

Do not correct indentation in this commit in order to have the smallest
changeset possible, highlighting the actual changes
[the only logic change being mapTypes.selected and mapFilters.selected
being set one function (initMoreOptions) earlier].

This was SVN commit r17435.
 2015-12-11 18:20:45 +00:00
wraitii 48e3959391 Change the "Summary" button from the top bar to the menu to help support our minimal resolution. 
Disable said button for non-observers.
Refs #3387.

This was SVN commit r17434.
 2015-12-11 15:49:33 +00:00
elexis 4a81d53f3b Gamesetup cleanup. 
Rename initMain to initGUIObjects to clarify what the function does.
While init() sets globals without touching the GUI, initGUIObjects
updates all GUI controls after the first tick.

Rename loadGameAttributes to loadPersistMatchSettings as that's more
specific as to where the attributes are loaded from.
Add some JSDoc comments and a TODO for an annoying old bug.

Simplifiy to-boolean conversions by negating twice (!!)

This was SVN commit r17433.
 2015-12-11 14:11:33 +00:00
elexis 682a7b3ba0 Gamesetup cleanup. 
Don't define variables inside switch-statements.
Move chat-font to global.
Rename host and an i to guid, newPlayer to newGUID to be more coherent.
Do early continues when finding joinings/leavings and swapping players.

This was SVN commit r17432.
 2015-12-11 11:55:16 +00:00
elexis c32a2b52be Gamesetup cleanup. 
Simplify initMapNameList.
Remove six superfluous checks.
Remove two unneeded variables in updatePlayerList.

This was SVN commit r17431.
 2015-12-11 10:17:44 +00:00
elexis 42548698c5 Gamesetup cleanup. 
Replace more var by let.
The only remaining places to update are switch-statements.

This was SVN commit r17429.
 2015-12-11 00:21:04 +00:00
elexis df86b15b91 Gamesetup cleanup. 
Simplify by using array functions, the ternary operator and unifying
duplicate code.
Move map-paths to a global.

This was SVN commit r17428.
 2015-12-11 00:02:18 +00:00
mimo d07f16ed80 petra: fix resource translations, fixes #3691 
This was SVN commit r17427.
 2015-12-10 20:35:24 +00:00
mimo afa07325a1 petra: improve the detection of stuck gatherers, refs #3562 
This was SVN commit r17426.
 2015-12-10 20:02:37 +00:00
mimo a74d9be130 make const the new method introduced in 2451872731 
This was SVN commit r17425.
 2015-12-10 19:23:50 +00:00
elexis 57260e185b Use let instead of var in the gamesetup. 
Doing so follows the principle of least exposure and means those
variables will be destroyed when leaving the block (i.e. memory being
freed up earlier).

The blocks affected by this commit are short (mostly 3-5 lines).
The variables are not referenced before or after the block, nor in their
temporal dead zones.

This was SVN commit r17424.
 2015-12-10 17:44:14 +00:00
wraitii e57c99c6f6 Add a button to the top bar to access the summary screen in-game or in replays. 
No effort was done to prevent players from accessing it since it's
impossible to prevent them from doing so anyway.

Fixes #3387 .

This was SVN commit r17423.
 2015-12-10 15:33:06 +00:00
elexis 4dcbad7b1b Simplify init() and initMain(). Exit gracefully in case of encountering an error there. 
Do not focus the maplist when entering the singleplayer gamesetup as
that actually doesn't have an effect (you can't scroll the maplist with
arrow-keys).

This was SVN commit r17422.
 2015-12-10 14:24:03 +00:00
elexis 9b4e359d64 Gah. 
This was SVN commit r17421.
 2015-12-10 13:28:57 +00:00
elexis 223305b7ae Simplify sendRegisterGameStanza by using the conditional operator and removing four variables which are used only once. 
This was SVN commit r17420.
 2015-12-10 13:20:45 +00:00
elexis 7a8c37a885 Use map function instead of deprecated for-each. 
This was SVN commit r17419.
 2015-12-10 13:06:36 +00:00
elexis 63fa889fcd Rename playableOnly to selectableOnly as non-selectable civs can be playable on scenario maps. 
This was SVN commit r17418.
 2015-12-10 12:52:38 +00:00
elexis af4dc43478 Revert the removal of non-selectable civs from the gamesetup (bbc325fb5a) to allow scenario maps to select unselectable civs. 
This was SVN commit r17417.
 2015-12-10 12:49:53 +00:00
leper 349b5786dd Fix test failure. Refs #3590. 
This was SVN commit r17416.
 2015-12-09 22:52:33 +00:00
mimo b6dbb2bff0 fix tabs of 2451872731 
This was SVN commit r17415.
 2015-12-09 20:56:53 +00:00
mimo 2451872731 improve performance of hierarchical pathfinder, refs #3588 
This was SVN commit r17413.
 2015-12-09 19:56:30 +00:00
fabio 73a26a22ca Enable by default postproc, smoothlos and all water features when on OpenGL4+. 
This autodetection has a higer priority than default.cfg, but lower
priority than local changes.
Note that after enabling these features some get disabled later on on
some drivers (Intel, software renderers).
Also note that mesa drivers only expose core profile OpenGL, and 0 A.D.
reads compatibility profile, so that on mesa drivers OpenGL4 is never
detected and these features are never enabled by default.

This was SVN commit r17412.
 2015-12-09 16:12:58 +00:00
fabio 07f0a178f4 Fixes what looks a copy-paste error. 
Makes disable_allwater setting in hwdetect.js what it was supposed to
do.

This was SVN commit r17411.
 2015-12-09 11:35:40 +00:00
fabio a5152c14d1 Properly use the passed parameter as all other occourences. 
Fixes 'disable_allwater = false' case in hwdetect.js.

This was SVN commit r17410.
 2015-12-09 11:28:24 +00:00
mimo 6a73dc2e16 fix multiple (useless) insertion in grid update of hierarchical pathfinder 
This was SVN commit r17409.
 2015-12-08 22:58:04 +00:00
leper b4f0227f1b Add support for undeletable entities. Fixes #3590. 
This was SVN commit r17408.
 2015-12-08 22:34:32 +00:00
mimo 82ca673e0a petra: retune the dock placement criteria, fixes #3469 
This was SVN commit r17407.
 2015-12-08 19:16:50 +00:00
leper 489e41362a Use placeholder in plural string. 
This was SVN commit r17406.
 2015-12-08 18:13:09 +00:00
leper fd32da5c87 Update tinygettext. 
Updates tinygettext to upstream commit
328f015d0b07465c8a5a05cbfc0a41154a2f8ebf.
This adds better collision logging.

This was SVN commit r17405.
 2015-12-08 18:05:11 +00:00
leper 61886f0e7a Use inheritance instead of redefining properties. 
This was SVN commit r17404.
 2015-12-08 18:05:06 +00:00
JoshuaJB 80663a6c8a Add gray, stone-esc modern button type. 
This was SVN commit r17403.
 2015-12-07 18:47:41 +00:00
elexis 71cd4ac3cc Simplify input.js. Unify checks, remove unneeded variables and use the conditional operator. 
This was SVN commit r17401.
 2015-12-07 13:45:50 +00:00
elexis 780a1de136 Don't comment out code. Refs #3486. 
This was SVN commit r17400.
 2015-12-07 12:27:52 +00:00
elexis 8af675e207 Don't emit sounds when selecting dead animals. Patch by Stan. Fixes #3486. 
This was SVN commit r17399.
 2015-12-07 00:21:24 +00:00
elexis 9e39d6b46c Implement markForPluralTranslation() which allows to translate plural-strings sent by the simulation. 
Use it for the build-restriction notifications.

Based on patch by Safa Alfulaij, fixes #3081.

This was SVN commit r17398.
 2015-12-06 23:56:03 +00:00
leper 66bb4deef8 Use the tech name as it is used everywhere else. 
This was SVN commit r17397.
 2015-12-06 21:29:09 +00:00
mimo d5e083247a fix 66bd932374 which has increased too much the repair specificness: it should be higher than the capture one, but smaller than the move one. refs #3443 
This was SVN commit r17396.
 2015-12-06 21:02:04 +00:00
leper 3483a2d226 Extract attack notification strings. Refs #3691. 
This was SVN commit r17395.
 2015-12-06 20:51:32 +00:00
leper abd7b78b02 Return the boolean test instead of having an if-return return. 
This was SVN commit r17394.
 2015-12-06 20:51:30 +00:00
elexis 2bd22bb6a8 Fix whitespace. 
This was SVN commit r17393.
 2015-12-06 17:13:47 +00:00
elexis 0462829579 Use more plural translations for tooltips. Patch by Safa Alfulaij. Refs #3081. 
This was SVN commit r17392.
 2015-12-06 16:56:46 +00:00
elexis 953e745067 Do a more explicit sanitycheck in loadCivData (in case we encounter the value false). 
Make that viking boat gaia which is more coherent with the other
eastereggs.

This was SVN commit r17391.
 2015-12-06 15:30:49 +00:00
elexis 21f032c305 Ignore the "user" mod when checking the compability of replays and savegames. 
This was SVN commit r17390.
 2015-12-06 14:00:03 +00:00
elexis 84678cf40e Tune lobby rating alignment and remove a TODO that won't be fixed due to uglyness. 
This was SVN commit r17389.
 2015-12-06 13:21:41 +00:00
elexis cff6056e9f Lobby cleanup. 
Remove unneeded 4 globals and 2 functions used for sorting the lobby
lists.

This was SVN commit r17388.
 2015-12-06 12:13:06 +00:00
elexis 66ec6dbf12 Lobby cleanup. 
Actually define these variables and revert to sorting by state for
gamelists by default (despite not having a column to sort for that).

This was SVN commit r17387.
 2015-12-06 11:42:30 +00:00
scythetwirler 987a7028bd Implements relative templates. Fixes #2936. Thanks to leper, wraitii, historicbruno and everyone else that helped. 
This was SVN commit r17386.
 2015-12-05 17:02:25 +00:00
mimo 8813cb3133 petra: some fixes (buildrestrictions min distance) and some cleanup 
This was SVN commit r17385.
 2015-12-05 15:02:45 +00:00
mimo 99c0d0493c remove warnings in structtree, fixes #3682, patch from s0600204 
This was SVN commit r17384.
 2015-12-05 14:57:09 +00:00
elexis 4b37462645 Restore player- and game-selection when updating the lists. Fixes #3244. 
The previous selection is saved globally so that we don't lose it in
case of no element being selected.
Also remove an unused variable.

This was SVN commit r17383.
 2015-12-05 04:28:23 +00:00
elexis 7316473921 Don't translate botnames in multiplayer games (so names are in english instead of the language of the host). Refs #3307 
This was SVN commit r17382.
 2015-12-04 23:54:45 +00:00
elexis bbc325fb5a Gamesetup cleanup. Refs #3680. 
Don't even load non-playable civs in the gamesetup and add sanity checks
to sanitizePlayerData() and loadCivData() so that we can remove later
checks.
Remove some blatantly wrong code from launchGame().
Move hardcoded romanNumbers to a global.

This was SVN commit r17381.
 2015-12-04 23:45:35 +00:00
elexis 71b0d9c052 Update atlas with the new map_sizes.json format. Refs #3355. 
This was SVN commit r17379.
 2015-12-04 16:37:30 +00:00
elexis 6572b6d042 Simplify civ info (main menu -> learn how to play -> history). 
Add JSDoc comments.
Refs #3680 a bit.

This was SVN commit r17378.
 2015-12-04 15:35:34 +00:00
elexis 654ec6f2bf Gamesetup cleanup. Refs #3680 
Simplify mapfilter code and mark g_CivData as const.

This was SVN commit r17377.
 2015-12-04 14:06:01 +00:00
elexis 82d93c89dd Gamesetup cleanup. Refs #3680 
Remove a broken implementation of default maps.
Remove some unneeded comments.

This was SVN commit r17376.
 2015-12-04 13:10:50 +00:00
elexis 99d7b73d2c Don't link unused eastereggs to wrong civs. Patch by Stan, fixes #3679. 
This was SVN commit r17375.
 2015-12-04 12:47:04 +00:00
elexis e8bb6f5974 Actually remove the old file from the repository. Refs #3355 
This was SVN commit r17374.
 2015-12-04 12:30:24 +00:00
elexis a98a44875e Move mapsizes to the new simulation settings system. Fixes #3355. 
Notice that initMapSizes() confusingly mapped from "LongName" to "names"
and from "Name" to "shortnames".
Now it's identical in both parts.

Also fixes a bug in the summary screen where it would show "Scenario"
for a skirmish map.

This was SVN commit r17373.
 2015-12-04 12:24:58 +00:00
elexis d50075adc4 Lobby cleanup. Fixes #3383 
This was SVN commit r17371.
 2015-12-04 00:22:15 +00:00
elexis 76a1a84a58 Lobby cleanup. Refs #3383 
Remove wrong attempt to display private-messages in the lobby.
Move hardcoded font to g_SenderFont global.
Replace some variables with references.
Correct indentation in ircFormat().

This was SVN commit r17370.
 2015-12-03 22:22:26 +00:00
elexis 787960b63c Lobby cleanup. Refs #3383 
Removes a broken translation in displayProfile().
Removes many unused functions, variables and comments.
Moves filter initialization to new function.
Moves hardcoded system color to g_SystemColor.
Simplifies a lot without changing the logic otherwise.

This was SVN commit r17369.
 2015-12-03 17:43:16 +00:00
elexis 88816a1043 Fix two oversights and simplify mapfilter-initialization. Refs #3383 
This was SVN commit r17368.
 2015-12-03 14:10:28 +00:00
elexis 2e69872b11 Remove debug parser from replay menu. Refs #3440 
This was SVN commit r17367.
 2015-12-03 03:12:43 +00:00
elexis 477e8c36ee Lobby cleanup. Simplifies updatePlayerList() and moves hardcoded color values to the top of the file for easy access. Refs #3383 
This was SVN commit r17366.
 2015-12-03 02:52:44 +00:00
historic_bruno 5b2738b0cb Doubles size of sound card string buffers, for users with many sound devices present. Fixes #3660 
This was SVN commit r17365.
 2015-12-02 22:41:17 +00:00
elexis 3c6580ed83 Add JSdoc comments to all lobby globals and remove g_MapSizes because it is only used locally. Refs #3383 
This was SVN commit r17364.
 2015-12-02 17:44:09 +00:00
elexis a88e8e3e5c Remove obfuscated easteregg in the lobby. 
This was SVN commit r17363.
 2015-12-02 17:21:08 +00:00
elexis 2b64d83978 Enlighten too dark username-colors in the lobby and gamesetup-chat. Patch by fpre, fixes #3205. 
This was SVN commit r17362.
 2015-12-02 17:00:12 +00:00
elexis e6840f5fca Remove useless global g_SpecialKey. Refs #3383 
This was SVN commit r17360.
 2015-12-02 16:00:20 +00:00
elexis d1f0cbe01d Renames to g_MapSizes, g_UserRating and g_SpamMonitor. Refs #3383 #3440 
This was SVN commit r17359.
 2015-12-02 14:54:08 +00:00
elexis 02c065e2c9 Removes the unused "gone" presence state from the lobby. Refs #3383. 
This was SVN commit r17358.
 2015-12-02 14:41:32 +00:00
elexis eeaffa05ee Correct sorting for ratings in the lobby and use fat-arrow functions. Fixes #3662. 
This was SVN commit r17357.
 2015-12-02 14:29:27 +00:00
elexis a1e57aaeaf Replay menu cleanups. Fixes #3440. 
Hides the summary-button in the replaymenu in case the summary wasn't
saved.
Corrects the timestamp for incompatible replays.
Remove unused UNUSED from header files.
Use string8() instead of OsString().
Mention a reported compiler warning.
Use const& instead of a copy in StartVisualReplay().

This was SVN commit r17356.
 2015-12-02 13:53:44 +00:00
elexis 0553a74884 Remove wrong semicolons. Refs #3424 
This was SVN commit r17353.
 2015-12-02 03:24:04 +00:00
mimo cd635f9615 cleanup of df6d30a910 
This was SVN commit r17352.
 2015-12-01 21:03:24 +00:00
mimo df6d30a910 fix affordable gui of gates 
This was SVN commit r17351.
 2015-12-01 19:41:52 +00:00
mimo 0a8fc4bb08 improve pathFinder by optimizing the DistanceToSquare computation, refs #3588 
This was SVN commit r17350.
 2015-12-01 19:01:41 +00:00
elexis b657eb05e2 Remove the unused and broken function GetBaseSpeed. Fixes #3672. 
This was SVN commit r17349.
 2015-12-01 13:17:34 +00:00
fabio 60f82e54dd Make the warning message on software renderers a bit more informative. 
This was SVN commit r17348.
 2015-12-01 09:42:49 +00:00
fabio 418318ea88 Properly read preferglsl in user config files. 
This was SVN commit r17347.
 2015-12-01 09:00:12 +00:00
elexis bef7682bbe Fixes a bug in the mauryan warchariot walk-animation. They were walking instead of standing on the chariot when it moves. 
Patch by Stan. Refs #2577.

This was SVN commit r17346.
 2015-11-30 22:09:00 +00:00
elexis 45723b1293 Don't break the translation of the playerdefaults. Refs #3355 
This was SVN commit r17345.
 2015-11-30 20:51:20 +00:00
mimo 6fd700d95d restore min range distance of defense towers, and make it removable with murder_hole tech, fixes #3559 
This was SVN commit r17344.
 2015-11-30 20:49:57 +00:00
leper 2008f3e3a9 Plural translation since that is needed for some languages. 
This was SVN commit r17343.
 2015-11-30 20:47:42 +00:00
mimo 66bd932374 gives repair a lower priority compared to capture, fixes #3443 
This was SVN commit r17342.
 2015-11-30 20:26:10 +00:00
leper 6f09803e8c TerrainTextureManager file loading rewrite. Fixes #3358. 
Add directory callback to vfs::ForEachFile.
Each terrain directory should now have a terrains.xml file,
as using the previous terrains.xml file is unlikely to be what was
intended.

This was SVN commit r17341.
 2015-11-30 20:12:12 +00:00
fabio af202ae963 Clean up software renderers detection. 
Fix llvmpipe (mesa) detection.
Add softpipe (mesa) detection.
Add GDI Generic (Windows) detection.
Consolidate software renderers detection in a function.
Disable s3tc on software renderers, it halves performance and make
textures weird.
Add a warning when on software renderer, to inform the player something
is bad.

This was SVN commit r17339.
 2015-11-30 16:12:12 +00:00
fabio fa9c8e061b Enable GLSL by default on OpenGL 3+. 
This doesn't override any user setting, it just changes the default when
no preferglsl setting is specified.

Fixes #3641.
Refs #145.

This was SVN commit r17338.
 2015-11-30 10:51:02 +00:00
elexis f8f8a1eb6a Increases the gatherer limit for some special resources. Fixes #3583. 
This was SVN commit r17336.
 2015-11-30 04:20:30 +00:00
elexis 324179e2b9 Show icon for the female inspiration aura. Fixes #3384 
This was SVN commit r17335.
 2015-11-30 03:58:19 +00:00
elexis d7e444b862 Loot resources that killed enemies carried. Fixes #2732 
This was SVN commit r17334.
 2015-11-30 03:41:18 +00:00
elexis 56716577e0 Changes the type "notification" of some GuiInterface-notifications to "chat" as the former isn't defined. 
Also fixes a typo reported by AlThePhoenix and removes trailing
whitespace.

This was SVN commit r17333.
 2015-11-30 02:06:58 +00:00
elexis 700859b2c3 Move the playerdefaults to the settings directory. Refs #3355 
This was SVN commit r17332.
 2015-11-30 01:33:59 +00:00
wraitii 61e5e92b14 Update/revamp my template analyzer tool. 
Remove the useless "fancy" data in favor of a simpler visualization of
templates, adding an in-place tool to filter and sort (for convenience).

This was SVN commit r17331.
 2015-11-29 19:19:20 +00:00
elexis ff30dc2ba4 Forgot to add the JSON file. Refs #3477. 
This was SVN commit r17330.
 2015-11-29 16:53:32 +00:00
elexis 296f3b2614 Adds a new cheat as an abbreviation for most other cheats. Also cleans the code. 
Fixes #3477. Patch by bb.

This was SVN commit r17329.
 2015-11-29 16:47:04 +00:00
wraitii 28bea05e06 Show units that can train other units (trainer units) in the structure tree. Patch by s0600204. Fixes #3213 . 
This was SVN commit r17328.
 2015-11-29 16:18:21 +00:00
mimo c9f40be84e improve indentation of 34b0c6d779 
This was SVN commit r17327.
 2015-11-29 16:13:13 +00:00
mimo 34b0c6d779 add a NOT when checking classes matching, fixes #3611 
This was SVN commit r17326.
 2015-11-29 15:59:52 +00:00
wraitii 814cdd9524 Tie tangent generation with preferGLSL setting for convenience since that setting was not really useful. Fixes #2506 . Patch by fabio. 
This was SVN commit r17325.
 2015-11-29 15:44:22 +00:00
wraitii 51793dde28 Fix an oversight when constructing walls that changed issued commands and would result in false positives when running with -serializationtest. Refs #3637 
This was SVN commit r17324.
 2015-11-29 15:25:51 +00:00
elexis bb7c4aa86a Code cleanup. Refs #3420. 
Since the window is now closed immediately after disconnect in
messages.js, we don't need to close it in menu.js.

This was SVN commit r17323.
 2015-11-29 15:11:30 +00:00
mimo 9f75b78a84 fix nearGatherPosition, fixes #3658 
This was SVN commit r17322.
 2015-11-29 14:43:28 +00:00
mimo 42d42243ac add specific names for gaul and brit fishing ships, fixes #3490, patch from stanislas69 
This was SVN commit r17321.
 2015-11-29 14:29:43 +00:00
elexis a6b44c12a2 Don't replace the custom colors of scenario maps with default colors. Fixes #3627. 
This was SVN commit r17320.
 2015-11-29 13:38:10 +00:00
elexis 58f88210f3 Informs the translation extractor of the replay menu. Fixes #3656. 
Thanks Itms for reporting :-)

This was SVN commit r17319.
 2015-11-29 13:31:38 +00:00
elexis 6a4e0f714c Cleans up Looter.js. Removes duplicate code and simplifies it. Fixes #3424. Thanks fcxSanya for the review! 
This was SVN commit r17318.
 2015-11-29 02:15:35 +00:00
elexis 7b67324ae6 Code cleanup. 
Adds missing whitespace to objects.
Removes trailing whitespace.
Corrects some for-loop counters.

This was SVN commit r17317.
 2015-11-29 01:45:45 +00:00
elexis d8ecc2f87f Lobby cleanup. 
Designate constants as such.
Comply with naming convention for globals.
Quote object keys.
Add few JSDoc comments.

Refs #3383.

This was SVN commit r17316.
 2015-11-29 01:29:38 +00:00
elexis d39810df7d Closes the chat window after disconnect and prevents opening it again. Fixes #3420. 
This was SVN commit r17315.
 2015-11-29 00:51:00 +00:00
elexis 7de746cc58 Visual replay code cleanup. Refs #3440. 
Moves StartVisualReplay() from JSInterface_VisualReplay.cpp to
VisualReplay.cpp, so that the former doesn't define any logic.
Uses replayFile.string8() instead of
utf8_from_wstring(replayFile.string()).
SAFE_DELETE instead of delete.
Fixes a compiler warning in getReplayDuration().

This was SVN commit r17314.
 2015-11-29 00:23:18 +00:00
elexis 8cf2333568 Corrects an offset of a menu entry. Thanks niektb for reporting. Refs #3440 
This was SVN commit r17313.
 2015-11-28 23:27:54 +00:00
wraitii d21f932bf9 Experiment: lower the cost of palisade walls a lot and of stone walls slightly, make them both faster to build. Make palisades less resistant (in particular to hack attacks). Reduce the efficiency of stone wall towers since those could be used stand-alone to have more towers. 
This was SVN commit r17312.
 2015-11-28 15:32:23 +00:00
mimo 8f74850215 add technologies for fishing, fixes #3576, fishing_net icon from stanislas69 
This was SVN commit r17311.
 2015-11-28 13:43:26 +00:00
mimo be9b6fa59c improves performance of hierarchical pathFinder, refs #3588 
This was SVN commit r17310.
 2015-11-28 13:06:44 +00:00
mimo 0d27dbf5a3 some petra cleanup 
This was SVN commit r17309.
 2015-11-28 11:46:45 +00:00
mimo ca3828f9ac some simulation cleanup 
This was SVN commit r17308.
 2015-11-28 11:43:14 +00:00
mimo be2ddb9c63 some gui cleanup 
This was SVN commit r17307.
 2015-11-28 11:23:04 +00:00
mimo 2548187474 fix selection when owner change, ref #3645 
This was SVN commit r17306.
 2015-11-28 11:16:13 +00:00
mimo 2d4ec03019 update packing flag, fixes #3628 
This was SVN commit r17305.
 2015-11-28 11:11:40 +00:00
mimo 0d1b595fa0 fix UnitAI state, fix #3630 
This was SVN commit r17304.
 2015-11-28 11:09:29 +00:00
leper 432df9b38e Use two range based for loops to fix two TODOs. 
This was SVN commit r17303.
 2015-11-28 08:27:42 +00:00
leper c0c19db94e Null serialization functions for some components without dynamic state. 
This was SVN commit r17302.
 2015-11-28 08:27:41 +00:00
leper e4834e8a0d Some JS component cleanup. 
This was SVN commit r17301.
 2015-11-28 08:27:38 +00:00
leper 5d243d0ce8 Clarify font licenses. 
This was SVN commit r17300.
 2015-11-28 08:27:36 +00:00
leper 9a40d1284e Update version numbers. Switch lobby room. 
This was SVN commit r17299.
 2015-11-28 08:27:33 +00:00
1220 changed files with 22931 additions and 179748 deletions
Expand all files Collapse all files
binaries/data/config/default.cfg
+12 -11
View File
@@ -4,6 +4,8 @@
; * DO NOT EDIT THIS FILE if you want personal customisations: *
; * create a text file called "local.cfg" instead, and copy *
; * the lines from this file that you want to change. *
; * You also need to copy the section tags ([hotkey], [gui], *
; * etc.) for the things you change. *
; * *
; * On Linux, create: *
; * $XDG_CONFIG_HOME/0ad/config/local.cfg *
@@ -73,7 +75,7 @@ shadowpcf = true
vsync = false
particles = true
silhouettes = true
showsky = false
showsky = true
nos3tc = false
noautomipmap = true
@@ -96,12 +98,9 @@ force_s3tc_enable = true
renderpath = default
;;;;; EXPERIMENTAL ;;;;;
; Prefer GLSL shaders over ARB shaders (not recommended). REQUIRES gentangents=true.
; Prefer GLSL shaders over ARB shaders. Allows fancier graphical effects.
preferglsl = false
; Generate tangents for normal and parallax mapping. REQUIRES preferglsl=true.
gentangents = false
; Experimental probably-non-working GPU skinning support; requires preferglsl; use at own risk
gpuskinning = false
@@ -342,23 +341,25 @@ rotate.y = 2
zoom.in = 5
zoom.out = 4
[jsdebugger]
; The Debugger is currently broken and can't be enabled until the SpiderMonkey upgrade is done and the debugger is updated for the new API.
enable = false ; Enable Javascript debugging.
[lobby]
chattimestamp = false ; Show time chat message was posted
history = 0 ; Number of past messages to display on join
room = "arena19" ; Default MUC room to join
room = "arena20" ; Default MUC room to join
server = "lobby.wildfiregames.com" ; Address of lobby server
xpartamupp = "wfgbot19" ; Name of the server-side xmpp client that manage games
xpartamupp = "wfgbot20" ; Name of the server-side xmpp client that manage games
[mod]
enabledmods = "mod public"
[network]
duplicateplayernames = false ; Rename joining player to "User (2)" if "User" is already connected, otherwise prohibit join.
lateobserverjoins = false ; Allow observers to join the game after it started
observerlimit = 6 ; Prevent further observer joins in running games if this limit is reached
[overlay]
fps = "false" ; Show frames per second in top right corner
realtime = "false" ; Show current system time in top right corner
netwarnings = "true" ; Show warnings if the network connection is bad
[profiler2]
autoenable = false ; Enable HTTP server output at startup (default off for security/performance)
binaries/data/mods/_test.sim/globalscripts/test-global-helper.js
+41
View File
@@ -2,3 +2,44 @@ function GlobalSubtractionHelper(a, b)
{
return a-b;
}
function Vector2D(x, y)
{
if (arguments.length == 2)
{
this.x = x;
this.y = y;
}
else
this.x = this.y = 0;
}
Vector2D.prototype.add = function(v)
{
this.x += v.x;
this.y += v.y;
return this;
};
function Vector3D(x, y, z)
{
if (arguments.length == 3)
{
this.x = x;
this.y = y;
this.z = z;
}
else
this.x = this.y = this.z = 0;
}
Vector3D.prototype.add = function(v)
{
this.x += v.x;
this.y += v.y;
this.z += v.z;
return this;
};
// make the prototypes easily accessible to C++
const Vector2Dprototype = Vector2D.prototype;
const Vector3Dprototype = Vector3D.prototype;
binaries/data/mods/mod/art/textures/ui/global/modern/button/gray-unselected-background.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/mod/art/textures/ui/global/modern/button/gray-unselected-center-bottom.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/mod/art/textures/ui/global/modern/button/gray-unselected-center-top.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/mod/art/textures/ui/global/modern/button/gray-unselected-left-bottom.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/mod/art/textures/ui/global/modern/button/gray-unselected-left-center.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/mod/art/textures/ui/global/modern/button/gray-unselected-left-top.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/mod/art/textures/ui/global/modern/button/gray-unselected-right-bottom.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/mod/art/textures/ui/global/modern/button/gray-unselected-right-center.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/mod/art/textures/ui/global/modern/button/gray-unselected-right-top.png
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/mod/globalscripts/l10n.js
+13 -2
View File
@@ -208,11 +208,22 @@ function translateObjectKeys(object, keys) {
* So it may only be used on a plain string,
* it won't have any effect on a calculated string.
*/
function markForTranslation(message) {
function markForTranslation(message)
{
return message;
}
function markForTranslationWithContext(context, message) {
function markForTranslationWithContext(context, message)
{
return message;
}
function markForPluralTranslation(singularMessage, pluralMessage, number)
{
return {
"message": singularMessage,
"pluralMessage": pluralMessage,
"pluralCount": number
};
}
binaries/data/mods/mod/gui/common/modern/sprites.xml
+144
View File
@@ -555,6 +555,150 @@
size="100%-8 100%-8 100% 100%"
/>
</sprite>
<!-- GRAY -->
<sprite name="ModernButtonGray">
<!-- Background -->
<image texture="global/modern/button/gray-unselected-background.png"
real_texture_placement="0 0 512 128"
texture_size="0 0 512 128"
size="2 2 100%-2 100%-2"
/>
<!-- Left -->
<image texture="global/modern/button/gray-unselected-left-top.png"
real_texture_placement="0 0 8 8"
size="0 0 8 8"
/>
<image texture="global/modern/button/gray-unselected-left-center.png"
real_texture_placement="0 0 8 16"
texture_size="0 0 8 16"
size="0 8 8 100%-8"
/>
<image texture="global/modern/button/gray-unselected-left-bottom.png"
real_texture_placement="0 0 8 8"
size="0 100%-8 8 100%"
/>
<!-- Center -->
<image texture="global/modern/button/gray-unselected-center-top.png"
real_texture_placement="0 0 128 8"
texture_size="0 0 128 8"
size="8 0 100%-8 8"
/>
<image texture="global/modern/button/gray-unselected-center-bottom.png"
real_texture_placement="0 0 128 8"
texture_size="0 0 128 8"
size="8 100%-8 100%-8 100%"
/>
<!-- Right -->
<image texture="global/modern/button/gray-unselected-right-top.png"
real_texture_placement="0 0 8 8"
size="100%-8 0 100% 8"
/>
<image texture="global/modern/button/gray-unselected-right-center.png"
real_texture_placement="0 0 8 16"
texture_size="0 0 8 16"
size="100%-8 8 100% 100%-8"
/>
<image texture="global/modern/button/gray-unselected-right-bottom.png"
real_texture_placement="0 0 8 8"
size="100%-8 100%-8 100% 100%"
/>
</sprite>
<sprite name="ModernButtonGrayOver">
<!-- Background -->
<image texture="global/modern/button/gray-unselected-background.png"
real_texture_placement="0 0 512 128"
texture_size="0 0 512 128"
size="2 2 100%-2 100%-2"
>
<effect add_color="42 42 42 0"/>
</image>
<!-- Left -->
<image texture="global/modern/button/gray-unselected-left-top.png"
real_texture_placement="0 0 8 8"
size="0 0 8 8"
/>
<image texture="global/modern/button/gray-unselected-left-center.png"
real_texture_placement="0 0 8 16"
texture_size="0 0 8 16"
size="0 8 8 100%-8"
/>
<image texture="global/modern/button/gray-unselected-left-bottom.png"
real_texture_placement="0 0 8 8"
size="0 100%-8 8 100%"
/>
<!-- Center -->
<image texture="global/modern/button/gray-unselected-center-top.png"
real_texture_placement="0 0 128 8"
texture_size="0 0 128 8"
size="8 0 100%-8 8"
/>
<image texture="global/modern/button/gray-unselected-center-bottom.png"
real_texture_placement="0 0 128 8"
texture_size="0 0 128 8"
size="8 100%-8 100%-8 100%"
/>
<!-- Right -->
<image texture="global/modern/button/gray-unselected-right-top.png"
real_texture_placement="0 0 8 8"
size="100%-8 0 100% 8"
/>
<image texture="global/modern/button/gray-unselected-right-center.png"
real_texture_placement="0 0 8 16"
texture_size="0 0 8 16"
size="100%-8 8 100% 100%-8"
/>
<image texture="global/modern/button/gray-unselected-right-bottom.png"
real_texture_placement="0 0 8 8"
size="100%-8 100%-8 100% 100%"
/>
</sprite>
<sprite name="ModernButtonGrayDisabled">
<!-- Background -->
<image texture="global/modern/button/gray-unselected-background.png"
real_texture_placement="0 0 512 128"
texture_size="0 0 512 128"
size="2 2 100%-2 100%-2"
/>
<!-- Left -->
<image texture="global/modern/button/gray-unselected-left-top.png"
real_texture_placement="0 0 8 8"
size="0 0 8 8"
/>
<image texture="global/modern/button/gray-unselected-left-center.png"
real_texture_placement="0 0 8 16"
texture_size="0 0 8 16"
size="0 8 8 100%-8"
/>
<image texture="global/modern/button/gray-unselected-left-bottom.png"
real_texture_placement="0 0 8 8"
size="0 100%-8 8 100%"
/>
<!-- Center -->
<image texture="global/modern/button/gray-unselected-center-top.png"
real_texture_placement="0 0 128 8"
texture_size="0 0 128 8"
size="8 0 100%-8 8"
/>
<image texture="global/modern/button/gray-unselected-center-bottom.png"
real_texture_placement="0 0 128 8"
texture_size="0 0 128 8"
size="8 100%-8 100%-8 100%"
/>
<!-- Right -->
<image texture="global/modern/button/gray-unselected-right-top.png"
real_texture_placement="0 0 8 8"
size="100%-8 0 100% 8"
/>
<image texture="global/modern/button/gray-unselected-right-center.png"
real_texture_placement="0 0 8 16"
texture_size="0 0 8 16"
size="100%-8 8 100% 100%-8"
/>
<image texture="global/modern/button/gray-unselected-right-bottom.png"
real_texture_placement="0 0 8 8"
size="100%-8 100%-8 100% 100%"
/>
</sprite>
<!--
==========================================
- Basic. -
binaries/data/mods/mod/gui/common/modern/styles.xml
+14 -3
View File
@@ -148,9 +148,20 @@
sprite="ModernButtonYellow"
sprite_disabled="ModernButtonYellowDisabled"
sprite_over="ModernButtonYellowOver"
sprite_pressed="ModernButtonRed"
font="sans-bold-14"
textcolor="black"
sprite_pressed="ModernButtonYellow"
font="sans-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="center"
sound_pressed="audio/interface/ui/ui_button_click.ogg"
/>
<style name="ModernButtonGray"
sprite="ModernButtonGray"
sprite_disabled="ModernButtonGrayDisabled"
sprite_over="ModernButtonGrayOver"
sprite_pressed="ModernButtonGray"
font="sans-bold-stroke-14"
textcolor="white"
text_align="center"
text_valign="center"
sound_pressed="audio/interface/ui/ui_button_click.ogg"
binaries/data/mods/mod/gui/gui.rnc
+1
View File
@@ -53,6 +53,7 @@ ex_settings =
attribute checked { bool }?&
attribute clip { bool }?&
attribute default_column { text }?&
attribute default_column_order { text }?&
attribute dropdown_size { xsd:decimal }?&
attribute dropdown_buffer { xsd:decimal }?&
attribute enabled { bool }?&
binaries/data/mods/mod/gui/gui.rng
+3
View File
@@ -202,6 +202,9 @@
<optional>
<attribute name="default_column"/>
</optional>
<optional>
<attribute name="default_column_order"/>
</optional>
<optional>
<attribute name="dropdown_size">
<data type="decimal"/>
binaries/data/mods/mod/hwdetect/hwdetect.js
+51 -6
View File
@@ -1,4 +1,4 @@
/* Copyright (c) 2013 Wildfire Games
/* Copyright (c) 2015 Wildfire Games
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -174,12 +174,17 @@ function RunDetection(settings)
// List of warning strings to log
var warnings = [];
// If variable value is not undefined it overrides default.cfg,
// local preferences have a higher priority anyway
var disable_audio = undefined;
var disable_s3tc = undefined;
var disable_shadows = undefined;
var disable_shadowpcf = undefined;
var disable_allwater = undefined;
var disable_fancywater = undefined;
var enable_glsl = undefined;
var enable_postproc = undefined;
var enable_smoothlos = undefined;
var override_renderpath = undefined;
// TODO: add some mechanism for setting config values
@@ -209,6 +214,35 @@ function RunDetection(settings)
var GL_VERSION = settings.GL_VERSION;
var GL_EXTENSIONS = settings.GL_EXTENSIONS.split(" ");
// Enable GLSL on OpenGL 3+, which should be able to properly
// manage GLSL shaders, needed for effects like windy trees
if (GL_VERSION.match(/^[3-9]/))
enable_glsl = true;
// Enable most graphics options on OpenGL 4+, which should be
// able to properly manage them
if (GL_VERSION.match(/^[4-9]/))
{
enable_postproc = true;
enable_smoothlos = true;
// enable all water effects
disable_allwater = false;
}
// Disable most graphics features on software renderers
if (GL_RENDERER.match(/^(Software Rasterizer|Gallium \S* on (llvm|soft)pipe.*|Mesa X11|Apple Software Renderer|GDI Generic)$/))
{
warnings.push("You are using '" + GL_RENDERER + "' graphics driver, expect very poor performance!");
warnings.push("If possible install a proper graphics driver for your hardware.");
enable_glsl = false;
enable_postproc = false;
enable_smoothlos = false;
// s3tc on software renderers halves fps and makes textures weird
disable_s3tc = true;
disable_shadows = true;
disable_shadowpcf = true;
disable_allwater = true;
}
// NVIDIA 260.19.* UNIX drivers cause random crashes soon after startup.
// http://www.wildfiregames.com/forum/index.php?showtopic=13668
@@ -235,7 +269,7 @@ function RunDetection(settings)
// Intel 4500MHD
// In the interests of performance, we'll disable them on lots of devices
// (with a fairly arbitrary cutoff for Intels)
if ((os_unix && GL_RENDERER.match(/^(Software Rasterizer|Gallium \S* on llvmpipe|Mesa X11|Apple Software Renderer)$/)) ||
if (
(os_unix && GL_RENDERER.match(/^Mesa DRI R[123]00 /)) ||
(os_macosx && IsWorseThanIntelMac(GL_RENDERER, "Intel HD Graphics 3000")) ||
(os_unix && IsWorseThanIntelMesa(GL_RENDERER, "Intel(R) Ironlake Desktop")) ||
@@ -247,14 +281,13 @@ function RunDetection(settings)
}
// Fragment-shader water is really slow on most Intel devices (especially the
// "use actual depth" option) and on software renderers, so disable it on all of them
if ((os_unix && GL_RENDERER.match(/^(Software Rasterizer|Gallium \S* on llvmpipe|Apple Software Renderer)$/)) ||
// "use actual depth" option), so disable it on all of them
if (
(os_macosx && IsWorseThanIntelMac(GL_RENDERER, "*")) ||
(os_unix && IsWorseThanIntelMesa(GL_RENDERER, "*")) ||
(os_win && IsWorseThanIntelWindows(GL_RENDERER, "*"))
)
{
disable_allwater = false;
disable_fancywater = true;
disable_shadowpcf = true;
}
@@ -293,6 +326,9 @@ function RunDetection(settings)
"disable_shadowpcf": disable_shadowpcf,
"disable_allwater": disable_allwater,
"disable_fancywater": disable_fancywater,
"enable_glsl": enable_glsl,
"enable_postproc": enable_postproc,
"enable_smoothlos": enable_smoothlos,
"override_renderpath": override_renderpath,
};
}
@@ -327,11 +363,20 @@ global.RunHardwareDetection = function(settings)
Engine.SetDisableShadowPCF(output.disable_shadowpcf);
if (output.disable_allwater !== undefined)
Engine.SetDisableFancyWater(output.disable_allwater);
Engine.SetDisableAllWater(output.disable_allwater);
if (output.disable_fancywater !== undefined)
Engine.SetDisableFancyWater(output.disable_fancywater);
if (output.enable_glsl !== undefined)
Engine.SetEnableGLSL(output.enable_glsl);
if (output.enable_postproc !== undefined)
Engine.SetEnablePostProc(output.enable_postproc);
if (output.enable_smoothlos !== undefined)
Engine.SetEnableSmoothLOS(output.enable_smoothlos);
if (output.override_renderpath !== undefined)
Engine.SetRenderPath(output.override_renderpath);
};
binaries/data/mods/mod/shaders/effects/gui_solid_mask.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<effect>
<technique>
<require shaders="fixed"/>
<pass shader="fixed:gui_solid"/>
</technique>
<technique>
<require shaders="glsl"/>
<pass shader="glsl/gui_solid_mask"/>
</technique>
</effect>
binaries/data/mods/mod/shaders/glsl/gui_add.fs
+3 -1
View File
@@ -7,5 +7,7 @@ varying vec2 v_tex;
void main()
{
gl_FragColor = texture2D(tex, v_tex) + color;
vec4 t = texture2D(tex, v_tex);
gl_FragColor.rgb = t.rgb + color.rgb * t.a;
gl_FragColor.a = t.a;
}
binaries/data/mods/mod/shaders/glsl/gui_solid_mask.fs
+13
View File
@@ -0,0 +1,13 @@
#version 110
uniform sampler2D tex;
uniform vec4 color;
varying vec2 v_tex;
void main()
{
vec4 t = texture2D(tex, v_tex);
gl_FragColor.rgb = color.rgb;
gl_FragColor.a = t.a*color.a;
}
binaries/data/mods/mod/shaders/glsl/gui_solid_mask.vs
+15
View File
@@ -0,0 +1,15 @@
#version 110
uniform mat4 transform;
varying vec2 v_tex;
attribute vec3 a_vertex;
attribute vec2 a_uv0;
void main()
{
gl_Position = transform * vec4(a_vertex, 1.0);
v_tex = a_uv0;
}
binaries/data/mods/mod/shaders/glsl/gui_solid_mask.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<program type="glsl">
<vertex file="glsl/gui_solid_mask.vs">
<stream name="pos"/>
<stream name="uv0"/>
<attrib name="a_vertex" semantics="gl_Vertex"/>
<attrib name="a_uv0" semantics="gl_MultiTexCoord0"/>
</vertex>
<fragment file="glsl/gui_solid_mask.fs"/>
</program>
binaries/data/mods/public/art/actors/flora/trees/acacia.xml
+56
View File
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="trunk-a">
<mesh>gaia/tree_acacia_a.dae</mesh>
<props>
<prop actor="flora/trees/acacia_top_a.xml" attachpoint="root"/>
<prop actor="flora/trees/acacia_branches_a.xml" attachpoint="root"/>
</props>
</variant>
<variant frequency="1" name="trunk-b">
<mesh>gaia/tree_acacia_b.dae</mesh>
<props>
<prop actor="flora/trees/acacia_top_b.xml" attachpoint="root"/>
<prop actor="flora/trees/acacia_branches_b.xml" attachpoint="root"/>
</props>
</variant>
<variant frequency="1" name="trunk-c">
<mesh>gaia/tree_acacia_c.dae</mesh>
<props>
<prop actor="flora/trees/acacia_top_c.xml" attachpoint="root"/>
<prop actor="flora/trees/acacia_branches_c.xml" attachpoint="root"/>
</props>
</variant>
<variant frequency="1" name="trunk-d">
<mesh>gaia/tree_acacia_d.dae</mesh>
<props>
<prop actor="flora/trees/acacia_top_d.xml" attachpoint="root"/>
<prop actor="flora/trees/acacia_branches_d.xml" attachpoint="root"/>
</props>
</variant>
<variant frequency="1" name="trunk-e">
<mesh>gaia/tree_acacia_e.dae</mesh>
<props>
<prop actor="flora/trees/acacia_top_e.xml" attachpoint="root"/>
<prop actor="flora/trees/acacia_branches_e.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant name="trunk-texture">
<textures><texture file="gaia/tree_dead.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/acacia_branches_a.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="acacia-branches-mesh-a">
<mesh>gaia/tree_acacia_branches_a.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="acacia-dead-branches">
<textures><texture file="gaia/tree_dead_branches.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/acacia_branches_b.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="acacia-branches-mesh-b">
<mesh>gaia/tree_acacia_branches_b.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="acacia-dead-branches">
<textures><texture file="gaia/tree_dead_branches.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/acacia_branches_c.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="acacia-branches-mesh-c">
<mesh>gaia/tree_acacia_branches_c.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="acacia-dead-branches">
<textures><texture file="gaia/tree_dead_branches.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/acacia_branches_d.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="acacia-branches-mesh-d">
<mesh>gaia/tree_acacia_branches_d.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="acacia-dead-branches">
<textures><texture file="gaia/tree_dead_branches.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/acacia_branches_e.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="acacia-branches-mesh-e">
<mesh>gaia/tree_acacia_branches_e.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="acacia-dead-branches">
<textures><texture file="gaia/tree_dead_branches.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/acacia_top_a.xml
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="acacia-top-mesh-a">
<mesh>gaia/tree_acacia_top_a.dae</mesh>
</variant>
</group>
<group>
<variant frequency="2" name="acacia-top-texture-a">
<textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="acacia-top-texture-b">
<textures><texture file="gaia/tree_baobab_b.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/acacia_top_b.xml
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="acacia-top-mesh-b">
<mesh>gaia/tree_acacia_top_b.dae</mesh>
</variant>
</group>
<group>
<variant frequency="2" name="acacia-top-texture-a">
<textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="acacia-top-texture-b">
<textures><texture file="gaia/tree_baobab_b.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/acacia_top_c.xml
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="acacia-top-mesh-c">
<mesh>gaia/tree_acacia_top_c.dae</mesh>
</variant>
</group>
<group>
<variant frequency="2" name="acacia-top-texture-a">
<textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="acacia-top-texture-b">
<textures><texture file="gaia/tree_baobab_b.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/acacia_top_d.xml
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="acacia-top-mesh-d">
<mesh>gaia/tree_acacia_top_d.dae</mesh>
</variant>
</group>
<group>
<variant frequency="2" name="acacia-top-texture-a">
<textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="acacia-top-texture-b">
<textures><texture file="gaia/tree_baobab_b.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/acacia_top_e.xml
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="acacia-top-mesh-e">
<mesh>gaia/tree_acacia_top_e.dae</mesh>
</variant>
</group>
<group>
<variant frequency="2" name="acacia-top-texture-a">
<textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
</variant>
<variant frequency="1" name="acacia-top-texture-b">
<textures><texture file="gaia/tree_baobab_b.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/aleppo_pine.xml
+18 -3
View File
@@ -13,15 +13,30 @@
</variant>
</group>
<group>
<variant frequency="1" name="Foliage-small">
<variant frequency="1" name="Aleppo-1">
<mesh>gaia/tree_pine_aleppo_1.dae</mesh>
</variant>
<variant frequency="1" name="Foliage-double">
<variant frequency="1" name="Aleppo-2">
<mesh>gaia/tree_pine_aleppo_2.dae</mesh>
</variant>
<variant frequency="2" name="Foliage-single">
<variant frequency="1" name="Aleppo-3">
<mesh>gaia/tree_pine_aleppo_3.dae</mesh>
</variant>
<variant frequency="1" name="Aleppo-4">
<mesh>gaia/tree_pine_aleppo_4.dae</mesh>
</variant>
<variant frequency="1" name="Aleppo-5">
<mesh>gaia/tree_pine_aleppo_5.dae</mesh>
</variant>
<variant frequency="1" name="Aleppo-6">
<mesh>gaia/tree_pine_aleppo_6.dae</mesh>
</variant>
<variant frequency="1" name="Aleppo-7">
<mesh>gaia/tree_pine_aleppo_7.dae</mesh>
</variant>
<variant frequency="1" name="Aleppo-8">
<mesh>gaia/tree_pine_aleppo_8.dae</mesh>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/dead_a_1.xml
+6 -6
View File
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>gaia/tree_dead_a_1.dae</mesh>
<props/>
<textures><texture file="gaia/tree_dead.dds" name="baseTex"/></textures>
<props>
<prop actor="props/flora/tree_dead_a1_branches.xml" attachpoint="root"/>
</props>
<textures>
<texture file="gaia/tree_dead.dds" name="baseTex"/>
</textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_dead.xml
+36
View File
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="trunk-b">
<mesh>gaia/tree_oak_new_b.dae</mesh>
</variant>
<variant frequency="1" name="trunk-c">
<mesh>gaia/tree_oak_new_c.dae</mesh>
</variant>
<variant frequency="1" name="trunk-d">
<mesh>gaia/tree_oak_new_d.dae</mesh>
</variant>
<variant frequency="1" name="trunk-e">
<mesh>gaia/tree_oak_new_e.dae</mesh>
</variant>
<variant frequency="1" name="trunk-f">
<mesh>gaia/tree_oak_new_f.dae</mesh>
</variant>
</group>
<group>
<variant name="trunk-texture">
<textures><texture file="gaia/tree_dead.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new.xml
+46
View File
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="trunk-a">
<mesh>gaia/tree_oak_new_a.dae</mesh>
<props><prop actor="flora/trees/oak_new_top_a.xml" attachpoint="root"/></props>
</variant>
<variant frequency="1" name="trunk-b">
<mesh>gaia/tree_oak_new_b.dae</mesh>
<props><prop actor="flora/trees/oak_new_top_b.xml" attachpoint="root"/></props>
</variant>
<variant frequency="1" name="trunk-c">
<mesh>gaia/tree_oak_new_c.dae</mesh>
<props><prop actor="flora/trees/oak_new_top_c.xml" attachpoint="root"/></props>
</variant>
<variant frequency="1" name="trunk-d">
<mesh>gaia/tree_oak_new_d.dae</mesh>
<props><prop actor="flora/trees/oak_new_top_d.xml" attachpoint="root"/></props>
</variant>
<variant frequency="1" name="trunk-e">
<mesh>gaia/tree_oak_new_e.dae</mesh>
<props><prop actor="flora/trees/oak_new_top_e.xml" attachpoint="root"/></props>
</variant>
<variant frequency="1" name="trunk-f">
<mesh>gaia/tree_oak_new_f.dae</mesh>
<props><prop actor="flora/trees/oak_new_top_f.xml" attachpoint="root"/></props>
</variant>
</group>
<group>
<variant name="trunk-texture">
<textures><texture file="gaia/tree_dead.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new_aut.xml
+46
View File
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="trunk-a">
<mesh>gaia/tree_oak_new_a.dae</mesh>
<props><prop actor="flora/trees/oak_new_top_aut_a.xml" attachpoint="root"/></props>
</variant>
<variant frequency="1" name="trunk-b">
<mesh>gaia/tree_oak_new_b.dae</mesh>
<props><prop actor="flora/trees/oak_new_top_aut_b.xml" attachpoint="root"/></props>
</variant>
<variant frequency="1" name="trunk-c">
<mesh>gaia/tree_oak_new_c.dae</mesh>
<props><prop actor="flora/trees/oak_new_top_aut_c.xml" attachpoint="root"/></props>
</variant>
<variant frequency="1" name="trunk-d">
<mesh>gaia/tree_oak_new_d.dae</mesh>
<props><prop actor="flora/trees/oak_new_top_aut_d.xml" attachpoint="root"/></props>
</variant>
<variant frequency="1" name="trunk-e">
<mesh>gaia/tree_oak_new_e.dae</mesh>
<props><prop actor="flora/trees/oak_new_top_aut_e.xml" attachpoint="root"/></props>
</variant>
<variant frequency="1" name="trunk-f">
<mesh>gaia/tree_oak_new_f.dae</mesh>
<props><prop actor="flora/trees/oak_new_top_aut_f.xml" attachpoint="root"/></props>
</variant>
</group>
<group>
<variant name="trunk-texture">
<textures><texture file="gaia/tree_dead.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new_top_a.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="oak-new-top-mesh-a">
<mesh>gaia/tree_oak_new_top_a.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="oak-top-texture-a">
<textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="2" name="oak-top-texture-b">
<textures><texture file="gaia/tree_oak_b.dds" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="oak-top-texture-c">
<textures><texture file="gaia/tree_oak_c.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new_top_aut_a.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="oak-new-top-mesh-a">
<mesh>gaia/tree_oak_new_top_a.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="oak-aut-top-texture-a">
<textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
</variant>
<variant frequency="2" name="oak-aut-top-texture-b">
<textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="oak-aut-top-texture-c">
<textures><texture file="gaia/tree_oak_c_aut.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new_top_aut_b.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="oak-new-top-mesh-b">
<mesh>gaia/tree_oak_new_top_b.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="oak-aut-top-texture-a">
<textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
</variant>
<variant frequency="2" name="oak-aut-top-texture-b">
<textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="oak-aut-top-texture-c">
<textures><texture file="gaia/tree_oak_c_aut.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new_top_aut_c.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="oak-new-top-mesh-c">
<mesh>gaia/tree_oak_new_top_c.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="oak-aut-top-texture-a">
<textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
</variant>
<variant frequency="2" name="oak-aut-top-texture-b">
<textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="oak-aut-top-texture-c">
<textures><texture file="gaia/tree_oak_c_aut.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new_top_aut_d.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="oak-new-top-mesh-d">
<mesh>gaia/tree_oak_new_top_d.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="oak-aut-top-texture-a">
<textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
</variant>
<variant frequency="2" name="oak-aut-top-texture-b">
<textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="oak-aut-top-texture-c">
<textures><texture file="gaia/tree_oak_c_aut.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new_top_aut_e.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="oak-new-top-mesh-e">
<mesh>gaia/tree_oak_new_top_e.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="oak-aut-top-texture-a">
<textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
</variant>
<variant frequency="2" name="oak-aut-top-texture-b">
<textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="oak-aut-top-texture-c">
<textures><texture file="gaia/tree_oak_c_aut.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new_top_aut_f.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="oak-new-top-mesh-f">
<mesh>gaia/tree_oak_new_top_f.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="oak-aut-top-texture-a">
<textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
</variant>
<variant frequency="2" name="oak-aut-top-texture-b">
<textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="oak-aut-top-texture-c">
<textures><texture file="gaia/tree_oak_c_aut.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new_top_b.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="oak-new-top-mesh-b">
<mesh>gaia/tree_oak_new_top_b.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="oak-top-texture-a">
<textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="2" name="oak-top-texture-b">
<textures><texture file="gaia/tree_oak_b.dds" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="oak-top-texture-c">
<textures><texture file="gaia/tree_oak_c.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new_top_c.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="oak-new-top-mesh-c">
<mesh>gaia/tree_oak_new_top_c.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="oak-top-texture-a">
<textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="2" name="oak-top-texture-b">
<textures><texture file="gaia/tree_oak_b.dds" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="oak-top-texture-c">
<textures><texture file="gaia/tree_oak_c.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new_top_d.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="oak-new-top-mesh-d">
<mesh>gaia/tree_oak_new_top_d.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="oak-top-texture-a">
<textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="2" name="oak-top-texture-b">
<textures><texture file="gaia/tree_oak_b.dds" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="oak-top-texture-c">
<textures><texture file="gaia/tree_oak_c.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new_top_e.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="oak-new-top-mesh-e">
<mesh>gaia/tree_oak_new_top_e.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="oak-top-texture-a">
<textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="2" name="oak-top-texture-b">
<textures><texture file="gaia/tree_oak_b.dds" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="oak-top-texture-c">
<textures><texture file="gaia/tree_oak_c.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/oak_new_top_f.xml
+26
View File
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="oak-new-top-mesh-f">
<mesh>gaia/tree_oak_new_top_f.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="oak-top-texture-a">
<textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
</variant>
<variant frequency="2" name="oak-top-texture-b">
<textures><texture file="gaia/tree_oak_b.dds" name="baseTex"/></textures>
</variant>
<variant frequency="4" name="oak-top-texture-c">
<textures><texture file="gaia/tree_oak_c.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/tree_dead.xml
+6
View File
@@ -4,9 +4,15 @@
<group>
<variant frequency="1" name="Tree dead 1">
<mesh>gaia/tree_dead_a_2.dae</mesh>
<props>
<prop actor="props/flora/tree_dead_a2_branches.xml" attachpoint="root"/>
</props>
</variant>
<variant frequency="1" name="Tree dead 2">
<mesh>gaia/tree_dead_a_1.dae</mesh>
<props>
<prop actor="props/flora/tree_dead_a1_branches.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
binaries/data/mods/public/art/actors/flora/trees/tree_test.xml
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="tree test top">
<mesh>gaia/tree_test.dae</mesh>
<props>
<prop actor="flora/trees/tree_test_top.xml" attachpoint="root"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="trunk">
<textures><texture file="gaia/trunk_deciduous_a.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/flora/trees/tree_test_top.xml
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="tree test top">
<mesh>gaia/tree_test_top.dae</mesh>
</variant>
</group>
<group>
<variant frequency="1" name="leaf-color-a">
<textures><texture file="gaia/tree_carob_a.dds" name="baseTex"/>
<texture file="props/yellow.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="leaf-color-b">
<textures><texture file="gaia/tree_carob_b.dds" name="baseTex"/>
<texture file="props/yellow.png" name="specTex"/>
</textures>
</variant>
<variant frequency="1" name="leaf-color-c">
<textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/>
<texture file="props/yellow.png" name="specTex"/>
</textures>
</variant>
</group>
<material>basic_trans_wind.xml</material>
</actor>
binaries/data/mods/public/art/actors/geology/cliff_face_desert.xml
-18
View File
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="straight_a">
<mesh>gaia/cliff_a.dae</mesh>
</variant>
<variant name="corner_inside">
<mesh>gaia/cliff_a_corner_inside.dae</mesh>
</variant>
</group>
<group>
<variant>
<textures><texture file="gaia/cliff_desert_a.dds" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/flora/forage_grapes.xml
+1 -1
View File
@@ -8,7 +8,7 @@
</group>
<group>
<variant name="grapes">
<textures><texture file="gaia/bush_grapes.dds" name="baseTex"/></textures>
<textures><texture file="gaia/bush_grapes.png" name="baseTex"/></textures>
</variant>
</group>
<group>
binaries/data/mods/public/art/actors/flora/trees/palm_d.xml → binaries/data/mods/public/art/actors/props/flora/tree_dead_a1_branches.xml
+4 -4
View File
@@ -5,10 +5,10 @@
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>gaia/palm_d.dae</mesh>
<props/>
<textures><texture file="gaia/wrld_palm.dds" name="baseTex"/></textures>
<mesh>props/tree_dead_a1_branches.dae</mesh>
<textures>
<texture file="gaia/tree_dead_branches.png" name="baseTex"/>
</textures>
</variant>
</group>
binaries/data/mods/public/art/actors/flora/trees/palm_e.xml → binaries/data/mods/public/art/actors/props/flora/tree_dead_a2_branches.xml
+4 -4
View File
@@ -5,10 +5,10 @@
<group>
<variant frequency="100" name="Base">
<animations/>
<mesh>gaia/palm_e.dae</mesh>
<props/>
<textures><texture file="gaia/wrld_palm.dds" name="baseTex"/></textures>
<mesh>props/tree_dead_a2_branches.dae</mesh>
<textures>
<texture file="gaia/tree_dead_branches.png" name="baseTex"/>
</textures>
</variant>
</group>
binaries/data/mods/public/art/actors/props/structures/britons/crannog_rocks.xml
-14
View File
@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant name="broch top">
<mesh>structural/celt_crannog_rocks.dae</mesh>
<textures>
<texture file="props/palisade_main.png" name="baseTex"/>
<texture file="props/palisade_main_norm.png" name="normTex"/>
</textures>
</variant>
</group>
<material>basic_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/units/selection_infantry.xml
-18
View File
@@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>props/special/selection_infantry.dae</mesh>
</variant>
</group>
<group>
<variant name="blue">
<textures><texture file="selections/select_blue_infantry.png" name="baseTex"/></textures>
</variant>
<variant name="red">
<textures><texture file="selections/select_red_infantry.png" name="baseTex"/></textures>
</variant>
</group>
<material>basic_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/props/units/shields/iberian_buckler_adv_reverse_back.xml
-16
View File
@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>props/shield/round_t_b.dae</mesh>
<props>
<prop actor="props/units/shields/iberian_buckler_adv_reverse_front.xml" attachpoint="back"/>
</props>
<textures><texture file="props/shield/celt_round_back.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
binaries/data/mods/public/art/actors/structures/romans/civic_house.xml
-15
View File
@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Roman Civic House">
<mesh>structural/rome_civic_house.dae</mesh>
<textures><texture file="structural/rome_struct.dds" name="baseTex"/></textures>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/structures/seleucids/barracks.xml
+44
View File
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Seleucid Barracks">
<mesh>structural/sele_barracks.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
<prop actor="props/flora/bush.xml" attachpoint="bush"/>
<prop actor="props/flora/bush.xml" attachpoint="bush_1"/>
<prop actor="props/flora/bush.xml" attachpoint="bush_2"/>
<prop actor="props/flora/bush.xml" attachpoint="bush_3"/>
<prop actor="props/flora/bush.xml" attachpoint="bush_4"/>
</props>
<textures>
<texture file="structural/Sele_struct_2.png" name="baseTex"/>
<texture file="structural/ao/sele_barracks_AO.png" name="aoTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_seleucids.xml" attachpoint="garrisoned"/>
</props>
</variant>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>
<prop actor="particle/destruction_smoke_med.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_med.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_med_gray.xml" attachpoint="root"/>
<prop actor="props/structures/macedonians/barracks_struct_b.xml" attachpoint="root"/>
<prop actor="props/structures/macedonians/barracks_props_a.xml" attachpoint="root"/>
<prop actor="props/structures/macedonians/barracks_props_shields.xml" attachpoint="root"/>
<prop actor="props/structures/macedonians/barracks_tile_c.xml" attachpoint="root"/>
<prop actor="props/structures/macedonians/barracks_decor.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans_ao.xml</material>
</actor>
binaries/data/mods/public/art/actors/structures/seleucids/fortress.xml
+2 -2
View File
@@ -24,8 +24,8 @@
<variant frequency="100" name="Idle"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
<prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned_1"/>
<prop actor="props/special/common/garrison_flag_seleucids.xml" attachpoint="garrisoned"/>
<prop actor="props/special/common/garrison_flag_seleucids.xml" attachpoint="garrisoned_1"/>
</props>
</variant>
<variant name="death">
binaries/data/mods/public/art/actors/structures/seleucids/outpost.xml
+35
View File
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="palisade rocks outpost">
<animations>
<animation event="0.5" load="0" name="attack_ranged" speed="100"/>
</animations>
<mesh>props/palisade_rocks_outpost.dae</mesh>
<props>
<prop actor="props/special/palisade_rocks_outpost_banners.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<textures><texture file="props/palisade_main.png" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_seleucids.xml" attachpoint="garrisoned"/>
</props>
</variant>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>
<prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
<prop actor="props/special/palisade_rocks_outpost_banners.xml" attachpoint="root"/>
</props>
</variant>
</group>
</actor>
binaries/data/mods/public/art/actors/structures/seleucids/scout_tower.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<variant frequency="100" name="Idle"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_hele.xml" attachpoint="garrisoned"/>
<prop actor="props/special/common/garrison_flag_seleucids.xml" attachpoint="garrisoned"/>
</props>
</variant>
<variant name="death">
binaries/data/mods/public/art/actors/structures/seleucids/siege_tower.xml
+36
View File
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Siege Tower">
<animations>
<animation file="mechanical/hele_siege_tower_move.dae" name="Walk" speed="15"/>
<animation file="mechanical/hele_siege_tower_move.dae" name="Run" speed="24"/>
<animation event="0.5" load="0.0" name="attack_ranged" speed="100"/>
</animations>
<mesh>structural/hele_siege_tower.dae</mesh>
<props>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
</props>
<textures><texture file="structural/hele_siege_tower.dds" name="baseTex"/></textures>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_seleucids.xml" attachpoint="garrisoned"/>
</props>
</variant>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>
<prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/structures/seleucids/wall_tower.xml
+43
View File
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<animations>
<animation event="0.5" load="0" name="attack_ranged" speed="100"/>
</animations>
<mesh>structural/hele_wall_tower.dae</mesh>
<props>
<prop actor="props/structures/hellenes/wall_turret.xml" attachpoint="root"/>
<prop actor="geology/decal_stone_medit_a.xml" attachpoint="root"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<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_tower.png" name="aoTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_seleucids.xml" attachpoint="garrisoned"/>
</props>
</variant>
<variant name="death">
<props>
<prop attachpoint="garrisoned"/>
<prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
<prop actor="props/structures/hellenes/wall_turret.xml" attachpoint="root"/>
<prop actor="geology/decal_stone_medit_a.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/structures/seleucids/wooden_tower.xml
+31
View File
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="palisade rocks fort">
<animations>
<animation event="0.5" load="0" name="attack_ranged" speed="100"/>
</animations>
<mesh>props/palisade_rocks_fort.dae</mesh>
<props>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<textures>
<texture file="props/palisade_main.png" name="baseTex"/>
<texture file="props/palisade_main_norm.png" name="normTex"/>
<texture file="props/palisade_main_spec.png" name="specTex"/>
<texture file="structural/ao/hele_wooden_tower.png" name="aoTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="garrisoned">
<props>
<prop actor="props/special/common/garrison_flag_seleucids.xml" attachpoint="garrisoned"/>
</props>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/actors/temp/temple_test.xml
-10
View File
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant>
<mesh>test/temple.dae</mesh>
<textures><texture file="null_check.dds" name="baseTex"/></textures>
</variant>
</group>
</actor>
binaries/data/mods/public/art/actors/units/mauryans/chariot_a.xml
+2 -2
View File
@@ -10,8 +10,8 @@
</animations>
<mesh>structural/maur_chariot_a.dae</mesh>
<props>
<prop actor="units/mauryans/infantry_archer_b.xml" attachpoint="rider1"/>
<prop actor="units/mauryans/infantry_archer_e.xml" attachpoint="rider2"/>
<prop actor="units/mauryans/chariot_a_r1.xml" attachpoint="rider1"/>
<prop actor="units/mauryans/chariot_a_r2.xml" attachpoint="rider2"/>
<prop actor="units/persians/pers_chariot_archer_b_h1.xml" attachpoint="horse1"/>
<prop actor="units/persians/pers_chariot_archer_b_h2.xml" attachpoint="horse2"/>
</props>
binaries/data/mods/public/art/actors/units/mauryans/chariot_a_r1.xml
+44
View File
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations>
<animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
<animation file="infantry/spear/idle/isp_01.psa" name="Walk" speed="1"/>
<animation event="0.84" file="biped/inf_arch_atk_a.psa" load="0.16" name="attack_ranged" speed="90"/>
<animation file="infantry/spear/idle/isp_01.psa" name="Run" speed="1"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
<animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
<animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
<animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
</animations>
<mesh>skeletal/m_tunic_long.dae</mesh>
<props>
<prop actor="props/units/heads/head_maur_tall_hair.xml" attachpoint="head"/>
<prop actor="props/units/heads/maur_inf_tall_wrap.xml" attachpoint="head"/>
<prop actor="props/units/weapons/bow_bamboo_long.xml" attachpoint="l_hand"/>
<prop actor="props/units/quiver_back_bamboo.xml" attachpoint="back"/>
</props>
<textures>
<texture file="skeletal/maur_iar_a.png" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="attack_ranged">
<props>
<prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
</variant>
<variant name="death">
<props>
<prop actor="props/units/blood_01.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/units/mauryans/chariot_a_r2.xml
+44
View File
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations>
<animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
<animation file="infantry/spear/idle/isp_01.psa" name="Walk" speed="1"/>
<animation event="0.84" file="biped/inf_arch_atk_a.psa" load="0.16" name="attack_ranged" speed="90"/>
<animation file="infantry/spear/idle/isp_01.psa" name="Run" speed="1"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
<animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
<animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
<animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
</animations>
<mesh>skeletal/m_tunic_long.dae</mesh>
<props>
<prop actor="props/units/heads/head_maur_tall_hair.xml" attachpoint="head"/>
<prop actor="props/units/heads/maur_inf_tall_wrap.xml" attachpoint="head"/>
<prop actor="props/units/weapons/bow_bamboo_long.xml" attachpoint="l_hand"/>
<prop actor="props/units/quiver_back_bamboo.xml" attachpoint="back"/>
</props>
<textures>
<texture file="skeletal/maur_iar_e.png" name="baseTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="attack_ranged">
<props>
<prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
</variant>
<variant name="death">
<props>
<prop actor="props/units/blood_01.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans.xml</material>
</actor>
binaries/data/mods/public/art/actors/units/mauryans/elephant_archer.xml
-32
View File
@@ -1,32 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="maur_elephant_asian_archer">
<mesh>skeletal/maur_elephant_archer.dae</mesh>
<props>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="loaded-projectile"/>
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
<textures>
<texture file="skeletal/maur_elephant_archer.png" name="baseTex"/>
<texture file="skeletal/maur_elephant_archer_spec.png" name="specTex"/>
<texture file="skeletal/maur_elephant_archer_normal.png" name="normTex"/>
</textures>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="Run">
<props>
<prop actor="particle/dust_cav.xml" attachpoint="root"/>
</props>
</variant>
<variant name="death">
<props>
<prop actor="props/units/blood_01.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans_parallax_spec.xml</material>
</actor>
binaries/data/mods/public/art/meshes/gaia/palm_d.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/palm_e.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_a.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_b.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_branches_a.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_branches_b.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_branches_c.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_branches_d.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_branches_e.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_c.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_d.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_e.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_top_a.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_top_b.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_top_c.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_top_d.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_acacia_top_e.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_dead_a_1.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_dead_a_2.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_oak_new_a.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_oak_new_b.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_oak_new_c.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_oak_new_d.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_oak_new_e.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_oak_new_f.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_oak_new_top_a.dae
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/meshes/gaia/tree_oak_new_top_b.dae
LFS
BIN
View File
Binary file not shown.

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