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
a517184150
Update the creditTranslators script for the A20 languages.
...
This was SVN commit r17963.
2016-03-28 00:18:13 +00:00
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
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
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
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
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
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
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
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
6f0d0ff8f4
Round max hp of units in simulation. Refs #3855
...
This was SVN commit r17951.
2016-03-25 12:51:48 +00:00
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
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
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
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
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
2016-03-24 14:54:47 +00:00
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
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
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#3350 .
This was SVN commit r17941.
2016-03-23 21:58:23 +00:00
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
82fa9d8f5b
Fix counting issue with previous commit
...
This was SVN commit r17939.
2016-03-23 10:01:27 +00:00
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
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
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
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
c43ce2ca55
cleanup of missing semicolon
...
This was SVN commit r17934.
2016-03-21 20:33:05 +00:00
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
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
820846b56b
Completely initialise Auras even before ownership is set. Fixes #3843
...
This was SVN commit r17931.
2016-03-21 16:22:40 +00:00
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
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
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
86a309ad76
Show replay path in commandline interface.
...
This was SVN commit r17927.
2016-03-21 12:09:21 +00:00
f8a09cf5c1
Seleucid barracks model, actor, AO
...
This was SVN commit r17926.
2016-03-21 10:25:01 +00:00
8f4daa9dd0
Lobby performance improvement.
...
Since 8b437a0b1c#3840 .
This was SVN commit r17924.
2016-03-21 03:44:01 +00:00
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
9e338f4461
Barter component cleanup. Replace deprecated for-each.
...
This was SVN commit r17922.
2016-03-21 00:45:32 +00:00
10b6022557
Convert string to int conversion in the lobby-leaderboard.
...
This was SVN commit r17921.
2016-03-21 00:38:31 +00:00
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
b84b9a374a
Improve some strings based on translators' feedback.
...
This was SVN commit r17919.
2016-03-20 18:58:59 +00:00
81948477df
fix the test when changing markets, fixes #3838
...
This was SVN commit r17918.
2016-03-20 14:00:49 +00:00
3025b4b8e3
Reduce query time of rating sorts.
...
This was SVN commit r17917.
2016-03-20 05:17:15 +00:00
01b963b259
Update version names to A20
...
This was SVN commit r17915.
2016-03-19 08:21:00 +00:00
d5059e8e23
Don't use that variable outside of scope.
...
This was SVN commit r17913.
2016-03-18 17:54:22 +00:00
31fe2770f6
Update credits, refs #3234 .
...
This was SVN commit r17912.
2016-03-18 14:58:13 +00:00
5c6ba10626
Remove blood from skeletons, refs #3455 .
...
This was SVN commit r17911.
2016-03-18 14:02:47 +00:00
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
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
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
d44c4fd5c6
Update manual to mention skirmish maps
...
This was SVN commit r17906.
2016-03-17 08:13:52 +00:00
f7045b23ce
Fix some errors reported by translators on Transifex.
...
This was SVN commit r17905.
2016-03-16 23:27:17 +00:00
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
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
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
29e0a23c8e
fix gui for non-sharable dropsites
...
This was SVN commit r17901.
2016-03-16 16:13:18 +00:00
d033038d69
Also translate specific name in strucTree (translations already exist)
...
This was SVN commit r17900.
2016-03-16 12:22:23 +00:00
c3324765d2
improved icon from niektb
...
This was SVN commit r17899.
2016-03-15 20:22:19 +00:00
0863f20722
cleanup
...
This was SVN commit r17898.
2016-03-15 18:27:17 +00:00
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
518ae4fcb2
Lock diplomacy for all players if the locked-teams setting is enabled, fixes #3702 .
...
GUI fix in 17e6b316fa
2016-03-15 04:53:13 +00:00
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
a2ecee4168
Rest of the previous commit, refs #3743 .
...
This was SVN commit r17894.
2016-03-15 04:08:07 +00:00
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
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
dd07241ef7
Petra: fix a bug in attackPlan spotted by leper
...
This was SVN commit r17891.
2016-03-14 18:08:51 +00:00
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
87da09bf1b
Fix tests broken in 028e573759
...
This was SVN commit r17889.
2016-03-14 17:50:56 +00:00
bedce1e617
Observer fix for shared-dropsites, refs #3791 .
...
This was SVN commit r17887.
2016-03-14 01:23:09 +00:00
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
a7b31398b0
Revert dbbc600dc3, refs #3745 , refs #3823
...
This was SVN commit r17885.
2016-03-13 22:18:31 +00:00
f7ea533ab9
better icon from niektb, refs #3791
...
This was SVN commit r17884.
2016-03-13 17:38:23 +00:00
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
d84ad7799a
Limit arrows on certain buildings and ships. Patch by sanderd17, fixes #3196 .
...
Balancing by elexis, reverts fcf7344537
2016-03-13 17:02:18 +00:00
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
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
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
2022aad5d1
decrease the hack armour of fields to favor rushes
...
This was SVN commit r17878.
2016-03-13 14:09:52 +00:00
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
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
028e573759
allow the use of allied dropsites using tech, fixes #3791
...
This was SVN commit r17875.
2016-03-13 13:33:21 +00:00
bcfa626bc4
Improve 27b4df0978.
...
This was SVN commit r17874.
2016-03-12 22:20:15 +00:00
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
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
753a79ff67
Fix messages.json
...
This was SVN commit r17868.
2016-03-12 17:48:16 +00:00
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
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
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
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
18829e17c2
Fix comment following e0a9dfd5a2.
...
This was SVN commit r17862.
2016-03-10 17:11:36 +00:00
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
2305218d9f
Optionnames are in lower case, refs #3604 .
...
This was SVN commit r17860.
2016-03-10 11:16:15 +00:00
b71e7e3538
Petra chathelper cleanup.
...
Inline variables used only once.
This was SVN commit r17859.
2016-03-10 10:44:52 +00:00
aa1e3f6d06
Session cleanup
...
Simpler errorhandling when fetching GUIInterface-notifications.
This was SVN commit r17858.
2016-03-10 10:15:23 +00:00
4b636fc407
Add a precision to the instructions included in default.cfg.
...
This was SVN commit r17857.
2016-03-09 21:48:41 +00:00
212d8e7dd0
cleanup of 98b4fe6d00
...
This was SVN commit r17856.
2016-03-09 21:45:14 +00:00
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
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
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
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
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
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
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
a1c6d9149b
fix typo from 8725c3ae7a
...
This was SVN commit r17848.
2016-03-08 18:49:06 +00:00
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
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
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
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
35a13c5080
Remove trailing whitespace.
...
This was SVN commit r17843.
2016-03-07 17:28:31 +00:00
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
dd5cc3d02e
Gamesetup cleanup.
...
Inline initializaiton of g_ServerName and fix a typo in e05c8263c5
2016-03-07 15:05:16 +00:00
fc0f496e3d
Fix indentation, refs #3803 .
...
This was SVN commit r17840.
2016-03-07 11:44:03 +00:00
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
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
49c30ae4b8
Give credit to three awesome contributors, refs #3802 .
...
This was SVN commit r17837.
2016-03-07 10:24:38 +00:00
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
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
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
5a8d7d1a58
petra cleanup
...
This was SVN commit r17831.
2016-03-05 16:20:49 +00:00
bcf2c75513
New in-game Credits page, fixes #3744 .
...
This was SVN commit r17830.
2016-03-05 11:52:08 +00:00
1504115c14
I shouldn't rename things.
...
This was SVN commit r17829.
2016-03-05 11:43:14 +00:00
dfbf874d8b
Some string fixes.
...
This was SVN commit r17828.
2016-03-05 11:30:27 +00:00
6451a4c3c1
Petra: improve choice of workers, fixes #3586 , patch from otero
...
This was SVN commit r17827.
2016-03-04 17:08:45 +00:00
6b19eefdcb
cleanup of some foreach
...
This was SVN commit r17826.
2016-03-04 16:51:52 +00:00
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
d3e9aa2101
petra: complete changes started in 8d0223d6aa + some cleanup"
...
This was SVN commit r17823.
2016-03-03 16:18:12 +00:00
7403b92785
petra cleanup: use some arrow functions for sort
...
This was SVN commit r17822.
2016-03-02 17:10:26 +00:00
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
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
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
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
23d37f188a
cleanup of some missing tabs
...
This was SVN commit r17817.
2016-03-02 16:25:14 +00:00
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
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
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
012b686e7c
Two early returns. Refs #3265 .
...
This was SVN commit r17813.
2016-03-02 13:42:47 +00:00
163af24a6c
cleanup in petra, patch by otero
...
This was SVN commit r17812.
2016-03-01 17:57:19 +00:00
9c6082ec23
fix garrison aura from heros, patch by fatherbushido
...
This was SVN commit r17811.
2016-03-01 17:19:16 +00:00
04c94da3cb
add some missing spaces in previous commit
...
This was SVN commit r17810.
2016-03-01 17:12:38 +00:00
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
b88fd4fe09
fix typo from 8a3bbdf4db
...
This was SVN commit r17808.
2016-02-29 17:21:35 +00:00
ba0700f612
garrisoning only works between mutual allies
...
This was SVN commit r17806.
2016-02-28 12:58:52 +00:00
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
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
652ec4f8e5
fix some resetting of gatherer walk animation
...
This was SVN commit r17802.
2016-02-24 18:57:23 +00:00
ec43274e2b
drop carried resources when finishing to build a dropsite
...
This was SVN commit r17801.
2016-02-24 18:49:28 +00:00
05cf535c58
do not drop resources when garrisoning in allied structure
...
This was SVN commit r17800.
2016-02-24 17:45:13 +00:00
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
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
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
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
df42b9caba
Commands.js cleanup.
...
This was SVN commit r17795.
2016-02-23 15:51:09 +00:00
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
b60c6f6b15
Commands.js cleanup - fix whitespace.
...
This was SVN commit r17793.
2016-02-23 14:52:20 +00:00
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
e953ca23ba
Commands.js cleanup. Replace deprecated for-each.
...
This was SVN commit r17791.
2016-02-23 14:36:50 +00:00
3a502c0d21
Commands.js cleanup, use fat-arrows.
...
This was SVN commit r17790.
2016-02-23 14:13:46 +00:00
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
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
c6804aad35
Small RMS library style improvement.
...
This was SVN commit r17787.
2016-02-23 10:46:32 +00:00
fc298eb3f5
Show time-notifications to observers, refs #3168 .
...
This was SVN commit r17786.
2016-02-22 22:53:48 +00:00
b68654b52d
Inlining this is not possible due to the closure.
...
This was SVN commit r17785.
2016-02-22 17:23:46 +00:00
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
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
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
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
6e9fd4ccf2
fix the ungarrison-all command from allied structures
...
This was SVN commit r17779.
2016-02-20 15:04:00 +00:00
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
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
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
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
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
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
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
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
4584a81656
be less restrictive with fix for #3785
...
This was SVN commit r17768.
2016-02-17 18:31:01 +00:00
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
41d7e64271
prevent short pathfinder to go into impassable region, fixes #3785
...
This was SVN commit r17765.
2016-02-15 21:24:27 +00:00
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
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
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
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
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
2016-02-15 15:38:56 +00:00
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
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
e3bd2e3fa8
Session cleanup, some simplifications.
...
This was SVN commit r17757.
2016-02-15 11:39:02 +00:00
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
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
ecb65cd58d
petra cleanup
...
This was SVN commit r17753.
2016-02-13 16:28:23 +00:00
2695e7c77b
Remove trailing whitespace, refs #3586 .
...
This was SVN commit r17752.
2016-02-13 11:44:46 +00:00
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
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
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
cd9106b664
Fix / finish previous commit.
...
This was SVN commit r17747.
2016-02-09 14:34:59 +00:00
ca9d06d6ad
Correct handling of replays with no turns or only turn 0.
...
Add a comment for 3ec3f0b160
2016-02-09 12:09:17 +00:00
4ac89001f4
Fix compile error for gcc 4.6, refs #3168 .
...
This was SVN commit r17745.
2016-02-08 22:44:23 +00:00
ca19d42a68
fix typos in renderer's initialization, refs #3737
...
This was SVN commit r17744.
2016-02-08 18:27:56 +00:00
ac1f935bad
Split GUI updates from onSimulationUpdate.
...
This was SVN commit r17743.
2016-02-08 14:01:21 +00:00
a9de2bf397
cleanup of 971d70fa99
...
This was SVN commit r17741.
2016-02-07 19:06:15 +00:00
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
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
26f7a3df96
init configDB with renderer initial values, refs #3737
...
This was SVN commit r17737.
2016-02-07 11:24:09 +00:00
a2f7d4d82a
Show fog of war in observermode, fixes #3168 .
...
This was SVN commit r17735.
2016-02-06 12:56:41 +00:00
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
b973eebeda
Add color indicator to the playerselection in observermode, refs #3168 .
...
This was SVN commit r17733.
2016-02-06 12:19:02 +00:00
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
4d41bd9622
reorganize options, adding dependences, refs #3737
...
This was SVN commit r17729.
2016-02-02 21:50:00 +00:00
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 0e0ed9492634f1817869
2016-02-02 16:33:36 +00:00
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
b1fbc5b6bd
Add newlines, remove unneeded braces.
...
This was SVN commit r17726.
2016-02-02 11:23:01 +00:00
254f6357f6
Fix a typo (terreins -> terrains).
...
This was SVN commit r17725.
2016-02-02 10:56:39 +00:00
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
30bd2baeeb
fix Migration scenario map
...
This was SVN commit r17722.
2016-01-29 18:53:09 +00:00
b65f2a338c
petra cleanup
...
This was SVN commit r17720.
2016-01-28 19:44:18 +00:00
c46e64c4d2
fix dropdown option
...
This was SVN commit r17719.
2016-01-28 18:44:50 +00:00
30d0bcd350
petra remove some useless code
...
This was SVN commit r17718.
2016-01-28 18:30:39 +00:00
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
06eadf2bc4
petra cleanup + some tweaks
...
This was SVN commit r17716.
2016-01-27 18:17:55 +00:00
564941c477
fix wall buildings after f34dc412b6, refs #3647
...
This was SVN commit r17715.
2016-01-26 19:04:29 +00:00
91ed318f0d
fix typo
...
This was SVN commit r17714.
2016-01-26 18:36:59 +00:00
08d326cef5
clone the rallypoint data from cmd, fixes #3751
...
This was SVN commit r17713.
2016-01-26 18:03:06 +00:00
090f2ccfe5
Don't modify the command object. Refs #3647 .
...
This was SVN commit r17712.
2016-01-26 17:58:15 +00:00
bb8ceba632
completes f34dc412b6 for non visual replays, refs #3751
...
This was SVN commit r17711.
2016-01-25 20:37:26 +00:00
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
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
e683751b4f
Delete code which became obsolete with 56bb858802.
...
This was SVN commit r17708.
2016-01-25 09:57:33 +00:00
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
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
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
199d38dfec
Work around clang bug to fix compiling.
...
This was SVN commit r17703.
2016-01-24 10:34:38 +00:00
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
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
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
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
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
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
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
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
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
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
c955d74330
petra cleanup (thanks to leper's suggestion)
...
This was SVN commit r17687.
2016-01-22 18:45:28 +00:00
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
edb16dafbb
petra cleanup
...
This was SVN commit r17684.
2016-01-21 20:38:56 +00:00
df7da846ad
some cleanup in ai api
...
This was SVN commit r17683.
2016-01-21 20:23:19 +00:00
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
cccd33e7fe
petra cleanup
...
This was SVN commit r17679.
2016-01-20 19:45:47 +00:00
87886b7b03
fix the AI for the switch to the Repairable component
...
This was SVN commit r17678.
2016-01-20 19:04:38 +00:00
dd545bdbf1
petra cleanup
...
This was SVN commit r17677.
2016-01-19 23:19:40 +00:00
0a64bf25cd
Sort globals, add JSDoc comments, remove trailing whitespace.
...
This was SVN commit r17676.
2016-01-19 18:09:34 +00:00
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
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
f34dc412b6
Deep freeze simulation commands to prevent accidental updates. Fixes #3647 .
...
This was SVN commit r17673.
2016-01-18 22:24:50 +00:00
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
a6f8b3b3d7
rename the Close button, refs #3737
...
This was SVN commit r17671.
2016-01-18 19:44:48 +00:00
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
9481c168bd
petra cleanup
...
This was SVN commit r17669.
2016-01-18 19:20:09 +00:00
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
2016-01-18 18:29:16 +00:00
f8941ac668
boost_signals was removed in 940868398c.
...
This was SVN commit r17667.
2016-01-18 16:46:32 +00:00
5d00d0ff8b
Update libpng to 1.6.21 + comments cleanup.
...
This was SVN commit r17666.
2016-01-18 16:42:54 +00:00
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
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
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
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
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
dc9d1fff11
restore sorting in template, refs #3741
...
This was SVN commit r17656.
2016-01-17 15:44:38 +00:00
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
b4d11cf747
let farms have the terrain ownership, fixes #3741
...
This was SVN commit r17654.
2016-01-16 12:47:33 +00:00
c4d9b64fe5
fix undef var when in petra debug
...
This was SVN commit r17653.
2016-01-15 19:12:34 +00:00
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
327c0d0d00
Remove trailing whitespace. Refs #118 .
...
This was SVN commit r17650.
2016-01-14 00:04:32 +00:00
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
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
c33d1e3741
Remove commented out code and comments invalid since 9542ecdd7e.
...
This was SVN commit r17647.
2016-01-13 22:39:09 +00:00
aa7ef01105
rename reload to revert
...
This was SVN commit r17646.
2016-01-13 22:32:42 +00:00
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
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
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
fb92761c92
Use explicit types instead of auto.
...
This was SVN commit r17642.
2016-01-13 00:42:55 +00:00
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
e6a8cd8c5e
Do not redeclare a variable.
...
This was SVN commit r17640.
2016-01-12 20:04:33 +00:00
ee6a5fd915
Extend defensive-stance tooltip and add quotes to object keys.
...
This was SVN commit r17639.
2016-01-12 18:32:30 +00:00
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
4107c2abb9
Fix link to documentation.
...
This was SVN commit r17637.
2016-01-11 23:56:51 +00:00
83efc8363e
fix old typos in sound config
...
This was SVN commit r17636.
2016-01-11 22:39:03 +00:00
2ec4d87abf
Use .assign instead of operator=.
...
This was SVN commit r17634.
2016-01-11 20:57:03 +00:00
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 47a03c3397https://bugzilla.mozilla.org/show_bug.cgi?id=1094176
This was SVN commit r17633.
2016-01-11 20:03:33 +00:00
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
775f856421
Use .assign instead of operator=.
...
This was SVN commit r17631.
2016-01-11 20:03:28 +00:00
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
785acdb1c6
Fix test failure on Windows.
...
This was SVN commit r17629.
2016-01-11 20:03:01 +00:00
f0fc36138d
cleanup of previous patches
...
This was SVN commit r17627.
2016-01-10 22:46:37 +00:00
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
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
e9511d21d5
Fix bug in d4d05c6236.
...
This was SVN commit r17624.
2016-01-10 17:25:40 +00:00
8c7b6dceaa
Show status-bars of all players to observers, fixes #3215 .
...
This was SVN commit r17623.
2016-01-10 16:47:57 +00:00
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
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
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
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
9a623a8e00
Style fixes.
...
This was SVN commit r17618.
2016-01-09 23:01:07 +00:00
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
9b922ebadd
Remove invisible character introduced in deaa224785.
...
This was SVN commit r17616.
2016-01-09 12:12:42 +00:00
629e73a768
Fix a compiler warning.
...
This was SVN commit r17615.
2016-01-09 09:52:51 +00:00
491cba314a
Translate some notification messages. Refs #3665 .
...
This was SVN commit r17614.
2016-01-08 23:22:45 +00:00
caa81a1d31
Remove garrison code duplication.
...
This was SVN commit r17613.
2016-01-08 23:02:26 +00:00
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
87a93b2498
Add version command line option. Fixes #2965 .
...
This was SVN commit r17611.
2016-01-08 19:35:33 +00:00
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
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
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
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
a7743e95b9
cleanup of unused counters
...
This was SVN commit r17605.
2016-01-06 21:15:58 +00:00
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
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
4c4beb8450
cleanup
...
This was SVN commit r17602.
2016-01-04 18:10:04 +00:00
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
ab4668ac79
Remove legacy error codes from strings.
...
This was SVN commit r17600.
2016-01-04 17:58:28 +00:00
7a3f011587
Fix a typo.
...
This was SVN commit r17599.
2016-01-04 17:05:43 +00:00
5033fd6cbf
Some const and fix the indentation.
...
This was SVN commit r17598.
2016-01-04 17:05:39 +00:00
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
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
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
a32aa3b6cf
petra: use the proper attack number when deserializing, refs #3720
...
This was SVN commit r17592.
2016-01-02 18:16:50 +00:00
036f985017
Add missing semicolons.
...
Update timestamp.
This was SVN commit r17591.
2016-01-02 18:12:02 +00:00
8773d816ae
add specific regeneration when idle, fixes #3606 , patch by Guuts
...
This was SVN commit r17590.
2016-01-02 18:10:10 +00:00
1d00164b6b
petra: make better use of the new fishing tech
...
This was SVN commit r17589.
2016-01-02 17:50:56 +00:00
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
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
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
7c89cfb3ba
fix typo in petra debug outputs
...
This was SVN commit r17585.
2016-01-01 17:41:49 +00:00
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
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
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
75eed7cc79
Missing semicolons, two wrong commata, jshint ftw.
...
This was SVN commit r17579.
2015-12-31 14:02:59 +00:00
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
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
f7a262fa4a
Remove trailing whitespace. Based on patch by otero, refs #3268 .
...
This was SVN commit r17576.
2015-12-31 11:45:13 +00:00
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
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
36c08193ba
optimizes range queries, fixes #3717
...
This was SVN commit r17573.
2015-12-30 13:44:51 +00:00
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
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
6cdd99474a
Fix fail.
...
This was SVN commit r17570.
2015-12-30 11:17:50 +00:00
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
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
9f65e90b60
Fix wrong errormessage in case of encountering a broken replay.
...
This was SVN commit r17567.
2015-12-29 14:00:30 +00:00
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
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
2a0d403b4b
let promotion improve a bit the capture strength of citizen
...
This was SVN commit r17564.
2015-12-28 18:51:49 +00:00
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
543472b77b
Optimization of isBoxVisible + cleanup, fixes #3712
...
This was SVN commit r17561.
2015-12-28 16:27:31 +00:00
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
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
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
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
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
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
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
b154056266
Those globals were removed in 5aae5ee55a.
...
This was SVN commit r17550.
2015-12-24 20:54:47 +00:00
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
39ffb0a6bd
Session menu cleanup.
...
Rename globals to g_Foo.
Remove unused variable playerID from updateTimeNotifications which
became obsolete in fe9eeedd66
2015-12-24 02:53:18 +00:00
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
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
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
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
48f72aacc9
petra: some defense tweaks + cleanup
...
This was SVN commit r17543.
2015-12-23 16:17:05 +00:00
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
03adf0111a
Session chat cleanup
...
Remove g_PlayerAssignments from calls to findGuidForPlayerID, since the
argument was removed in ae92736b02
2015-12-22 21:45:09 +00:00
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
3fd4d07ca1
Test \0 in object property names for serializing.
...
This was SVN commit r17539.
2015-12-22 19:01:18 +00:00
67b7366528
petra: remove hyphen in file names
...
This was SVN commit r17538.
2015-12-22 18:21:37 +00:00
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
3ba50b4ed4
decrease the repair rate of walls, refs #3707
...
This was SVN commit r17536.
2015-12-22 17:37:00 +00:00
6970ebba16
Test non-ASCII string conversions.
...
This was SVN commit r17535.
2015-12-22 17:30:05 +00:00
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
385101bbe7
petra: cleanup of defenseManager
...
This was SVN commit r17533.
2015-12-22 16:58:53 +00:00
dca07f9ddd
Fix e9bc3e2089.
...
This was SVN commit r17532.
2015-12-22 16:44:27 +00:00
4212777334
Session chat cleanup.
...
Correct indentation.
This was SVN commit r17531.
2015-12-22 16:05:27 +00:00
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
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
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
848efb56b3
Make a method const.
...
This was SVN commit r17527.
2015-12-22 14:08:32 +00:00
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
b790403c87
Strip trailing whitespace from network code.
...
This was SVN commit r17524.
2015-12-21 13:58:32 +00:00
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
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
0dda3b579c
drop resources before switching to next queued order, fixes #1670
...
This was SVN commit r17521.
2015-12-20 21:30:34 +00:00
d4d05c6236
Session cleanup. Patch by Stan.
...
Eliminate the deprecated for-each.
This was SVN commit r17520.
2015-12-20 21:20:05 +00:00
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
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
eb8e381934
GuiInterface Cleanup
...
Remove trailing whitespace.
This was SVN commit r17517.
2015-12-20 19:18:39 +00:00
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
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
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
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
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
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
e80e37cb21
Fix whitespace.
...
This was SVN commit r17509.
2015-12-19 02:03:30 +00:00
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
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
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
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
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
825a2fcc34
Summary screen cleanup. Based on patch by bb, fixes #3518 .
...
This was SVN commit r17503.
2015-12-19 01:00:32 +00:00
a381334976
Gamesetup cleanup
...
Unify the gameattributes-update of checkboxes.
This was SVN commit r17502.
2015-12-18 22:40:56 +00:00
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
abce6cb737
Pathfinder optimization, fixes #3541 .
...
Simplify the math of Geometry::TestRayAASquare.
This was SVN commit r17500.
2015-12-18 15:05:33 +00:00
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
2d34b198df
Remove a wrong tag from two skirmish maps.
...
This was SVN commit r17497.
2015-12-17 21:10:20 +00:00
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
dca32228b5
fix dead tree actor, patch by stanislas69, fixes #3705
...
This was SVN commit r17495.
2015-12-16 20:45:08 +00:00
3196df663f
some petra cleanup
...
This was SVN commit r17494.
2015-12-16 17:57:39 +00:00
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
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
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
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
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
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
6873a5e5a9
Gamesetup cleanup
...
Unify switch-statement and remove unused variables.
This was SVN commit r17487.
2015-12-15 23:57:45 +00:00
f99de00779
Fix an operator precedence bug in the previous commit.
...
This was SVN commit r17486.
2015-12-15 23:19:01 +00:00
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
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
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
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
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
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
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
931f5f752b
Gamesetup cleanup.
...
Resolve if-statements in initMultiplayerSettings.
This was SVN commit r17478.
2015-12-15 00:21:27 +00:00
5a7a56da41
more cleanup on petra
...
This was SVN commit r17477.
2015-12-14 21:17:22 +00:00
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
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
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
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
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
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
9a2d0f803e
Remove disabled by default SDL1 support.
...
Refs #2041 .
This was SVN commit r17470.
2015-12-14 10:52:21 +00:00
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
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
4dbc9b8b1d
Cleanup color.js
...
Move some shared color-code to color.js.
Remove shuffleArray() as it's unused since bbc325fb5a
2015-12-14 03:53:48 +00:00
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
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
45c7d1681f
petra cleanup, mainly renaming stuff for better readability
...
This was SVN commit r17463.
2015-12-13 22:04:09 +00:00
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
b87b3ff3dc
Left some debug code in.
...
This was SVN commit r17460.
2015-12-13 17:39:19 +00:00
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
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
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
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
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
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
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
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
2015-12-12 20:29:54 +00:00
745b1aae8d
Correctly hide the mapsize-description (see 0b4308bbc8).
...
This was SVN commit r17449.
2015-12-12 18:07:39 +00:00
47a23904e5
adding more diversity in petra warnings
...
This was SVN commit r17448.
2015-12-12 15:45:02 +00:00
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
2e54fee44d
Fix oversight in 3006904403.
...
This was SVN commit r17446.
2015-12-12 15:27:07 +00:00
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
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
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
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
ead4caaa41
do mot modify the cmd object, refs #3467
...
This was SVN commit r17441.
2015-12-11 20:15:10 +00:00
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
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
eacbdd4dfb
cleanup in the petra queueManager
...
This was SVN commit r17438.
2015-12-11 18:45:03 +00:00
489822e384
some cleanup in the ai common-api
...
This was SVN commit r17437.
2015-12-11 18:35:01 +00:00
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
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
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
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
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
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
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
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
d07f16ed80
petra: fix resource translations, fixes #3691
...
This was SVN commit r17427.
2015-12-10 20:35:24 +00:00
afa07325a1
petra: improve the detection of stuck gatherers, refs #3562
...
This was SVN commit r17426.
2015-12-10 20:02:37 +00:00
a74d9be130
make const the new method introduced in 2451872731
...
This was SVN commit r17425.
2015-12-10 19:23:50 +00:00
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
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
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
9b4e359d64
Gah.
...
This was SVN commit r17421.
2015-12-10 13:28:57 +00:00
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
7a8c37a885
Use map function instead of deprecated for-each.
...
This was SVN commit r17419.
2015-12-10 13:06:36 +00:00
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
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
349b5786dd
Fix test failure. Refs #3590 .
...
This was SVN commit r17416.
2015-12-09 22:52:33 +00:00
b6dbb2bff0
fix tabs of 2451872731
...
This was SVN commit r17415.
2015-12-09 20:56:53 +00:00
2451872731
improve performance of hierarchical pathfinder, refs #3588
...
This was SVN commit r17413.
2015-12-09 19:56:30 +00:00
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
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
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
6a73dc2e16
fix multiple (useless) insertion in grid update of hierarchical pathfinder
...
This was SVN commit r17409.
2015-12-08 22:58:04 +00:00
b4f0227f1b
Add support for undeletable entities. Fixes #3590 .
...
This was SVN commit r17408.
2015-12-08 22:34:32 +00:00
82ca673e0a
petra: retune the dock placement criteria, fixes #3469
...
This was SVN commit r17407.
2015-12-08 19:16:50 +00:00
489e41362a
Use placeholder in plural string.
...
This was SVN commit r17406.
2015-12-08 18:13:09 +00:00
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
61886f0e7a
Use inheritance instead of redefining properties.
...
This was SVN commit r17404.
2015-12-08 18:05:06 +00:00
80663a6c8a
Add gray, stone-esc modern button type.
...
This was SVN commit r17403.
2015-12-07 18:47:41 +00:00
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
780a1de136
Don't comment out code. Refs #3486 .
...
This was SVN commit r17400.
2015-12-07 12:27:52 +00:00
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
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
66bb4deef8
Use the tech name as it is used everywhere else.
...
This was SVN commit r17397.
2015-12-06 21:29:09 +00:00
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
3483a2d226
Extract attack notification strings. Refs #3691 .
...
This was SVN commit r17395.
2015-12-06 20:51:32 +00:00
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
2bd22bb6a8
Fix whitespace.
...
This was SVN commit r17393.
2015-12-06 17:13:47 +00:00
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
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
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
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
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
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
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
8813cb3133
petra: some fixes (buildrestrictions min distance) and some cleanup
...
This was SVN commit r17385.
2015-12-05 15:02:45 +00:00
99c0d0493c
remove warnings in structtree, fixes #3682 , patch from s0600204
...
This was SVN commit r17384.
2015-12-05 14:57:09 +00:00
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
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
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
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
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
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
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
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
e8bb6f5974
Actually remove the old file from the repository. Refs #3355
...
This was SVN commit r17374.
2015-12-04 12:30:24 +00:00
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
d50075adc4
Lobby cleanup. Fixes #3383
...
This was SVN commit r17371.
2015-12-04 00:22:15 +00:00
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
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
88816a1043
Fix two oversights and simplify mapfilter-initialization. Refs #3383
...
This was SVN commit r17368.
2015-12-03 14:10:28 +00:00
2e69872b11
Remove debug parser from replay menu. Refs #3440
...
This was SVN commit r17367.
2015-12-03 03:12:43 +00:00
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
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
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
a88e8e3e5c
Remove obfuscated easteregg in the lobby.
...
This was SVN commit r17363.
2015-12-02 17:21:08 +00:00
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
e6840f5fca
Remove useless global g_SpecialKey. Refs #3383
...
This was SVN commit r17360.
2015-12-02 16:00:20 +00:00
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
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
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
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
0553a74884
Remove wrong semicolons. Refs #3424
...
This was SVN commit r17353.
2015-12-02 03:24:04 +00:00
cd635f9615
cleanup of df6d30a910
...
This was SVN commit r17352.
2015-12-01 21:03:24 +00:00
df6d30a910
fix affordable gui of gates
...
This was SVN commit r17351.
2015-12-01 19:41:52 +00:00
0a8fc4bb08
improve pathFinder by optimizing the DistanceToSquare computation, refs #3588
...
This was SVN commit r17350.
2015-12-01 19:01:41 +00:00
b657eb05e2
Remove the unused and broken function GetBaseSpeed. Fixes #3672 .
...
This was SVN commit r17349.
2015-12-01 13:17:34 +00:00
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
418318ea88
Properly read preferglsl in user config files.
...
This was SVN commit r17347.
2015-12-01 09:00:12 +00:00
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
45723b1293
Don't break the translation of the playerdefaults. Refs #3355
...
This was SVN commit r17345.
2015-11-30 20:51:20 +00:00
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
2008f3e3a9
Plural translation since that is needed for some languages.
...
This was SVN commit r17343.
2015-11-30 20:47:42 +00:00
66bd932374
gives repair a lower priority compared to capture, fixes #3443
...
This was SVN commit r17342.
2015-11-30 20:26:10 +00:00
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
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
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
f8f8a1eb6a
Increases the gatherer limit for some special resources. Fixes #3583 .
...
This was SVN commit r17336.
2015-11-30 04:20:30 +00:00
324179e2b9
Show icon for the female inspiration aura. Fixes #3384
...
This was SVN commit r17335.
2015-11-30 03:58:19 +00:00
d7e444b862
Loot resources that killed enemies carried. Fixes #2732
...
This was SVN commit r17334.
2015-11-30 03:41:18 +00:00
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
700859b2c3
Move the playerdefaults to the settings directory. Refs #3355
...
This was SVN commit r17332.
2015-11-30 01:33:59 +00:00
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
ff30dc2ba4
Forgot to add the JSON file. Refs #3477 .
...
This was SVN commit r17330.
2015-11-29 16:53:32 +00:00
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
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
c9f40be84e
improve indentation of 34b0c6d779
...
This was SVN commit r17327.
2015-11-29 16:13:13 +00:00
34b0c6d779
add a NOT when checking classes matching, fixes #3611
...
This was SVN commit r17326.
2015-11-29 15:59:52 +00:00
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
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
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
9f75b78a84
fix nearGatherPosition, fixes #3658
...
This was SVN commit r17322.
2015-11-29 14:43:28 +00:00
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
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
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
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
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
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
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
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
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
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
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
be9b6fa59c
improves performance of hierarchical pathFinder, refs #3588
...
This was SVN commit r17310.
2015-11-28 13:06:44 +00:00
0d27dbf5a3
some petra cleanup
...
This was SVN commit r17309.
2015-11-28 11:46:45 +00:00
ca3828f9ac
some simulation cleanup
...
This was SVN commit r17308.
2015-11-28 11:43:14 +00:00
be2ddb9c63
some gui cleanup
...
This was SVN commit r17307.
2015-11-28 11:23:04 +00:00
2548187474
fix selection when owner change, ref #3645
...
This was SVN commit r17306.
2015-11-28 11:16:13 +00:00
2d4ec03019
update packing flag, fixes #3628
...
This was SVN commit r17305.
2015-11-28 11:11:40 +00:00
0d1b595fa0
fix UnitAI state, fix #3630
...
This was SVN commit r17304.
2015-11-28 11:09:29 +00:00
432df9b38e
Use two range based for loops to fix two TODOs.
...
This was SVN commit r17303.
2015-11-28 08:27:42 +00:00
c0c19db94e
Null serialization functions for some components without dynamic state.
...
This was SVN commit r17302.
2015-11-28 08:27:41 +00:00
e4834e8a0d
Some JS component cleanup.
...
This was SVN commit r17301.
2015-11-28 08:27:38 +00:00
5d243d0ce8
Clarify font licenses.
...
This was SVN commit r17300.
2015-11-28 08:27:36 +00:00
9a40d1284e
Update version numbers. Switch lobby room.
...
This was SVN commit r17299.
2015-11-28 08:27:33 +00:00
082af749f0
Actually remove all unlisted translations.
...
This was SVN commit r17298.
2015-11-21 20:00:20 +00:00
229e850dba
Fix a compiler warning.
...
This was SVN commit r17296.
2015-11-20 20:42:45 +00:00
fc6af83c2a
cleanup 5b335442fb
...
This was SVN commit r17294.
2015-11-20 19:47:08 +00:00
5b335442fb
fix a bug in the HierarchicalPathfinder revealed by changes in 9b0ed97d05, patch by wraitii
...
This was SVN commit r17293.
2015-11-20 19:45:48 +00:00
08df9e8533
Update built on OS X to 1.6.19.
...
This was SVN commit r17291.
2015-11-19 23:47:41 +00:00
ee8f9516eb
Update translations to be included in the release.
...
This was SVN commit r17290.
2015-11-19 23:09:49 +00:00
3cbbf31173
revert 6e0e607b20 as it prevented to open the developper overlay in autostart games
...
This was SVN commit r17288.
2015-11-19 22:28:30 +00:00
0b2da13dea
never edit a patch before commiting !
...
This was SVN commit r17287.
2015-11-19 22:17:00 +00:00
621b22265f
petra: fix some units staying idle after recovering capture points to their own structures
...
This was SVN commit r17285.
2015-11-19 22:09:57 +00:00
9b0ed97d05
fixes and performance improvements in hierarchical pathfinder, fixes #3621
...
This was SVN commit r17284.
2015-11-19 22:02:25 +00:00
4a2a155090
petra: do not sent a tribute to a defeated player
...
This was SVN commit r17283.
2015-11-19 20:04:21 +00:00
6e0e607b20
Temporary fix for #3551 in the interest of having a fair A19. Prohibit deverloper overlay cheats when cheats are disabled. Patch by elexis. Refs #3551
...
This was SVN commit r17282.
2015-11-19 17:27:27 +00:00
9e35f7d68b
The over-rasterization of obstructions introduced in [17161] could in very rare cases lead to an OOS in the passability grid. Fixes #3612 .
...
This was SVN commit r17278.
2015-11-16 22:03:10 +00:00
83191580c0
cleanup of 34fd23e920 to make l.... happy
...
This was SVN commit r17277.
2015-11-16 18:59:10 +00:00
9819b23529
I should not commit half-finished debug code.
...
This was SVN commit r17276.
2015-11-16 18:48:05 +00:00
09285ec257
Fixes #3507 . Patch by Palaxin.
...
This was SVN commit r17275.
2015-11-16 18:37:00 +00:00
70164a02c4
Handle double-clicks on list elements better. Patch by elexis.
...
Fixes #3574
This was SVN commit r17274.
2015-11-16 18:23:21 +00:00
721c731567
Decreases slinger walkspeed so they have a slightly harder time slaughtering skirmishers.
...
This was SVN commit r17271.
2015-11-15 22:01:11 +00:00
c2f3d61a80
Fix #3613 by adding the visibility component to triggers. Patch by elexis.
...
This was SVN commit r17270.
2015-11-15 21:23:35 +00:00
2e3b7f5906
Lessens the effect of another very powerful aura.
...
This was SVN commit r17269.
2015-11-15 20:38:56 +00:00
678cd646bd
Lessens the effect of a very powerful aura.
...
This was SVN commit r17268.
2015-11-15 20:26:37 +00:00
afef406e18
petra: fix cases where the ai would wrongly think a resource is inaccessible (because of missing reset of its internal flags)
...
This was SVN commit r17267.
2015-11-15 19:35:40 +00:00
025e28be83
fix test broken in 34fd23e920, fix #3614
...
This was SVN commit r17266.
2015-11-15 17:48:25 +00:00
39f572af88
Stop processing turns after a replay finishes. Patch by elexis. Fixes #3581
...
The animations continue because we currently have no easy way to stop
interpolating. My suggestion would be to implement a network
synchronised pause and use something like that.
This was SVN commit r17265.
2015-11-15 15:08:46 +00:00
34fd23e920
optimize the finding of new target (no changes on the output) when lots of units involved, fixes #3605
...
This was SVN commit r17264.
2015-11-15 13:19:21 +00:00
6b8dc7684a
Return in case we do not have any available JS timer slots instead of accessing OOB memory.
...
This was SVN commit r17263.
2015-11-15 01:09:35 +00:00
f1f0fa1f8f
Fix a typo. Thanks stan for noticing.
...
This was SVN commit r17260.
2015-11-14 21:46:05 +00:00
fcb1008fa3
Fix wolfhound actor. Patch by stanislas69. Fixes #3608 .
...
This was SVN commit r17259.
2015-11-14 21:45:27 +00:00
e7040784ff
Adds an update trigger or else rating list isn't updated on join.
...
This was SVN commit r17258.
2015-11-14 20:26:41 +00:00
c93eb938cc
New mastiff and wolfhound units with full animations modeled by Micket (Thanks Micket, they're awesome!)
...
three variations of mastiff texture for its different ranks with
different armor levels.
Wolfhound unit not yet applied to the template, but it has its own
animations
New rhino unit, modeled by Micket too. It has a duplicated template from
the bear as placeholder.
This was SVN commit r17257.
2015-11-14 20:07:21 +00:00
3760891131
Fix the precedent fix. It turns out the code behaves in much weirder ways than I expected.
...
This was SVN commit r17255.
2015-11-14 19:03:20 +00:00
14f53315d6
Fix previous commit and OOS and rejoin. I need to get my hands on the guy that decided "init" wasn't called on deserialize.
...
This was SVN commit r17254.
2015-11-14 18:41:52 +00:00
3473828735
Makes some powerful techs harder to obtain or less effective.
...
This was SVN commit r17253.
2015-11-14 17:29:00 +00:00
ebbabb01f5
Other small JS performance improvement.
...
This was SVN commit r17252.
2015-11-14 16:07:48 +00:00
4e492ab7fa
Optimize PerformGather in ResourceGatherer.js after the Tracelogger revelead it was a performance hotspot. Should be about twice as fast.
...
Optimizations were: caching gathering rates and removing a useless
message.
This was SVN commit r17251.
2015-11-14 12:26:33 +00:00
092206b12e
Finding new targets can be really slow when lot of units are involved. In Combat demo huge for example, it could represent more than 30% of the simulation time. Part of it is because we loop several times on all identity classes of all enemy units, and most of the time for nothing. This patch avoids the useless loops, and adds some cleanup.
...
In addition, when testing if we can't attack a units, Capture and
Slaughter were used even if not applicable.
This was SVN commit r17250.
2015-11-13 17:47:31 +00:00
e7fb75a680
Initialize new variables correctly.
...
This was SVN commit r17247.
2015-11-12 23:07:54 +00:00
e9271025dc
Forgot to serialize a new unitMotion variable, resulting in OOS on rejoin.
...
This was SVN commit r17245.
2015-11-12 20:57:50 +00:00
bc0048d592
Update rallypoint coordinates for rallypoints targeting entities ("attack", "repair"...). Fixes #3597
...
This was SVN commit r17243.
2015-11-12 17:39:46 +00:00
9357cce112
Math is hard
...
This was SVN commit r17242.
2015-11-12 17:32:33 +00:00
3febc387d5
Styling fixes.
...
This was SVN commit r17241.
2015-11-12 17:23:50 +00:00
52443dfe80
Fix an erroneous ENSURE in PatchRData and move it where it will be very slightly clearer. Fixes #3598
...
This was SVN commit r17240.
2015-11-12 17:22:44 +00:00
da7bd0c92c
Improved action-capture icon, designed by stan and wraitii.
...
Fixes #3595 .
This was SVN commit r17239.
2015-11-12 09:46:31 +00:00
913545aa41
Mark several CFixedVector2D as const and passed by reference in Geometry and a few other places. Mark some functions (that probably already were) inline.
...
Also make sure we don't include Geometry.h where it's not necessary.
This was SVN commit r17238.
2015-11-11 20:50:02 +00:00
f3b22e51a3
Optimize Geometry::PointIsInSquare, which is used quite often in performance hotspots.
...
Original patch by mimo. Refs #3588
This was SVN commit r17236.
2015-11-11 20:02:47 +00:00
c2928c44d4
Make farm props sway in the wind (they sway very lightly).
...
This was SVN commit r17235.
2015-11-11 19:12:06 +00:00
a138bed96b
Fix an issue where units did not notice other moving units with my latest commits.
...
This was SVN commit r17234.
2015-11-11 19:06:07 +00:00
cc199c4cca
Fix a critical typo in the last commit and a debug message left in accidentally. Thanks fabio.
...
This was SVN commit r17232.
2015-11-11 13:55:36 +00:00
56baae08c3
Fix action-capture icon transparency and optimize with optipng -o 5 and advdef -z -4
...
Refs: #2823
This was SVN commit r17230.
2015-11-11 13:34:15 +00:00
06cb37ff74
Add PlanNextStep back to the unitMotion, in a completely different version. This basically anticipates where we'll probably move next, and checks if static units might block us. Makes paths look slightly better.
...
This was SVN commit r17229.
2015-11-11 13:29:06 +00:00
607955489d
Check if units are in the world in UnitRenderer::PickAllEntitiesAtPoint. Probably fixes #3587 , though I'm not sure as it proved unreproducible.
...
This was SVN commit r17228.
2015-11-11 13:27:13 +00:00
1b00bfc98d
Change the capture icon to something that looks like two flags instead of a weird red blob. Icon by Stan.
...
This was SVN commit r17227.
2015-11-11 13:24:41 +00:00
3b13fb7608
Improve unitMotion behavior. When a unit's path is obstructed, it will now try shortpathing around an increasingly large search range, to optimize behavior in trivial cases where it just needs to go around a unit.
...
Also stop trying too hard when we are close to the destination and our
only order is to move there.
This should result in a slight optimization of the behavior, as well as
slightly more sanity overall.
This was SVN commit r17226.
2015-11-11 12:49:24 +00:00
3ddd72c1a4
Fix a rare case where units might get stuck around other idle entities, and clarify a related comment.
...
Refs #3471
This was SVN commit r17225.
2015-11-11 12:28:38 +00:00
c42160ec10
Fix an issue where units could not go around large obstructions when short-pathing as it ran in the search-space "walls", reported by gamebot. Fixes #3593 .
...
This is also a very slight optimization.
This was SVN commit r17224.
2015-11-11 12:23:11 +00:00
2f6f0bd477
Serialize everything that is needed by UpdateVisibilityData instead of assuming everything as dirty.
...
Fixes #3271 .
This was SVN commit r17223.
2015-11-11 12:15:57 +00:00
8b0bca0556
Fix action-capture icon transparency.
...
Refs: #2823
This was SVN commit r17222.
2015-11-11 11:45:39 +00:00
9e0ef737b2
Fix Athenian town phase description.
...
This was SVN commit r17219.
2015-11-11 03:27:38 +00:00
5f7ce1089a
Fix translation comments.
...
This was SVN commit r17218.
2015-11-11 03:27:34 +00:00
32da740f14
Allow kicking/banning players from gamesetup and session. Patch by elexis. Fixes #3241 .
...
This was SVN commit r17217.
2015-11-11 02:05:23 +00:00
d3ff090ce7
Fix an OOS issue where, on ownership change, units affected by speed-modifying technologies did not update their speed.
...
This was SVN commit r17215.
2015-11-10 23:31:06 +00:00
f0deeab899
Rename commands to g_Commands.
...
This was SVN commit r17213.
2015-11-09 23:25:34 +00:00
51ec6f4728
improve function RasterizeRectWithClearance, about 40% faster, ref #3588
...
This was SVN commit r17212.
2015-11-09 21:16:46 +00:00
35b0478f70
Improve Mauryan corral specific name. Patch by stanislas69. Fixes #3555 .
...
This was SVN commit r17211.
2015-11-09 16:49:53 +00:00
0ba9fa1cc1
Optimize RasterizeRectWithClearance slightly further. Thanks mimo for noticing.
...
This was SVN commit r17209.
2015-11-08 18:08:49 +00:00
313d324fac
Fix some cases of unit "dancing". Thanks to Elexis for nagging me.
...
This was SVN commit r17208.
2015-11-08 17:55:23 +00:00
fe040c695f
Change the shape rasterization to not use DistanceToSquare, which often called sqrt. This apparently reduces total turn time by as much as 5% (!)
...
Refs #3368
This was SVN commit r17207.
2015-11-08 17:24:59 +00:00
cb025bb725
Removes extraneous check from XpartaMuPP. Fixes #3568 .
...
This was SVN commit r17206.
2015-11-08 17:09:59 +00:00
dd6d09521c
Not sure how but I messed up the previous commit.
...
This was SVN commit r17205.
2015-11-08 16:44:08 +00:00
42d0e6d46e
Optimize the hierarchical pathfinder's "makeGoalReachable" slightly. Does not affect simulation results.
...
This was SVN commit r17204.
2015-11-08 16:39:43 +00:00
cd025b2069
fix typo
...
This was SVN commit r17203.
2015-11-08 13:09:49 +00:00
7c2f178634
petra: do not try to train females if not available in templates, only a temporary fix waiting for #3586
...
This was SVN commit r17202.
2015-11-08 13:05:56 +00:00
8f00293a58
Assign proper alternatives to some terrian materials. Fixes #3585
...
This was SVN commit r17200.
2015-11-07 19:43:41 +00:00
d569fe63b4
petra: don't loose time approaching a target entity if it was captured in the meantime
...
This was SVN commit r17199.
2015-11-07 18:12:55 +00:00
c319ff062d
Partial fix to a formation "gliding" issue, unsure so far what is causing this.
...
This was SVN commit r17198.
2015-11-07 17:36:31 +00:00
3163c9d4a2
Fix a rare issue with the short-range pathfinder where units took odd paths when the target was beyond the search zone.
...
This was SVN commit r17197.
2015-11-07 14:33:55 +00:00
ad4edba3dc
move a bit an unreachable tree, fixes #3584
...
This was SVN commit r17196.
2015-11-07 14:22:10 +00:00
eed9739031
Make terrain conform to the materialmgr.quality setting. Make quality 0.0 remove triplanar texturing and tree swaying effect.
...
In consequence, pick a sensible default at 2.0 so that new players have
a somewhat good looking game.
This was SVN commit r17195.
2015-11-06 20:55:07 +00:00
2d7074e8d6
Fix unused variables left behind.
...
This was SVN commit r17194.
2015-11-06 20:42:12 +00:00
596025df71
Fix a bug in [17163] that could get units with a large passability class stuck.
...
This was SVN commit r17192.
2015-11-06 20:33:13 +00:00
e26b59c917
Changes to unitMotion.
...
Make sure we do not treat as circles entities that we really should
treat as squares (such as trees). This fixes an issue reported by Stan.
Make sure we never forget about our destination if we are blocked by
unit obstructions. This makes sure that units in a group but not in
formation will not be blocked by the other units, and probably makes the
general behavior more sane. Helps following [17166]
Refs #3505 , #3471 , #3376
This was SVN commit r17191.
2015-11-06 20:09:18 +00:00
9efd79e240
Fix an issue where square diagonals were incorrectly handled when checking the distance to the target. Fixes #3577 properly. Patch by mimo.
...
Decrease fishing ship gathering range in consequence (revert [17178]).
This was SVN commit r17190.
2015-11-06 19:56:52 +00:00
1ed3761859
Fix style issues and redundant code in [17161] and [17163].
...
This was SVN commit r17189.
2015-11-06 19:48:08 +00:00
2126b53b9d
Fixes interpolation of flying objects.
...
This was SVN commit r17187.
2015-11-06 16:56:39 +00:00
33398baa90
petra: only units which have effectively started an attack should be stopped when the attack is aborted, fixes #3582
...
This was SVN commit r17185.
2015-11-05 20:52:41 +00:00
83bba7bdfc
revert e0771b98dd which was based on misunderstanding of the algo, and fix the inverted_circle case, refs #3577
...
This was SVN commit r17184.
2015-11-05 19:22:04 +00:00
05547bf36f
Fix an oversight.
...
This was SVN commit r17182.
2015-11-05 16:52:19 +00:00
071c5317f4
I have noticed from walking on a bridge everyday to work that reflections are more distorted when vieved at an angle. This is a quick attempt at imitating this effect.
...
This was SVN commit r17181.
2015-11-04 21:08:24 +00:00
a9323da01b
Fix #3566 by fixing an off-by-one error in the final replay turn logic. Patch by elexis.
...
This was SVN commit r17180.
2015-11-04 20:33:34 +00:00
815b0e4e03
Change tree obstruction sizes following [17161] as it looks better and will help units navigate through forests.
...
This was SVN commit r17179.
2015-11-04 20:14:39 +00:00
12d8753eff
Bump fishing ships gathering range since their obstruction size was effectively increased with the new pathfinder. This resulted in them sometimes not being able to deposit their resources at docks.
...
Fixes #3577 , reported by maxticatrix through elexis.
This was SVN commit r17178.
2015-11-04 19:49:56 +00:00
8f1853b8d8
Prevent accidental overwriting of replays in very rare cases while we wait for a better solution.
...
Refs #3255
This was SVN commit r17177.
2015-11-04 19:26:40 +00:00
f91478c730
Fix an oversight in the obstruction manager that lead to possibly the most insidious OOS error we've seen so far.
...
Fixes #3292 .
This was SVN commit r17176.
2015-11-04 18:51:47 +00:00
bc6727a23a
Show a message about cheats being enabled in gamesetup. Patch by elexis. Fixes #3546 .
...
This was SVN commit r17175.
2015-11-03 20:44:53 +00:00
9138bff64e
Increases pierce armour of ranged siege.
...
This was SVN commit r17174.
2015-11-03 20:14:04 +00:00
9b8180ffe8
Slight nerf reduction.
...
This was SVN commit r17173.
2015-11-03 18:46:12 +00:00
54b405a0d0
Reduces effectiveness of early camel rush
...
This was SVN commit r17172.
2015-11-03 18:19:11 +00:00
e527a5c321
Fix #3525 and #3399 by recalculating territories on request to GetTerritoryPercentage. Patch by elexis
...
This was SVN commit r17171.
2015-11-02 07:32:43 +00:00
6493974800
Fix #2676 by only acknowledging commands matching the sender's name if cheats are disabled. Based on patch by historic_bruno.
...
This was SVN commit r17170.
2015-11-02 03:20:44 +00:00
a897fac229
petra: fix a rare serialization bug where an entity inside an army was killed on the same turn it was serialized
...
This was SVN commit r17169.
2015-11-01 18:54:29 +00:00
3ba435ae35
Lowers the minrange of towers and the briton fortress, which were too big and resulted in units close to them being impossible to attack. This seems like an oversight and not a feature, as we currently do not have murder holes or similar technologies.
...
I left outpost minrange higher so that it's actually safe to attack
outposts when you reach their foot. Seemed realistic.
Fixes #3559
This was SVN commit r17167.
2015-11-01 17:22:43 +00:00
1694913b16
Make "no formation" the default setting but keep formations activated to help pathfinding in A19. Use at your own risk. Refs #3505 and #3565 .
...
Also make rabbit, chicken and shark no longer obstruct movement, to
further help with pathfinding. These may or may not be udpated later.
Refs #3562 . Fixes #3497 .
This was SVN commit r17166.
2015-11-01 17:10:19 +00:00
e5765ba1ef
petra: do not react to pseudo-attacks (recovering capture points) from allies
...
This was SVN commit r17165.
2015-11-01 17:09:09 +00:00
d9e9345be2
fix some indentation of 6e05a00929
...
This was SVN commit r17164.
2015-11-01 16:47:53 +00:00
357203a90f
Pathfinding changes: unit-unit collisions now allow for some overlap, so units can get closer to each other, which I found improved pathfinding considerably.
...
Also fix a potential issue I noticed in some cases, though that
particular fix implies scrapping waypoints, so if units seem to get
lost, please report so and I'll revert those changes.
I can't find any way to get units stuck with this patch.
This was SVN commit r17163.
2015-11-01 13:38:48 +00:00
14038d4cd8
Fix more pathfinding issues.
...
Change the way the long-range pathfinder rasterisation works slightly so
that we have a better compatibility with the short-range pathfinder.
Should fix the "stuck units" issues, though I am not sure so I am not
marking them as fixed so far. Refs #3471 , #3505 , and possibly #3292 .
Caveat: I am now using clearance of 0.8 for "default" class, which might
have side-effects: please report anything weird.
Also fix leftover style issues.
This was SVN commit r17161.
2015-11-01 07:28:43 +00:00
4428c1e690
Fix #3537 with better rating state enforcement. Patch by elexis.
...
This was SVN commit r17160.
2015-10-31 21:19:58 +00:00
a6111ff8b7
Fix #3309 by capping m_DeltaSimTime in NetTurnManager.cpp. Patch by elexis. Review by Philip.
...
This was SVN commit r17159.
2015-10-31 21:04:47 +00:00
6acfec0f44
Fix a logic error in the hierarchical pathfinder that resulted in it not updating all passability classes correctly. Fixes #3538 , refs #3292 (it fixes one of the cases, but not the examples).
...
Also features style fixes, thanks leper for noticing.
This was SVN commit r17158.
2015-10-31 20:47:47 +00:00
a3f467ae4e
Make resources have a static, passable obstruction. Ought to be a temporary fix. Fixes #3530
...
See #3530#comment:9 for a proper fix to this issue.
This was SVN commit r17156.
2015-10-31 15:28:42 +00:00
4d804cf26b
fix typo in 6e05a00929
...
This was SVN commit r17155.
2015-10-31 13:42:14 +00:00
6e05a00929
fix obstruction of target entity not taken into account in short pathfinder, closes #3539
...
This was SVN commit r17154.
2015-10-31 13:37:34 +00:00
9a623cb302
only decay towards connected tiles, fixes #3558
...
This was SVN commit r17153.
2015-10-31 13:26:59 +00:00
8494e36aa8
Revert the logic change in 9da482ead4. This commit removed the checks in UnitMotion against structures, which should have been fine except the short-range pathfinder and the long-range pathfinder are not entirely compatible (check out #3532 for details). This behavior was probably slightly optimized, but it was too clever for its own good in the current state of the pathfinder, might be reintroduced later.
...
This resulted in ALL "units inside obstructions" issues.
Thanks to elexis for the testing.
Fixes #3532 , #3450 .
Refs #3538 (still OOSes), #3410 (unitmotion remains buggy for
formations, but this is only aesthethic.)
Probably affects #3471 and #3505 , but those are not fixed.
This was SVN commit r17152.
2015-10-31 08:43:31 +00:00
e895b044e7
Fix #3553 by removing a superfluous warning. Patch by elexis.
...
This was SVN commit r17151.
2015-10-31 07:21:09 +00:00
c517bc2aab
Double-click to join game/load replay. Fixes #3557 . Patch by elexis.
...
This was SVN commit r17150.
2015-10-31 06:05:18 +00:00
108633affd
Fix #3415 . Removes 'ghost' scrollbar bounding to enable extreme-right hover and selection in dropdowns. Patch by elexis.
...
This was SVN commit r17149.
2015-10-31 05:40:43 +00:00
230654f6ca
Correct celtic champion swordsman running animation speed. Fixes #3542 . Patch by stanislas69.
...
This was SVN commit r17148.
2015-10-31 04:12:43 +00:00
3e7dd53aa1
Hotfix #3549 for A19. Don't save ip and player name during lobby-initiated joins.
...
This was SVN commit r17147.
2015-10-31 04:10:04 +00:00
2a26db2dc2
fix passability of mauryan support elephant, refs #3539
...
This was SVN commit r17146.
2015-10-26 23:14:26 +00:00
e0771b98dd
fix switch between square or circle approximation in UnitMotion, refs #3539
...
This was SVN commit r17145.
2015-10-26 22:59:26 +00:00
f4cb822d9d
do the circle approximation also in INVERTED goals in UnitMotion, refs #3405
...
This was SVN commit r17143.
2015-10-18 20:23:02 +00:00
70d5e4e318
fix the INVERTED_CIRCLE and INVERTED_SQUARE PathGoal, fixes #3405
...
This was SVN commit r17142.
2015-10-18 20:21:20 +00:00
d7b8e0fb79
do not assume a max number of players in the ai api
...
This was SVN commit r17141.
2015-10-17 17:04:28 +00:00
cb7c25768a
Petra: some cleanups
...
This was SVN commit r17140.
2015-10-17 17:01:26 +00:00
496dc13952
remove orphan function after ef4a1e261c, patch by stanislas69
...
This was SVN commit r17139.
2015-10-17 16:55:21 +00:00
21992c0827
Fixes incorrect build restriction message for MaxDistance, patch by karamel, fixes #3529
...
This was SVN commit r17138.
2015-10-17 09:47:01 +00:00
82590753d7
fix a moved function, fixes #3531
...
This was SVN commit r17137.
2015-10-16 17:14:39 +00:00
070a7259ad
Fixes more dialog button order issues, based on patch by stanislas69, fixes #3524
...
This was SVN commit r17135.
2015-10-15 04:07:37 +00:00
b97e565017
Fixes path formatting in Windows OOS error message, patch by elexis, fixes #3498
...
This was SVN commit r17134.
2015-10-15 03:50:45 +00:00
c0b4e78801
Fixes stream serialization bug on OS X 10.8 and older, which caused instant OOS in multiplayer games, fixes #3108 .
...
Fixes test failures on OS X 10.7 and older, refs #3109
This was SVN commit r17133.
2015-10-15 03:31:30 +00:00
4043c56518
Fixes global init order bug that caused OOS between OS X and other platforms, fixes #3499 . May improve pathfinding behavior in some cases, please test!
...
This was SVN commit r17132.
2015-10-15 02:51:12 +00:00
32dafe707d
cleanup and simplification of 38af159598, fixes #3519
...
This was SVN commit r17130.
2015-10-12 17:12:36 +00:00
78f6551b83
Fixes some incorrect texture references found by checkrefs.pl, refs #2524
...
This was SVN commit r17129.
2015-10-11 22:28:02 +00:00
3122792da8
Fixes missing reference in Iberian corral, patch by elexis, fixes #3520
...
This was SVN commit r17128.
2015-10-11 22:01:56 +00:00
4994dfb26a
Avoids RuntimeError: dictionary changed size during iteration
...
This was SVN commit r17127.
2015-10-11 20:47:52 +00:00
9db4fb5ddb
fix typo in Game.cpp
...
This was SVN commit r17126.
2015-10-11 11:12:27 +00:00
93a14b595f
var inside loop was not redefined to undef, replace it by let, fixes #3513
...
This was SVN commit r17125.
2015-10-11 11:04:53 +00:00
b0f267b61c
fix typo in UnitMotion, fixes #3474
...
This was SVN commit r17124.
2015-10-11 11:00:11 +00:00
f5348c6dd6
Introduce less rounding errors in the falloff to allow a more precise territory calculation. Fixes #3334 . Based on code by elexis.
...
This was SVN commit r17122.
2015-10-11 09:01:50 +00:00
fd5f9c547b
Updates OS X libs build script to use miniupnpc 1.9.20151008
...
This was SVN commit r17120.
2015-10-10 23:53:54 +00:00
1ac5ccff0b
fix the ceaseFire gui, patch by elexis, fixes #3413
...
This was SVN commit r17118.
2015-10-10 16:51:52 +00:00
40acf66ba9
Fixes hotkey bugs introduced in a07add11c6, patch by elexis. Fixes #3495
...
This was SVN commit r17116.
2015-10-10 07:22:07 +00:00
02628b8902
Removes unused pathfinder consts, patch by stanislas69. Fixes #3500
...
This was SVN commit r17115.
2015-10-10 06:48:42 +00:00
a90d2cd43a
fix JS undefined property warning, patch by Evulant (AlThePhoenix), fixes #3496
...
This was SVN commit r17114.
2015-10-09 21:57:34 +00:00
412779684c
improves 38af159598
...
This was SVN commit r17113.
2015-10-09 18:14:53 +00:00
d73734ff50
fix wrong chat colors, patch by AlThePhoenix, fixes #3489
...
This was SVN commit r17112.
2015-10-09 17:54:39 +00:00
38af159598
fix UnitAI state of turrets, fix #3481
...
This was SVN commit r17111.
2015-10-08 21:59:52 +00:00
1b3ee1195c
remove some useless ternary operators in ai api
...
This was SVN commit r17110.
2015-10-08 21:19:00 +00:00
ef4a1e261c
fix standGround units not attacking, patch by karamel, fixes #3284
...
This was SVN commit r17109.
2015-10-08 20:48:05 +00:00
03b00b0041
revert d5c758eef3 and better fix of #3430 , fixes #3466
...
This was SVN commit r17108.
2015-10-06 20:59:13 +00:00
3bf05c81fc
temple aura should only affect healable units, fixes #3482
...
This was SVN commit r17107.
2015-10-05 20:45:39 +00:00
86d81c5baa
fix attackAsFormation of special formations, fixes #3086
...
This was SVN commit r17106.
2015-10-05 20:40:14 +00:00
2767ae83d7
Fixes button order in delete unit confirmation dialog, fixes #3483
...
This was SVN commit r17105.
2015-10-05 01:47:20 +00:00
e0093c8ecc
Remove an unused function (it was used by the old pathfinder).
...
This was SVN commit r17103.
2015-10-04 18:02:16 +00:00
b11b16a99a
petra: fix edge case where the AI could not build houses
...
This was SVN commit r17102.
2015-10-04 17:58:55 +00:00
2505a2ec70
Remove a preprocessor ambiguity, fixes #3480 .
...
This was SVN commit r17101.
2015-10-04 17:21:36 +00:00
395c90372e
fishing ships are not expected to be able to move in formation
...
This was SVN commit r17100.
2015-10-03 17:50:50 +00:00
b2ed9d79cc
fix Aegean sea RMS, patch by stanislas69
...
This was SVN commit r17099.
2015-10-03 17:45:17 +00:00
cfe4a2e568
Fix a cause of serialization problems. Fixes #3450 .
...
This was SVN commit r17097.
2015-10-03 11:02:12 +00:00
bb997f6cae
Fix previous commit.
...
This was SVN commit r17096.
2015-10-03 10:32:30 +00:00
d60940ac59
Code improvements and style fixes.
...
This was SVN commit r17095.
2015-10-03 08:27:19 +00:00
dc69aed954
Remove some old and unused code.
...
This was SVN commit r17094.
2015-10-02 18:27:10 +00:00
4e95efacb8
temporarily disable the AttackAsFormation, refs #3086
...
This was SVN commit r17093.
2015-10-01 20:38:02 +00:00
9a8c88216a
Copy capture points for mirages. Fixes #3475 .
...
This was SVN commit r17092.
2015-10-01 16:32:48 +00:00
102358a5cb
Fix build for recent versions of miniupnpc.
...
This was SVN commit r17091.
2015-09-30 21:32:54 +00:00
061c7f6058
Const ref.
...
This was SVN commit r17090.
2015-09-30 20:28:23 +00:00
b0a6979242
Source the spidermonkey patch script. Fixes #3462 .
...
This was SVN commit r17089.
2015-09-30 20:28:13 +00:00
a345edee75
petra: fix inconsistencies in the (rare) case the AI choose to launch an attack against gaia units
...
This was SVN commit r17088.
2015-09-29 19:31:39 +00:00
3a06d3a08b
fix team chat, patch by elexis, fixes #3464
...
This was SVN commit r17087.
2015-09-29 18:53:30 +00:00
d5c758eef3
change immediately to IDLE state when no more orders, fixes #3430
...
This was SVN commit r17086.
2015-09-27 17:32:55 +00:00
2132f868b8
Replace the rectangle rasterization algorithm by the original version from Philip's branch.
...
The current version is flawed (it doesn't handle the partially
obstructed cells as it should).
Refs #3410 .
This was SVN commit r17084.
2015-09-27 16:46:26 +00:00
a7e0dc1534
update attack and heal range queries, patch by leper, fixes #3080
...
This was SVN commit r17082.
2015-09-27 12:23:40 +00:00
31b29b98ad
petra: implement first choice between capture and attack, fixes #3459
...
This was SVN commit r17081.
2015-09-26 22:25:37 +00:00
fb10249cd8
cleaning of the AI api for capture/attack choice, refs #3459
...
This was SVN commit r17080.
2015-09-26 22:06:54 +00:00
1f5bb8d62e
fix some flaws revealed by the fix #3430
...
This was SVN commit r17079.
2015-09-26 21:41:35 +00:00
9cc477c5ef
let the garrison regeneration rate depends on the phase, fixes #3434
...
This was SVN commit r17077.
2015-09-24 22:15:58 +00:00
82f3ee7384
fix typo in previous commit
...
This was SVN commit r17076.
2015-09-24 21:57:43 +00:00
037fe8282e
fix initialization of this.oldAttackType used for resetting the attack anims, fix #3221
...
This was SVN commit r17075.
2015-09-24 21:55:09 +00:00
aceff9ab15
fix rallyPoint on market foundation
...
This was SVN commit r17074.
2015-09-24 21:06:06 +00:00
831c386856
Make the structure tree support paired technologies. Patch by s0600204, fixes #3401 .
...
This was SVN commit r17073.
2015-09-24 19:54:59 +00:00
0e80c9c945
Make the territory decay rate a decimal value. Fixes #3449 .
...
This was SVN commit r17072.
2015-09-24 19:52:36 +00:00
b19d900a02
Fix fb6b86f928, fixes #3218 .
...
This was SVN commit r17071.
2015-09-24 17:40:49 +00:00
8c146cb325
Fix missing rounding in the GUI. Patch by stanislas69, fixes #3245 .
...
This was SVN commit r17070.
2015-09-24 17:36:40 +00:00
315143424c
New berry bush colors, texture updated by stanislas69. Fixes #3377 .
...
This was SVN commit r17069.
2015-09-24 17:21:45 +00:00
dcf8e66aca
Update the goal serialization for 03d2c5e40b. Fixes #3425 .
...
This was SVN commit r17068.
2015-09-24 17:13:39 +00:00
a1a61be547
Also patch SpiderMonkey on OSX.
...
This was SVN commit r17067.
2015-09-24 12:04:15 +00:00
a564ccaf11
Update version name: This will be A19 Syllepsis, which means "Capture" in Ancient Greek.
...
This was SVN commit r17065.
2015-09-23 21:18:44 +00:00
de2f97a9cc
Fix translation of starting resources, patch by elexis, refs #3355
...
This was SVN commit r17064.
2015-09-23 21:12:31 +00:00
a68d5dae0d
fix developper overlay in visual replay, patch by elexis, fixes #3435
...
This was SVN commit r17063.
2015-09-23 20:28:22 +00:00
1456db00fc
reduce the increase of decayRate from 5060b1bb4f
...
This was SVN commit r17062.
2015-09-22 18:53:29 +00:00
71c52f15e9
reduce the increase of decayRate from 5060b1bb4f
...
This was SVN commit r17061.
2015-09-22 18:52:57 +00:00
5060b1bb4f
Make loyalty drain on decaying buildings much more punishing.
...
This was SVN commit r17060.
2015-09-22 03:05:16 +00:00
14aaa7c640
add some missing semicolon
...
This was SVN commit r17059.
2015-09-21 21:08:58 +00:00
676358e634
some cleanups of the AIs
...
This was SVN commit r17057.
2015-09-21 17:26:19 +00:00
b830233498
Fix previous commit, some new files didn't pass through.
...
This was SVN commit r17055.
2015-09-21 17:14:26 +00:00
d64b95b28c
An awesome Visual Replay menu, made by elexis. Fixes #3258 .
...
This was SVN commit r17054.
2015-09-21 17:00:21 +00:00
7002af5b9c
Some capturing nerfs.
...
This was SVN commit r17053.
2015-09-20 19:09:02 +00:00
ff7aa57931
Complete c19903936b.
...
This was SVN commit r17052.
2015-09-20 14:26:21 +00:00
107015861c
move map description, refs #3258 , patch by elexis
...
This was SVN commit r17051.
2015-09-20 12:44:01 +00:00
3317e6c68b
rename autostart visualreplay, refs #3258 , patch by elexis
...
This was SVN commit r17050.
2015-09-20 12:29:59 +00:00
2971852f27
Fix map selection in the lobby gamesetup. Patch by elexis.
...
This was SVN commit r17049.
2015-09-20 10:44:29 +00:00
c19903936b
Correct a missed translation comment and fix translation contexts in the simulation settings.
...
This was SVN commit r17048.
2015-09-20 10:37:45 +00:00
0db7ea2dd2
still another bunch of missing semicolon signaled by jshint
...
This was SVN commit r17047.
2015-09-19 13:04:33 +00:00
4235c67764
still another bunch of cleanup (mainly missing semicolon) signaled by jshint
...
This was SVN commit r17046.
2015-09-19 12:55:58 +00:00
0b86bbd424
another bunch of cleanup (mainly missing semicolon) signaled by jshint
...
This was SVN commit r17045.
2015-09-19 12:50:48 +00:00
e42e02d4fe
bunch of cleanup (mainly missing semicolon) signaled by jshint
...
This was SVN commit r17044.
2015-09-19 12:41:21 +00:00
e2bfba740b
sanitize matchsettings, patch by elexis, fixes #3431
...
This was SVN commit r17043.
2015-09-19 12:35:10 +00:00
fb6b86f928
Use the good material for the destroyed roman camp actor. Patch by stanislas69, fixes #3218 .
...
This was SVN commit r17042.
2015-09-19 12:18:27 +00:00
881f80a26a
Highlight all player names in the lobby chat. Patch by stanislas69, fixes #3281 .
...
This was SVN commit r17041.
2015-09-19 12:15:06 +00:00
4996d28110
change player color in gamesetup in random and skirmish maps, patch by elexis and stanislas69, fixes #1580
...
This was SVN commit r17040.
2015-09-18 21:54:43 +00:00
c24f2b1414
Revert a wrongly committed WIP change.
...
This was SVN commit r17038.
2015-09-18 19:54:19 +00:00
7b84c26a44
Fix some issues reported on Transifex.
...
This was SVN commit r17037.
2015-09-18 19:51:56 +00:00
0c043b5bdb
Fix edge case in the UnitAI state machine. Fixes #3429 .
...
This was SVN commit r17036.
2015-09-18 17:07:32 +00:00
4da5d571fc
Move the AI data to the new simulation settings system. Patch by elexis. Refs #3355 .
...
This was SVN commit r17034.
2015-09-18 16:36:52 +00:00
4655196d6f
petra: exit immediately when no entities, fix #3110
...
This was SVN commit r17033.
2015-09-17 18:19:06 +00:00
57a094268c
petra: some tweaks and cleanings
...
This was SVN commit r17032.
2015-09-17 17:58:34 +00:00
749637dc84
Move the map types to the new simulation settings system. Patch by elexis. Refs #3355 .
...
This was SVN commit r17031.
2015-09-17 17:55:27 +00:00
b478b9742a
Workaround for a specific case of #3410 , where units could stand on a committed foundation. Just check for units and order them to leave during all the building.
...
Refs #3410 .
This was SVN commit r17029.
2015-09-17 16:34:30 +00:00
b77ad821c2
Reenable formations and fix/improve the communication between UnitAI and UnitMotion. With the new pathfinder some path requests can be completed instantaneously, so UnitAI has to handle MoveStarted messages even in the IDLE state.
...
Please note that this commit makes #3410 really visible. Formation
members might pass through buildings.
Refs #3410 , #3337 .
This was SVN commit r17028.
2015-09-17 16:31:23 +00:00
fc45777793
delay the ownerShip only after the entity is spawned, fix #3422
...
This was SVN commit r17027.
2015-09-16 09:33:38 +00:00
21619a4705
Move the victory conditions to the new simulation settings system. Patch by elexis. Refs #3355,#3001
...
This was SVN commit r17026.
2015-09-16 09:22:36 +00:00
4e716699d7
cleanup of EntityState caching
...
This was SVN commit r17025.
2015-09-15 21:34:31 +00:00
7e18c0fd9e
determineAction only when needed
...
This was SVN commit r17024.
2015-09-15 18:39:03 +00:00
012bf32673
petra: improve detection of threatening enemy units, complete and fix 7ac0a4a3db, fixes #3418
...
This was SVN commit r17023.
2015-09-15 18:29:57 +00:00
7eefcbe8c5
Do not use non-static data member initializer.
...
GCC 4.6 does not support those and initializing it in the ctor is a lot
clearer in this case.
This was SVN commit r17022.
2015-09-15 00:55:03 +00:00
a65a8472f9
Mark some const functions as such.
...
This was SVN commit r17021.
2015-09-13 20:59:10 +00:00
e7f736fd0f
Move the game speeds to the new simulation settings system. Patch by elexis. Refs #3355
...
This was SVN commit r17019.
2015-09-13 19:15:07 +00:00
ae3aad704d
fix previous commit
...
This was SVN commit r17018.
2015-09-13 19:06:14 +00:00
9816e7c92d
Rename some variables to point out that they are only used in visual replay. Add script function IsVisualReplay. Refs #9 #3355 , patch by elexis
...
This was SVN commit r17017.
2015-09-13 19:03:33 +00:00
7ac0a4a3db
petra: improve detection of threatening enemy units
...
This was SVN commit r17016.
2015-09-13 17:25:18 +00:00
4964303f54
petra: be more restrictive to attack a field, refs #3406
...
This was SVN commit r17015.
2015-09-13 17:21:48 +00:00
ae6475fcc0
Fix a typo, patch by godlikeldh.
...
This typo didn't have any influence since dirty unit shapes are usually
discarded during the rasterization (they don't block long-range
pathfinding). Switching the order of a check in RasterizeHelper prevents
performance problems to a really small extent.
This was SVN commit r17014.
2015-09-13 10:18:37 +00:00
03d2c5e40b
Support inverted goals with the long-range pathfinder. This allows units to flee and should fix problems with ranged units too close to their targets. Fixes #3405 , refs #3372 .
...
Now that units flee it's necessary to fix the unit chasing: this commit
reintroduces some code from 298115f4c5#1537 .
Also includes some style improvements to the UnitMotion code.
This was SVN commit r17013.
2015-09-13 09:33:09 +00:00
bbcf996531
Move the population cap to the new simulation settings system. Patch by elexis. Refs #3355 .
...
This was SVN commit r17012.
2015-09-13 00:32:34 +00:00
8bb21e251a
Make Tuscan Acropolis skirmish map playable. Changes by stanislas69. Fixes #2970 .
...
This was SVN commit r17011.
2015-09-12 20:59:19 +00:00
73c210f6fb
Clean up line endings.
...
This was SVN commit r17010.
2015-09-12 20:58:59 +00:00
bdd6dd0f2f
JS component cleanup.
...
This was SVN commit r17009.
2015-09-12 20:58:57 +00:00
f271dd2bc1
fix display in structure tree of techs researchable only at a later phase than their availability, #fix #3411 , patch by S0600204
...
This was SVN commit r17008.
2015-09-12 20:02:14 +00:00
29f7f56f60
Add the starting resources to the new simulation settings system, refs #3355 , patch by elexis
...
This was SVN commit r17007.
2015-09-12 19:29:42 +00:00
a3767c3236
Add the ceasefire settings to the new simulation settings system.
...
Patch by elexis, refs #3355 .
This was SVN commit r17006.
2015-09-12 09:48:35 +00:00
979ea476b7
petra: do no make a trade route between too nearby markets
...
This was SVN commit r17005.
2015-09-11 18:06:26 +00:00
8507a7bc27
Create commands.txt only when actually starting the game. Patch by elexis. Fixes #3408 .
...
This was SVN commit r17004.
2015-09-11 17:44:50 +00:00
558695365d
Add some documentation about system components. Fixes #3315 .
...
This was SVN commit r17003.
2015-09-11 04:10:26 +00:00
fc051d94cc
Add check for non-passable (likely water-only) maps to territory percentage calculation.
...
Patch by s0600204. Fixes #3407 .
This was SVN commit r17002.
2015-09-11 02:16:21 +00:00
7842aa0468
petra: do not loose time attacking useless structures
...
This was SVN commit r17001.
2015-09-10 19:27:18 +00:00
dff16f664e
make fences not capturable (as walls and palisades)
...
This was SVN commit r17000.
2015-09-10 19:26:06 +00:00
9da482ead4
Based on previous experimental changes, major update to the unit motion.
...
With this change, units will not check their movement against all
obstructions when moving: terrain and static obstructions are assumed to
be handled by the long-range pathfinder.
However, when static obstructions are changed, the paths have to be
invalidated. In order to minimize the performance impact, units will
check for obstructions when they move after a passability change. If
they collide with something, they will recompute a path that will take
into account the new passability map.
Also includes some code cleanup. This patch should not change
performance a lot: the lower number of checks should give a small
performance improvement while using the message broadcasting system
should hurt it a bit.
Fixes #3376 , #3337 , #1914 .
This was SVN commit r16998.
2015-09-10 18:12:13 +00:00
8b437a0b1c
Fix #3386 , patch by elexis.
...
This was SVN commit r16997.
2015-09-10 05:30:18 +00:00
00a51404c9
cleanup of some for ... in loops on arrays (replaced by for ... of)
...
This was SVN commit r16996.
2015-09-09 18:21:17 +00:00
6213db17dd
petra: some tweaks in trade techs
...
This was SVN commit r16995.
2015-09-09 18:00:53 +00:00
ec6ae9d601
avoid that ships block allied docks, fix #3402
...
This was SVN commit r16994.
2015-09-09 17:37:44 +00:00
3f37ac44d6
Correctly fix the splashscreen typo.
...
This was SVN commit r16993.
2015-09-08 19:23:47 +00:00
bd355c531a
petra: fix and complete c1efebab15
...
This was SVN commit r16992.
2015-09-07 18:14:50 +00:00
a40fdd52d9
fix typo in 19d8c631be
...
This was SVN commit r16991.
2015-09-07 18:00:59 +00:00
5a685b84ca
Recompute the cost grid in the TerritoryManager when needed. Patch by s0600204. Fixes #3399 , #3400 .
...
This was SVN commit r16990.
2015-09-06 22:35:38 +00:00
c1efebab15
petra: do not always try to capture (depends on garrison inside target)
...
This was SVN commit r16989.
2015-09-06 18:39:46 +00:00
19d8c631be
Commit an updated version of the splashscreen for the new pathfinder.
...
This was SVN commit r16988.
2015-09-06 09:08:55 +00:00
4e3b933b11
Fixes some issues in checkrefs.pl: soundgroups have new gender and lang tags, PMP version bump, GUI XML can include directories, civ data path changed
...
This was SVN commit r16987.
2015-09-06 04:42:28 +00:00
448b8248cf
Revert my experimental changes from the previous days. Hopefully I can design something that doesn't introduce a ton of new issues. Refs #3376
...
This was SVN commit r16986.
2015-09-05 18:20:08 +00:00
1d89d05956
Don't try to short-path to non-point goals, because the algorithm won't deal with connectivity. Fixes another bug reported in #3363 .
...
This was SVN commit r16985.
2015-09-04 20:43:05 +00:00
2a7dc39d07
some cleanups of gui code
...
This was SVN commit r16984.
2015-09-04 17:50:04 +00:00
9e3ee0e849
Petra: make a bit more use of cavalry
...
This was SVN commit r16983.
2015-09-04 17:47:54 +00:00
3005637370
Make a compromise between f240374b28 and f134ac63bb by making the filtering of pathfinding-blocking shapes conditional.
...
Those shapes need to be taken into account when computing a short path,
but they need to be discarded when checking movements or they will
create long/short inconsistencies.
This was SVN commit r16981.
2015-09-03 20:09:25 +00:00
ad9736b5a5
Fix Arabic plural equation in tinygettext.
...
Patch by SafaAlfulaij taken from
https://github.com/tinygettext/tinygettext/pull/8 .
This was SVN commit r16980.
2015-09-03 16:42:05 +00:00
847fbea820
Apparently SVN messed up when I applied the patch for 0c14436c26, so fix it.
...
Also include some fixes to elexis's oversights, refs #3355 .
This was SVN commit r16979.
2015-09-03 07:32:32 +00:00
c0d8645a6d
remove some unnecessary object<->array copies + some parentheses cleanup
...
This was SVN commit r16978.
2015-09-02 18:14:26 +00:00
7d6553099f
Fix wrong offset when clicking too close to the header of sortable lists. Also added some code comments.
...
Patch by elexis, fixes #3391
This was SVN commit r16976.
2015-09-02 17:55:02 +00:00
0c14436c26
Move player and team number limits to a centralized file which will also eventually hold various kinds of settings.
...
Patch by elexis, refs #3355
This was SVN commit r16975.
2015-09-02 17:45:01 +00:00
8dde1cda94
Style cleanup, and remove a wrong TODO.
...
This was SVN commit r16974.
2015-09-02 17:40:31 +00:00
0c4c6e499d
Fix the LeaveFoundation order in UnitAI in the case of animals. The code used was a hack using the fleeing tactics, so use the regular "Order.LeaveFoundation" code shared with non-animal units.
...
Fixes #3372
This was SVN commit r16973.
2015-09-02 17:36:20 +00:00
bcc75b2156
fix buggy test
...
This was SVN commit r16972.
2015-09-02 17:11:29 +00:00
f134ac63bb
Revert most of f240374b28 which was actually bad. It caused units to get stuck because the obstructions won't block the same paths when rasterized on the grid and when directly tested for collisions.
...
As a general rule, pathfinding-blocking shapes should not be tested
against for movements. Only the passability grid should be considered.
As the algorithm which tests paths on this grid was fixed in 1c9ea56800Fixes #3376 .
This was SVN commit r16971.
2015-09-02 15:50:16 +00:00
5ff31a1e33
small cleanup of unit_actions.js
...
This was SVN commit r16970.
2015-09-01 20:49:37 +00:00
c599019b0a
fix crash when switching to gaia perspective while controlAllUnits is enabled
...
This was SVN commit r16969.
2015-09-01 20:46:49 +00:00
025391db35
fix behavior when under alert, fixes #3273
...
This was SVN commit r16968.
2015-08-31 19:54:06 +00:00
2c87ccb66e
Fix typo causing errors for building placement.
...
This was SVN commit r16967.
2015-08-30 23:07:25 +00:00
9451cf38f7
Fixes Esc key opening options dialog in match setup, introduced by a964e83c79
...
This was SVN commit r16966.
2015-08-30 21:31:03 +00:00
8a8a3b8377
Revert a wrong piece of code from 63e42fbd31. Refs #3293
...
This was SVN commit r16965.
2015-08-30 20:32:22 +00:00
1a15131d2d
Lobby bot optimizations.
...
This was SVN commit r16964.
2015-08-30 17:50:16 +00:00
63e42fbd31
Display which player(s) are OOS when it happens. Also fix some encoding issues with file paths.
...
Patch by elexis, fixes #3293 .
This was SVN commit r16963.
2015-08-30 17:47:18 +00:00
f47cb2c711
Fix the OOS reported by elexis in #3335 , and clean some whitespace and style.
...
The list of modified entities was thrown out on global visibility
updates (those happen on rejoin) but only in-world entities were
actually updated then, causing problems with garrisoning.
Now the list of modified entities can happen to be large, so replace the
hacky check for infinite loops by a real check.
This was SVN commit r16962.
2015-08-30 17:42:10 +00:00
45a39e7dfd
Fix 3171 by moving some logic to C++. These changes do not optimize the presence buffer and only fix the state bug.
...
This was SVN commit r16961.
2015-08-30 12:56:48 +00:00
2aef62d65f
Handle backrefs properly for maps and sets. Fixes #3374 .
...
Allocate the tag for the backreference before deserializing the content,
to match the order of serializing.
This was SVN commit r16959.
2015-08-30 04:51:16 +00:00
acf7b7aefb
Some gamesetup and in-game messages code convention related cleanup. Based on patch by elexis.
...
This was SVN commit r16958.
2015-08-30 03:34:07 +00:00
870237cce4
Do not create range queries in case we aren't at war with anyone. Fixes #3382 .
...
This was SVN commit r16957.
2015-08-30 02:49:49 +00:00
8befb23db3
In-game chat code cleanup. Based on patches by elexis.
...
This was SVN commit r16956.
2015-08-30 02:21:17 +00:00
57f340f906
Fix player rejoins. Refs #3242 .
...
This was SVN commit r16955.
2015-08-30 02:03:50 +00:00
c9893b3dd0
Test serialization of nested maps. Refs #3164 , #3374 .
...
This was SVN commit r16954.
2015-08-30 00:06:39 +00:00
90a99a1589
Prevent observers from using most chat commands. Refs #2879 .
...
Chat prefixed with /all could circumvent the check. Fix this by only
allowing /me.
(Note that this is not a full solution, see #3270.)
Refactors the cheat and chat input code based on changes in some of
elexis' patches.
This was SVN commit r16953.
2015-08-29 23:30:41 +00:00
a67b3b8942
UnitAI cleanup. Setup*RangeQuery. Refs #3080 .
...
Do not create range queries when being destructed.
rangeMan -> cmpRangeManager.
This was SVN commit r16952.
2015-08-29 22:49:52 +00:00
8217fa1a0e
Warn about range queries that can never return any results.
...
This was SVN commit r16951.
2015-08-29 22:49:49 +00:00
6f0850f6bc
Improve UnitAI's FindNearby* functions.
...
Stop them from starting a range query in case we have no ownership (or
-1).
Make use of Array.find() to make them a bit nicer.
This was SVN commit r16950.
2015-08-29 22:49:46 +00:00
31113cb8c3
UnitAI cleanup.
...
Use Array.{some,every,forEach,find} to simplify existing code.
Also make use of some fat arrow functions.
Some code style fixes.
Let FindNewHealTargets call RespondToHealableEntities to remove code
duplication.
This was SVN commit r16949.
2015-08-29 22:49:44 +00:00
5a7b4e380a
Rename some occurences of *Man to cmp*Manager.
...
This was SVN commit r16948.
2015-08-29 22:49:42 +00:00
2b1c128b66
Change the attack hotkey to Ctrl.
...
This is both easier to press, and also does not introduce any hotkey
conflict.
This was SVN commit r16947.
2015-08-29 22:49:38 +00:00
39343a8c84
Fix test failure.
...
This was SVN commit r16946.
2015-08-29 22:49:32 +00:00
e56dddbefb
Optionally allow observers to rejoin a game when they weren't here during the game setup.
...
Patch by elexis, fixes #3242 .
This was SVN commit r16945.
2015-08-28 20:20:10 +00:00
8e70140ec2
Handle properly static shapes that overlap the edge of the map (likely to happen with square maps).
...
This should fix #3364 .
This was SVN commit r16944.
2015-08-28 11:38:14 +00:00
d31ebaa47a
add a new Repairable component defining a ratio of repairTime/buildTime for repairable entities. Fixes #633
...
This was SVN commit r16943.
2015-08-27 20:31:10 +00:00
34555ad70c
Enhance i18n extractor to support a single context for a json file. Patch by elexis. Refs #3355 .
...
This was SVN commit r16942.
2015-08-27 19:07:36 +00:00
d129ae3cd8
Fix a special situation where map control percentage wasn't computed properly.
...
Also improve the code and fix a typo.
Based on patch by s0600204, fixes #3378 .
This was SVN commit r16941.
2015-08-27 16:26:32 +00:00
e3208c8784
fix rallyPoint on foundation, (it worked only by chance because all structures are repairable)
...
This was SVN commit r16940.
2015-08-25 15:39:11 +00:00
b9ab8f5855
Explicitly include public's mod.json in Windows packages.
...
Also clean up some unused options in the dist script.
This was SVN commit r16939.
2015-08-25 12:55:05 +00:00
217a478ac7
Improved materials for wooden towers (spec maps, AO maps, parallax). Patch and AO map by stanislas69, fixes #3352 .
...
This was SVN commit r16938.
2015-08-24 07:09:05 +00:00
8923768bff
Fix spelling of "Feminization" in the summary screen and in associated code.
...
This was SVN commit r16935.
2015-08-23 18:00:17 +00:00
47bca54228
Fixes the computation of team values for some of the summary counters, and reorder columns. Refs #3311
...
This was SVN commit r16934.
2015-08-23 17:57:51 +00:00
a63b7a0126
Add ability to query the map control percentage, and use this value in the summary screen. Patch by s0600204, fixes #3321
...
This was SVN commit r16933.
2015-08-23 17:44:37 +00:00
b694ab41d9
Show the number of trade carts and looted resources in the summary screen. Patch by bb, fixes #3311
...
This was SVN commit r16932.
2015-08-22 17:57:41 +00:00
74c420f658
GUI code cleanup. Fixes #3354 .
...
Lots of code style fixes:
* type [*&]varname -> type[*&] varname
* else
if (...)
->
else if (...)
* Spaces around some ops.
* i++ -> ++i.
* switch-case style fixes.
* Indentation fixes.
* Removing some commented out code.
* include header sorting
* Changed multiple pointer var declarations to be one per line.
* Removed strange spaces in some places.
* Changed some include header guards to be consistent with the rest of
the codebase.
* Use UNUSED() instead of UNUSED2().
Some small code fixes:
* Using .find() instead of .count() == 0.
* !.empty() instead of .size() == 0.
* Range-based for loops.
* Making some member functions const by small changes.
* Adds GetScrollBarPos(idx) const for this.
* Using early returns/continues in some places.
* Uses size_t for some loops in CList and COList.
* Removes unused heading element (not attribute) from COList.
* Use ENSURE in one case where some custom code did something similar.
* Made some parameters const ptrs/refs.
* Change removal loop in GUItext.cpp to erase-unique.
* Made some static things const.
* Allow iterating over children of IGUIObject with range-based for
loops by
exposing begin() and end() (rename from ChildrenIt{Begin,End}()) and
use it.
Comments:
* Comment COList.
* Update a few comments.
* Remove useless or duplicated comments.
This was SVN commit r16931.
2015-08-21 17:08:41 +00:00
d821601978
Revert changes when clicking "Cancel" in the options page.
...
Patch by Stefan, fixes #3324
This was SVN commit r16930.
2015-08-21 07:54:21 +00:00
c7edc09f51
Revert 7cc2d65ec7.
...
The problem caused by nested Maps is actually #3374 .
Cloning the data object saved by the !AuraManager fixes #3188 .
Also, using Map fixes a serialization problem, refs #3375 .
On top of those changes, some reordering of add/multiply to avoid any
ordering mistake.
Fixes #3164 , Refs #3374
This was SVN commit r16929.
2015-08-21 07:29:08 +00:00
a63e9c521d
Optionally limit the framerate in menus to 50 FPS, to save power. Patch by elexis, fixes #2882
...
This was SVN commit r16927.
2015-08-20 13:22:44 +00:00
ba82743777
Some range-based for loops.
...
This was SVN commit r16926.
2015-08-20 12:58:41 +00:00
b2e8a241d2
Properly check loaded scripts in the second simulation instance of a serialization test. Fixes #3238
...
This was SVN commit r16925.
2015-08-20 12:52:29 +00:00
1ab3a4a02d
Fix 6506bc20cb, refs #3238
...
This was SVN commit r16924.
2015-08-20 12:49:43 +00:00
558d43bac5
Replace some functor structs with lambdas, closures or range-based fors.
...
This was SVN commit r16923.
2015-08-19 03:33:04 +00:00
36c6b50944
Revert emplace for associative containers. Fixes #3366 .
...
GCC < 4.8.0 does not support emplace for those.
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=44436 .
This was SVN commit r16922.
2015-08-19 03:32:47 +00:00
674f49f1a8
Remove generated test files during clean-workspaces.sh. Patch by otero. Fixes #3275 .
...
Also remove two generated and disabled test files.
This was SVN commit r16921.
2015-08-19 01:30:09 +00:00
bd8f9b7824
Fix enemy corpses visible in the fog of war. Fixes #3179 .
...
This was SVN commit r16919.
2015-08-16 09:29:34 +00:00
1c9ea56800
Fix the CheckLineMovement algorithm. Added some comments and a test to avoid problems.
...
This addresses some "stuck units" cases.
This was SVN commit r16918.
2015-08-13 16:21:39 +00:00
01de76f4be
Code improvements for the hierarchical pathfinder: cache hits and variable initialization.
...
This was SVN commit r16917.
2015-08-11 15:21:11 +00:00
28ef270571
Enhance the MakeGoalReachable algorithm to handle better non-point goals.
...
Fixes #3363 , #3297 .
This was SVN commit r16915.
2015-08-11 09:47:08 +00:00
f7a7b687fc
Don't send TerrainChanged messages when painting the terrain, as terrain texture doesn't influence passability.
...
This was SVN commit r16914.
2015-08-10 11:55:43 +00:00
e263c8f1de
Remove EnableSSE2 for Windows builds. Fixes #3361 .
...
Since we do not require SSE2 on *nix requiring it on Windows makes no
sense,
it also breaks the game for some users.
This was SVN commit r16912.
2015-08-03 19:57:42 +00:00
c333ae3fc2
Escape [ char in a gui caption.
...
This was SVN commit r16911.
2015-08-02 23:10:08 +00:00
3c8fe51712
complete b3f7b8633a for (un)packing
...
This was SVN commit r16910.
2015-08-02 17:24:04 +00:00
ec96c737ee
Actually use vpObj instead of obj, and use it in all cases. Refs #3354 .
...
This was SVN commit r16909.
2015-08-02 14:40:51 +00:00
b3f7b8633a
fix incoherent UnitAI state when changing ownership of a cheering or garrisoned unit
...
This was SVN commit r16908.
2015-08-02 09:39:08 +00:00
591771a0be
make siege tower able to capture, fixes #3356
...
This was SVN commit r16907.
2015-08-02 09:32:47 +00:00
94302a4149
Move engine version to common file. Patch by elexis. Fixes #3359 .
...
This was SVN commit r16906.
2015-08-01 23:03:13 +00:00
701f1dbb51
Fix sudden main-menu background jumps. Patch by s0600204. Fixes #3312 .
...
This was SVN commit r16905.
2015-08-01 23:02:57 +00:00
2a6eac3bd4
Petra: fix order of event processing in defenseManager
...
This was SVN commit r16904.
2015-07-31 16:55:38 +00:00
217a500d60
Add missing license headers. Fixes #3357 .
...
This was SVN commit r16903.
2015-07-31 11:28:14 +00:00
1a8096a920
Reliably send the ReplayFinished message at the very end of visual replays. Patch by elexis.
...
This was SVN commit r16902.
2015-07-30 21:55:34 +00:00
a4e606c575
TerrainTextureManager cleanup.
...
This was SVN commit r16901.
2015-07-30 21:51:01 +00:00
c5aad60776
Actually stop iterating if retval != INFO::OK. Also fix comments.
...
This was SVN commit r16900.
2015-07-30 21:50:58 +00:00
15a4c813d6
Add support for AArch64 (ARM64). Patch by tbm. Fixes #3345 .
...
This was SVN commit r16899.
2015-07-30 19:52:55 +00:00
0868d03e74
Fix previous commit.
...
This was SVN commit r16898.
2015-07-30 17:27:27 +00:00
2238a18aee
Close and free replay streams. Based on patch by elexis.
...
This was SVN commit r16897.
2015-07-30 16:43:22 +00:00
4f91b16d0f
Allow pausing during visual replays. Patch by elexis. Refs #3341 .
...
This was SVN commit r16896.
2015-07-30 15:55:19 +00:00
47336b770f
Add clipping to OList cells. Patch by elexis. Fixes #3353 .
...
This was SVN commit r16895.
2015-07-30 01:33:48 +00:00
8bfe16cac8
Use in-place construction.
...
This was SVN commit r16894.
2015-07-29 23:44:17 +00:00
c5eb9b7bb7
Range-based for for VfsPath loops.
...
This was SVN commit r16893.
2015-07-29 23:44:12 +00:00
540cf75794
L10n code cleanup.
...
This was SVN commit r16892.
2015-07-29 23:44:05 +00:00
356b08ec5d
update heroes and their auras for capture, fixes #3331
...
This was SVN commit r16891.
2015-07-29 17:54:08 +00:00
f2f3076bd7
minor cleanup
...
This was SVN commit r16890.
2015-07-29 17:50:04 +00:00
7b81f9a866
add garrison flag for wooden tower, patch from stanislas69, fixes #3059
...
This was SVN commit r16889.
2015-07-29 17:15:40 +00:00
a07add11c6
Some range-based for loops and some style cleanup.
...
This was SVN commit r16888.
2015-07-29 01:07:23 +00:00
b4d517c261
Fix infinite loop in key code to key name mapping.
...
Also make some data const and construct data in-place.
This was SVN commit r16887.
2015-07-29 01:07:18 +00:00
2cae918059
Same as previous commit, but nicer. Refs #3329
...
This was SVN commit r16886.
2015-07-27 20:39:46 +00:00
c81f243b58
Use the mirage data to determine the best attack in case of capture attack. Fixes #3329
...
This was SVN commit r16885.
2015-07-27 19:54:40 +00:00
851e863892
Remove animation name compatibility mapping.
...
10 years should have given everyone enough time to move to the new
naming scheme.
This was SVN commit r16884.
2015-07-27 01:08:29 +00:00
be36bec6df
Replace a translation string by an equivalent that is already used thrice.
...
This was SVN commit r16883.
2015-07-27 01:08:27 +00:00
da48c8c26f
Some const refs and one const function.
...
This was SVN commit r16882.
2015-07-27 01:08:25 +00:00
bd53e9d736
Remove unused ah_translate code.
...
This was SVN commit r16881.
2015-07-27 01:08:15 +00:00
2a655d1363
cleanup of 4054e5cb04
...
This was SVN commit r16880.
2015-07-26 14:54:52 +00:00
27de859f9b
Petra: minor tweaks in farming
...
This was SVN commit r16879.
2015-07-26 14:49:01 +00:00
4054e5cb04
make a wooden tower template for each civ, refs #3059
...
This was SVN commit r16878.
2015-07-26 14:43:21 +00:00
edd03ad557
disable the delete button when less than 50% cp, fixes #3300 , patch by bb
...
This was SVN commit r16877.
2015-07-22 17:06:06 +00:00
eb47670cd1
Some string fixes reported by translators.
...
This was SVN commit r16874.
2015-07-21 21:19:41 +00:00
a61c7560eb
petra: minor attack tweaks
...
This was SVN commit r16873.
2015-07-21 19:30:54 +00:00
b0a5087dda
Prevent observers from pausing the game. Patch by Stefan. Fixes #3341 .
...
This was SVN commit r16871.
2015-07-19 23:03:03 +00:00
f240374b28
Fix a number of short/long range pathfinder inconsistencies revealed by 128a603287.
...
This was SVN commit r16869.
2015-07-18 12:33:40 +00:00
1e79b3a8af
Update templates to reflect the recent obstruction changes for units.
...
Fixes #3294 .
This was SVN commit r16868.
2015-07-18 12:30:26 +00:00
128a603287
Use the terrain-only grid for terrain edges in the short pathfinder algorithm. This grid is updated on each terrain change, whereas the passability grid is updated once a turn. This caused OOS on rejoin, fixes #3292 .
...
However, using the terrain-only grid reveals one discrepancy between the
short pathfinder (which uses unit radii) and the long one (which uses
unit clearances). So I implemented the change proposed by sanderd17 in
#3294 , which is removing unit radius and using only the pathfinder
clearance. Refs #3294
Now some tweaking has to be done in the templates, so that units get a
passability class suited to their apparent size. In the meantime the
unit motion is quite bugged.
This was SVN commit r16867.
2015-07-18 08:37:49 +00:00
35071dd44b
allow changing the trading gain with tech + rework of market techs, fixes #3326
...
This was SVN commit r16866.
2015-07-17 19:27:15 +00:00
a0d21e8d9e
do not fill changedTemplateInfo when no AIs to prevent OOS, refs #3133
...
This was SVN commit r16865.
2015-07-17 17:45:15 +00:00
b471975332
improve consistency between decay and regen rates for buildings, fixes #3332
...
This was SVN commit r16864.
2015-07-16 18:29:53 +00:00
76d5374e77
Some string changes based on translators' feedback.
...
This was SVN commit r16863.
2015-07-16 17:07:55 +00:00
f9440a964a
minor petra tweaks
...
This was SVN commit r16860.
2015-07-15 17:29:06 +00:00
8fc4ecaa6b
Fix previous commit, stupid typo...
...
This was SVN commit r16859.
2015-07-15 16:57:23 +00:00
b58f8ab969
Serialize the activation flag of the scripted Visibility component.
...
Currently only preview entities are affected, and they are not
serialized, but it could break a lot of things in the future.
This was SVN commit r16858.
2015-07-15 16:55:05 +00:00
39d93ea17c
Change the handling of modified entities in the visibility update.
...
The game has to deal with situations such as: the visibility of an
entity changes, a mirage is created for it -> the mirage visibility is
updated -> the entity visibility is updated back.
All of this process now happens in the same turn, and all updates are
guaranteed to be performed. This fixes a source of serialization errors
and rejoin OOSes.
Fixes #3107
This was SVN commit r16857.
2015-07-15 16:46:59 +00:00
9f1b85d562
Remove a useless global terrain update when modifying environment settings in Atlas.
...
Also make sure that the settings are updated in the game view in a
non-hacky way.
This was SVN commit r16855.
2015-07-14 17:08:02 +00:00
b0386d7fab
Fix gamesetup for observer games. Thanks to elexis
...
This was SVN commit r16854.
2015-07-14 11:26:14 +00:00
d08279ceb6
some fixes for petra
...
This was SVN commit r16853.
2015-07-13 13:05:14 +00:00
74b600d661
modify also capture points in the civ specific techs affecting structure health, fixes #3333
...
This was SVN commit r16852.
2015-07-13 12:46:26 +00:00
c946ebbf7c
prevent structures without territory influence to decay in allied territory
...
This was SVN commit r16851.
2015-07-12 18:46:44 +00:00
04982b0bf5
Fix compiler warning
...
This was SVN commit r16849.
2015-07-12 16:49:26 +00:00
f74215e96c
rounding needed for houses with popBonus%5 != 0, fixes #3328
...
This was SVN commit r16848.
2015-07-12 15:23:34 +00:00
0f10e21ab1
Keep ownership when changing formation. Fixes #3154 , fix proposed by sanderd17.
...
This was SVN commit r16847.
2015-07-12 08:48:31 +00:00
edf6e909b2
...aaaaand I forgot this guy.
...
This was SVN commit r16846.
2015-07-12 08:11:30 +00:00
0d32afd688
Improve the style of GUI string text call functions.
...
This was SVN commit r16845.
2015-07-12 08:09:55 +00:00
0682190def
Don't postpone rendering of icons when they are at the end of a GUI string.
...
Fixes #2502
This was SVN commit r16844.
2015-07-12 07:38:04 +00:00
9161cd7e24
petra: rework of the management of captured/decaying structures
...
This was SVN commit r16843.
2015-07-11 17:00:21 +00:00
0c45e3b5d0
Correctly compute the masks for shared visibility updates. The old code was working only because of luck when shared vision was always reciprocal.
...
Refs #2055 , fixes #3327
This was SVN commit r16842.
2015-07-11 16:45:09 +00:00
c4389abceb
let petra use wooden towers in village phase
...
This was SVN commit r16841.
2015-07-09 20:46:09 +00:00
1b88eaf1cd
Do not reset victory conditions when changing map selection. The behavior is now coherent with everything else (players, etc.) when selecting random maps.
...
Patch by elexis, fixes #3209
This was SVN commit r16840.
2015-07-09 16:52:12 +00:00
b3fa75529b
All work and no play... refs #3253
...
This was SVN commit r16839.
2015-07-08 19:17:32 +00:00
cf21c34e3f
Give players and bots their actual name during the game, for better experience.
...
Patch by elexis, fixes #3253
This was SVN commit r16838.
2015-07-08 19:03:14 +00:00
542061dbed
Handle gaps in the teams list in the summary screen, plus code cleanup.
...
Patch by elexis, fixes #3323
This was SVN commit r16837.
2015-07-08 17:01:34 +00:00
4a0bb47a62
AI: various cleanings and fixes
...
This was SVN commit r16836.
2015-07-07 17:32:35 +00:00
aa78c1be66
Make the connectivity grid generation algorithm of the hierarchical pathfinder a bit less stupid.
...
This was SVN commit r16834.
2015-07-05 20:32:52 +00:00
11c9471ad6
Change back the long pathfinder to take into account non-pathfinding classes, but only when reloading, to avoid impacting the performance.
...
Also make the GetPassabilityClasses functions use references instead of
wild allocations. Use a reference when passing pass classes to the AI
worker.
This was SVN commit r16833.
2015-07-05 19:14:52 +00:00
0e4e3754e9
Update the passability grid properly when changing the map shape or the water height. Also include a fix for a possible bad memory access.
...
This was SVN commit r16832.
2015-07-04 21:25:57 +00:00
7ca2084e89
Fix #3072
...
This was SVN commit r16831.
2015-07-04 18:00:51 +00:00
b7a1b9fbd4
fixes some wonder templates
...
This was SVN commit r16830.
2015-07-04 16:46:20 +00:00
32252ea00c
fix persian conscription_cavalry which needs persian levy_cavalry
...
This was SVN commit r16829.
2015-07-03 17:01:19 +00:00
512f69379b
Fix the male variation of non-Roman healers. Fixes #3318
...
This was SVN commit r16828.
2015-07-02 16:59:16 +00:00
3018359576
Improve a little bit Atlas performance when modifying terrain elevation.
...
This was SVN commit r16827.
2015-07-01 19:13:56 +00:00
e500de4dc6
AI: clean up
...
This was SVN commit r16826.
2015-06-30 19:10:57 +00:00
30e5f032d8
Adapt Atlas to the new pathfinder. Fixes #3298
...
This was SVN commit r16824.
2015-06-29 19:59:41 +00:00
6a9019564e
AI: clean up some obsolete code
...
This was SVN commit r16823.
2015-06-28 19:08:00 +00:00
7b298cccdb
Increase bench size to meet minimum obstruction size. Fixes #3316 .
...
This was SVN commit r16822.
2015-06-28 19:05:22 +00:00
dc29884f6e
Fix a shader glitch I left in when removing conditional defines. Fixes #3119 .
...
We ought to add more anisotropic filtering on normal textures with
parallax too or it breaks the effect too quickly.
This was SVN commit r16821.
2015-06-28 13:16:05 +00:00
e0838c5326
Update the pathfinder docs.
...
This was SVN commit r16820.
2015-06-27 15:16:21 +00:00
3efa4be02c
AI completes the removal of the JS pathfinder and fixes naval transport
...
This was SVN commit r16819.
2015-06-27 13:30:44 +00:00
575d708fca
Correct the outpost tooltip for capturing.
...
Adapt the Theatron tooltip to the new specific name of the technology.
Add a final stop.
This was SVN commit r16818.
2015-06-25 20:14:45 +00:00
0b8597fd2d
Petra: improve performance of initialization in naval maps
...
This was SVN commit r16817.
2015-06-25 18:19:12 +00:00
e1a34eb4ea
Handle (de)serialization of the AI pathfinder.
...
This was SVN commit r16815.
2015-06-24 20:24:58 +00:00
0b7343dccc
Preserve the dirtiness informations of the passability grid at deserialization for proper AI updates.
...
Refs #3310
This was SVN commit r16814.
2015-06-24 20:15:06 +00:00
ae0c051e83
Petra: remove some huge spikes when profiling
...
This was SVN commit r16813.
2015-06-24 18:42:09 +00:00
152d39d8a6
Fix save/load games, and use the new code to enhance the tests.
...
This was SVN commit r16812.
2015-06-23 20:39:11 +00:00
4f331c1359
cleanup of previous commits
...
This was SVN commit r16810.
2015-06-22 20:04:11 +00:00
7ac4b53cb8
AI: start switch from the internal JS pathFinder to the c++ one, thanks to Itms implementation. Still wip
...
This was SVN commit r16809.
2015-06-22 17:19:24 +00:00
d045bb87d6
fix the market placement following new pathFinder changes
...
This was SVN commit r16808.
2015-06-22 16:49:49 +00:00
fae2caed1a
adapt AIs to changes in e6d1afe48b
...
This was SVN commit r16807.
2015-06-22 16:47:42 +00:00
e6d1afe48b
Add a terrain passability class for water. Fixes #3308
...
This was SVN commit r16806.
2015-06-22 15:30:23 +00:00
1793a96c14
Actually remove the unused expression.
...
This was SVN commit r16805.
2015-06-21 20:44:31 +00:00
495aa7bec5
Expose TemplateExists() to RM scripts.
...
This was SVN commit r16804.
2015-06-21 20:22:34 +00:00
c5814ef76c
Fixes tests adding system components without using the SYSTEM_ENTITY id - this caused assertion failures in debug builds
...
This was SVN commit r16803.
2015-06-21 19:22:12 +00:00
ae4dfe294d
Actually state the file instead of the directory in some error messages.
...
This was SVN commit r16802.
2015-06-21 18:46:33 +00:00
5a0b9b0e70
Fix some issues found by static analysis (clang-analyzer and cppcheck).
...
This was SVN commit r16801.
2015-06-21 18:46:31 +00:00
caa8f51c2e
Annotate custom assert for clang-analyzer.
...
This was SVN commit r16800.
2015-06-21 18:46:23 +00:00
30d96af5a2
a bit of cleanup in petra naval code
...
This was SVN commit r16799.
2015-06-20 20:49:31 +00:00
92832b1dc7
Petra fixes for naval maps
...
This was SVN commit r16797.
2015-06-19 21:09:41 +00:00
bbafed7fbf
Lobby code cleanup.
...
This was SVN commit r16796.
2015-06-19 17:25:28 +00:00
cc4af6d2d4
Allies only share vision when researching a tech. Based on patch by niektb. Fixes #2055
...
This was SVN commit r16795.
2015-06-19 09:24:55 +00:00
1830c6346b
Revert most of 989f164500, and add a comment to prevent people from making the same mistake.
...
This code used to make units with the pass class "ship-small" blocked
nearly everywhere.
This was SVN commit r16794.
2015-06-18 19:54:30 +00:00
eeee79e7f3
AI fix for building placement + some cleanings
...
This was SVN commit r16793.
2015-06-18 19:19:24 +00:00
c6ca83949c
Prevent players from rejoining that were not present on game start. Patch by elexis. Fixes #3305 .
...
This was SVN commit r16792.
2015-06-18 18:20:54 +00:00
9701a85554
Fix a possible problem with grid updates. Refs #3296 .
...
This was SVN commit r16791.
2015-06-18 16:31:38 +00:00
e7707f0f0c
Fix issue with OOS in replays. Patch by elexis
...
This was SVN commit r16790.
2015-06-18 15:29:03 +00:00
008fb80855
AI: remove code from old pathFinder
...
This was SVN commit r16789.
2015-06-17 21:03:49 +00:00
989f164500
Make the terrain analysis slightly more efficient for pathfinding passability classes, and fix a mistake introduced in 1709353e2c.
...
This was SVN commit r16787.
2015-06-17 20:48:41 +00:00
155c6e6ccd
Properly initialize the AI pathfinder, and clean whitespace.
...
This was SVN commit r16786.
2015-06-17 20:35:23 +00:00
1c29b21b69
adapt the AI to 1709353e2c, fixes #3295
...
This was SVN commit r16785.
2015-06-17 20:30:57 +00:00
1709353e2c
Changes the general behavior of non-pathfinding passability classes, in order to make the handling of foundation obstructions less difficult. This will allow the AI to be fixed, as reported in #3295 .
...
Also some cleanup and comments updates.
Refs #3295 .
This was SVN commit r16784.
2015-06-17 20:19:53 +00:00
4b8f0c9fb9
Change ResourceTrickle schema to match all other resource schemas. Patch by s0600204. Fixes #3303 .
...
This was SVN commit r16783.
2015-06-17 15:26:06 +00:00
b8fce56821
Implement sortable columns for the gui, and use them in the lobby. Patch by Vladislav. Fixes #2405 .
...
This was SVN commit r16781.
2015-06-17 09:10:50 +00:00
2ff4c60859
Adjusts some capturing parameters.
...
This was SVN commit r16779.
2015-06-16 19:41:08 +00:00
a568b42bf9
Code cleanup.
...
This was SVN commit r16778.
2015-06-16 14:35:16 +00:00
c8a5708654
Fix tests.
...
This was SVN commit r16777.
2015-06-15 19:48:42 +00:00
fcf7344537
Nerfs fire rate of garrisoned ships.
...
This was SVN commit r16776.
2015-06-15 16:39:42 +00:00
fdb99a5c8c
Buffs melee cavalry HP.
...
This was SVN commit r16775.
2015-06-15 16:36:26 +00:00
dc97eeb5e5
Re-enables promotions.
...
This was SVN commit r16774.
2015-06-15 16:31:26 +00:00
8380b67f94
Move GUI schemas to the mod mod. Fix some validation related errors in the mod mod.
...
Check if the used directory exists before trying to add a validator.
Refs #245 .
This was SVN commit r16773.
2015-06-15 16:00:26 +00:00
7887734ef0
Add attack notifications for capture attacks. Patch by Vladislav. Fixes #3257 .
...
This was SVN commit r16772.
2015-06-15 01:16:51 +00:00
68ea5f37f4
Remove unused ctors. Fixes compilation with GCC 4.6.
...
This was SVN commit r16771.
2015-06-14 23:50:38 +00:00
4af117434d
Fixes clang unused parameter warning
...
This was SVN commit r16770.
2015-06-14 23:45:15 +00:00
25a7d79d1e
FIXE ERROR: CCmpPosition::GetPosition called on entity when IsInWorld is false, when you save a map with garrisoned units, thx to daniel for report
...
This was SVN commit r16769.
2015-06-14 22:17:39 +00:00
0a67de37bc
Fixes clang warning about unknown warning group -Wunused-but-set-variable
...
This was SVN commit r16768.
2015-06-14 21:07:42 +00:00
47b4530245
Replaces usage of readlink -f in update-workspaces.sh with a perl one-liner, for compatibility with BSD and OS X, fixes #916
...
This was SVN commit r16767.
2015-06-14 20:43:12 +00:00
2128cfbcb8
Updates readme.txt with new visual replay option, refs #9
...
This was SVN commit r16765.
2015-06-14 19:59:19 +00:00
473b282265
Refactor the grid update code. Should give a significant performance boost to the simulation update.
...
Also fixes some bad code that could lead to hidden bugs.
Fixes #3296 , thanks elexis for testing ;)
This was SVN commit r16764.
2015-06-14 19:22:07 +00:00
0e7f0f861b
Fixes A19 map converter script to be compatible with Python 2 (uses struct instead of to_bytes and from_bytes)
...
This was SVN commit r16763.
2015-06-14 17:53:12 +00:00
d676b047a0
Move ~LongPathfinder after the declaration of LongOverlay.
...
Also improve the style.
This was SVN commit r16762.
2015-06-13 21:02:01 +00:00
c3546cbf51
Fixes Polybolos template inconsistencies.
...
Fixes Palisade Angle Spike obstruction size failing new minimum
requirement.
This was SVN commit r16761.
2015-06-13 19:01:59 +00:00
6b9b863747
Increases fortress build time and cost and nerfs attack and armour of crush-dealing Mauryan champion swordsmen.
...
This was SVN commit r16760.
2015-06-13 16:50:01 +00:00
d52a71ae31
Nerfs ranged units, though to a lesser extent for skirmishers/javelinists.
...
This was SVN commit r16759.
2015-06-13 16:48:37 +00:00
a9ac2edce5
Decrases phasing time and costs.
...
This was SVN commit r16758.
2015-06-13 16:46:29 +00:00
e5419cf19b
Decreases HP of peacocks and both HP and crush armour of female citizens.
...
This was SVN commit r16757.
2015-06-13 16:44:47 +00:00
2a657a7eb7
Fix changing ownership to -1
...
This was SVN commit r16756.
2015-06-13 13:02:10 +00:00
204dcf201c
Improve ownership changes by only giving the cp of the old owner to the new owner.
...
This was SVN commit r16755.
2015-06-13 09:53:15 +00:00
30efa73a38
FIX error: comparison between pointer and integer ('IReplayLogger *' and 'int') introduced in [16727] over osx
...
This was SVN commit r16754.
2015-06-13 02:42:21 +00:00
534b8076e4
Petra: check if the location of a new foundation is under enemy fire (only implemented for some structures for the time being)
...
This was SVN commit r16753.
2015-06-12 20:30:25 +00:00
6581796103
New long-range pathfinder.
...
Based on Philip's work located at
http://git.wildfiregames.com/gitweb/?p=0ad.git;a=shortlog;h=refs/heads/projects/philip/pathfinder
Includes code by wraitii, sanderd17 and kanetaka.
An updated version of docs/pathfinder.pdf describing the changes in
detail will be committed ASAP.
Running update-workspaces is needed after this change.
Fixes #1756 .
Fixes #930 , #1259 , #2908 , #2960 , #3097
Refs #1200 , #1914 , #1942 , #2568 , #2132 , #2563
This was SVN commit r16751.
2015-06-12 18:58:24 +00:00
aa1512a662
code cleaning in petra
...
This was SVN commit r16750.
2015-06-11 20:11:08 +00:00
1442b7e913
Petra: fix some capture cases not handled by 61f3d80ab0
...
This was SVN commit r16749.
2015-06-11 19:20:52 +00:00
fd3d697edf
Make it easier to add different backgrounds
...
This was SVN commit r16747.
2015-06-11 09:08:46 +00:00
61f3d80ab0
Petra: the AI now destroy captured buildings it can't keep
...
This was SVN commit r16746.
2015-06-10 18:16:03 +00:00
12d4209eed
fix typo
...
This was SVN commit r16745.
2015-06-10 16:41:34 +00:00
1395b441e0
Clean up advanced and elite templates by defining the modifications as technologies. This will not alter gameplay for now, as the advanced and elite units are disabled in game. Fixes #2620
...
This was SVN commit r16744.
2015-06-10 14:41:00 +00:00
1811323f95
Petra: small fixes in trade and attack
...
This was SVN commit r16743.
2015-06-09 19:06:59 +00:00
752aac16ee
Fix Seleucid actor file to be valid under the actor RNG
...
This was SVN commit r16742.
2015-06-09 15:24:46 +00:00
950d361c15
Fix the material Relax NG files.
...
This was SVN commit r16741.
2015-06-09 15:15:19 +00:00
fe0bb4ab4e
Fix Iberian tower and barracks to be valid under the actor RNG
...
This was SVN commit r16740.
2015-06-09 13:33:40 +00:00
fe71300e07
Move some fish to the sea. Fixes #3289
...
This was SVN commit r16739.
2015-06-09 13:18:24 +00:00
40f2762170
Fix healer support template
...
This was SVN commit r16738.
2015-06-08 14:50:16 +00:00
558461a792
Fix female support template
...
This was SVN commit r16737.
2015-06-08 14:44:20 +00:00
a964e83c79
Fixes button order consistency in a few places: resign confirmation, manual, splashscreen, fixes #2837 . NOTE: the convention is Cancel/Back button on the left, other action buttons are to the right. Please report any you find that don't match that!
...
Adds hotkey.cancel mapped to the Escape key, which is now used for
closing/canceling in-game dialogs, fixes #2636 , #3200 . Please report any
dialogs where Esc doesn't work!
This was SVN commit r16736.
2015-06-08 03:07:45 +00:00
7cac7cd65e
Add RNC to RNG conversion script that uses trang. Fixes #245 .
...
Also fix the material.rnc.
This was SVN commit r16734.
2015-06-07 23:52:52 +00:00
a18fbd12ec
XML validation. Based on patch by historic_bruno. Refs #245 .
...
This was SVN commit r16733.
2015-06-07 21:56:52 +00:00
f260e75499
improve display of timing options, patch by Vladislav, fixes #2894
...
This was SVN commit r16732.
2015-06-07 20:58:51 +00:00
6a1ee7137c
fix starting techs
...
This was SVN commit r16731.
2015-06-07 12:13:40 +00:00
2457b69fb3
Fix const attribute for some function parameters.
...
This was SVN commit r16730.
2015-06-07 09:24:19 +00:00
ce19d55176
AIs: remove the hardcoded athen phases
...
This was SVN commit r16729.
2015-06-06 15:41:04 +00:00
be93b31411
Visual replay of command files, patch by elexis.
...
Works with the command line argument
"-replay-visual=/path/to/commands.txt". It is not integrated to the main
menu GUI yet.
Refs #9 .
This was SVN commit r16727.
2015-06-06 08:45:49 +00:00
e9c27d4066
Fix wrong technology application as discovered by wowgetoffyourcellphone and niektb
...
This was SVN commit r16726.
2015-06-05 10:39:10 +00:00
a839adc615
Fix Carthagian healer voices. Patch by karamel. Fixes #3220
...
This was SVN commit r16725.
2015-06-05 09:12:26 +00:00
4a7994a595
improve indentation in previous tag
...
This was SVN commit r16724.
2015-06-04 21:26:01 +00:00
f1f8479ffe
fix entityLimits with replaced tech
...
This was SVN commit r16723.
2015-06-04 21:24:34 +00:00
06e71f56ca
Petra: units now have less dead time before getting their orders
...
This was SVN commit r16722.
2015-06-04 19:35:56 +00:00
3c139b1022
make the unitai idle propriety consistent with its state at unit creation
...
This was SVN commit r16721.
2015-06-04 19:00:42 +00:00
abab4a71af
Add loading-screen tip about territory decay, and update other tips to the current state of the game.
...
This was SVN commit r16720.
2015-06-04 17:24:31 +00:00
fcc992feae
Fix math
...
This was SVN commit r16719.
2015-06-04 16:06:37 +00:00
cdbc775531
Fix code style
...
This was SVN commit r16718.
2015-06-04 15:36:34 +00:00
79d2af3e26
Split up different status bars for even easier moddability + add a capture bar (thanks again to Vladislav for making this possible). Refs #3233
...
This was SVN commit r16716.
2015-06-04 13:55:45 +00:00
14bfbbf9d4
Allow sprites to have color multiplication, which allows player-colored bars. Patch by Vladislav. Fixes #3233
...
This was SVN commit r16715.
2015-06-04 12:16:52 +00:00
f6f4f83784
Fixes instant multiplayer crash on OS X Lion (10.7). libc++ had a bug where it set eofbit on reading the last character in a stringstream, we compare gcount with the expected length as a workaround to detect real eofs. Fixes #3109 .
...
This was SVN commit r16714.
2015-06-04 05:11:47 +00:00
6506bc20cb
Fixes #3238 , SetGlobal 'TriggerHelper' called multiple times
...
This was SVN commit r16713.
2015-06-03 20:34:59 +00:00
65e442eea5
this varying ceaseFireTimeRemaining was disturbing when ceasefire was inactive and display selection state activated
...
This was SVN commit r16712.
2015-06-03 17:16:11 +00:00
aa41651fda
remove a useless splice
...
This was SVN commit r16711.
2015-06-02 20:58:18 +00:00
a286091470
mostly some cleanings of AI code + a petra fix when a player is defeated
...
This was SVN commit r16710.
2015-06-02 20:52:12 +00:00
ffdacbb612
Fix issues with technologies and pop bonus/cost. Patch by Vladislav. Fixes #3236
...
This was SVN commit r16709.
2015-06-02 14:33:21 +00:00
2092ed4396
Removes use of 'register' storage class, deprecated in C++11. Fixes -Wdeprecated-register build warnings in clang, fixes #3068 .
...
This was SVN commit r16708.
2015-06-02 03:20:04 +00:00
040bdd14db
fix some selectionGroups
...
This was SVN commit r16707.
2015-06-01 21:04:31 +00:00
c3b8923ff7
Update tinygettext.
...
Updates tinygettext to upstream commit
0e34a55e514763a48f8abe7812405ffe722a31f4.
No actual code changes from the previously bundled version, but it was
relicensed to zlib.
Keeps the addition of precompiled.h and win32 dirent.
This was SVN commit r16705.
2015-06-01 01:09:19 +00:00
f71be3c764
Use iterators for XMBAttributeList and XMBElementList. Fixes #3269 .
...
This was SVN commit r16704.
2015-06-01 00:29:35 +00:00
d3da00dc99
Fix some issues found by static analysis.
...
Actually abort in case of recursive includes again. Refs #2622 .
This was SVN commit r16703.
2015-06-01 00:29:23 +00:00
9854d04794
Petra: react to PlayerDefeated events for target choice
...
This was SVN commit r16701.
2015-05-31 19:53:23 +00:00
f009b52c0f
Fix null-reference
...
This was SVN commit r16700.
2015-05-31 12:23:08 +00:00
b5e22a22ea
Fix error message missed in f680caa14f. Refs #3118 .
...
This was SVN commit r16699.
2015-05-30 22:25:54 +00:00
c1594c4bc8
Petra: add missing changes in previous commit
...
This was SVN commit r16698.
2015-05-30 19:15:36 +00:00
9408860acc
Petra: some code reshuffling + small bug fixes
...
This was SVN commit r16697.
2015-05-30 19:12:01 +00:00
b738772d65
Fix typo
...
This was SVN commit r16696.
2015-05-29 19:51:48 +00:00
2ae17391ae
Fix AI to use the same bitmask as set in e68ef21334
...
This was SVN commit r16695.
2015-05-29 18:28:46 +00:00
f1445b16c6
IsAlly -> IsMutualAlly, and move the divide-by-zero check
...
This was SVN commit r16693.
2015-05-29 07:16:54 +00:00
e68ef21334
Don't decay when connected to connected allied territory, and also allow the decay script to determine which parts of the territory should blink
...
This was SVN commit r16692.
2015-05-29 07:02:16 +00:00
f4432330e1
cleaning
...
This was SVN commit r16691.
2015-05-28 20:42:01 +00:00
f200815de4
AI: avoid creating some unused maps and cleanings
...
This was SVN commit r16690.
2015-05-28 20:35:05 +00:00
e5727980da
Adds debug output to display return code of failing SHGetFolderPathW, refs #3267
...
This was SVN commit r16688.
2015-05-27 02:02:32 +00:00
37357326f7
Petra: improve storehouse placement and fix some inconsistencies with new pathFinder refs #2960
...
This was SVN commit r16687.
2015-05-26 21:45:04 +00:00
57407172e8
Plural translations.
...
This was SVN commit r16686.
2015-05-26 16:29:22 +00:00
1d7b394752
Fix male death. Refs #3220
...
This was SVN commit r16685.
2015-05-26 16:04:26 +00:00
e638af5422
Clean up some unused variables and assignments.
...
This was SVN commit r16684.
2015-05-26 15:40:07 +00:00
4ccc9130ba
Add missing include.
...
This was SVN commit r16683.
2015-05-26 15:40:04 +00:00
60f784900a
Fix the territory influence weight to fit into an u16 number. (no idea why the buildings have so many different weights though).
...
This was SVN commit r16682.
2015-05-26 14:25:23 +00:00
2424604329
Add some structure to the voice files. Use the structure in the templates to enable parameters. Resample the voices to be mono/positional. Patch by karamel. Fixes #3220
...
This was SVN commit r16681.
2015-05-26 12:25:10 +00:00
b65c232e51
Allow setting rallypoint on enemy entities. Patch by maveric, fixes #1046
...
This was SVN commit r16680.
2015-05-26 10:59:09 +00:00
84ba6c0719
Include string fixes from Itms again
...
This was SVN commit r16679.
2015-05-25 16:06:53 +00:00
6752389c98
Let technologies replace other technologies, and use this for the town and city phase. Main implementation by niektb, structree fix by s0600204. Fixes #3208
...
This was SVN commit r16678.
2015-05-25 15:52:02 +00:00
0054486dba
Implement methods to find the neighbour of a certain territory, and use it for territory decay. Fixes #3204
...
This was SVN commit r16676.
2015-05-25 14:17:45 +00:00
c93c1c92eb
Replace std::auto_ptr uses by std::unique_ptr since the former is deprecated.
...
This was SVN commit r16674.
2015-05-25 01:23:27 +00:00
5b2e9c95e7
More encoding fixes and EOL changes, fixes #3262
...
This was SVN commit r16672.
2015-05-24 19:07:05 +00:00
3b106c352d
Upload back the reviewed technologies, two of them were badly encoded. See ce31be2055 and 04e7c99b1b.
...
This was SVN commit r16671.
2015-05-24 17:53:59 +00:00
bbf3422f01
Enhance the alert buttons by moving them to the garrisoning panel. Also add a new icon for the maximum level of alert.
...
Suggestion and testing by rogue-spectre, fixes #2474 .
This was SVN commit r16670.
2015-05-24 13:51:02 +00:00
b2e2e47205
Update some old templates in the Combat demo map.
...
This was SVN commit r16669.
2015-05-24 13:05:40 +00:00
04e7c99b1b
Temporarily revert ce31be2055 for technologies, refs #3262 .
...
Also add a forgotten change for the Athenian wonder.
This was SVN commit r16668.
2015-05-24 11:37:10 +00:00
599a2daa85
Amend previous commit, reported by qwertz
...
This was SVN commit r16667.
2015-05-24 09:37:31 +00:00
ce31be2055
General review of Greek specific names. I didn't bother to go through Seleucids, who might be modified, and I ignored the history section most of the time because we don't use it anywhere anymore AFAIK.
...
My reference was the "Abrégé du dictionnaire Grec - Français" by A.
Bailly.
This was SVN commit r16666.
2015-05-24 09:11:57 +00:00
57afd0091b
petra cleanings and tweaks
...
This was SVN commit r16664.
2015-05-21 20:23:21 +00:00
f98a1cf9ac
Show a different notification if livestock is attacked. Patch by fcxSanya. Fixes #3176 .
...
This was SVN commit r16663.
2015-05-20 22:40:10 +00:00
f64538b6ee
Actually handle multiple notifications instead of one per turn. Patch by elexis. Fixes #3222 .
...
This was SVN commit r16662.
2015-05-20 22:09:59 +00:00
ec4d0183ad
Use the actual player name in MP. Patch by elexis. Refs #3252 .
...
This was SVN commit r16661.
2015-05-20 15:02:20 +00:00
7ca255c3fa
Clarify time elapsed in summary screen. Patch by qwertz. Fixes #3128
...
This was SVN commit r16660.
2015-05-20 09:08:07 +00:00
a7b6e44717
Fix player names in trade tooltips. Patch by elexis. Fixes #3252
...
This was SVN commit r16659.
2015-05-20 08:30:19 +00:00
122155bb65
Allow observers to see the wonder victory message. Patch by elexis. Fixes #3226
...
This was SVN commit r16658.
2015-05-20 08:11:03 +00:00
1723fbcca8
Cleanup some ceasefire code. Patch by elexis. Fixes #2749
...
This was SVN commit r16657.
2015-05-20 07:25:25 +00:00
6dcf636d7c
fix attackable players in unitai, refs #2749
...
This was SVN commit r16656.
2015-05-19 20:10:19 +00:00
4947818c52
petra tweak
...
This was SVN commit r16655.
2015-05-19 17:11:09 +00:00
07351999fd
Fixes #3248 , patch by elexis
...
This was SVN commit r16654.
2015-05-17 22:11:41 +00:00
8b4b8431e3
Small cleanup, based on a change from one of Philip's old patches
...
This was SVN commit r16653.
2015-05-16 09:39:27 +00:00
ce558ddf56
petra now try to regain capture points of its own structure, plus some bug fixes
...
This was SVN commit r16652.
2015-05-14 20:09:45 +00:00
4b9e11eedd
a few fixes and tweaks for petra
...
This was SVN commit r16651.
2015-05-13 15:37:49 +00:00
d41671044a
petra: additional bugfixes and tweaks
...
This was SVN commit r16649.
2015-05-10 20:21:00 +00:00
20877632ce
Fix 1vs1 Game, Fix Resign double message
...
This was SVN commit r16648.
2015-05-10 16:12:55 +00:00
a39aa76e62
These temporary roots aren't needed anymore with SpiderMonkey 31
...
This was SVN commit r16647.
2015-05-10 09:01:39 +00:00
ae34c4a079
petra: let units avoid attacking palisades when a better target is possible
...
This was SVN commit r16644.
2015-05-09 19:05:24 +00:00
bbe4a30a56
improve the fix of b30e7ca26b for lag when failed ejection of lots of units
...
This was SVN commit r16643.
2015-05-09 18:16:41 +00:00
5a6a848eb2
some code cleaning in petra
...
This was SVN commit r16642.
2015-05-09 17:53:24 +00:00
552c3ede69
petra: add protection when no boarding point found, fix #3232
...
This was SVN commit r16641.
2015-05-09 17:23:57 +00:00
707a89dc5e
Add hotkey to select idle units only to manual. See 347ffabaeb.
...
This was SVN commit r16640.
2015-05-09 17:09:06 +00:00
1155bf589b
petra: fix bug in garrisoning following capture adaptation
...
This was SVN commit r16639.
2015-05-08 18:48:51 +00:00
c8e964f0e9
fix wrong test from d21c0026ec
...
This was SVN commit r16638.
2015-05-08 17:48:40 +00:00
074408b114
fixes #3101 , patch by elexis
...
This was SVN commit r16637.
2015-05-08 15:21:09 +00:00
b30e7ca26b
fix lag when a garrisoned ship is destroyed in the middle of water
...
This was SVN commit r16636.
2015-05-08 15:11:32 +00:00
d664fadc38
Seleucid Fortress commit
...
This was SVN commit r16635.
2015-05-08 04:12:58 +00:00
e4a5d5b4dd
Added Conquest Strutures and Conquest Units in victory modes, fixes #2976 , refs #1649
...
This was SVN commit r16634.
2015-05-08 03:06:14 +00:00
399daeddbf
prevent loading of templates in AIManager when no AIs, fixes #3101
...
This was SVN commit r16633.
2015-05-07 19:09:39 +00:00
3aad4d8e30
Revert 2b7ba4ff0b by adding a way to specify globally disabled templates.
...
Refs #3174
This was SVN commit r16632.
2015-05-06 20:43:49 +00:00
8e44687ae3
Properly fix #3223 .
...
The previous commit destroyed the context while it was still in use.
This was SVN commit r16631.
2015-05-06 20:28:28 +00:00
2b7ba4ff0b
Disable the Ptolemaic lighthouse on some maps with a lot of little water spots.
...
Refs #3174 .
This was SVN commit r16629.
2015-05-06 18:48:13 +00:00
642500b49e
Make the Ptolemaic lighthouse reveal the shore on the entire map.
...
Fixes #3174
This was SVN commit r16628.
2015-05-06 18:47:02 +00:00
4db041e3c6
Stop leaking g_ScriptStatsTable in replay mode. Fixes #3223 .
...
This was SVN commit r16627.
2015-05-05 22:34:41 +00:00
03bc22510b
fix entities deserialization in AIInterface and remove duplicates entities and templates in sharedAI, refs #3060 and fixes #1089
...
This was SVN commit r16626.
2015-05-05 20:38:43 +00:00
709c667ddd
Add different icons to the range auras. Icons by niektb. Fixes #3224
...
This was SVN commit r16625.
2015-05-05 14:09:58 +00:00
d21c0026ec
Add optional ceasefire time to the game. Patch by elexis. Fixes #2749
...
This was SVN commit r16624.
2015-05-05 13:38:36 +00:00
7f606250f8
Fix build failure on GCC 4.6.
...
This was SVN commit r16623.
2015-05-04 19:37:25 +00:00
f5107ad189
Fix OOS caused by saving build progress. Fixes #3217
...
This was SVN commit r16622.
2015-05-04 12:49:11 +00:00
b8a20c958c
Do not serialize properties for Sets. Serialization tests for Map and Set.
...
This was SVN commit r16620.
2015-05-04 01:41:09 +00:00
ee17247ee5
petra: some fixes in tech researches
...
This was SVN commit r16619.
2015-05-03 16:13:21 +00:00
0a44d24c96
Flip the overlay sprites face around to show the non-mirrored side. Now sprites are rendered correctly (which should have happened in d4794b5474).
...
This was SVN commit r16617.
2015-05-03 15:55:17 +00:00
7a70c475df
Improve rejoin messages. Patch by elexis. Fixes #1949 .
...
This was SVN commit r16614.
2015-05-03 02:06:17 +00:00
ecf229046a
String fixes.
...
This was SVN commit r16613.
2015-05-02 22:35:13 +00:00
d4794b5474
Flip aura icons correctly
...
This was SVN commit r16612.
2015-05-02 20:01:03 +00:00
27560e72fe
Visualise auras by adding status icons to affected units. Implement the visualisation for the temple aura. Fixes #3180
...
This was SVN commit r16611.
2015-05-02 16:15:59 +00:00
18a97cc82a
Add structure tree to the game session. Based on patch by Louhike. Fixes #3101
...
This was SVN commit r16610.
2015-05-02 12:22:25 +00:00
a9afa61a7b
Serialization support for ES6 Sets.
...
This was SVN commit r16608.
2015-05-01 23:04:28 +00:00
af37b00f4b
Add QueryMiragedInterface. Fixes #3189 .
...
QueryMiragedInterface allows to make writing Mirage-aware code
(GuiInterface)
simpler and less prone to error.
Replaces ResourceSupply's GetGatherers() with GetNumGatherers() as the
former
was never used in a way other than the second.
This was SVN commit r16607.
2015-05-01 17:03:37 +00:00
7d20695412
petra: fixes and tweaks of the previous commits for capture
...
This was SVN commit r16606.
2015-05-01 14:13:59 +00:00
385c47fe6b
do not transfer the unused full gatherer list to the AIs, refs #3189
...
This was SVN commit r16605.
2015-05-01 12:53:41 +00:00
7d8dee27cc
Autocomplete observer nicks in-game. Patch by elexis. Fixes #3203 .
...
This was SVN commit r16604.
2015-04-30 22:12:56 +00:00
d3de7c6594
Adjust gui Relax NG grammar for size parsing changes in 5ce12c2263.
...
Moves sound_group grammar files to the mod mod to prevent an error
loading it with #245 .
This was SVN commit r16603.
2015-04-30 22:05:46 +00:00
522bd8b37c
petra: let the ai capture gaia structures
...
This was SVN commit r16602.
2015-04-30 19:07:28 +00:00
fe9eeedd66
Serialise messages in the GuiInterface to allow players to see them on a saved game or after a rejoin. Fixes #3185
...
This was SVN commit r16601.
2015-04-30 18:01:38 +00:00
41113f6f9b
Adjust gui Relax NG grammar to <repeat> changes in 622614de02.
...
This was SVN commit r16600.
2015-04-30 04:39:50 +00:00
43a31ce494
petra: use a map instead of object for garrison bookkeeping
...
This was SVN commit r16599.
2015-04-29 19:44:41 +00:00
b0f7c00622
petra: continuation on capture adaptation
...
This was SVN commit r16598.
2015-04-29 17:59:29 +00:00
6389dba54f
Allow players to unload all their units when garrisoned in allied buildings. Patch by maveric. Fixes #2857
...
This was SVN commit r16597.
2015-04-29 17:32:17 +00:00
e758701da5
Include missing header.
...
This was SVN commit r16595.
2015-04-29 15:54:08 +00:00
7d953ff0a7
Fix compiler warning.
...
This was SVN commit r16594.
2015-04-29 00:07:48 +00:00
296d363812
Remove forgotten warning
...
This was SVN commit r16593.
2015-04-28 13:12:13 +00:00
5e5799a45a
Fix tests
...
This was SVN commit r16592.
2015-04-28 12:16:33 +00:00
7cc2d65ec7
Revert b0c74699b0 until problems with nested maps are solved. Refs #3164
...
This was SVN commit r16591.
2015-04-28 12:13:48 +00:00
1e98b7d37e
Add useful decay message for the AI, and fix a style issue
...
This was SVN commit r16590.
2015-04-27 18:38:00 +00:00
f9a025ba6b
petra: some cleanings and tweaks
...
This was SVN commit r16589.
2015-04-27 18:34:24 +00:00
04c4e666de
Put territory decay in the Capture regen timer to avoid jumpyness of GUI elements
...
This was SVN commit r16588.
2015-04-27 18:04:58 +00:00
40eb747bc4
Express tooltip for placing defensive buildings in meters. Patch by maveric. Fixes #3079
...
This was SVN commit r16587.
2015-04-27 13:47:47 +00:00
502e1a3960
Use SDL2 by default everywhere.
...
SDL1 can still be forced passing --sdl1 to update-workspaces.sh.
Eventually, if no blocking issues arise, SDL1 support could be dropped
after next release.
This was SVN commit r16586.
2015-04-27 08:49:16 +00:00
487d6a1afc
When using SDL2 recommend a >= 2.0.2 version to avoid incurring in possible bugs with older versions.
...
This was SVN commit r16585.
2015-04-27 07:56:34 +00:00
8ff8667ed0
add initialization of capturePoints in AIProxy + some cleanings
...
This was SVN commit r16584.
2015-04-26 18:07:55 +00:00
42c04cdad2
Show the maximum population setting in a tooltip. Patch by elexis. Fixes #3197
...
This was SVN commit r16583.
2015-04-26 09:42:54 +00:00
a959fcf337
Disable resign button after resigning once. Patch by elexis. Fixes #3193
...
This was SVN commit r16582.
2015-04-26 08:57:26 +00:00
8099fe01de
Drop off resources when building dropsite. Patch by maveric. Fixes #3093
...
This was SVN commit r16581.
2015-04-26 08:35:10 +00:00
604538a63a
Fix issue with preferences in BuildingAI. Refs #1731
...
This was SVN commit r16580.
2015-04-26 08:21:43 +00:00
6c13bd92fd
improve 632c8bd17e
...
This was SVN commit r16579.
2015-04-25 17:29:22 +00:00
632c8bd17e
petra: continuation of adaptation to capture
...
This was SVN commit r16578.
2015-04-25 17:00:15 +00:00
4d1dee171e
Explicitely add the UnitAI target to the BuildingAI target list to circumvent the range mismatch. Refs #1731
...
This was SVN commit r16577.
2015-04-25 12:54:34 +00:00
9a8c03093b
Fix line endings of some template files, and add the native line endings svn prop
...
This was SVN commit r16576.
2015-04-25 09:33:42 +00:00
d7960fa775
Try out some replacement animations for capturing on athenian infantry
...
This was SVN commit r16575.
2015-04-25 08:16:55 +00:00
9b5560b383
fix rounding when returning resources from aborted foundation, patch by elexis, fixes #3132
...
This was SVN commit r16574.
2015-04-24 17:51:27 +00:00
e8accbe565
petra: inform allied players when advancing to the next phase, patch by maveric, fixes #2757
...
This was SVN commit r16573.
2015-04-24 17:37:46 +00:00
e0606468df
Translate some tooltips as plurals. Unify aura tooltip code.
...
This was SVN commit r16571.
2015-04-23 18:58:39 +00:00
6e58781e51
Make Sicilia Nomad a skirmish map and fix the description.
...
This was SVN commit r16570.
2015-04-23 17:33:49 +00:00
7f74f7d218
Make capture attack visible in Atlas
...
This was SVN commit r16569.
2015-04-23 17:14:15 +00:00
5cbf2404af
Fix tower tech tooltip. Patch by elexis. Fixes #3191 .
...
This was SVN commit r16568.
2015-04-23 00:33:54 +00:00
bda45f6526
Clarify the XpartaMuPP readme. Fixes #3163 .
...
Also converts it to markdown.
This was SVN commit r16567.
2015-04-22 23:43:59 +00:00
2e6a248ade
Pass some properties as null instead of undefined to circumvent serializer limitations. Based on patch by elexis. Fixes #3187 .
...
This was SVN commit r16566.
2015-04-22 22:10:18 +00:00
d8f1f19f94
Save game type and victory scripts before random map is selected. Fixes #3184
...
This was SVN commit r16565.
2015-04-22 13:48:45 +00:00
d08fdf43d7
Fix some issues with capturing and miraged entities
...
This was SVN commit r16564.
2015-04-22 09:59:59 +00:00
6c7eb93e1c
Add temporary capture cursor
...
This was SVN commit r16563.
2015-04-22 08:20:41 +00:00
885aec20dd
fix a typo in 9be10939cb
...
This was SVN commit r16562.
2015-04-21 19:25:54 +00:00
625cfb79d3
petra: another fix for capture events
...
This was SVN commit r16561.
2015-04-21 19:00:51 +00:00
7bb30ef6b0
Fix some more flags
...
This was SVN commit r16560.
2015-04-21 17:58:07 +00:00
9be10939cb
petra: react to more capture events and some tweaks on attacks
...
This was SVN commit r16559.
2015-04-21 17:15:19 +00:00
2972cb3202
Small fix
...
This was SVN commit r16558.
2015-04-21 14:33:28 +00:00
fa878c2f31
Force attack instead of capture when the attack hotkey is pressed
...
This was SVN commit r16557.
2015-04-21 13:21:19 +00:00
701663afaa
Add minimap ping alert for capture attack
...
This was SVN commit r16556.
2015-04-21 08:27:26 +00:00
999f3e3497
Fix gui problem when selecting a combination of capturable and non-capturable entities
...
This was SVN commit r16554.
2015-04-20 16:26:58 +00:00
6766401510
Fix the resign problem with capturing
...
This was SVN commit r16553.
2015-04-20 16:22:48 +00:00
535d612e06
Small fixes.
...
This was SVN commit r16552.
2015-04-20 14:51:06 +00:00
a8c44d947c
Fix tests
...
This was SVN commit r16551.
2015-04-20 07:47:07 +00:00
ad27deeb9d
Implement building capturing. Fixes #996
...
This was SVN commit r16550.
2015-04-20 07:45:45 +00:00
751c46c60b
petra: let the AI know it can build a new base around a captured cc,refs #996
...
This was SVN commit r16549.
2015-04-18 18:28:02 +00:00
b8b3f66027
petra: improve attack management and let some parameters vary with maxpopulation, fixes #3173
...
This was SVN commit r16548.
2015-04-17 18:43:07 +00:00
a0cf780e1e
Amend 5c84c3e9e5
...
This was SVN commit r16547.
2015-04-16 13:17:58 +00:00
2042e6b2d4
Added TriggerScripts Reload(Hotloading) when you change the file and save
...
This was SVN commit r16546.
2015-04-16 04:30:51 +00:00
06916dde43
Yet another fix for the gamesetup persistent settings.
...
Patch by elexis, fixes #3165
This was SVN commit r16545.
2015-04-15 21:22:39 +00:00
5c84c3e9e5
Some entities (like birds) can have negative positions without being marked as out-of-world.
...
Refs #2430
This was SVN commit r16544.
2015-04-15 12:19:47 +00:00
120ff2c60c
Fix the structure tree a second time, this should also work on Windows.
...
This was SVN commit r16542.
2015-04-15 09:10:05 +00:00
6aa99d762f
Add a new spatial subdivision, based on an old patch by wraitii.
...
This subdivision is faster but less precise, so range queries get more
entities and are a bit slower (up to 1ms approx.), but the overall gain
on a simulation update is always positive and can reach 10ms per frame.
For now, this new subdivision is only used by the range manager,
integrating it in the obstruction manager might be sensible.
Refs #2430
This was SVN commit r16540.
2015-04-14 21:33:43 +00:00
a0340efab8
fix an unfortunate typo affecting the AIs
...
This was SVN commit r16539.
2015-04-14 20:23:42 +00:00
1ea1755ee7
Petra: follow-up on changes to deal with capture
...
This was SVN commit r16538.
2015-04-14 20:14:39 +00:00
a980d8fdfc
Fix structure tree by allowing undefined templates in the productionqueue
...
This was SVN commit r16537.
2015-04-14 18:45:02 +00:00
03506a0eec
fix typo creating 71fb9ef162
...
This was SVN commit r16536.
2015-04-13 21:04:49 +00:00
71fb9ef162
Add AI safety guard. I had a game with an undefined template, but that shouldn't happen at that point.
...
This was SVN commit r16535.
2015-04-13 10:10:38 +00:00
b6bcfdbb2e
Fixes missing newlines in debug_printf, patch by elexis, fixes #3056
...
This was SVN commit r16534.
2015-04-12 19:38:31 +00:00
d139a75de3
new button in diplomacy to request an attack to allies, works also for AIs, fix #3157
...
This was SVN commit r16533.
2015-04-11 18:46:05 +00:00
7fbab6dd10
Petra: update the target of an attack when it has been captured
...
This was SVN commit r16532.
2015-04-11 18:26:47 +00:00
01673b4c58
Add the -ooslog support for replays. Refs #3169 , see also a7b18d02bf.
...
This was SVN commit r16531.
2015-04-11 18:12:35 +00:00
528dc9179a
Fix mace and ptol skirmish replacements
...
This was SVN commit r16529.
2015-04-10 11:58:12 +00:00
41550ea849
add a missing protection following changes for capture
...
This was SVN commit r16528.
2015-04-09 19:53:03 +00:00
d41fb4612f
Fix athen archer selection
...
This was SVN commit r16527.
2015-04-09 17:36:27 +00:00
27601c5b8b
Adapt naval manager to deal with structures from different civs. Similar to 107185d7dd
...
This was SVN commit r16526.
2015-04-09 12:27:03 +00:00
eb9e7ee84d
Make all champion, hero and siege producing buildings ready for capture. Fixes #2614 (hopefully)
...
This was SVN commit r16525.
2015-04-09 09:44:24 +00:00
2700f74dd3
Make docks ready to capture. Refs #2614
...
This was SVN commit r16524.
2015-04-09 08:22:29 +00:00
bdfedb1c49
Rename Seleucid mercenary units to reflect their mercenary state
...
This was SVN commit r16523.
2015-04-09 08:08:20 +00:00
b92fac170a
Rename ptolemaic mercenary units to reflect their mercenary state
...
This was SVN commit r16522.
2015-04-09 07:44:16 +00:00
6250990bfd
Make barracks ready to capture. Refs #2614
...
This was SVN commit r16521.
2015-04-09 07:15:50 +00:00
107185d7dd
adapt the AI API to deal with structures from different civs for capture
...
This was SVN commit r16519.
2015-04-08 16:23:39 +00:00
19692c0acc
Fix entity names in map files.
...
This was SVN commit r16518.
2015-04-08 08:15:47 +00:00
358b1c06d8
Petra: start changes needed to support capture
...
This was SVN commit r16514.
2015-04-07 20:23:12 +00:00
1dcfd75e62
Fix typo
...
This was SVN commit r16513.
2015-04-07 13:34:26 +00:00
b0c74699b0
Use Maps instead of Objects in the Auramanager to improve performance. Also remove the IonMonkey v24 workaround. Refs #2684
...
This was SVN commit r16512.
2015-04-07 09:52:06 +00:00
481cf0f754
Modify ProductionQueue of Civil Centres in preparation of capturing. Refs #2614
...
This was SVN commit r16511.
2015-04-07 07:37:25 +00:00
b4cbc14490
Style fixes
...
This was SVN commit r16510.
2015-04-07 07:15:59 +00:00
abe6347554
Some cheat code cleanup.
...
This was SVN commit r16509.
2015-04-06 22:43:54 +00:00
cf527707da
Revert "Improve ARRAY_SIZE." ( 7afaacda19).
...
constexpr and noexcept are only supported by VS November 2013 CTP.
This was SVN commit r16508.
2015-04-06 21:24:53 +00:00
f2c76cc75d
Fix a number of issues related to historical messages and initial join in the multiplayer lobby. Fixes #3156
...
This was SVN commit r16507.
2015-04-06 19:33:37 +00:00
71a84682ad
Fix the productionQueue for capturing. Needs the AI to be fixed in a similar way, and still needs template changes to see the full effect. Refs #2614
...
This was SVN commit r16506.
2015-04-06 15:02:37 +00:00
c8401bd737
Rename cart mercenary units to distinguish them from regular units
...
This was SVN commit r16505.
2015-04-06 12:47:12 +00:00
165bebb00e
Rename some _2_ templates to regular names. This is possible since the pikemen were renamed too
...
This was SVN commit r16504.
2015-04-06 12:08:45 +00:00
97ef1c542d
Rename spearmen with pikes into pikemen. This avoids problems with civs that have both pikemen and spearmen.
...
This was SVN commit r16503.
2015-04-06 11:49:23 +00:00
8eebb5d118
Rename Athen marine archer as a special unit should have a non-standard name
...
This was SVN commit r16502.
2015-04-06 11:23:02 +00:00
2b57410021
Better tested summary screen update. Also make modern tooltip style more consistant with the general light on dark theme.
...
This was SVN commit r16501.
2015-04-06 06:17:09 +00:00
18ff57c316
Update version in mod.json.
...
This was SVN commit r16500.
2015-04-05 17:14:47 +00:00
7afaacda19
Improve ARRAY_SIZE.
...
This was SVN commit r16499.
2015-04-05 16:50:26 +00:00
a6a2914882
Fix error when you paste entities over another entity and you try to rotate at the same time while pressing alt/shift key
...
This was SVN commit r16497.
2015-04-04 21:45:11 +00:00
43508ce3a0
some petra code reshuffling
...
This was SVN commit r16496.
2015-04-04 15:38:53 +00:00
c735f9a579
Revert wrong commit 14b7e7568c
...
This was SVN commit r16495.
2015-04-04 09:11:05 +00:00
14b7e7568c
Rename athen archer, as it's not a default unit. Naming it as a default unit makes any capture code more difficult.
...
This was SVN commit r16494.
2015-04-04 08:56:14 +00:00
0131f2e4d5
Fix gamesetup options for lobby games
...
This was SVN commit r16493.
2015-04-03 09:40:50 +00:00
dfd7978cb2
fix typo (particate → participate)
...
This was SVN commit r16492.
2015-04-03 07:39:25 +00:00
8d3d9616a2
be more generic with starting entities of nomad maps
...
This was SVN commit r16491.
2015-04-02 21:01:19 +00:00
afbf6e8e40
cleanings of AIInterface
...
This was SVN commit r16490.
2015-04-02 20:28:02 +00:00
1482a84875
replace some slow (foreach in) loops
...
This was SVN commit r16489.
2015-04-02 20:22:33 +00:00
0e2c30c7d2
Reduce the strength of the elevation brushes in Atlas.
...
This was SVN commit r16488.
2015-04-02 13:43:47 +00:00
4e763ef26e
Move civ JSON files to simulation/data. Patch by MattDoerksen. Fixes #2562 .
...
This was SVN commit r16485.
2015-04-01 23:48:33 +00:00
7695d2fcb9
Refine checks for invalid player ids for mirages. Patch by elexis. Fixes #3149 .
...
This was SVN commit r16484.
2015-04-01 23:48:26 +00:00
41863d6ae2
Explicitly cast to unsigned to fix a warning.
...
This was SVN commit r16483.
2015-04-01 23:48:23 +00:00
96410ee9a4
Fix heightmap rectangle. Take the water plain height as the base plane, instead of a hardcoded value.
...
This was SVN commit r16482.
2015-04-01 14:17:18 +00:00
aa808baabf
Fix the stumped maps in Alpine Mountains
...
This was SVN commit r16481.
2015-03-31 17:30:59 +00:00
ebb57aa516
Fix tests by enlarging the precision bumped in 7ed45213a9
...
This was SVN commit r16479.
2015-03-31 16:56:09 +00:00
7ed45213a9
Allow heightmaps to be 8 times as high by lessening precisions. Includes conversion script and modified standard maps. Bump the map version number. Fixes #3112
...
This was SVN commit r16478.
2015-03-31 16:48:31 +00:00
a84765fc75
Add all non-structure starting entities to Unknown Nomad. Patch by elexis. Fixes #3153 .
...
This was SVN commit r16477.
2015-03-30 23:44:48 +00:00
072afdcede
Fix line endings for random maps.
...
This was SVN commit r16476.
2015-03-30 23:41:12 +00:00
b5593bf1a9
petra changes in the choice of player to be attacked
...
This was SVN commit r16475.
2015-03-30 20:21:46 +00:00
ec9a49562b
Remove debug warning + fix typo
...
This was SVN commit r16474.
2015-03-30 18:49:54 +00:00
a05f146c79
Disable data gathering in AIInterface when no AI players are loaded
...
This was SVN commit r16473.
2015-03-30 18:44:02 +00:00
8712ad835c
Fix buildingAI in case of modifications (techs, auras, ownership changes, ...) + clean up the code a bit
...
This was SVN commit r16472.
2015-03-30 09:25:20 +00:00
809cc074fa
petra: small tweaks and cleanings
...
This was SVN commit r16471.
2015-03-29 13:01:38 +00:00
569b5e244d
fix computation of foundation refund when destroyed, fixes #3132
...
This was SVN commit r16470.
2015-03-26 19:17:37 +00:00
798cd2963e
Add option to disable treasures on skirmish and random maps
...
This was SVN commit r16469.
2015-03-26 08:31:50 +00:00
1cd41e33c6
Niektb's Northern Island skirmish map.
...
This was SVN commit r16468.
2015-03-25 19:50:37 +00:00
61590f28d3
let AIProxy deal with new entities created without ownership, fixes #3142
...
This was SVN commit r16467.
2015-03-25 18:22:23 +00:00
3e98d379ab
LordGood's Alpine Mountains skirmish map with some modifications by niektb.
...
This was SVN commit r16466.
2015-03-25 15:56:30 +00:00
2fe444269e
Game Speed display over UI, Fixes #3129
...
This was SVN commit r16465.
2015-03-25 13:20:54 +00:00
6bc34da330
Emblem button states
...
This was SVN commit r16464.
2015-03-25 00:35:52 +00:00
5950d16500
Some structree improvements for issues exposed by mods. Changes by s0600204.
...
This was SVN commit r16463.
2015-03-24 18:12:42 +00:00
c73c9370ee
Update tinygettext. Fixes #2522 .
...
Updates to upstream changeset f71a8e5e84bffadd61ac93768b332262989844fd,
with some additions
that will be submitted upstream (without the addition of precompiled.h
and win32 dirent).
This was SVN commit r16462.
2015-03-24 17:47:08 +00:00
28abcb3bcc
cache some formation info in gui + some cleanings, see #3078
...
This was SVN commit r16460.
2015-03-23 18:38:27 +00:00
a430e03d1d
Petra: fix for nested loops using same loop index
...
This was SVN commit r16459.
2015-03-23 18:06:31 +00:00
58d955e426
Some cleanup.
...
This was SVN commit r16458.
2015-03-23 13:34:23 +00:00
e35970b700
Petra: rewrite of the dock placement. It should be more robust and compatible with the new pathfinder now
...
This was SVN commit r16457.
2015-03-22 22:00:59 +00:00
64adec79da
fix a wrong copy&paste in 86054bcf7e
...
This was SVN commit r16456.
2015-03-22 21:51:57 +00:00
dec4552ffe
Removes special handling of fullscreen toggle on OS X w/ SDL 1.2, which is no longer used
...
This was SVN commit r16453.
2015-03-21 21:01:01 +00:00
f680caa14f
Escape lobby game names. Fixes #3118 .
...
This was SVN commit r16452.
2015-03-21 16:24:29 +00:00
09ff1f8bea
fix some cases where a water nomad random map could end up without water
...
This was SVN commit r16451.
2015-03-19 21:43:55 +00:00
89107d1406
Fixes grayscale PNG handling, there is no need to convert them all to RGB and 4741e896c4 broke special font texture handling. Instead, only grayscale with alpha PNGs will be converted to RGBA (they fail to load otherwise).
...
Removes warning about converting grayscale textures, refs #1640 .
This was SVN commit r16449.
2015-03-19 03:04:01 +00:00
2a1fcc88e3
Expands game speed dropdown by 10 pixels to accommodate German text and hopefully most other languages
...
This was SVN commit r16448.
2015-03-19 01:43:04 +00:00
5dd3cbb254
Random nomad maps are now in default filter.
...
The number of starting units has been increased to speedup the startup
(building of cc)
Treasures are added when the starting resources are not sufficient to
either build a dock in water maps, or build a cc in land maps.
This was SVN commit r16447.
2015-03-17 22:03:33 +00:00
bed480c433
remove some obsolete variables after #16416
...
This was SVN commit r16446.
2015-03-17 21:43:48 +00:00
e288bb7c4e
Some gamesetup cleanup. Refs #3049 .
...
This was SVN commit r16445.
2015-03-16 23:56:42 +00:00
312155d22f
Use arrays for specifying StartingTechnologies, DisabledTechnologies, and DisabledTemplates.
...
Also add an example for StartingTechnologies to the Carthagian sandbox
map. Refs #1404 .
This was SVN commit r16444.
2015-03-16 21:54:32 +00:00
09796350c8
Fix changephase cheat broken in af8a6f5e8c.
...
This was SVN commit r16443.
2015-03-16 18:50:51 +00:00
46d17483db
Remove --with-system-miniupnpc.
...
It was deprecated in 776567d9b2
2015-03-16 04:35:01 +00:00
14f5eed8c7
Restores action-heal cursor from 1d3adefacc now that the engine supports indexed color PNGs, refs #2823
...
This was SVN commit r16440.
2015-03-16 02:38:03 +00:00
4741e896c4
Improves handling of PNG textures based on GdkPixbuf's setup_png_transformations. The PNG decoder should now support grayscale, RGB or indexed color; bit depth up to 16; and interlacing. Fixes #1640 , refs #2823 , #3082
...
This was SVN commit r16439.
2015-03-16 02:28:00 +00:00
b1c4e29ac8
Fixes inconsistencies in spelling of colour/color by preferring "color" (only wxWidgets remains with some API that requires "colour"), fixes #1029 .
...
NOTE: requires update-workspaces and may require correction of some
modded actors/scenarios
This was SVN commit r16438.
2015-03-15 23:59:48 +00:00
7334f76af6
Fix some issues in af8a6f5e8c.
...
This was SVN commit r16437.
2015-03-15 23:56:18 +00:00
1ae38b8d06
Deletes folder missed in 99cb4b42fd
...
This was SVN commit r16436.
2015-03-15 23:25:46 +00:00
99cb4b42fd
Deletes old autobuilder files.
...
Deletes old dds_analyse.pl script.
Updates tools LICENSE.txt
This was SVN commit r16435.
2015-03-15 22:18:02 +00:00
333c4401b9
Deletes obsolete entity converter tool.
...
Deletes unmaintained contributors.txt list, see forum topic for more
useful list: http://wildfiregames.com/forum/index.php?showtopic=15542
This was SVN commit r16434.
2015-03-15 21:38:43 +00:00
2395204011
fixes some typos in previous commits
...
This was SVN commit r16433.
2015-03-15 20:58:33 +00:00
2b6bde800c
some changes to let Petra build structures with the new PathFinder branch
...
This was SVN commit r16432.
2015-03-15 18:25:03 +00:00
caf89fa04e
Rename ps/Overlay(.h|.cpp) to ps/Shapes(.h|.cpp), fixes a TODO located in graphics/Overlay.h.
...
The file name did not match the content.
Also little cleanup of some unnecessary includes.
This was SVN commit r16431.
2015-03-15 18:06:32 +00:00
f29d059617
Remove conditional defines as those served a very doubtful purpose with parallax, replacing it with something dynamic in the shader. This cleans the C++ side of the renderer as conditional defines were very ugly.
...
This was SVN commit r16430.
2015-03-15 12:22:36 +00:00
5a4ddb52a2
Change the tooltip for number of builders to give more useful information and add one on the healthbar of foundations.
...
This was SVN commit r16429.
2015-03-15 12:00:28 +00:00
5d6f95321d
Fix actor errors revealed by 618fe81814.
...
This was SVN commit r16428.
2015-03-15 11:45:33 +00:00
618fe81814
Check when loading an actor that it defines all the texture samplers required by its material. Print out a readable error otherwise. Fixes #1613 (note that this does not check for unnecessary samplers as that is non-trivial and does not lead to graphical glitches).
...
Also add a shortcut for some defines to clean-up material files slightly
and make the link between sampler and shader more explicit.
This was SVN commit r16427.
2015-03-15 11:37:26 +00:00
372a016311
do not let animals be preferredTarget
...
This was SVN commit r16426.
2015-03-15 11:30:04 +00:00
24cdf6b851
Petra: check EjectHealth level before trying to garrison
...
This was SVN commit r16425.
2015-03-15 10:57:04 +00:00
866e00d154
Petra AI now warns its allies when in need of a tribute
...
This was SVN commit r16424.
2015-03-15 10:28:48 +00:00
cb2da36527
few tunings for Petra
...
This was SVN commit r16423.
2015-03-15 10:20:20 +00:00
86054bcf7e
reduce time of some rndm map generation, i.e. alpine_lakes is about 3 times faster now
...
This was SVN commit r16422.
2015-03-15 10:08:16 +00:00
a3335b39e5
fix AI init crash when more than 255 disconnected regions in some random maps
...
This was SVN commit r16421.
2015-03-15 10:00:16 +00:00
09dc9e6f1d
fix rounding problem in AI health, fixes #2446
...
This was SVN commit r16420.
2015-03-15 09:54:48 +00:00
47cb6c01db
fix #16416
...
This was SVN commit r16419.
2015-03-15 09:52:15 +00:00
e41ec77eb6
Remove unused file.
...
This was SVN commit r16417.
2015-03-15 04:16:31 +00:00
af8a6f5e8c
Removes generic hele and celt civs. Based on patch by prodigalson and
...
comments by s0600204. Fixes #2619 .
Also removes the theb civ json file.
This was SVN commit r16416.
2015-03-15 04:16:24 +00:00
82b08db6ec
Remove grouping from civ info screen. Only show playable civs. Refs #2619 .
...
Does not use loadCivData(true) as the civ info screen can also be opened
from the
gamesetup screen and both use g_CivData.
This was SVN commit r16415.
2015-03-15 04:15:59 +00:00
38a007f6fa
Properly escape a string.
...
This was SVN commit r16414.
2015-03-15 04:15:57 +00:00
6f3e682484
Extract strings from the structree. Fixes #3064 .
...
This was SVN commit r16413.
2015-03-15 04:15:53 +00:00
3c093ef741
Update lobby room.
...
This was SVN commit r16412.
2015-03-15 04:15:45 +00:00
1303b4d39b
Fix a couple oversights and address cavalry skirmishers.
...
This was SVN commit r16409.
2015-03-09 02:05:32 +00:00
1a4176ebcf
Updates OS X icon with multiple sizes and slightly reduced transparency to make it more easily clickable.
...
Updates OS X bundle build script, disables broken testing, refs #2780
This was SVN commit r16408.
2015-03-09 00:24:15 +00:00
eaa8f89ffc
Reverts action-heal cursor from 1d3adefacc, it was modified to indexed color not currently supported by the engine, fixes #3082 , refs #1640 . Reapplies the transparent color removal, refs #2823 .
...
Deletes unused test-old cursor
This was SVN commit r16407.
2015-03-06 22:01:11 +00:00
206aeaf99f
Revert 37da37dbd5. Refs #3072 .
...
This was SVN commit r16406.
2015-03-03 23:56:00 +00:00
c3f62542a4
Expands area for release name slightly, as it was cut off at 1024x768 resolution
...
This was SVN commit r16404.
2015-03-03 21:37:59 +00:00
54e806e3c6
Slight ranged cavalry health nerf and cost adjustment for cavalry archer.
...
This was SVN commit r16402.
2015-03-03 04:12:30 +00:00
2b5de1df93
Do not send VisionRangeChanged messages when deserializing. Fixes #3075 .
...
This was SVN commit r16401.
2015-03-03 01:59:42 +00:00
7901f4087d
Revert 1d3adefacc on unused test-old.png (and optimize with optipng and advdef anyway), apparently imagemagick trick mess it up. It could be eventually be removed if not needed.
...
Refs #2823 .
This was SVN commit r16400.
2015-03-02 10:26:12 +00:00
a5db659ce4
Update translations to be included in the release.
...
This was SVN commit r16399.
2015-03-02 00:10:00 +00:00
607bbcc2f1
Fixes invisible particles (clouds, dust storms) due to incorrect bounds calculations on the emitters, fixes #2643 .
...
Makes the emitters a little more efficient by only setting
position/rotation when their transform changes.
This was SVN commit r16397.
2015-03-01 23:58:53 +00:00
e4bf24dc9a
Adjusts female citizen attack.
...
This was SVN commit r16395.
2015-03-01 19:58:06 +00:00
839264b279
Adds missing GLSL normal definitions to terrain_decal effect (no visible difference on my system but technically correct), refs #2046
...
This was SVN commit r16394.
2015-03-01 19:33:04 +00:00
8a2638a8f5
Nerfs bolt shooters, especially against buildings.
...
This was SVN commit r16392.
2015-02-28 20:56:19 +00:00
37da37dbd5
Cleanup post-game summary page again. Fixes #3072
...
This was SVN commit r16391.
2015-02-28 18:32:50 +00:00
ea2eb2bd57
Removes some outdated techs due to string freeze.
...
This was SVN commit r16390.
2015-02-28 16:55:28 +00:00
aab15123f1
I hate myself.
...
This was SVN commit r16389.
2015-02-28 14:11:21 +00:00
2d7d5b446d
Fix Atlas so that changing water type will actually change water type.
...
Fix the water shader so that object reflections are more visible. Looks
better.
This was SVN commit r16388.
2015-02-28 13:50:52 +00:00
b04761f1b8
binaries/data/mods/mod/art/textures/cursors/test.png and binaries/data/mods/public/art/textures/cursors/arrow-default.png were previously a copy of the same file (same md5), during conversion in 1d3adefacc they were indipendently converted and had different md5 (just the date inside the png was different). Use again the same file just to make obvious they are identical.
...
Refs: #2823 .
This was SVN commit r16387.
2015-02-28 08:09:30 +00:00
1d3adefacc
Fixes cursor with dirty transparency.
...
I used elexis script and also optimized pngs with optipng -o 5 and
advdef -z -4
Thanks elexis for the imagemagick script!
Fixes #2823 .
This was SVN commit r16386.
2015-02-27 10:13:24 +00:00
3a25256960
Revert d69ecad481. Refs #3072 .
...
This was SVN commit r16385.
2015-02-25 19:10:10 +00:00
d69ecad481
Cleanup post-game summary page. Fixes #3072
...
This was SVN commit r16384.
2015-02-25 14:51:52 +00:00
72b0f5aaed
Increases swordsmen damage slightly to match spear.
...
This was SVN commit r16383.
2015-02-25 07:33:51 +00:00
7ce48dda69
Adds macmouse config option, this enables SDL2's Ctrl+Click emulation of right-clicking on OS X. NOTE: enabling this option will affect game hotkeys (e.g. garrisoning), so they should be reassigned to something like Super in that case
...
This was SVN commit r16380.
2015-02-22 21:24:27 +00:00
1ac24adde2
Disables some SpiderMonkey-related build warnings with clang
...
This was SVN commit r16379.
2015-02-22 21:15:47 +00:00
8bf1fe1437
Disables water in actor viewer, as a temporary workaround for the "red water" bug, see #2692 for proper fix
...
This was SVN commit r16378.
2015-02-22 19:49:06 +00:00
fc58b52396
Building defense adjustments for health/armor values for organic units.
...
This was SVN commit r16377.
2015-02-22 18:55:22 +00:00
18a115e772
Forces using libc++ on OS X, to fix pre-Mavericks build given the game's new C++11 requirements, fixes #3062 .
...
Forces using C++11 in build-osx-libs.sh, for consistency
This was SVN commit r16375.
2015-02-22 01:19:39 +00:00
7fe9eb956f
Fixes error in SMBIOS::InitStructures by not warning on invalid header size, fixes #2985
...
This was SVN commit r16374.
2015-02-22 00:42:11 +00:00
21f3be7df5
Always select a texture unit before calling glEnable(GL_TEXTURE_2D).
...
Without this, some code will enable (and set other parameters for)
whatever random texture unit the previous stage had selected. This can
break any fixed-function rendering, since either it will not have
enabled the correct texture unit, or its correct setup will be
interfered with by another texture unit that shouldn't be enabled. (This
doesn't affect ARB/GLSL shader rendering, since they don't care about
the enabled state, but the GUI (and some debug things) are still FFP in
the default ARB mode.)
Fixes #2833 (in which the fancy water shader selected texture units 5/6,
which then got enabled, and remained enabled forever).
This was SVN commit r16372.
2015-02-21 21:40:10 +00:00
4860957fa6
Adjusts skirmisher cavalry closer to that of their infantry counterpart.
...
This was SVN commit r16371.
2015-02-21 19:37:06 +00:00
b9cf610562
Makes palisade fort cheaper than defense tower.
...
This was SVN commit r16370.
2015-02-21 19:08:26 +00:00
cdc9d98e00
do not apply multiple leavefoundation orders, fix #3010
...
This was SVN commit r16369.
2015-02-21 17:40:59 +00:00
e67379a25f
Buffs rams for better durability.
...
This was SVN commit r16368.
2015-02-21 15:14:04 +00:00
0817808e9b
Check visibility of units before moving the camera to their position, when using selection groups.
...
Fixes #3065 .
This was SVN commit r16367.
2015-02-21 10:53:56 +00:00
f8ff206169
Recreate some tech modified values upon deserialization. Fixes #3055 .
...
Also check for some possible null pointers.
This was SVN commit r16364.
2015-02-21 01:41:24 +00:00
0da0b062e1
Return the correct projectile id to fix serialization test failure.
...
This was SVN commit r16363.
2015-02-21 01:41:09 +00:00
8ecfa6cf7c
Nerfs skirmishers slightly.
...
This was SVN commit r16361.
2015-02-20 15:17:29 +00:00
00da480b83
Trigger a global visibility update after shared LoS changes. Fixes the entities of new mutual allies not visible.
...
Also add some player-dependent logic to avoid performance bottlenecks.
This was SVN commit r16359.
2015-02-20 14:35:19 +00:00
e48e330db7
Sets SDL2 as default and only build option on Windows.
...
Removes remnants of WSDL. Refs #2041
This was SVN commit r16357.
2015-02-20 05:52:18 +00:00
d644845ae5
Fixes Atlas on Linux with SDL2 by reordering OpenGL init, based on patch by yashi, fixes #2847
...
This was SVN commit r16356.
2015-02-20 05:46:24 +00:00
6b364ad240
Reverts half of 6317e320f2 due to string freeze.
...
This was SVN commit r16355.
2015-02-18 19:32:08 +00:00
6317e320f2
Nerfs hero aura and deletes hardcoded health.
...
This was SVN commit r16354.
2015-02-18 19:30:22 +00:00
27e4122d44
fix damages on nearby units which, because of wrong argument (3d instead of 2d) was tested on x-y distance instead of x-z, resulting in faraway entities being damaged
...
This was SVN commit r16353.
2015-02-18 19:20:14 +00:00
3dbe3a364f
Adds "demo" keyword to some unplayable, unfinished maps so they are hidden in game setup, patch by thamlett, refs #2881
...
This was SVN commit r16352.
2015-02-17 21:26:24 +00:00
a5e940430f
Suppresses libpng warning "iCCP: known incorrect sRGB profile" by manually handling warning messages (errors still use default handler), fixes #2184
...
This was SVN commit r16350.
2015-02-17 10:50:19 +00:00
70219ab61f
Fixes GLSL terrain decal flicker by initializing normal vectors, fixes #2064
...
This was SVN commit r16349.
2015-02-17 08:13:24 +00:00
4b921d89da
prevent JS warning
...
This was SVN commit r16348.
2015-02-16 19:40:27 +00:00
5871c2c16d
fix #3058 , patch from Stan
...
This was SVN commit r16347.
2015-02-16 19:02:40 +00:00
6a12dab20f
Some hacks to fix game setup persisting problems, patch by @aBothe.
...
Fixes #3033 , #3034 .
The whole gamesetup.js system should be eventually re-factored to remove
those hacks and to improve the robustness of the code: see #3049 .
This was SVN commit r16346.
2015-02-16 17:48:27 +00:00
6f9c5efd76
Nerfs the robustness of ranged siege against melee units.
...
This was SVN commit r16344.
2015-02-16 15:19:41 +00:00
ba210c4d59
Fix c229b46ac2.
...
This was SVN commit r16343.
2015-02-16 14:38:13 +00:00
72ff88880c
Buffs walkspeed of pikemen slightly.
...
This was SVN commit r16341.
2015-02-16 00:26:43 +00:00
f8bd862512
Updated a few structure icons. Some new tech icons.
...
This was SVN commit r16340.
2015-02-15 12:32:55 +00:00
a3374d3164
Icons for palisade wall and palisade fort
...
This was SVN commit r16339.
2015-02-15 11:17:18 +00:00
c229b46ac2
Move visibility component activation check to C++. Patch by Itms.
...
This improves performance quite a lot because it avoids a huge number of
calls from C++ to JS. Check the ticket for performance measurements.
Refs #2913
This was SVN commit r16337.
2015-02-14 17:13:50 +00:00
f18a6981bb
Fixes extraneous attack. Reported by zzippy.
...
This was SVN commit r16336.
2015-02-14 14:55:32 +00:00
49222a4c6a
Fix Windows build
...
This was SVN commit r16334.
2015-02-14 02:22:22 +00:00
bb9de80dd4
Convert CConsole to take UTF-8 strings.
...
This avoids vswprintf failures when printing non-ASCII char* strings
from CLogger into the console.
Also convert ScriptInterface::ToString to return UTF-8, to avoid some
utf8_from_wstring calls.
Also remove some unused and redundant CConsole functions.
This was SVN commit r16333.
2015-02-14 01:49:34 +00:00
e06a7b37d8
Convert debug_printf to take UTF-8 strings instead of wchar_t.
...
This fixes the problem where passing a non-ASCII string to
debug_printf(L"%hs", s) caused vswprintf_s to fail on Linux (because it
doesn't know what encoding the char* is meant to have). Now debug
messages will remain as UTF-8 until they reach the OS.
Fixes #3021 .
This was SVN commit r16332.
2015-02-14 01:45:13 +00:00
bf4b8bfe9c
Siege balancing.
...
This was SVN commit r16331.
2015-02-13 07:05:54 +00:00
682a944d7e
Little code tweak without performance impact
...
This was SVN commit r16329.
2015-02-12 23:24:48 +00:00
bd7b07cc80
Make the visibility cache a bit more clever, by making LoS tiles as dirty separately for each player.
...
It is necessary to rely on shared los masks, else some visibility
updates will be missing.
Refs #2913 , see this ticket for a performance graph.
This was SVN commit r16328.
2015-02-12 23:22:29 +00:00
5725ceda9d
Petra: really fix the bug supposed to be fixed in 04fa2dd4ec
...
This was SVN commit r16327.
2015-02-12 21:04:29 +00:00
c049b0ae27
Treat \t as whitespace in config files. Fixes #3050 .
...
This was SVN commit r16326.
2015-02-12 17:31:10 +00:00
1e54289aa8
Only check binaries/data for po/pot files.
...
This was SVN commit r16324.
2015-02-12 00:25:47 +00:00
5775485421
Fix a bug that triggered errors when loading Roman champion cavalry.
...
This was SVN commit r16322.
2015-02-11 22:21:11 +00:00
e407b97d0e
Updates pikemen counter bonus to match that of spearmen.
...
This was SVN commit r16321.
2015-02-11 22:20:29 +00:00
42d96cfde7
...
...
This was SVN commit r16320.
2015-02-11 22:06:41 +00:00
b239bcd8b9
protection against JS warning
...
This was SVN commit r16319.
2015-02-11 20:27:04 +00:00
cd9eeef1b7
force garrisoned units as turrets to have stance standground, fixes #2905
...
This was SVN commit r16318.
2015-02-11 18:34:06 +00:00
04fa2dd4ec
Petra: more tunings for new ranges and fix a bug in attack preparation
...
This was SVN commit r16317.
2015-02-11 18:20:30 +00:00
51a37e6d0f
String changes, based on input from Transifex users:
...
- Fix a typo in the options screen
- Add an indication to Persian heroes dates, that are actually dates of
reign.
This was SVN commit r16316.
2015-02-11 15:08:09 +00:00
143e199d45
Add a new function to update the water renderer textures when resizing the renderer window. Patch by pendingchaos.
...
This fixes #2692 though the same issue might appear in some other cases
(possibly Atlas) and those will have to be checked.
This was SVN commit r16315.
2015-02-10 19:41:29 +00:00
cf30c90732
Nerfs melee cavalry slightly and increases spearman bonus.
...
This was SVN commit r16313.
2015-02-10 00:37:21 +00:00
a8f726df55
fix #3043 by increasing the minimum distance between civs
...
This was SVN commit r16312.
2015-02-09 19:21:56 +00:00
cc0c21d46b
Update the Survival of the Fittest map description for more clarity. Refs #2817
...
This was SVN commit r16310.
2015-02-09 18:06:46 +00:00
bb99c42aa5
Increase max VBO size back to 4MB.
...
Some meshes (e.g. pers_gardens_struct with gentangents enabled) have
>32K vertexes, and won't fit in a 2MB VBO. 0ef6c7555eFixes #3026 , #3042 .
This was SVN commit r16309.
2015-02-08 23:39:02 +00:00
26d303d854
Improve mod support of the structree. Patch by s0600204.
...
Adapt structree for changes from the balancing branch.
This was SVN commit r16308.
2015-02-08 23:07:18 +00:00
5d447432ec
fix previous fix
...
This was SVN commit r16307.
2015-02-08 23:03:47 +00:00
1f52d98856
fix game description of unknown_nomad
...
This was SVN commit r16306.
2015-02-08 22:58:19 +00:00
1af4a60b7c
Petra: some tweaks for new ranges from balance brabnch
...
This was SVN commit r16305.
2015-02-08 21:32:55 +00:00
c58a2a3c79
Hero balancing.
...
This was SVN commit r16302.
2015-02-08 20:54:34 +00:00
d09beef3de
Allow cavalry spearmen to do a little more hack to better counter siege.
...
This was SVN commit r16301.
2015-02-08 20:49:24 +00:00
001179da6e
Lessens the range difference between units and adjusts vision accordingly.
...
This was SVN commit r16300.
2015-02-08 20:12:07 +00:00
e1f61ea8f8
Fix tab/space issues with 6e37d6698b.
...
This was SVN commit r16299.
2015-02-08 18:17:56 +00:00
6bdd912146
Fix double-escape in the lobby chat.
...
This was SVN commit r16298.
2015-02-08 17:37:33 +00:00
75d295b25e
Add /allies to chat with mutual allies. Patch by trompetin17. Refs #1767 .
...
This was SVN commit r16297.
2015-02-08 17:37:24 +00:00
92701639f6
Update g_Players on diplomacy changes so the GUI actually knows about them.
...
This was SVN commit r16296.
2015-02-08 17:37:15 +00:00
a11bf075b1
Some text fixes reported by translators.
...
This was SVN commit r16295.
2015-02-08 15:46:26 +00:00
1b82389cf8
Reduces cavalry vision and makes palisade fort count as a village structure instead of town.
...
This was SVN commit r16294.
2015-02-08 15:07:35 +00:00
6e37d6698b
MessageBox cleanup.
...
This was SVN commit r16293.
2015-02-08 05:48:33 +00:00
f9c95b6953
Do not send gaia stats for rated games.
...
This was SVN commit r16292.
2015-02-08 01:59:02 +00:00
486094298e
Properly escape user chat.
...
This was SVN commit r16291.
2015-02-08 01:24:23 +00:00
37912c05ca
Increases tower range and nerfs archer accuracy.
...
This was SVN commit r16290.
2015-02-07 22:53:36 +00:00
f28c3b2392
fix the fix of 9ccd986bde
...
This was SVN commit r16289.
2015-02-07 22:47:09 +00:00
e882479e1a
Add tab-completition to game setup screen. Patch by trompetin17.
...
This was SVN commit r16288.
2015-02-07 21:57:57 +00:00
19ec4ced91
Clean up the splashscreen. More concise wording, only modern styling, alignment fixes, larger click/touch targets, and code cleanup.
...
This was SVN commit r16287.
2015-02-07 19:18:06 +00:00
f56102967f
Balance branch merge.
...
This was SVN commit r16285.
2015-02-07 18:50:36 +00:00
3c2a450679
Updates splashscreen. Fixes #3025 .
...
This was SVN commit r16284.
2015-02-07 18:30:16 +00:00
5e7b55996c
Fixes build with libmozjs-31-dev package from Ubuntu PPA. Fixes #3039 .
...
This was SVN commit r16283.
2015-02-07 18:28:44 +00:00
0f98bdb7ee
Fix a typo.
...
This was SVN commit r16282.
2015-02-07 15:51:45 +00:00
da0f33f137
Reduce drastically the number of mirages by making fogging conditional: entities will be miraged only if their health/resource amount is modified, or if they have a non-gaia owner.
...
Fixes the animals hidden in the FoW, and adds the missing status bars
for mirages.
Also small cleanup of the code.
Refs #2913
This was SVN commit r16281.
2015-02-07 15:48:32 +00:00
b66465de73
Improve code clarity after 0a53c5e06a by removing a fall-through.
...
Also fix the indentation to follow the coding conventions.
This was SVN commit r16280.
2015-02-07 15:38:22 +00:00
dab6836378
modified version of the skirmish/Sicilia map, to feature news in A18: starting without cc and with units garrisoned
...
This was SVN commit r16279.
2015-02-07 13:15:14 +00:00
9ccd986bde
fix initialization when changing maps, refs #2803
...
This was SVN commit r16278.
2015-02-07 12:49:00 +00:00
08827a9d64
fix a typo
...
This was SVN commit r16277.
2015-02-07 12:44:51 +00:00
932dbc7221
Import s0600204's structree.
...
Taken from https://github.com/s0600204/0ad-structree-mod with some
improvements from my fork.
On small resolutions some buildings might not be fully visible (see
#3038 ).
This was SVN commit r16276.
2015-02-07 01:37:05 +00:00
f6903393bd
Add various rotation modes for multiple object selections (individual rotation, global rotation with or without individual rotation).
...
Patch by trompetin17, fixes #1213
This was SVN commit r16275.
2015-02-06 22:23:50 +00:00
0a53c5e06a
Fix hero selection ring not cleared when the unit goes out of the world (when garrisoning for instance).
...
Patch by trompetin17, fixes #2627 .
This was SVN commit r16274.
2015-02-06 20:47:31 +00:00
18a1820d9c
Remove stray character.
...
This was SVN commit r16273.
2015-02-06 16:50:22 +00:00
766d2f833f
Fix gather rally points for formations (batches). Patch by stanislas69. Fixes #3037 .
...
Also clean up some whitespace.
This was SVN commit r16272.
2015-02-06 02:11:39 +00:00
846fdc1ed8
Provide explicit spezializations of hash_value for CTexturePtr and CTextureProperties. Fixes #3036 .
...
This was SVN commit r16271.
2015-02-06 02:03:20 +00:00
f0ae351158
read starting tech, disabled tech, ... from map JSON file, refs #1404
...
This was SVN commit r16270.
2015-02-05 22:29:36 +00:00
e12f53c48d
Some more gui cleanup.
...
This was SVN commit r16269.
2015-02-05 17:42:16 +00:00
94507bf7ee
Remove entirely the unit in the Celt outpost. Also clean out the dae model to remove the associated prop point.
...
Fix by stanislas69, fixes #2876 .
This was SVN commit r16268.
2015-02-04 17:39:24 +00:00
bf6323a71f
Amend 7020d17886 and also fix observer mode. Fixes #3032 .
...
This was SVN commit r16267.
2015-02-04 09:20:00 +00:00
d5aab3f056
hotkey button should have no effect when button is disabled, fix #3031
...
This was SVN commit r16266.
2015-02-03 18:22:41 +00:00
2eff0348c5
remove unused argument
...
This was SVN commit r16265.
2015-02-03 18:19:14 +00:00
b08941ba8d
Add back some data to the basic simulation state, works around 2ef3c0c42e.
...
Fixes #3016 .
This was SVN commit r16264.
2015-02-03 17:35:34 +00:00
0aa7e882b7
More gui cleanup.
...
This was SVN commit r16263.
2015-02-03 02:37:42 +00:00
e1b13dead9
Clean up tooltip code a bit more.
...
Remove useless tooltip from spart citizen, as the classes should be done
using visible classes.
This was SVN commit r16262.
2015-02-03 02:02:51 +00:00
53b335f5ae
Improve auto-completition of nick names and add it to the in-game chat. Patch by trompetin17. Refs #1767 .
...
This was SVN commit r16261.
2015-02-02 23:44:06 +00:00
3ee30f125c
update online manual
...
This was SVN commit r16260.
2015-02-02 21:18:39 +00:00
0038fb2e1e
Petra: small tweaks in defense
...
This was SVN commit r16259.
2015-02-02 20:52:45 +00:00
e75498a655
Fix d71161fe4c on WxWidgets 2.8
...
This was SVN commit r16258.
2015-02-02 20:20:37 +00:00
ec7c8f2d65
Move gain config setting retrieval to the sound manager. Fixes #3030 .
...
Also clean up the sound manager a bit.
This was SVN commit r16257.
2015-02-02 13:44:06 +00:00
d71161fe4c
Add a list of selected entities, grouped by template.
...
Patch by trompetin17, fixes #1392
This was SVN commit r16255.
2015-02-01 21:23:06 +00:00
3225e564fe
Fix 1564a10120, plus code cleanup
...
This was SVN commit r16254.
2015-02-01 19:04:21 +00:00
e1e5979d73
Petra: garrison siege units when useful
...
This was SVN commit r16252.
2015-01-30 18:41:33 +00:00
ad4e995bd4
clean 499d41ad80
...
This was SVN commit r16251.
2015-01-30 18:15:03 +00:00
7020d17886
Fix Gaia perspective, in which one could only see entities with a dirty visibility cache.
...
This was SVN commit r16250.
2015-01-30 18:08:16 +00:00
f52e3ea052
Fix uninitialized variable, fix by trompetin17, fixes #3027 .
...
This was SVN commit r16249.
2015-01-30 17:37:40 +00:00
1564a10120
Move back the computation of most of the visibilities from JS to engine, to improve performance.
...
Also fix the remaining TODO left by #958 , as a use case of the scripted
Visibility component.
Refs #2913 , #958 .
This was SVN commit r16248.
2015-01-30 15:28:06 +00:00
7d282f6bb1
Petra: improve late game when resources rely mainly on trade
...
This was SVN commit r16246.
2015-01-29 21:49:38 +00:00
499d41ad80
Shift key when deleting a saved game do not need confirmation, addresses #3018
...
This was SVN commit r16245.
2015-01-29 21:18:48 +00:00
df2e077870
Trailing spaces cleanup, based on patch by trompetin17, refs #1767 .
...
This was SVN commit r16244.
2015-01-29 16:10:03 +00:00
c654be8796
Extend ac8124b332 and avoid /delayload warnings in Windows builds when building Atlas and Collada.
...
This was SVN commit r16243.
2015-01-29 14:02:58 +00:00
6a70e3a62f
Updates checkrefs.pl to support mod mod and GUI XML change
...
This was SVN commit r16242.
2015-01-28 03:26:39 +00:00
0ef6c7555e
Optimise VBO updates.
...
Some drivers (at least the Intel drivers on Windows) are slow at
incrementally updating a VBO with hundreds of calls to glBufferSubData
every frame. Performance is significantly better if you use
glBufferData(NULL) to tell it to discard all the previous contents, and
then re-upload all the data at once.
Update CVertexBuffer so that GL_DYNAMIC_DRAW/GL_STREAM_DRAW buffers are
handled with the new mechanism. This requires the caller to hold onto
the backing store so it can be re-uploaded when necessary, and needs a
bit more signalling to indicate exactly what needs uploading.
I see an improvement from roughly 60 to 75 fps on Intel HD Graphics
3000, Windows, 1024x768, Siwa Oasis.
This was SVN commit r16241.
2015-01-28 00:48:00 +00:00
c599f92875
Big cleanup of the summary page internals, making use of nested tags in the xml and organizing the logic in a more flexible way.
...
Patch by trompetin17, fixes #2952 .
This was SVN commit r16240.
2015-01-27 21:38:05 +00:00
965a6f3838
update online manual, refs #3018
...
This was SVN commit r16239.
2015-01-27 18:24:33 +00:00
8af1c907fa
Reset victory conditions on map change. Refs #3001 .
...
This was SVN commit r16238.
2015-01-27 17:46:57 +00:00
0a34e6106d
Improve readability printing a single error message.
...
This was SVN commit r16237.
2015-01-27 09:14:30 +00:00
b38a6e9383
add hotkey for deleting saved games, addresses #3018
...
This was SVN commit r16236.
2015-01-26 21:05:31 +00:00
c61981793c
Fixes some missing replacements of mozjs24 with mozjs31
...
This has caused the bundled library to be built even if
--with-system-mozjs31 is specified (but actually it has still correctly
used the system library after building the bundled library).
Refs #2462
This was SVN commit r16235.
2015-01-26 18:19:24 +00:00
ee08dff5ad
Updates Windows installer config, making the SM debug dll exclusion more generic
...
This was SVN commit r16234.
2015-01-26 05:01:53 +00:00
2eabb799b9
Clear the victory conditions properly. Refs #3001 .
...
This was SVN commit r16232.
2015-01-25 20:52:10 +00:00
4473ed5c88
glext_funcs: Support glMapBuffer, glMapBufferRange
...
This was SVN commit r16231.
2015-01-25 16:36:23 +00:00
a8499e89eb
Pad vertex data to power-of-two sizes.
...
This reduces the total number of different vertex sizes in the system,
allowing more data to share a single CVertexBuffer, therefore reducing
the amount of wasted space in each CVertexBuffer and reducing VRAM
usage.
This was SVN commit r16230.
2015-01-25 15:38:51 +00:00
0423f6cc29
Petra: tweaks the starting strategy for scenarios with lot of units
...
This was SVN commit r16229.
2015-01-25 11:23:06 +00:00
123bab6793
Replace use of safe bool by explicit bool operator.
...
This was SVN commit r16228.
2015-01-25 03:11:24 +00:00
4c1903500b
Switch to std::shared_ptr and std::weak_ptr.
...
This was SVN commit r16227.
2015-01-25 03:10:58 +00:00
0843100d11
Remove partial emulation of some C++11 features for older compilers.
...
This was SVN commit r16226.
2015-01-24 20:37:18 +00:00
0261d12727
Remove some checks for usupported VS versions (<2013).
...
This was SVN commit r16225.
2015-01-24 20:37:16 +00:00
fc902df07c
Remove checks for unsupported GCC versions (<4.6).
...
This was SVN commit r16224.
2015-01-24 20:37:07 +00:00
59503b9ae9
Add basic support for GUI scaling factor, to help with high-res displays (e.g. 4K monitors and 1080p tablets).
...
Use the config setting "gui.scale = 0.5" to make the GUI bigger.
This was SVN commit r16223.
2015-01-24 20:06:37 +00:00
c976366590
Added a script for i18n maintenance tasks
...
The script updates the local repository, regenerates the POT files,
downloads the
latest PO files, reverts any change that Pology determines as not
meaningful, and
adds the modified files to the local VCS.
The script does not actually perform the final commit, that is left for
the user.
Ref #2492
This was SVN commit r16222.
2015-01-24 19:57:44 +00:00
ac8124b332
Avoid /delayload warnings in Windows build.
...
This was SVN commit r16220.
2015-01-24 18:54:47 +00:00
67956f969e
Make ARRAY_SIZE(pointer) complain in GCC, not just in MSVC.
...
The ArraySizeDeducer trick has worked since at least GCC 4.4, so it's
fine to rely on it now.
This was SVN commit r16218.
2015-01-24 17:35:25 +00:00
de25e536c3
Update NONCOPYABLE to use C++11 "=delete".
...
This gives slightly better error messages.
This was SVN commit r16217.
2015-01-24 17:33:49 +00:00
3ce38e536e
Update cassert to use C++11 static_assert.
...
This gives clearer error messages, and simplifies the code.
This was SVN commit r16216.
2015-01-24 17:29:19 +00:00
15e8637b67
Fix build with Visual Studio
...
I've reverted this workaround before the SM31 commit because I thought
it's only a problem with VS2010. Actually VS2013 still doesn't support
C++11 well enough and still requires the workaround.
Refs #2669 , #2462
This was SVN commit r16215.
2015-01-24 16:33:27 +00:00
c02a7e1a7b
SpiderMonkey 31 upgrade
...
This upgrade also introduces exact stack rooting (see to the wiki:
JSRootingGuide) and fixes problems with moving GC. This allows us to
enable generational garbage collection (GGC).
Measurements a few months ago have shown a performance improvement of a
non-visual replay of around 13.5%. This probably varies quite a bit, but
it should be somewhere between 5-20%. Memory usage has also been
improved. Check the forum thread for details.
Thanks to everyone from the team who helped with this directly or
indirectly (review, finding and fixing issues, the required C++11
upgrade, the new autobuilder etc.)! Also thanks to the SpiderMonkey
developers who helped on the #jsapi channel or elsewhere!
Fixes #2462 , #2415 , #2428 , #2684 , #1374
Refs #2973 , #2669
This was SVN commit r16214.
2015-01-24 14:46:52 +00:00
b9e46f386b
Disable online reporting of profiler data.
...
Nobody ever looks at the data, and it takes up a lot of server disk
space. The feature should probably be restored in the future once we've
fixed all the obvious performance problems, since a wider range of data
lets us search for system-dependent issues (e.g. some GL drivers are
particularly slow with particular features), but it's not worthwhile
now.
This was SVN commit r16213.
2015-01-24 14:29:05 +00:00
236f67d45f
Petra: fix defensive garrison by using GarrisonArrowClasses + several small fixes
...
This was SVN commit r16212.
2015-01-24 13:28:17 +00:00
f1f36232d8
fix limit changer when stating limit = 0
...
This was SVN commit r16211.
2015-01-24 12:03:31 +00:00
8f0ace2658
Make Android %ls/%hs workaround work on secure_crt as well as wsecure_crt.
...
Refs #2996 .
This was SVN commit r16210.
2015-01-24 00:22:12 +00:00
4d4ddb5978
Add workaround for Android libc++ swprintf bug.
...
Based on patch by BogDan. Refs #2996 .
This was SVN commit r16209.
2015-01-24 00:20:15 +00:00
8ca674d461
cppformat: Fix Android build.
...
The NDK only exposes the BSD-style strerror_r, not the GNU-style, so
select the appropriate code path.
This was SVN commit r16208.
2015-01-23 21:15:48 +00:00
2e01b157d6
Fix build error in GLES configurations
...
This was SVN commit r16207.
2015-01-23 20:54:14 +00:00
c9dee72667
GLES doesn't have glDisable(GL_TEXTURE_2D).
...
Patch by BogDan. Refs #2996 .
This was SVN commit r16206.
2015-01-23 20:40:02 +00:00
8a39ea5543
Avoid misaligned pointer dereferences, which can fail on ARM.
...
Based on patch by BogDan. Refs #2996 .
This was SVN commit r16205.
2015-01-23 20:39:40 +00:00
c9c80a9d94
SDL_SetWindowGammaRamp fails on Android, so don't bother using it.
...
Based on patch by BogDan. Refs #2996 .
This was SVN commit r16204.
2015-01-23 20:39:02 +00:00
ad3e330861
Workaround for limitations of Android's vswprintf implementation.
...
Based on patch by BogDan. Refs #2996 .
This was SVN commit r16203.
2015-01-23 20:38:13 +00:00
b64ff8d09a
Remove Android hack to autoload a map.
...
Patch by BogDan. Refs #2996 .
This was SVN commit r16202.
2015-01-23 20:36:52 +00:00
a2efd97476
fix js error
...
This was SVN commit r16201.
2015-01-23 17:34:46 +00:00
adcd9191a6
Updates Windows installer config for 65cc47f6c0
...
This was SVN commit r16200.
2015-01-23 03:38:02 +00:00
65cc47f6c0
Deletes unused bundled MSVC runtime libs for old 2005 and 2008 versions.
...
Removes VC80 manifest info.
This was SVN commit r16199.
2015-01-23 03:21:48 +00:00
5fa3318bbf
Adds premake build vs2013 workspace, since that's now our only supported version, and removes workspaces for old unsupported versions.
...
Rebuilds premake win32 binary with VC++ 2013.
This was SVN commit r16195.
2015-01-23 01:46:28 +00:00
f3f2717c66
Fix tests on 32-bit builds.
...
This was SVN commit r16193.
2015-01-22 21:13:09 +00:00
f350a24c73
Disable "assignment operator could not be generated" warning globally on Windows, since it's never useful.
...
This was SVN commit r16192.
2015-01-22 21:09:33 +00:00
d7926eb612
Add basic tests for %s/%hs/%ls in sprintf_s, swprintf_s.
...
This was SVN commit r16191.
2015-01-22 20:39:53 +00:00
ef2a358f87
Remove sys_vswprintf.
...
The implementation on Windows was gross. The only user was CLogger,
which no longer uses it.
Also fix vswprintf_s to handle truncated output correctly (by returning
"") on Linux, now that CLogger is no longer relying on the buggy
behaviour.
This was SVN commit r16190.
2015-01-22 20:39:28 +00:00
afa492f473
Preprocessor: Avoid using "%.*hs" in log format string, since cppformat doesn't support it.
...
This was SVN commit r16189.
2015-01-22 20:38:16 +00:00
568c415d0a
Convert wchar_t*/wstring arguments to UTF-8 strings in CLogger messages.
...
This was SVN commit r16188.
2015-01-22 20:37:38 +00:00
e02d7ad949
Automatically replace %hs/%ls with %s in CLogger format strings.
...
Everything is char* now, so we don't need to mess around with different
string types.
Done with:
ag -ls 'LOG(MESSAGE|MESSAGERENDER|WARNING|ERROR)' source | xargs perl
-pi -e'1 while
s/(LOG(MESSAGE|MESSAGERENDER|WARNING|ERROR).*)%[hl]s/$1%s/g'
This was SVN commit r16187.
2015-01-22 20:36:24 +00:00
38a8e2e0d6
Automatically convert most path.string().c_str() to path.string8()
...
Done with:
ag -l 'LOG.*string\(\).c_str\(\)' source | xargs perl -pi -e'1 while
s/(LOG.*string)\(\)\.c_str\(\)/${1}8()/g'
This was SVN commit r16186.
2015-01-22 20:35:17 +00:00
b90bc147c9
Add Path::string8 (which returns a UTF-8 encoded std::string).
...
This saves the hassle of writing utf8_from_wstring(path.string()) in
places like log messages, and can be extended to better handle
non-ISO-8859-1 paths on Linux.
This was SVN commit r16185.
2015-01-22 20:33:11 +00:00
e9a33b71ae
Manually fix the less trivial CLogger format strings.
...
This was SVN commit r16184.
2015-01-22 20:32:06 +00:00
49e2ecea63
Automatically convert all CLogger format strings from wchar_t* to char*.
...
Done with:
ag -ls 'LOG(MESSAGE|MESSAGERENDER|WARNING|ERROR)' source | xargs sed
-i 's/LOG\(MESSAGE\|MESSAGERENDER\|WARNING\|ERROR\)(L/LOG\1(/g'
This was SVN commit r16183.
2015-01-22 20:31:30 +00:00
dcf5a2667f
CLogger: Use cppformat instead of sys_vswprintf.
...
sys_vswprintf relies on platform-specific printf implementations, which
vary widely between platforms (in handling of truncation, return values,
use of %s/%S/%hs/%ls for mixing char and wchar_t strings, etc) and are
therefore a pain.
Use cppformat's fmt::sprintf instead, which has very similar syntax to
sprintf but is more C++ish and is portable.
Also, wchar_t is stupid, so use char* strings (which are expected to be
UTF-8) in CLogger. This creates a bit of a pain with changing all
callers to convert to char* strings, but that's their fault for not
using UTF-8 already.
Refs #3011 .
This was SVN commit r16182.
2015-01-22 20:30:05 +00:00
ca7b890e16
cppformat: Add basic tests for the functionality we use.
...
This was SVN commit r16181.
2015-01-22 20:28:57 +00:00
47b9a043b2
cppformat: Permit NULL arguments for %s.
...
Throwing exception on NULL is a bit extreme, and unhelpful when it
happens in rarely-tested error paths. Printing "(null)" is safer and
provides compatibility with glibc sprintf.
This was SVN commit r16180.
2015-01-22 20:27:58 +00:00
9c8798b592
cppformat: Remove support for CUSTOM types.
...
These cause a lot of type-safety trouble - unsupported types passed into
fmt::sprintf (like CStr or enums) will be accepted at compile time, but
trigger an exception at runtime. Remove them, so we'll get either an
implicit conversion to a supported type, or a compile-time error.
This was SVN commit r16179.
2015-01-22 20:27:34 +00:00
8875ae9cdf
cppformat: Fix compatibility with our build system on Windows.
...
This was SVN commit r16178.
2015-01-22 20:26:58 +00:00
f16407f6e9
cppformat: Fix -Wundef build warnings from GCC.
...
This was SVN commit r16177.
2015-01-22 20:26:32 +00:00
f96593a9f3
Import cppformat v0.11.0
...
Refs #3011 .
This was SVN commit r16176.
2015-01-22 20:25:10 +00:00
f8bfe3eafb
Clean up redundancies in templates for the Visibility component, refs #2913
...
This was SVN commit r16175.
2015-01-22 17:23:25 +00:00
ad1adbe027
Implement the Rotary Mill aura for Celtic factions. Patch by niektb, fixes #2900 .
...
Also remove the placeholder technology and the rotary mill generic
Celtic template, and rename the rotary mill portrait. Refs #2619 .
This was SVN commit r16174.
2015-01-22 10:16:26 +00:00
1857c33602
Remove use of __attribute__ that breaks the Windows build. Refs #2522 .
...
This was SVN commit r16172.
2015-01-21 22:37:25 +00:00
b5b9c0f2ae
Improve template code style for the Decay component.
...
This was SVN commit r16171.
2015-01-21 21:45:05 +00:00
b65dcaba48
Prevent observers from using the team chat. Patch by trompetin17, fixes #2879 .
...
This was SVN commit r16170.
2015-01-21 21:18:55 +00:00
76120d888b
Add some tinygettext changes from SuperTuxKart. Refs #2522 .
...
Move some data to RO. Pass some parameters as references.
Taken from https://github.com/Grumbel/tinygettext/issues/3 .
This was SVN commit r16169.
2015-01-21 21:17:45 +00:00
aeb18239c3
Update tinygettext to upstream commit ca0f3ff640. Refs #2522 .
...
Keeps our addition of precompiled.h (fd3d3352654c9d99ff68de6823d23f8fc14655b5
2015-01-21 20:37:37 +00:00
df3222a073
Petra: improve choice of target when attacking, to prevent cases where most units would follow the same target
...
This was SVN commit r16167.
2015-01-20 18:31:57 +00:00
852cd11305
Improve the performance of the GetLosVisibility function by using the cache (currently used for mirages only) whenever possible.
...
This was SVN commit r16166.
2015-01-20 16:29:50 +00:00
7a48606471
GLES compatibility for particle shader
...
This needs to use the model-view matrix, not model-view-projection (the
transform uniform), else the axes won't be unit vectors and the particle
sizes will be wrong. But GLES doesn't have the pre-defined matrices, so
pass it in explicitly.
This was SVN commit r16165.
2015-01-19 21:44:53 +00:00
e1e163b3f7
Improve ogl_WarnIfError() to report the file/line where the error was detected
...
This was SVN commit r16164.
2015-01-19 20:06:16 +00:00
b74e853144
Fix typo which caused GLES errors
...
This was SVN commit r16163.
2015-01-19 20:04:46 +00:00
4554ed676e
continue to display research overlay after victory, fixes #2983
...
This was SVN commit r16161.
2015-01-18 16:55:52 +00:00
09bbc9c35c
Enable C++11 by default.
...
Don't generate workspaces and remove checks for unsupported compier/IDE
version$
Refs #2669
This was SVN commit r16160.
2015-01-18 13:44:03 +00:00
10f90fd8cf
Petra: fix missing line in 0a5089c841
...
This was SVN commit r16159.
2015-01-18 10:28:30 +00:00
a72d490759
Fix Atlas compile problems with C++11 and clang. Thanks to trompetin17 for investigating this.
...
Refs #2669
This was SVN commit r16158.
2015-01-18 09:48:41 +00:00
840c8215b6
Fixes build error 'no viable conversion' on OS X with clang, libc++ and c++11, refs #2462 .
...
Removes explicit use of _Unwrap(), prefer deference operator * instead
This was SVN commit r16157.
2015-01-18 06:36:15 +00:00
8976fb7646
Fixes MSVC warning C4100 unreferenced formal parameter
...
This was SVN commit r16156.
2015-01-18 06:26:00 +00:00
4ca156e2d8
Updates build-osx-libs.sh to use wxWidgets 3.0.2.
...
Adds patch to fix wxWidgets build on Yosemite (based on
http://trac.wxwidgets.org/changeset/76743 ), fixes #2924 .
Removes patch for previous version of wxWidgets.
This was SVN commit r16155.
2015-01-18 03:31:26 +00:00
0a5089c841
Petra: prevent melee units to try to attack ships + tweaks on buildings
...
This was SVN commit r16154.
2015-01-17 17:50:27 +00:00
ba14819191
Use future-proof lib path in build-osx-libs.sh. Patch by trompetin17.
...
There are symbolic links to the library binaries in the directory
dist/lib. It's better to use these links rather than the location they
point to for the copy command (they point to a different location in
ESR31).
Refs #2462
This was SVN commit r16153.
2015-01-17 14:03:22 +00:00
993d9c72d3
Petra: various small tweaks
...
This was SVN commit r16152.
2015-01-17 12:53:33 +00:00
02a50fce62
Notify map makers when they are placing obstructed entities (overlapping other ones or placed outside the borders of the map). Patch by trompetin17
...
Fix #1163 , refs #2829 .
This was SVN commit r16149.
2015-01-14 09:11:11 +00:00
755ec45a14
Use correct format specifiers. Patch by bog_dan_ro.
...
This was SVN commit r16148.
2015-01-13 18:37:50 +00:00
702fb7344e
allow maps to handle garrisoned units, fixes #2984
...
This was SVN commit r16147.
2015-01-13 17:59:55 +00:00
f2d71164e6
Fixes game mode defaulting to Conquest when Endless mode is selected.
...
Patch by niektb, thanks!
Fixes #3001 .
This was SVN commit r16146.
2015-01-13 12:08:54 +00:00
528ed2d15e
prevent error when switching perspective to gaia
...
This was SVN commit r16145.
2015-01-12 22:03:03 +00:00
e916c7e91f
add display of trading goods when multiple selection
...
This was SVN commit r16144.
2015-01-12 21:39:31 +00:00
9855717840
Petra fix js warning when building cart super_dock, addresses #2998
...
This was SVN commit r16143.
2015-01-12 20:47:14 +00:00
320cfa0bfc
Petra: complete the rework of starting game to allow more flexibility (i.e. support of nomad maps)
...
This was SVN commit r16142.
2015-01-11 22:47:24 +00:00
851d3d964a
Fixes MSVC build warnings about unhanded cases in switch statement (C4062) and missing parameter in macro (C4003)
...
This was SVN commit r16141.
2015-01-11 21:37:53 +00:00
8fc14655b5
Improve 524a942b52. Refs #2637 .
...
This was SVN commit r16140.
2015-01-11 19:14:03 +00:00
95fa46304f
Don't specify wxwidgets lib names in extern_libs4.lua
...
It works without specifying them and this way it builds with wxwidgets
2.8 and 3 on Windows
Refs #2891
This was SVN commit r16139.
2015-01-11 17:25:24 +00:00
524a942b52
Only print add_translation warning when translations do not match
...
FIXES 2637
This was SVN commit r16138.
2015-01-11 14:08:01 +00:00
873399b294
fix a typo, addresses #2998
...
This was SVN commit r16136.
2015-01-10 19:41:02 +00:00
731e3dd13c
Petra: continue rework of starting game to allow more game type
...
This was SVN commit r16135.
2015-01-10 14:34:26 +00:00
77dba7a8bb
Remove some duplication in the gui tooltip code.
...
This was SVN commit r16134.
2015-01-09 17:08:12 +00:00
539b4d8372
Remove an old, useless and possibly broken call.
...
This was SVN commit r16133.
2015-01-09 16:59:01 +00:00
c681174fad
Adds a notice about a known issue in premake4.lua with the icc compiler
...
Refs #2994
This was SVN commit r16132.
2015-01-09 12:48:42 +00:00
5cf2086a33
Fix the initial exploration of territories, which shouldn't be performed in Atlas.
...
Also clean up the code a bit.
Fixes #2969
This was SVN commit r16129.
2015-01-08 22:36:13 +00:00
006faaeaeb
Petra: tunings for 9b79b5b844
...
This was SVN commit r16128.
2015-01-08 22:01:38 +00:00
0f21151c4b
Some gui code cleanup/restructuring.
...
Moving some tooltip code that only needs templates to common/ to
allow to use that for the structree mod.
This was SVN commit r16127.
2015-01-08 21:37:59 +00:00
57033850a8
Check for unsaved changes in Atlas. Patch by trompetin17, fixes #2819 .
...
This was SVN commit r16126.
2015-01-08 21:29:27 +00:00
57ecf88ac2
Move some technology template and template information retrieval code
...
to globalscripts, so that the gui is able to use it without needing the
simulation.
This helps remove code duplication in the structree mod.
This was SVN commit r16125.
2015-01-08 19:55:10 +00:00
e8fb23e940
Fix tests broken in bd31f83587.
...
This was SVN commit r16124.
2015-01-08 19:20:34 +00:00
bdb1145f63
remove some debug printout forgotten in 9b79b5b844
...
This was SVN commit r16123.
2015-01-07 21:55:21 +00:00
9b79b5b844
Petra: first step of base management rework needed for nomad maps
...
This was SVN commit r16122.
2015-01-07 21:40:10 +00:00
bb6003ea0c
rename civ specific player template following 4243433f94 convention
...
This was SVN commit r16121.
2015-01-07 21:18:59 +00:00
bd31f83587
Check if components exist before using them.
...
Remove EntityLimits and TechnologyManager from the gaia player template.
This was SVN commit r16120.
2015-01-07 20:48:36 +00:00
4243433f94
Use a gaia specific player entity.
...
Fix some code that assumed components exist instead of testing for them.
EntityLimits and TechnologyManager are not needed for gaia and will be
removed in the future.
This was SVN commit r16119.
2015-01-07 20:33:19 +00:00
c6bb3df43a
following #2877 , civilCentre must be disabled for this kind of scenario
...
This was SVN commit r16118.
2015-01-07 20:29:01 +00:00
01fb25fdab
Fix variable name.
...
This was SVN commit r16117.
2015-01-07 19:52:33 +00:00
a8c85035f8
Ignore gaia in PlayerData when loading maps.
...
This was SVN commit r16116.
2015-01-06 00:16:06 +00:00
b36c78b4c4
Fix build warning
...
This was SVN commit r16115.
2015-01-05 20:05:53 +00:00
d8b1549883
Seleucid farmstead
...
This was SVN commit r16114.
2015-01-04 12:46:57 +00:00
045fea23aa
Properly adjust Atlas for the init changes.
...
This was SVN commit r16112.
2015-01-03 17:42:42 +00:00
c21514b844
Do not include domestic animals in military selection. Patch by trompetin17. Fixes #2978 .
...
This was SVN commit r16111.
2015-01-03 15:44:28 +00:00
dadfcb06d2
Specify icons for base phase techs.
...
This was SVN commit r16110.
2015-01-03 15:15:55 +00:00
d13821fa7d
Village phase icon
...
This was SVN commit r16109.
2015-01-03 12:01:21 +00:00
0195cdb374
Seleucid storehouse
...
This was SVN commit r16108.
2015-01-03 04:03:22 +00:00
abb62b0662
fix a typo in petra, thanks to brian
...
This was SVN commit r16106.
2015-01-02 19:35:35 +00:00
21f525c966
Seleucid temple now has fully articulated stairs!
...
This was SVN commit r16105.
2015-01-02 14:43:07 +00:00
f0d7346b8f
Happy New Year! :D
...
This was SVN commit r16103.
2015-01-02 14:22:23 +00:00
5bad08d66b
Seleucid civ center placeholder
...
This was SVN commit r16102.
2015-01-02 13:21:40 +00:00
8441a3f8d6
Fix compilation failure with GCC and C++98/03.
...
Local types shall not be used as a template argument. So move it
to a higher scope. This restriction was lifted in C++11, so we
might want to change this back when we switch to that.
This was SVN commit r16101.
2015-01-01 23:57:04 +00:00
8097eeb8ab
Fix RMS library forgotten in the previous commit.
...
Changes some direct accesses to use the library function.
This was SVN commit r16100.
2015-01-01 23:57:00 +00:00
a472944689
Clean up LoadPlayerSettings.
...
Include gaia to make iteration easier.
Add TemplateExists() to the TemplateLoader. Refs #2877 .
This was SVN commit r16099.
2015-01-01 23:10:24 +00:00
8e30410109
Improve PickEntitiesAtPoint
...
First, do a ray intersection test with the bounding-sphere for all
entities on the map and then check the more detailed selection shape for
the remaining candidates. Do checks that require component lookups after
the ray intersection tests because these are relatively expensive.
The old method for figuring out which entities are below the mouse
cursor was incorrect because it does a 2D check to filter out the first
candidates which can lead to incorrect results with lower camera angles
and high buildings or buildings with a large footprint. Such problems
were avoided with quite a large radius for this 2D test and resulted in
a large number of candiate entities after this first test (200-500).
Also rename PickEntitiesAtPoint to PickEntityAtPoint and make it return
only one (the closest) match.
I've tested performance with the tracelogger by starting a map and then
moving the mouse in circles for one minute. The results were relatively
stable. I've compared the total time percentage of input.js:836, which
spends nearly all of the time in PickEntityAtPoint.
Ardennes Forest - Normal size: Original: 41.46% Patched: 31.6%
Ardennes Forest - Giant size: Original: 40.59% Patched: 51.55%
As we see, it's faster on normal map sizes but slower on giant maps with
a lot of entities.
This approach can be further improved with some kind of spatial
subdivision for the culling (like an octree), which would help the unit
renderer too. This way it should be possible to make it faster (and
still correct) on all map sizes and with a large total numbers of
entities.
This was SVN commit r16098.
2015-01-01 23:05:26 +00:00
7ac837fb90
allow the removal of entity limits when some requirements are satisfied. This allows to have starting games without cc
...
This was SVN commit r16097.
2015-01-01 18:28:21 +00:00
95e0763ac9
Seleucid temple commit! Minor edits to Sele_struct_2 texture file.
...
This was SVN commit r16096.
2015-01-01 16:28:32 +00:00
e8d1acfa41
preserve random civ in saved game settings, refs #2963
...
This was SVN commit r16095.
2014-12-31 15:34:48 +00:00
802320e753
some petra cleanings
...
This was SVN commit r16094.
2014-12-31 09:59:47 +00:00
9329506e0d
add support for civ specific player template, see #2877
...
This was SVN commit r16092.
2014-12-31 09:31:41 +00:00
f984ba40ee
Seleucid house commit
...
This was SVN commit r16091.
2014-12-31 07:27:07 +00:00
913674a202
Remove useless call.
...
This was SVN commit r16090.
2014-12-31 00:21:41 +00:00
2c20936ce3
Save map settings. Patch by @aBothe. Fixes #2963 .
...
This was SVN commit r16089.
2014-12-31 00:21:24 +00:00
8f387e0044
Remove code duplication and some cleanup.
...
This was SVN commit r16088.
2014-12-30 18:21:02 +00:00
992169c3ab
Fix indentation in daaddaf433.
...
This was SVN commit r16087.
2014-12-30 17:27:18 +00:00
555601fe51
Petra: avoid creating unused entitycollections
...
This was SVN commit r16085.
2014-12-29 23:56:37 +00:00
daaddaf433
Stop music in Atlas when reloading a map, patch by trompetin17, fixes #1712 .
...
This was SVN commit r16084.
2014-12-29 21:01:54 +00:00
f337905f14
Actually focus the group instead of following it. Patch by trompetin17. Fixes #2972 .
...
This was SVN commit r16083.
2014-12-29 20:40:37 +00:00
53023b7efc
This was SVN commit r16082.
2014-12-29 19:26:37 +00:00
9a17a96054
Fix warning when following units. Fixes #2971 .
...
This was SVN commit r16081.
2014-12-29 18:56:00 +00:00
354bd8b088
Only delete/create players until the needed number is reached. Patch by trompetin17. Fixes #1953 .
...
Previously we removed all players and created them anew. This caused
issues in Atlas,
as some components were recreated, but did not get informed about
already existing
entities (eg cmpTechnologyManager). By only creating/deleting players
until we obtain
the new number of players we do not have this issue.
This was SVN commit r16080.
2014-12-29 17:33:39 +00:00
f2edd35989
Enable LoadCivData to only load playable civs. Patch taken from s0600204's structree work.
...
This was SVN commit r16079.
2014-12-29 16:24:42 +00:00
8608b0fe89
Seleucid Tower and textures
...
This was SVN commit r16078.
2014-12-29 12:29:41 +00:00
d68a057153
Fix warning.
...
This was SVN commit r16077.
2014-12-28 16:45:06 +00:00
0406f62ea0
Fix a typo, reported by t4nk004 on IRC.
...
This was SVN commit r16076.
2014-12-28 16:35:32 +00:00
4c12440868
Give access to the templates to the GUI. This will be useful for eventually displaying factions specificities in main menus.
...
This was SVN commit r16075.
2014-12-28 16:21:07 +00:00
92af594986
Petra: rewrite a stupidly inefficient function spotted by the traceLogger
...
This was SVN commit r16073.
2014-12-27 18:44:34 +00:00
0dd6711afa
make Petra support passability and territory maps of different resolutions, addresses #2960
...
This was SVN commit r16072.
2014-12-27 15:23:20 +00:00
2ef3c0c42e
Compute the actual percentage of map explored by the team in the summary screen.
...
Fixes #2587 .
This was SVN commit r16071.
2014-12-26 19:13:40 +00:00
dbb4b2c920
Update the Greek Acropolis (4) map description to remove the reference to the old non-skirmish map.
...
This was SVN commit r16070.
2014-12-26 18:07:10 +00:00
1e17cbe33c
Use the range manager to pick entities when drawing a selection box during a game. This allows for a significant performance improvement.
...
Fixes #2961 , patch by @aBothe.
This was SVN commit r16068.
2014-12-26 13:07:49 +00:00
ec9e0dfeed
Add missing file in 286112e0aa.
...
Refs: #2937 .
This was SVN commit r16065.
2014-12-25 14:22:15 +00:00
286112e0aa
Fixes #2937 . Thanks to Lion_Kanzen and Pureon for making icons.
...
This was SVN commit r16064.
2014-12-25 05:12:39 +00:00
b2650e08ba
Fixes obelisks for player 2 and player 3 that were inverted.
...
Patch by silure, thanks!
Fixes #2962 .
This was SVN commit r16063.
2014-12-24 15:26:45 +00:00
9684bcd360
add AI support of maps of different dimensions, see #2960
...
This was SVN commit r16062.
2014-12-23 14:17:52 +00:00
49187dd990
Drop support for AIs that are not using modules.
...
This was SVN commit r16061.
2014-12-23 01:20:50 +00:00
d21cf8f3aa
Clarify some comments.
...
This was SVN commit r16060.
2014-12-23 00:46:00 +00:00
ce0c1e4302
Report names of components or interfaces in case of error when registering those.
...
This was SVN commit r16059.
2014-12-23 00:29:14 +00:00
efce88b97b
Call setlocale(3) on BSDs so that we can log unicode strings. Patch by Teiresias. Fixes #1142 .
...
This was SVN commit r16058.
2014-12-22 00:23:07 +00:00
4ce667412b
Improve performance when looking for new targets.
...
Tested in combat demo huge where nearly 50% of the replay time is spent
looking for new targets, and GetPreference is called a lot as used to
sort possible targets.
Caching the preferred classes before the second loop, the replay time of
combat demo huge is reduced by about 15%. Replacing the "for each" loops
by "for of" loops gains an additionnal 7%.
This was SVN commit r16057.
2014-12-21 14:30:47 +00:00
96c45eac61
Fix missing escapes.
...
This was SVN commit r16056.
2014-12-21 02:23:17 +00:00
71ba68e3a3
Fix performance problem with unnecessary global message subscription
...
On my ESR31 branch, I've made two measurements with different replays
(both around 15000 turns).
In the first, I got around 3% performance improvement and in the second
about 7.5%. It mainly depends on how often aura changes related to the
female citizen aura happen.
This was SVN commit r16055.
2014-12-21 01:44:00 +00:00
01e2a33486
various small improvements in petra (choice of units in start game, ram management and team warnings when new trade route available)
...
This was SVN commit r16054.
2014-12-19 17:57:24 +00:00
39f6a8d3cd
reshuffle the petra deserialization to prevent it to modify the metadata infos
...
This was SVN commit r16053.
2014-12-16 21:33:07 +00:00
a13cc54fc3
Use correct variable. Fix #2957 .
...
This was SVN commit r16052.
2014-12-16 21:05:24 +00:00
a143c847e2
small fixes for petra
...
This was SVN commit r16051.
2014-12-14 21:35:24 +00:00
a9c6b7080a
Fixes intermittent error messages caused by uninitialized variable
...
This was SVN commit r16049.
2014-12-14 17:43:40 +00:00
9b6981465a
improve a bit the fix of 639a174388
...
This was SVN commit r16048.
2014-12-13 21:30:13 +00:00
639a174388
petra: fix choice of target when enemy resigned + some cleanings
...
This was SVN commit r16047.
2014-12-13 16:47:37 +00:00
add113a2a1
Remove duplicated layers of unescaping which required multiple escapes in some places.
...
This was SVN commit r16043.
2014-12-13 01:08:29 +00:00
a22f30c9b0
Improve AI performances thanks to traceLogger diagnostics. The gain is about 10% of AI time. The patch includes also some code cleanings.
...
This was SVN commit r16042.
2014-12-12 17:41:10 +00:00
34855896d0
fix typo in 30fb8d0f57
...
This was SVN commit r16041.
2014-12-12 07:36:34 +00:00
30fb8d0f57
ResourceGatherer cleanup.
...
s/var/let/, check if cmpPlayer != null before using it, some whitespace.
This was SVN commit r16039.
2014-12-12 01:11:06 +00:00
92ee34d76f
Properly localize tribute messages.
...
This was SVN commit r16038.
2014-12-12 01:11:04 +00:00
eb8a6c9427
Explictly use GMT when displaying a localized time that is not a date. Patch by lafferjm. Fixes #2938 .
...
Also make some parameters const references.
This was SVN commit r16037.
2014-12-12 01:11:00 +00:00
539046f750
Improves performance for the ResourceGatherer component
...
The tracelogger has shown one of the functions as 4.9% and one as 2.2%
before the patch. After the patch, both functions were below 0.5%. 100%
is the time for all JS code being executed during a non-visual replay,
including GC, overhead for the tracelogger and JIT code compiling.
This was SVN commit r16036.
2014-12-11 23:12:08 +00:00
e435ef2704
several optimisations on the ai, refs #2370
...
This was SVN commit r16035.
2014-12-11 20:24:33 +00:00
622614de02
Allow nesting repeat tags in the GUI.
...
This was SVN commit r16034.
2014-12-10 20:10:02 +00:00
fd93e4ae74
Remove testing of some special templates. We need to find a good way to generate template subsets, refs #2951 .
...
This fixes the tests fail introduced in b05879e151
2014-12-09 23:20:31 +00:00
21ecb22432
remove some now empty functions following previous patch
...
This was SVN commit r16032.
2014-12-09 20:30:27 +00:00
bce404adf2
Fixes the translation of the map size in the rihgt sidebar of the lobby
...
Fixes #2547
This was SVN commit r16031.
2014-12-09 20:11:16 +00:00
ae7c2f9586
ai: entitycollections switch to maps, see #2370
...
This was SVN commit r16030.
2014-12-09 19:55:37 +00:00
36187ea64a
petra: allow replacing civ center in game
...
This was SVN commit r16029.
2014-12-08 18:23:27 +00:00
6a785f791a
additional fix for inefficient EC, thanks to Yves for noticing
...
This was SVN commit r16028.
2014-12-07 22:19:59 +00:00
3e09cf4797
improve petra performances, see #2370
...
This was SVN commit r16027.
2014-12-07 16:36:56 +00:00
37ae9f4ad2
fix previous tag
...
This was SVN commit r16026.
2014-12-06 16:13:13 +00:00
0facb07ca6
petra: changes in farms and tributes management
...
This was SVN commit r16025.
2014-12-06 14:48:06 +00:00
f80adad667
Fixes some inconsistent line endings and EOL-related SVN properties.
...
This was SVN commit r16024.
2014-12-06 12:11:42 +00:00
b05879e151
Move template items GetRetainInFog and AlwaysVisible from Vision to Visibility.
...
Refs #2913
This was SVN commit r16022.
2014-12-05 18:33:59 +00:00
0df90c5c2b
ai common api : use maps for entitycollection lists + cleanings
...
This was SVN commit r16019.
2014-12-03 20:22:13 +00:00
7e0e566346
Fix typo in include. Refs #2086 .
...
This was SVN commit r16018.
2014-12-03 16:43:51 +00:00
4931652263
Non-fighting ships should not be agressive by default
...
This was SVN commit r16017.
2014-12-01 20:58:46 +00:00
5403c19cf0
petra: internal functions are now serialized
...
This was SVN commit r16016.
2014-11-30 19:05:39 +00:00
3c45599be5
fix default ai difficulty when using autostart, was easy since f90841cf78
...
This was SVN commit r16015.
2014-11-30 16:35:32 +00:00
1cc19e9176
Specify that my templatesanalyzer tool is distributed under the MIT license. Thanks to leper for noticing that it was currently unspecified.
...
This was SVN commit r16014.
2014-11-30 16:28:04 +00:00
759a6701f6
Fix test build.
...
The parser that extracts the methods to call does not care about
defines.
This was SVN commit r16013.
2014-11-29 21:26:01 +00:00
c0092aaca5
petra: some cleanings + (small) timing optimizations
...
This was SVN commit r16012.
2014-11-29 18:53:17 +00:00
049312e5a2
various small tunings for petra
...
This was SVN commit r16011.
2014-11-26 22:01:40 +00:00
89cc0fd0e1
Add support to escape dots (.) by using double dots (..) for aura keys. Fixes #2945 (I think)
...
This was SVN commit r16010.
2014-11-26 19:59:08 +00:00
1430efa9d6
Properly handle auto-research promotion techs at game start.
...
This was SVN commit r16009.
2014-11-25 22:47:02 +00:00
7102f86de3
petra: avoid updating some no-more-used entitycollections
...
This was SVN commit r16008.
2014-11-25 19:00:17 +00:00
347ffabaeb
Change the way we filter out selected entities when we draw a selection box. Add a hotkey to allow selecting only idle units.
...
Patch by Rolf Sievers, fixes #2407 .
This was SVN commit r16007.
2014-11-24 16:46:05 +00:00
882c1383e1
Add wall style for Seleucids in the random map scripts. Currently, Hellenic walls are used. Fixes a bug in the Fortress random map.
...
Patch by FeXoR.
Fixes #2942 , refs #2619 .
This was SVN commit r16006.
2014-11-24 16:19:17 +00:00
04343a8407
Fix a comment written too quickly
...
This was SVN commit r16005.
2014-11-23 21:47:15 +00:00
a7cc670a2d
petra: stop (after some time) to try gathering inaccessible resources (i.e. chicken inside buildings in random maps) + some cleanings
...
This was SVN commit r16004.
2014-11-23 14:48:26 +00:00
5f9c908abb
Allow techs to modify the resources that can be dropped of at dropsite. Patch by niektb. Fixes #2629 .
...
This was SVN commit r16003.
2014-11-22 23:21:11 +00:00
87d5d37488
Some source string fixes.
...
This was SVN commit r16002.
2014-11-22 22:21:54 +00:00
c385a88c88
Remove unused overload of GetSavedGameData
...
This was SVN commit r16001.
2014-11-22 19:46:24 +00:00
d1cdf8f952
display victory conditions when selecting a map, fixes #2727
...
This was SVN commit r16000.
2014-11-21 18:30:17 +00:00
0cc9cfd40c
fix a JS error in petra
...
This was SVN commit r15999.
2014-11-21 17:46:07 +00:00
2734982657
Escape a character.
...
This was SVN commit r15998.
2014-11-20 22:19:35 +00:00
504e23acb8
Make some things static.
...
This was SVN commit r15997.
2014-11-20 22:19:33 +00:00
335ac3d0cb
Query /proc for the executable path on Linux. Patch by starslayer. Refs #2086 .
...
Factor out unix_ExecutablePathname() which is used by BSDs and Linux (as
a fallback).
This was SVN commit r15996.
2014-11-20 22:19:21 +00:00
8a66a732c7
Add "Copy" and "Paste" entries to the Atlas "Edit" menu. Patch by stilz_, fixes #2642 .
...
This was SVN commit r15994.
2014-11-20 20:52:32 +00:00
1abd5669c9
Replace spaces in source file paths with non-breaking spaces. Refs #2539 .
...
This way our map file paths are not split due to word wrapping in the po
files.
This was SVN commit r15993.
2014-11-19 23:10:51 +00:00
f90841cf78
add a very-easy level for AI, addresses #2899
...
This was SVN commit r15990.
2014-11-18 21:21:21 +00:00
da1af993f7
petra: better AI recovery after its economy is badly damaged + some fixes
...
This was SVN commit r15989.
2014-11-18 19:56:23 +00:00
3589aa39b9
Update documentation on how to generate the entity component documentation.
...
This was SVN commit r15987.
2014-11-18 03:57:21 +00:00
afecbf02f3
Extend the config parser to support ini-style config files. Refs #1810 .
...
Config settings in a section are stored as "sectionname.setting"
internally.
Do not write section headers when writing config files as we would need
to write
settings without a dot first or ignore them. This can be changed once
all settings
belong to a section.
This was SVN commit r15986.
2014-11-18 03:57:07 +00:00
73de625089
Also change GameSetup.cpp.
...
This was SVN commit r15985.
2014-11-18 00:24:29 +00:00
9407dbe45e
Remove useless parameter from CFG_GET_VALUE.
...
This was SVN commit r15984.
2014-11-17 23:29:49 +00:00
3e4c701ab6
ensure that there are no dupes in buildable list
...
This was SVN commit r15983.
2014-11-17 23:07:57 +00:00
6695f1a3e8
Remove CParser. Fixes #2589 .
...
This was SVN commit r15981.
2014-11-17 01:04:24 +00:00
b995135138
Use an FSM to parse our config files instead of using CParser. Refs #2589 .
...
Properly write config settings with multiple values back to files. Refs
#1810 .
Print error messages if we encountered an invalid setting.
This was SVN commit r15980.
2014-11-17 01:03:59 +00:00
334f391446
Oxford comma.
...
(We seem to use it elsewhere in the UI, so be consistent.)
This was SVN commit r15979.
2014-11-16 23:44:40 +00:00
cbc49f43e6
The show full games filter in the lobby should be off by default.
...
This was SVN commit r15978.
2014-11-16 22:40:00 +00:00
947abde749
Flip the buttons in the leave game confirmation dialog to the no/yes order to match other dialogs.
...
Per the Apple Human Interface Guidelines the confirmation button should
be on the right. We do that for all(?) other dialogs, but not this one.
This was SVN commit r15977.
2014-11-16 22:21:57 +00:00
caed74df23
Fix line endings.
...
This was SVN commit r15976.
2014-11-16 22:21:06 +00:00
1b91421e5e
Escape special character.
...
This was SVN commit r15975.
2014-11-16 22:06:18 +00:00
30b7a34112
Rename Arcadia 2 to Arcadia, because there doesn't seem to be an Arcadia 1 any more.
...
This was SVN commit r15974.
2014-11-16 22:03:47 +00:00
f88ee2766e
use by default a random seed for the AI to make it less repetitive
...
This was SVN commit r15973.
2014-11-16 19:53:29 +00:00
94e6e29a34
Properly escape a character and remove a stray tag.
...
This was SVN commit r15972.
2014-11-16 18:00:02 +00:00
ccb5366e40
fixes #2935
...
This was SVN commit r15971.
2014-11-16 10:09:20 +00:00
59676dfc84
Update tools/LICENSE.txt
...
This was SVN commit r15970.
2014-11-16 02:10:31 +00:00
df4c07238d
Change GUI tag parsing to use a FSM instead of using CParser. Refs #2589 .
...
Parameters now have to be quoted with ".
Supports " in parameters by escaping them with \.
Tag start characters can be included in normal text by escaping them
with \.
Better error handling and a error messages to help with fixing
invalid/malformed strings.
This was SVN commit r15969.
2014-11-16 02:10:28 +00:00
d15e2f0cf6
Check for availability of XmppClient.
...
Move Lobby script function registration to the lobby JS interface.
This was SVN commit r15968.
2014-11-16 02:10:24 +00:00
d58189d510
Parse terrain properties without CParser. Refs #2589 .
...
This was SVN commit r15967.
2014-11-16 02:09:02 +00:00
fc1fe174cd
Amend the "Reveal All" behavior by always hiding mirages.
...
This was SVN commit r15966.
2014-11-14 20:29:35 +00:00
4d89820f1c
Fixes build errors on Windows introduced in c813a11427 and 1a0f9b086e.
...
This was SVN commit r15964.
2014-11-13 22:37:43 +00:00
8a290b3204
Fix mirages not flushed properly, introduced in 9ad2fc9fac.
...
This was SVN commit r15963.
2014-11-13 21:04:40 +00:00
49a31c5de2
prevent events from the first turn after deserialization to be thrown away
...
This was SVN commit r15962.
2014-11-13 20:21:00 +00:00
c813a11427
Split ScriptRuntime and ScriptInterface code to separate files.
...
The runtime is becoming more and more important in the JSAPI. As a
result, we also have more functionality on the runtime level and having
the whole ScriptRuntime class hidden in ScriptInterface.cpp doesn't make
sense anymore. ScriptInterface.cpp also has become quite a large file
and pulling out the runtime part makes it a bit smaller.
Refs #2462
This was SVN commit r15961.
2014-11-13 11:19:28 +00:00
1a0f9b086e
GUI cleanup.
...
Remove toTitleCase(). Unify iColorToString() and rgbToGuiColor().
Translate XMPP errors (displayed when connecting).
This was SVN commit r15960.
2014-11-13 01:26:36 +00:00
6e788fb15e
Clean up JSON parsing code. Refs #1374 .
...
Fix Engine.ReadJSONFile() which did throw a JS exception that was not
caught. Discovered by s0600204.
Expose Engine.ReadJSONFile() to the gui scripts.
This was SVN commit r15959.
2014-11-13 01:26:22 +00:00
e1c77bb487
Fix tests.
...
This was SVN commit r15958.
2014-11-12 19:51:28 +00:00
6556aa8c1e
fix petra serialization
...
This was SVN commit r15957.
2014-11-12 18:44:43 +00:00
9ad2fc9fac
Slightly improve fogging performance by avoiding the constant deletion/re-creation of mirages.
...
This makes the simulation update faster per entity but also makes the
number of entities greater at a given moment. The performance gain is
positive.
This was SVN commit r15956.
2014-11-12 15:56:45 +00:00
7130997df9
still more fixes on ai serialization + some cleanings
...
This was SVN commit r15954.
2014-11-11 22:08:28 +00:00
b596f7a893
additional fixes for petra serialization
...
This was SVN commit r15953.
2014-11-11 19:02:35 +00:00
13a71f6ae4
some fixes and cleaning in petra saved game support
...
This was SVN commit r15952.
2014-11-11 11:07:57 +00:00
6bab40c139
some bugfixes on ai serialization
...
This was SVN commit r15951.
2014-11-10 20:22:10 +00:00
e4774066e2
complete the support of saved games by Petra. It is playable now, but still needs cleaning and bug fixes.
...
This was SVN commit r15950.
2014-11-10 18:35:52 +00:00
c236e8a877
further steps towards saved games support, but still wip
...
This was SVN commit r15948.
2014-11-10 09:03:03 +00:00
e108b162b6
Add hotloading for translation files. Fixes #2915 .
...
This was SVN commit r15947.
2014-11-09 16:58:14 +00:00
8b9847e007
Replace CScriptValRooted with JS::Heap<T> and custom tracer for CNetClient
...
Refs #2462
This was SVN commit r15946.
2014-11-09 15:16:00 +00:00
e1f354024a
Persian temple upgrade
...
This was SVN commit r15945.
2014-11-09 11:30:50 +00:00
8e2d514228
Exact stack rooting for CParamNode
...
Refs #2415
Refs #2462
This was SVN commit r15944.
2014-11-09 11:08:53 +00:00
9040f8a3d3
Persian stables upgrade
...
This was SVN commit r15941.
2014-11-08 23:51:33 +00:00
edd9622050
wip petra support of saved games, still incomplete
...
This was SVN commit r15940.
2014-11-08 19:23:29 +00:00
b5c8646cea
Fix actors not retained in FoW after d07d1a17f3.
...
Refs #2913 .
This was SVN commit r15939.
2014-11-08 18:14:45 +00:00
db2f570ef6
Added several missing files of previous commit
...
This was SVN commit r15938.
2014-11-08 13:21:10 +00:00
e3e829c4b1
Upgraded persian fortress variation B.
...
Upgraded all cypress variations.
Added six tropical shrubs.
This was SVN commit r15937.
2014-11-08 13:07:45 +00:00
f4b5054815
Fix valgrind warning about uninitialized variable. Patch by Echelon9. Fixes #2878 .
...
This was SVN commit r15936.
2014-11-08 00:37:42 +00:00
2db1f14015
Cart_fortress recentered.
...
This was SVN commit r15935.
2014-11-07 11:27:59 +00:00
259fcdd8ed
Roman vesta temple and triumphal arch AO maps.
...
Added missing actor for persian barracks
This was SVN commit r15934.
2014-11-07 10:56:41 +00:00
a4b209bf2c
Set text align for options to left, increase the size for labels for boolean options. Fixes #2918 .
...
This was SVN commit r15933.
2014-11-07 01:24:13 +00:00
1d1c086e2a
Allow translating some strings in the mod selector. Fixes #2919 .
...
Also change column size so that the gd translation fits. (Verified with
long strings)
This was SVN commit r15932.
2014-11-07 00:57:09 +00:00
cbc151cb1e
Persian barracks upgrade.
...
This was SVN commit r15931.
2014-11-07 00:29:31 +00:00
8200182399
Persian fortress variation upgrade. Second variation upgrade soon.
...
This was SVN commit r15930.
2014-11-06 11:29:14 +00:00
6ae21e1ce7
some ai cleaning
...
This was SVN commit r15929.
2014-11-05 21:03:25 +00:00
7dad37c78f
Some cleanup. Fix a comment.
...
This was SVN commit r15928.
2014-11-05 00:22:14 +00:00
518d2d0c2a
Translation fixes.
...
This was SVN commit r15927.
2014-11-05 00:22:11 +00:00
d07d1a17f3
Add a new Visibility component that will eventually allow scripted components and mods to influence an entity's visibility.
...
This first commit only refactors code and does not add any new feature.
Refs #2913 (see this ticket for more information about the change)
This was SVN commit r15925.
2014-11-04 20:53:25 +00:00
0855c1169b
Upgraded persian Civic centre. Added new shrubs. New pers_cc variation in process
...
This was SVN commit r15924.
2014-11-04 11:45:20 +00:00
2cfab37485
Persian market variations upgrade. Added ao/normal/spec and made the stalls conform to the terrain.
...
This was SVN commit r15923.
2014-11-02 21:58:57 +00:00
6e30381acd
petra: push priority of first market and remove some unnecessary ===
...
This was SVN commit r15922.
2014-11-02 20:45:57 +00:00
f9d7335e12
simplify the way petra deals with worker
...
This was SVN commit r15921.
2014-11-02 20:27:13 +00:00
7cdbd7a6fd
Fixed ao map for the roman short wall segment
...
This was SVN commit r15920.
2014-11-02 17:00:29 +00:00
221d93da91
Upgraded persian buildings:
...
blacksmith, dock, farmstead, defense tower, wonder
This was SVN commit r15919.
2014-11-01 11:36:01 +00:00
69c1e4fc52
prevent petra to build siege towers as it does not know how to use them
...
This was SVN commit r15918.
2014-10-31 17:22:44 +00:00
772024a10c
fix a JS error
...
This was SVN commit r15917.
2014-10-30 20:16:59 +00:00
f756cab1f8
Update sprintf.js to the latest version 1.0.2 ( https://github.com/alexei/sprintf.js ).
...
Update suggested and patch generated by Shane, fixes #2859 .
This was SVN commit r15916.
2014-10-29 23:23:11 +00:00
5491faffba
New unit mesh variations and heads with some example animations and units xmls
...
This was SVN commit r15915.
2014-10-29 22:48:48 +00:00
199eb46d86
Fixes GLES build
...
This was SVN commit r15914.
2014-10-29 02:36:42 +00:00
10d13a991c
Use fitplural added in upstream revision 1404284. Refs #2539 .
...
This was SVN commit r15913.
2014-10-28 16:03:19 +00:00
7f1fd01174
Moves some includes out of Renderer.h to slightly optimize compilation
...
This was SVN commit r15912.
2014-10-28 03:57:22 +00:00
2b841f56ae
petra: cleaning of the code for dock placement
...
This was SVN commit r15911.
2014-10-27 19:53:06 +00:00
ff50b0b74c
Fixes incorrect input handling in dropdowns and lists, they were manually handling all events, but should only handle certain key presses. Fixes #2885 .
...
Fixes bug where lists/dropdowns could select an invalid index.
This was SVN commit r15909.
2014-10-27 04:37:06 +00:00
570b0374f4
Convert path separator after building the full path.
...
This was SVN commit r15908.
2014-10-27 03:09:36 +00:00
d06ecc1b89
Fixes some errors in i18n scripts: use ASCII quotes to avoid charset errors in Windows command line, and use function form of print
...
This was SVN commit r15907.
2014-10-27 02:42:06 +00:00
e2536ae4bc
Internationalizes in-game menu text, based on patch by Jaison, fixes #2540 .
...
Fixes inconsistent use of "Settings" to refer to game options dialog
This was SVN commit r15906.
2014-10-27 01:32:11 +00:00
e3e86e2a29
Fixes init of post processing effects, so they can be cleanly enabled/disabled at runtime. Fixes #2890 , refs #2672 , #2893 .
...
Updates descriptions on options screen and fixes comment in default.cfg
(smoothlos does not require preferglsl)
This was SVN commit r15905.
2014-10-27 00:53:31 +00:00
4a68170aeb
Add msgstrs for plural forms to pots.
...
This was SVN commit r15904.
2014-10-26 17:25:12 +00:00
466942fc29
fix the choice of target in attacks + start changes in dock placement + some cleanings
...
This was SVN commit r15903.
2014-10-26 13:10:20 +00:00
b4997dc7c6
Fixes minimap GLES compatibility by making point size a uniform and passing into the shaders
...
This was SVN commit r15901.
2014-10-26 04:37:26 +00:00
21b83734f9
Fixes shader type error with some compilers
...
This was SVN commit r15900.
2014-10-26 01:44:58 +00:00
7f247580b3
Remove outdated bundled transifex client. Fixes #2789 .
...
Anyone wanting to pull updates from transifex should install the client.
This was SVN commit r15896.
2014-10-26 00:28:41 +00:00
23cabedec8
Translate map size of lobby games on the client.
...
This was SVN commit r15895.
2014-10-26 00:28:38 +00:00
ae10d34d99
Switch i18n scripts to use Pology. Fixes #2539 .
...
Still requires a patch to Pology to keep the source file ordering.
This was SVN commit r15894.
2014-10-26 00:28:35 +00:00
cf3e42f6fb
Make map description end with a full stop.
...
This was SVN commit r15893.
2014-10-26 00:28:26 +00:00
c524542477
Make map description end with a full stop.
...
This was SVN commit r15892.
2014-10-21 20:03:06 +00:00
b2f9dc305c
check that selected units still exist when rebuilding the selection
...
This was SVN commit r15891.
2014-10-21 16:26:27 +00:00
6334ee3f8b
Reverts 03eaf9b461 due to licensing issues (source/lib is MIT licensed) and replaces with compatible FreeBSD/clang-based solution, patch by pstumpf. Refs #2675
...
This was SVN commit r15890.
2014-10-18 20:45:11 +00:00
2a7c3a95f9
improve gui performance, refs #2179 comment 28
...
This was SVN commit r15889.
2014-10-18 16:37:53 +00:00
c65817829f
Adds compatibility for XMPP differences between platforms that can cause case inconsistencies.
...
This was SVN commit r15888.
2014-10-18 14:28:46 +00:00
d4884a2099
Removes empty valgrind lib directory and linker setting from extern_libs4.lua. Fixes linker warning with Git repos, since empty directories aren't included
...
This was SVN commit r15887.
2014-10-18 04:59:53 +00:00
03eaf9b461
Fixes cpuid to work with i386 CPUs and PIE/PIC, based on old GCC cpuid.h source and patch by pstumpf, fixes #2675
...
This was SVN commit r15886.
2014-10-18 03:07:24 +00:00
1631b8de14
Fixes Atlas error when using the map open/save dialog on Linux, based on patch by njm, fixes #2858
...
This was SVN commit r15885.
2014-10-18 01:53:06 +00:00
3c33a8a072
Add back the VS2013 project files to the files generated by update-workspaces.bat on Windows, as Boost libs were updated to 1.56.
...
Fixes #2271 , addresses d672d9625d
2014-10-17 17:50:53 +00:00
620399270d
various small petra tunings
...
This was SVN commit r15880.
2014-10-17 17:15:06 +00:00
a29e233fdf
Remove another leftover "Counter" string, see also d3351a645f.
...
Patch by thamlett, fixes #2830
This was SVN commit r15879.
2014-10-17 14:19:32 +00:00
c981dc4e9d
Adds missing l10n folder to OS X bundle build script, fixes #2689
...
This was SVN commit r15878.
2014-10-17 02:59:11 +00:00
ba5685eff3
cleaning of the Petra configuration
...
This was SVN commit r15877.
2014-10-15 20:52:23 +00:00
f7a64d4abc
Prevents gaul defense_tower_a from showing a unit when not garrisoned. Fixes #2876
...
This was SVN commit r15876.
2014-10-15 19:08:15 +00:00
a63328d859
Upgraded persian struct texture missing in previous commit.
...
This was SVN commit r15875.
2014-10-15 16:20:59 +00:00
18ab827886
Change L10n code to use ps/Singleton, so that we can recreate it.
...
This allows for adding locales in mods.
This was SVN commit r15874.
2014-10-15 16:04:37 +00:00
f5179930f5
Remove leftovers from bundled miniupnpc. Refs #2552 .
...
Fix cleanup of SM24.
This was SVN commit r15873.
2014-10-15 15:34:32 +00:00
c1575e8f48
Upgraded persian houses and palace with normal and AO.
...
Upgraded persian textures (diffuse normal and spec) WIP
This was SVN commit r15872.
2014-10-15 13:59:55 +00:00
776567d9b2
Removes bundled MiniUPnPc source, it is now a required system library on *nix. NOTE: update-workspaces must be run. See the updated BuildInstructions for details.
...
Adds precompiled MiniUPnPc 1.9 libs for win32, fixes #2552 .
Updates build-osx-libs.sh for these changes, including patch to fix
clang symbol visibility (fixed upstream).
Updates LICENSE.txt.
Fixes bug in build-osx-libs.sh where downloaded files might not have the
expected filename.
Fixes problem with building wxWidgets for 32-bit OS X targets,
apparently ARCH is ignored sometimes, but --enable-macosx_arch works.
This was SVN commit r15870.
2014-10-15 03:47:13 +00:00
227d828b67
Updates Windows version strings for 8.1 and 10 (technical preview)
...
This was SVN commit r15869.
2014-10-14 21:37:19 +00:00
78896154fe
Change a scope for a bunch of variables in the Attack component. This simple change allows modders to modify the whole attack schema.
...
Patch by Radagast, fixes #2671
This was SVN commit r15868.
2014-10-14 20:44:17 +00:00
d3351a645f
Remove some "Counters/Countered by" tooltips as the hard counters system has been disabled.
...
Patch by thamlett, fixes #2830
This was SVN commit r15867.
2014-10-14 20:37:15 +00:00
8ce7c818f5
internationalization of ai chat messages
...
This was SVN commit r15866.
2014-10-14 19:43:19 +00:00
1f8cd485d4
fix translation of ai chat messages (allowing for parameters)
...
This was SVN commit r15865.
2014-10-14 18:58:41 +00:00
bb02dcd0e9
Fix broken tests.
...
This was SVN commit r15864.
2014-10-14 01:25:32 +00:00
7090334756
fix previous commit
...
This was SVN commit r15863.
2014-10-13 19:55:12 +00:00
20a9c9ab62
prevent the AI from using disabled templates
...
This was SVN commit r15862.
2014-10-13 19:52:03 +00:00
4ecfa25c5e
Sync minimal-flags with what Gentoo uses.
...
This was SVN commit r15861.
2014-10-12 23:40:05 +00:00
4ef63e8673
Change tooltips with incorrect garrison count. Patch by thamlett. Fixes #2748 .
...
This was SVN commit r15860.
2014-10-12 23:15:28 +00:00
affdd9f548
Petra now send (if enough resources) tributes to allies in difficulty
...
This was SVN commit r15859.
2014-10-12 22:12:15 +00:00
443158869c
let the AIs know when a tribute is sent
...
This was SVN commit r15858.
2014-10-12 22:00:19 +00:00
6ec902ec20
Fix a typo in the packaging scripts.
...
This was SVN commit r15857.
2014-10-12 20:53:13 +00:00
ec8e240e81
redesign of the trading for Petra, should me more efficient and supports naval trading
...
This was SVN commit r15856.
2014-10-12 20:21:47 +00:00
5d9029a1d9
stop trying to build when not enough resources, fixes #2835
...
This was SVN commit r15855.
2014-10-12 20:09:03 +00:00
7fd407ca1f
update correctly the tradeRoute set on market foundations
...
This was SVN commit r15854.
2014-10-12 19:56:24 +00:00
3df4799dea
enable test on tech for AI
...
This was SVN commit r15853.
2014-10-12 19:55:15 +00:00
849cbc13ee
Fix path in fontbuilder.
...
This was SVN commit r15852.
2014-10-12 19:27:55 +00:00
46fd718ac1
Initialize some variables. Patch by Echelon9. Fixes #2862 .
...
This was SVN commit r15851.
2014-10-12 19:27:49 +00:00
3c8ef99007
Switch lobby room. Update mod version.
...
This was SVN commit r15850.
2014-10-12 19:27:42 +00:00
9c92f45c61
Fixes typo in OS X bundle build script.
...
Changes SDL2 version in build-osx-libs.sh to Hg snapshot SDL-2.0.4-9134,
refs #2852
This was SVN commit r15849.
2014-10-06 23:45:34 +00:00
0b0184af1d
Removes SDL1 from OS X libraries build script
...
This was SVN commit r15848.
2014-10-06 01:05:46 +00:00
a028027f75
Fix previous commit.
...
This was SVN commit r15847.
2014-10-05 22:46:24 +00:00
41ea9539a2
Update the translations selection script to match our choices for A17.
...
This was SVN commit r15846.
2014-10-05 22:05:22 +00:00
5d9d9a67bf
Allow enabling the post processing filters during a game.
...
Includes numerous code updates, also updated the copyright for
cd5de73f3adan@sstrev.com , fixes #2672 .
This was SVN commit r15843.
2014-10-05 20:50:10 +00:00
cd5de73f3a
Allow setting the "Smoothing LoS" option during a game.
...
Patch by dan@sstrev.com , fixes #2513
This was SVN commit r15841.
2014-10-05 20:02:04 +00:00
2af4272c07
allow war dogs to garrison in ships
...
This was SVN commit r15840.
2014-10-05 19:25:27 +00:00
807fd8c236
fix bonus caption display, thanks to Polakrity
...
This was SVN commit r15839.
2014-10-05 13:57:59 +00:00
642011e6c0
Fixes tests broken in e91215d5c9.
...
This was SVN commit r15838.
2014-10-04 15:37:33 +00:00
90c0957cef
Fixes cavalry upgrade inconsistencies.
...
This was SVN commit r15837.
2014-10-04 14:13:14 +00:00
e91215d5c9
improve gui performance, refs #2179 comment 21
...
This was SVN commit r15836.
2014-10-04 11:40:53 +00:00
8a3435915b
Slightly buffs swordsmen and fixes a couple inconsistencies.
...
This was SVN commit r15835.
2014-10-04 05:31:29 +00:00
54bc1c7173
Fixes #2831 . Patch by prodigalson.
...
This was SVN commit r15834.
2014-10-04 05:17:36 +00:00
69c8b89f84
Fixes blank window after maximizing, minimizing, then restoring the game on Windows. In SDL2, this is an SDL_WINDOWEVENT_EXPOSED event, which we must handle to reset the game's minimized state. Refs #2041
...
This was SVN commit r15832.
2014-10-04 00:46:53 +00:00
5a985e18f4
Modify GC scheduling and reduce VFS cache size.
...
It seems like there is a memory leak if we haven't finished with the
marking phase of an incremental GC and SpiderMonkey has to trigger a
full GC because it runs out of memory. With this patch we stop trying to
make incremental GCs if we are above 1/2 of the runtime size and do Full
GCs instead. This should make such low memory conditions even less
likely than they were already after the previous patch. Also reduce the
maximum VFS cache size to 400 MB.
Refs #2808
This was SVN commit r15831.
2014-10-04 00:43:04 +00:00
9c4eb0295a
Fixes some bugs related to IME text input in SDL2, including a possible crash, refs #2041 . Behavior seems reasonably consistent now on Windows and OS X
...
This was SVN commit r15830.
2014-10-03 23:33:41 +00:00
5c97a681d4
fix typo in Petra, thanks niektb for noticing
...
This was SVN commit r15829.
2014-10-02 19:01:26 +00:00
a86231240d
Fixes some bugs in OS X bundle build script.
...
Logs most build output to file using simple redirects for now.
Hides output of pushd/popd commands
This was SVN commit r15828.
2014-09-29 04:33:51 +00:00
f10bdf5089
Fixes some issues when toggling fullscreen mode with SDL2, refs #2041 :
...
* SDL_WINDOW_RESIZABLE must be set when creating the window, apparently
only fullscreen flags take effect in SDL_SetWindowFullscreen
* Stores window position, so a window can be restored to both its
original position and size, rather than defaults
* Changes initial window position from undefined to centered, it caused
some problems with window positioning returning from fullscreen mode
This was SVN commit r15827.
2014-09-28 22:10:09 +00:00
2afeec0c01
Unify removal of incomplete translations in packaging scripts. Fixes #2825 .
...
This was SVN commit r15826.
2014-09-28 21:51:48 +00:00
436eb18397
Updates precompiled win32 gloox lib to 1.0.11 and rebuilt glooxwrapper with VC++ 2010. Note: gloox 1.0.3 and later changed the license from GPL v2 to v3.
...
Updates LICENSE.txt accordingly.
This was SVN commit r15825.
2014-09-28 21:44:48 +00:00
db71b74d7d
Clarifies some license versions in LICENSE.txt and makes formatting more consistent
...
This was SVN commit r15824.
2014-09-28 21:37:03 +00:00
001f32e080
Removes lib path for cxxtest from extern_libs4.lua, to avoid clang linker warning
...
This was SVN commit r15823.
2014-09-28 21:18:44 +00:00
a18107aa7c
Fix placing of some entities in various maps, refs #2560 .
...
This was SVN commit r15822.
2014-09-28 16:53:19 +00:00
5200ea0365
Fixes starting Atlas from in-game on OS X, patch by trompetin17, refs #2427
...
This was SVN commit r15821.
2014-09-28 07:03:51 +00:00
9148e5609f
Updates library LICENSE.txt for new cxxtest version and addition of SDL2
...
This was SVN commit r15820.
2014-09-28 01:58:37 +00:00
857698e231
Fix memory leak when loading mods from config.
...
This was SVN commit r15818.
2014-09-28 00:13:55 +00:00
e07305fd9f
Buffs melee cavalry attack by 20% and overall cavalry speed by 2.0.
...
This was SVN commit r15817.
2014-09-27 22:01:50 +00:00
0caab0429f
Fixes Reset Water Data button position in Atlas, fixes #2820
...
This was SVN commit r15815.
2014-09-27 02:42:42 +00:00
ea2db5386b
Fixes water rendering and crashes on GPUs without FBO support, fixes #2667
...
This was SVN commit r15814.
2014-09-27 01:32:03 +00:00
2f8ed7980d
Makes the bot more lenient on case sensitivity due to inconsistencies in case between Windows and Unix.
...
This was SVN commit r15813.
2014-09-27 01:06:28 +00:00
b524f59657
check ResourceGatherer interface before trying to gather, fixes #2801
...
This was SVN commit r15812.
2014-09-26 21:23:32 +00:00
119aad9da9
fix a debug message
...
This was SVN commit r15811.
2014-09-26 17:07:17 +00:00
20956c94b0
Update some strings.
...
This was SVN commit r15809.
2014-09-26 14:26:21 +00:00
8f039bfb44
Fixes translation inclusion regex for build-osx-bundle.sh, fixes #2764
...
This was SVN commit r15808.
2014-09-26 01:06:21 +00:00
7ca08e2485
Fix type errors in cmpAttack by switching parameter and object.
...
This was SVN commit r15805.
2014-09-25 16:33:38 +00:00
eda8f3cc18
Tweak some strings, addressing concerns pointed out by translators on Transifex.
...
This was SVN commit r15804.
2014-09-25 15:36:18 +00:00
fe30c0e6a1
Switch to ErrorPrinter on Windows. Refs #2488 .
...
This was SVN commit r15803.
2014-09-25 15:17:30 +00:00
d7d1607021
Fix GUI errors when a client joins a multiplayer game setup room.
...
Based on a patch by cwprogger, fixes #2779
This was SVN commit r15802.
2014-09-25 15:05:10 +00:00
b155d4f7e3
Updates OS X bundle build script. Adds --release flag which can be used to build a proper release bundle, including SVN export, at the expense of time and disk space. Moves SVN-specific logic to this mode, otherwise the script works with git or no source control at all.
...
Removes obsolete instructions for building a 32-bit 10.5 bundle.
This was SVN commit r15801.
2014-09-25 02:18:19 +00:00
d1a31b3f54
Fixes regex for excluding translations from release packages, refs #2494
...
This was SVN commit r15800.
2014-09-25 02:07:46 +00:00
5ad07045e2
Sets OS X build to use SDL2 by default, refs #2041
...
This was SVN commit r15799.
2014-09-25 01:54:58 +00:00
a815ca0de9
Nerfs sele hero aura, transitions a tech, and fix spaces.
...
This was SVN commit r15798.
2014-09-25 00:53:48 +00:00
d67ffa039c
Handle an error of no suitable tiles being found gracefully in Schwarzwald RMS. Fixes #2787 .
...
This was SVN commit r15797.
2014-09-24 20:48:19 +00:00
533fb6f7bc
Load the public mod by default. Fixes #2754 .
...
This was SVN commit r15796.
2014-09-24 17:49:22 +00:00
4753a0c1c2
Replace usage of "GUIs" in cxxtest with the command line,
...
and extend that to support -libdir <dir> and -disabled. Fixes #2488 .
This was SVN commit r15795.
2014-09-24 15:35:31 +00:00
29effb5089
Build fixes and improvements for BSDs. Fixes #2804 .
...
This was SVN commit r15793.
2014-09-24 14:11:13 +00:00
d6709d3e08
Ignore mods (in the modmod) that do not specify required properties. Fixes #2822 . Refs #2794 .
...
Fixes description display if filters are used.
This was SVN commit r15792.
2014-09-24 01:36:57 +00:00
091b958344
Fix an issue with filters and translations in the modmod.
...
This was SVN commit r15791.
2014-09-24 00:26:13 +00:00
b5a0e2ec5c
Updates OS X DMG background image, by He who must not be named
...
This was SVN commit r15790.
2014-09-23 02:48:23 +00:00
1a2c9835c9
Adds patch for wxWidgets build on OS X, fixes Atlas crash on VMs with software rendering.
...
Cleans up wxWidgets config flags
This was SVN commit r15788.
2014-09-23 00:33:14 +00:00
3b49576fa6
Tunes GC scheduling a bit to reduce memory usage.
...
The main problem was that GC was only called from the simulation before
this patch. This means when you were waiting in the multiplayer lobby or
just had the GUI open, it only called GC when getting close to the JS
runtime size limit (I assume). Another problem was the Net Server
runtime which didn't GC either. Here the runtime size limit is 16 MB
though, so it's not too terrible. These issues have both been addressed
and GC has been given a bit more time per incremental slice to make sure
it gets done in time. It's still far from perfect, but there are too
many changes in SpiderMonkey related to GC, so I don't want to spend too
much time on this yet.
Refs #2808
This was SVN commit r15787.
2014-09-22 20:13:04 +00:00
3f75e5db0e
Adds --sdl2 flag to update-workspaces.bat, making SDL2 the default on Windows, refs #2041
...
This was SVN commit r15786.
2014-09-22 19:42:55 +00:00
5593f573f4
Cleans up handling of SDL2 text input events, no behavior change expected.
...
Implements SDL2 text editing handler for input fields, this is for IME
support, so users entering CJK text can see what they're composing
before committing it. Should have no effect on SDL1 or normal text
input.
This was SVN commit r15785.
2014-09-22 19:00:20 +00:00
03dd6908ec
Petra: decreases size of attacking armies in easy level
...
This was SVN commit r15784.
2014-09-22 18:53:54 +00:00
9592c59704
Fixes crash in Atlas color picker tool, noticeable with wxWidgets 3.0. Colors returned by wxColourData::GetCustomColour aren't always valid, so we have to test them with IsOk() before accessing them. Fixes #2805
...
This was SVN commit r15782.
2014-09-21 21:25:51 +00:00
a89d0190bd
Use ES6 Maps in the AI API for applying tech and aura modification to entity templates.
...
This should improve performance a bit (check the ticket for details).
Refs #2475
This was SVN commit r15781.
2014-09-21 21:02:15 +00:00
b1ca37eead
Extend visibility update to all tiles around LoS vertices. Incidentally prevent an issue from arising on square maps. Also improve a code comment.
...
This should be enough to fix #2760 .
This was SVN commit r15779.
2014-09-21 20:29:54 +00:00
bce96c99bb
small fixes/improvments to the AI
...
This was SVN commit r15776.
2014-09-21 12:02:33 +00:00
357fa957c8
Add a translation comment for "Join Game" buttons in the main menu and the lobby, to clarify the translation context.
...
Fixes #2548
This was SVN commit r15775.
2014-09-21 08:35:21 +00:00
8f61e36352
Adds SDL2 to build-osx-libs.sh, but leave SDL1 as the default while we test, refs #2041 .
...
Note: SDL2_CONFIG is now the variable to override the path to
sdl2-config, SDL_CONFIG remains to override the path to sdl-config
This was SVN commit r15774.
2014-09-20 19:02:24 +00:00
a8d8c6d101
Reverts the use of Set in f5336c42b8.
...
Sets don't support multiple elements with the same key which is required
here to fire timers multiple times per turn.
Refs #2475
This was SVN commit r15773.
2014-09-20 18:48:12 +00:00
f5336c42b8
Adds Serialization support for ES6 Maps.
...
Also includes the patch from Sanderd17 to use Maps and Sets for the
Timer components. Sets can't be serialized yet, but in this case they
don't require serialization.
Refs #2475
This was SVN commit r15770.
2014-09-20 17:14:53 +00:00
6b2677a3fd
Adds profiles to the multiplayer lobby. Fixes #2504 .
...
This was SVN commit r15768.
2014-09-20 15:35:26 +00:00
d62e3729d5
Improves SDL2 support, includes patch by yashi and fabio, refs #2041 :
...
* Adds SDL color cursor implementation
* Adds config option for choosing preferred display in multimonitor
setup
* Uses text input API to better handle CJK input
* Fixes various hotkey and input bugs
SDL 1.2 is still the default and recommended, to test experimental SDL2
support, pass the --sdl2 flag to update-workspaces
This was SVN commit r15767.
2014-09-20 12:12:35 +00:00
801d13aa8b
Address some possible causes of bad handling of visibility updates. Also includes a little code tweaking allowing the global update of all visibility data.
...
Refs #2760
This was SVN commit r15765.
2014-09-20 08:26:45 +00:00
55b12857b3
Buffs ranged units slightly as massing melee units was slightly overpowered.
...
This was SVN commit r15764.
2014-09-19 03:39:24 +00:00
6999295b7e
Fixes #2768 .
...
This was SVN commit r15763.
2014-09-19 03:14:46 +00:00
aa5fded9ae
This was SVN commit r15762.
2014-09-17 23:22:20 +00:00
c56407a1f8
Fixes autostart init of player data, patch by mimo, fixes #2798 .
...
Cleans up some of the autostart logic, removes and renames a few options
for clarity.
Updates readme.txt to reflect these changes and include some examples
This was SVN commit r15761.
2014-09-17 01:15:03 +00:00
b5f32e720f
Rename the Briton hero Cynvelin to Cunobelin, which is a more common appellation, and is coherent with the historical data of the game. Also fix some typos by this mean.
...
Fixes #2639
This was SVN commit r15759.
2014-09-16 09:13:26 +00:00
809189d953
Fixes "quit" command and GUI notification for AI debugging, fixes #2755
...
This was SVN commit r15758.
2014-09-16 02:50:49 +00:00
b2a479cc74
reset some map attribute, addresses #2803
...
This was SVN commit r15757.
2014-09-15 21:59:51 +00:00
3f1db1ef01
remove aegis bot
...
This was SVN commit r15756.
2014-09-15 20:19:00 +00:00
66a2fe6308
Unload hotkeys on shutdown.
...
Fixes double registration of hotkeys on engine restart.
This was SVN commit r15755.
2014-09-15 01:27:06 +00:00
28c0b00b2e
Sorts games in gamesList by status, then name. Refs #2463 , #2448 .
...
This was SVN commit r15754.
2014-09-14 22:11:03 +00:00
7b80c86645
Updates a comment forgotten in 113f72a503. Refs #2463 , #2448 .
...
This was SVN commit r15753.
2014-09-14 21:23:49 +00:00
16a99e5ad3
Fixes some untranslated text in the multiplayer lobby (map name, type, and description), refs #2547
...
This was SVN commit r15752.
2014-09-14 21:10:49 +00:00
113f72a503
Makes running games visible in the lobby. These will be colored in red. Refs #2463 , #2448 .
...
This was SVN commit r15751.
2014-09-14 20:59:35 +00:00
67c3a80c42
reset the trigger script when changing map, fix #2793
...
This was SVN commit r15750.
2014-09-14 16:52:33 +00:00
4f7a935f44
fix a rare case where a Petra attack would not know its target is already destroyed
...
This was SVN commit r15749.
2014-09-14 13:43:11 +00:00
0f0f4f7b03
Fixes crash on OS X if dir_watch_Poll is called during init before dir_watch_Add, refs #2427 , #2650
...
This was SVN commit r15748.
2014-09-14 00:27:38 +00:00
0605232aaf
Updated the welcome screen to inform players about the temporary removal of formations.
...
This was SVN commit r15747.
2014-09-13 20:34:27 +00:00
60d92b643d
Fixes some unused variables in Atlas
...
This was SVN commit r15746.
2014-09-13 19:34:04 +00:00
01395ce96d
Fixes clang warning about hidden overloaded virtual function
...
This was SVN commit r15745.
2014-09-13 19:06:55 +00:00
fe381158fb
fix ptol_trader camel sounds, patch by thamlett
...
This was SVN commit r15744.
2014-09-13 17:54:40 +00:00
2acfbb04a5
fix a stupid typo, fixes #2797
...
This was SVN commit r15743.
2014-09-13 17:25:33 +00:00
70d81040cb
Fixes Atlas copy/paste not copying actor seeds, patch by trompetin17, fixes #2791
...
This was SVN commit r15742.
2014-09-13 16:53:43 +00:00
ab4a1952f5
Small tweak for the options page, requesting game restart when enabling postproc effects.
...
This was SVN commit r15740.
2014-09-13 10:13:48 +00:00
b0c14154ee
prevent a warning message of undefined variable
...
This was SVN commit r15739.
2014-09-13 09:57:12 +00:00
8c5470daf1
Fixes #2795 . Refs #2792
...
This was SVN commit r15738.
2014-09-13 00:39:56 +00:00
acd86047dc
Only split strings if they are non-empty. Fixes previous commit.
...
This was SVN commit r15737.
2014-09-12 23:11:03 +00:00
dd6b6779af
trained animals in corral should not respond to alert, adresses #2792
...
This was SVN commit r15736.
2014-09-12 22:01:21 +00:00
134e3c84b0
Clean up some code.
...
Fixes linker error on OSX.
This was SVN commit r15735.
2014-09-12 21:45:30 +00:00
a8189f89e5
Stop music when resetting the simulation test mode in Atlas.
...
Patch by trompetin17, fixes #1712
This was SVN commit r15734.
2014-09-12 21:38:10 +00:00
83dda90662
Remove last traces of removed persian background images. Patch by dan@sstrev.com. Fixes #2777 .
...
This was SVN commit r15733.
2014-09-12 21:14:07 +00:00
d0abd6628b
Add messages.json file to the modmod. Fixes #2790 .
...
This was SVN commit r15732.
2014-09-12 20:08:38 +00:00
87e0d9e6c1
Petra: some tunings in tech research following the merge of balance branch
...
This was SVN commit r15728.
2014-09-10 17:56:19 +00:00
9ba74f5b5f
fix heal_barracks tech
...
This was SVN commit r15727.
2014-09-10 17:51:51 +00:00
e4d7586cdd
Sets default compiler for OS X build to clang, using hack that should be replaced if we upgrade premake.
...
Fixes linking error in ICU build from build-osx-libs.sh (it was setting
the C++ compiler to clang, which is the C compiler, so it wouldn't
automatically link to the c++ lib). Now build-osx-libs.sh and the game
should use clang and whichever c++ lib is the default
This was SVN commit r15725.
2014-09-09 23:56:39 +00:00
7ada7dd2a8
Some tweaks to profiler2:
...
* separate the HTTP profiling server from the on-screen profiler
* allow shutting down the HTTP profiler
* print messages when enabling/disabling HTTP and GPU profilers
Patch by kingbasil, fixes #1862
This was SVN commit r15723.
2014-09-09 18:17:08 +00:00
bdd8bc1f44
update the in-game hotkeys page following 2f1d143dc2
...
This was SVN commit r15722.
2014-09-09 17:22:13 +00:00
fee304d789
Fixes crash from 41b98a6f12 where a VBChunk* was released but not set to NULL
...
This was SVN commit r15721.
2014-09-09 04:13:50 +00:00
7b3476e104
fix #2783
...
This was SVN commit r15720.
2014-09-08 20:37:04 +00:00
9c683af1e4
Fixes undefined property reference in Atlas after generating random map.
...
Fixes crash after failed random map generation in Atlas
This was SVN commit r15719.
2014-09-08 03:48:24 +00:00
881ad4090b
Fixes weird unconventional use of logical not operator that also triggered a warning in clang
...
This was SVN commit r15717.
2014-09-08 00:19:35 +00:00
3d1cd08a4c
Suppresses noisy clang/libc++ warnings from SpiderMonkey headers on OS X
...
This was SVN commit r15716.
2014-09-07 23:58:22 +00:00
41b98a6f12
Fixes incorrect reuse of a member variable in WaterManager, caused a crash when starting a new map in Atlas after loading a water map. Fixes #2784 .
...
Fixes likely mem leaks from not cleaning up vertex buffer allocations
This was SVN commit r15715.
2014-09-07 23:49:24 +00:00
e027981f95
Fixes missing functions_utility_list.js in initial mod selector screen
...
This was SVN commit r15714.
2014-09-07 23:29:33 +00:00
13b229d503
Gameplay rebalance after a long period of testing and rebalancing. See https://github.com/scythetwirler/0ad for details on changes.
...
This was SVN commit r15713.
2014-09-07 21:47:26 +00:00
7ce9097d1c
small cleaning of d0472b021b
...
This was SVN commit r15710.
2014-09-07 10:28:18 +00:00
640f898377
Move some animals outside of deep water in the skirmish map "Watering Holes (4)".
...
Fixes #2013
This was SVN commit r15709.
2014-09-07 09:27:36 +00:00
5b51ca862f
2014 remake (A17)
...
This was SVN commit r15708.
2014-09-06 23:21:06 +00:00
be98e31de2
Improve the description of the British hero Kunobelinos in the History panel.
...
New text by Haommin, fixes #2639 .
This was SVN commit r15706.
2014-09-06 20:09:07 +00:00
d0472b021b
Supersede the "Reveal all" flag when displaying mirages, to avoid seeing other players' mirages. This is especially problematic when switching perspective to an AI player.
...
Fixes #2712 , thanks mimo for the report and for having looked into the
related code.
This was SVN commit r15705.
2014-09-06 19:59:49 +00:00
76a5be4c4c
Fix previous commit.
...
This was SVN commit r15704.
2014-09-06 15:31:36 +00:00
2b1efa5035
Revert an unoptimized GUI update from f7e591c9f2. Instead, notify directly the GUI in case of miraged entities, and treat them the same way we treat renamed entities.
...
Fixes #2778
This was SVN commit r15703.
2014-09-06 13:34:54 +00:00
001e6f6ca3
Fixed iberian fortress garrison flag and smooth groups. Patch by stanislas69. Removed kennel mud mesh. Fixes #2765
...
This was SVN commit r15702.
2014-09-05 15:59:36 +00:00
72ee7a12de
fixed kennel crash. Patch by stanislas69. Fixes #2766
...
This was SVN commit r15701.
2014-09-05 15:37:44 +00:00
bafb300bf8
Updated Persian Civic structure. Fixes #2630
...
This was SVN commit r15700.
2014-09-03 21:27:55 +00:00
c56089a082
Reference a missing script file in the mod selector.
...
Reported and patched by Radagast, fixes #2762
This was SVN commit r15699.
2014-09-03 16:58:08 +00:00
69bd930219
Excludes debug DLLs from Windows installer, fixes #855
...
This was SVN commit r15697.
2014-09-01 01:44:10 +00:00
8034a677e5
Fixes build-osx-libs.sh to rebuild SpiderMonkey when its README.txt changes, fixes #2551
...
This was SVN commit r15696.
2014-08-31 04:19:13 +00:00
032d031729
Petra: revisit the attacks + several bugfixes + add some more debug printouts
...
This was SVN commit r15695.
2014-08-30 20:06:48 +00:00
611d20016a
fixes error with GetPosition2D called while out of world
...
This was SVN commit r15694.
2014-08-30 17:03:04 +00:00
5bfe2a4b65
Don't call miraging codes while iterating through the range manager's entities map.
...
I already had made that mistake when working on the fogging system so I
documented it in the code.
Fixes #2756
This was SVN commit r15692.
2014-08-29 09:01:08 +00:00
c069a6555c
prevent js error
...
This was SVN commit r15691.
2014-08-28 08:59:45 +00:00
52e9551957
Petra: prevent infinite loop in mods where units are their own promotion
...
This was SVN commit r15690.
2014-08-28 08:01:25 +00:00
c0621ee28f
Stop updating some data after the end of a game.
...
This prevents game music from being played again, just after
defeat/victory.
Fixes #2714 , #2744
This was SVN commit r15689.
2014-08-27 18:37:20 +00:00
30b5fb6c41
Pass map settings also to Scenario games, including in particular trigger scripts for victory conditions.
...
Fixes #2715
This was SVN commit r15688.
2014-08-27 15:25:16 +00:00
179162069e
Updated cxxtestgen.exe for cxxtest4.4 (created as described in #2450 ).
...
This was SVN commit r15686.
2014-08-27 12:39:04 +00:00
6942edb788
Fix a misplaced block of code from ea78d97989 that caused Atlas to show errors at startup.
...
This was SVN commit r15685.
2014-08-27 12:30:29 +00:00
a994053a6a
Petra: fix for some units which stay idle when their base is destroyed
...
This was SVN commit r15684.
2014-08-27 12:21:13 +00:00
b2d07d5e5a
complete 2f1d143dc2 for moveAttack in rallyPoint + some cleaning
...
This was SVN commit r15682.
2014-08-26 19:35:43 +00:00
ea78d97989
Explore the map inside a player's territory border at the beginning of a game.
...
Also handle properly the "Explore Map" option with the new fogging
system.
Fixes #2709
This was SVN commit r15681.
2014-08-26 10:01:04 +00:00
4cd7dd77c1
add missing files from dd189ffe1f
...
This was SVN commit r15680.
2014-08-26 09:53:29 +00:00
dd189ffe1f
fix #15678 when preferglsl=true
...
This was SVN commit r15679.
2014-08-26 09:41:14 +00:00
be2f0e69fc
Make the modmod standalone.
...
Mount public in case we are starting Atlas and no mods are specified in
the config.
If users remove all mods and save this to the config and try to start
Atlas it will
crash, as it cannot find some needed files.
This was SVN commit r15678.
2014-08-25 16:38:54 +00:00
64bfa089af
Add mod selection mod.
...
Includes some contributions by rada and sanderd17.
This was SVN commit r15677.
2014-08-25 16:02:54 +00:00
523d220ac5
Add engine support to load mods from config and restart into mods.
...
Restructure mod mounting code a bit to make it reusable, and use it for
replays. Fixes #2703 .
This was SVN commit r15676.
2014-08-25 16:02:40 +00:00
09e6d5ae02
fix 2f1d143dc2, which fixes #2747
...
This was SVN commit r15674.
2014-08-24 19:56:50 +00:00
c5c394fd17
Fix some disabled tests.
...
This was SVN commit r15673.
2014-08-24 15:29:53 +00:00
2b7e9728b6
Fix failure in TestNetComms::test_basic_DISABLED. Patch by Echelon9. Fixes #2426 .
...
This was SVN commit r15672.
2014-08-24 12:02:52 +00:00
2f1d143dc2
give possibility to choose type of targets in moveAttack, fixes #2740
...
This was SVN commit r15671.
2014-08-24 11:51:03 +00:00
ac9d4f1036
various small fixes and cleanings to Petra
...
This was SVN commit r15670.
2014-08-24 11:35:08 +00:00
0e01f20d29
Upgrades cxxtest.
...
Replaces cxxtest-4.3 with cxxtest-4.4 (without .gitignore or .cvsignore
files) (see [[SVN:14817]]).
Applies the same changes as done in c8bdd993c0
2014-08-24 08:19:24 +00:00
da2050793d
Fix some greek unit names. Patch by pstumpf2. Fixes #2746 .
...
This was SVN commit r15666.
2014-08-24 07:04:39 +00:00
057bef91f2
Fix undefined property warning. Fixes #2742 .
...
This was SVN commit r15665.
2014-08-23 17:23:15 +00:00
efe21b85da
Garrison orders canceled in the ai were not properly canceled in the simulation. Fixes #2741 and #2743 .
...
This was SVN commit r15664.
2014-08-23 13:40:56 +00:00
811e38a833
Fixes for survival of the fittest map.
...
This was SVN commit r15663.
2014-08-22 05:33:12 +00:00
e4194af0c2
fixes some non-working techs (was in reverted 40365ee815)
...
This was SVN commit r15661.
2014-08-21 09:09:08 +00:00
5616221c99
improve comment, see #2737
...
This was SVN commit r15660.
2014-08-21 09:00:42 +00:00
6fe9af70cf
remove debug output from previous commit
...
This was SVN commit r15659.
2014-08-19 09:41:38 +00:00
14b7472c15
petra: prevent JS errors when expected buildings do not exist (for mods)
...
This was SVN commit r15658.
2014-08-19 09:34:34 +00:00
36d205035e
New Iberian tower models
...
This was SVN commit r15657.
2014-08-18 19:30:56 +00:00
edcc4d3ec5
Change the vision range together with the attack range for some techs. Refs #2736 . Patch by serveurix
...
This was SVN commit r15656.
2014-08-18 19:20:46 +00:00
d9fcebd433
Revert Surprise commits by Mythos_Ruler, 4f7549b4f8 and 40365ee815 following team decision. They will be put in a separate git branch. This is done to avoid conflict with scythetwirler's balance branch and potential other work in that area.
...
This was SVN commit r15655.
2014-08-18 10:35:30 +00:00
f939f7953d
petra: first step towards use of heroes
...
This was SVN commit r15654.
2014-08-18 09:44:32 +00:00
6c8fd6b3dd
Fix the rotary mill animation
...
This was SVN commit r15653.
2014-08-17 17:34:43 +00:00
d112902b99
fixing ngon glitch on iberian wonder
...
This was SVN commit r15651.
2014-08-17 13:53:01 +00:00
cb1612ad8a
Iberian wonder
...
This was SVN commit r15650.
2014-08-17 13:19:27 +00:00
4f7549b4f8
fix'd attack elements in these templates
...
This was SVN commit r15647.
2014-08-16 02:32:58 +00:00
12771edb0e
Delete dynamic message subscriptions on simulation reset.
...
This was SVN commit r15646.
2014-08-16 01:23:50 +00:00
422b9d79dc
Fixes the cataphract helmet. Textures by stanislas69.
...
This was SVN commit r15645.
2014-08-15 23:54:09 +00:00
40365ee815
Surprise.
...
100% brand new rebalance for every unit in the game, after lengthy
discussion with Enrique.
Some updated portraits.
A couple new tips.
Stan's "cataphract" mask and helmet (the helmet needs a texture).
This was SVN commit r15644.
2014-08-15 23:10:44 +00:00
aa6de51793
Fix FPS, real time, and game time overlay hotkeys. Fixes 704d0f9511.
...
This was SVN commit r15643.
2014-08-15 22:03:12 +00:00
1a33003538
AI should not use EntityRenamed messages coming from mirages, addresses #2724
...
This was SVN commit r15642.
2014-08-15 16:18:57 +00:00
d5cacb027f
Snow wolf. Texture edited by stanislas69
...
This was SVN commit r15641.
2014-08-15 12:14:45 +00:00
fef9b87381
Ptolemy I hero for ptolemaics by stanislas69
...
This was SVN commit r15640.
2014-08-15 12:04:52 +00:00
302b67049c
Gaul farmstead reshape (smaller) by stanislas69
...
This was SVN commit r15639.
2014-08-15 11:49:23 +00:00
8c1a7d5d4c
Ptolemaic blacksmith update by stanislas69
...
This was SVN commit r15638.
2014-08-15 11:35:07 +00:00
4f44416bb0
New Iberian houses
...
This was SVN commit r15637.
2014-08-14 21:01:04 +00:00
a4be909094
Temporary fixing the victory bug in survival of the fittest map. Refs #2721 .
...
This was SVN commit r15636.
2014-08-14 09:50:51 +00:00
b67a6f230b
Fix typo from 704d0f9511.
...
This was SVN commit r15635.
2014-08-13 19:02:59 +00:00
704d0f9511
Add config settings for FPS, realtime, and gametime overlays.
...
This was SVN commit r15634.
2014-08-13 18:56:07 +00:00
c13547c9a0
Stan's rotary mill
...
This was SVN commit r15633.
2014-08-13 17:55:14 +00:00
a4df483f60
Forgot to make a variable unused.
...
This was SVN commit r15631.
2014-08-13 14:52:38 +00:00
ada7691bce
Add current time counter which can be triggered using Alt+T. Fixes #2718 . Patch by thamlett.
...
This was SVN commit r15630.
2014-08-13 02:35:29 +00:00
abef0673bd
fixes some typos
...
This was SVN commit r15629.
2014-08-12 20:45:06 +00:00
0b385384aa
Fix terrain overlay rendering after water.
...
This was SVN commit r15628.
2014-08-12 15:58:03 +00:00
f7cab71243
Iberian barracks replacement
...
This was SVN commit r15627.
2014-08-12 03:42:59 +00:00
8593825eee
Modifies 23c708f72a to use the NONCOPYABLE macro as suggested by leper.
...
This was SVN commit r15626.
2014-08-09 21:16:25 +00:00
23c708f72a
Prevent copying of ScriptInterface objects.
...
Copying a ScriptInterface is not allowed. The destructor destroys the
JSContext and if there's a copy around that still uses it, that causes
crashes which can be quite hard to debug. This change prevents copying
by of ScriptInterface objects by making the copy constructor private,
which will reveal such errors at compile time.
This was SVN commit r15625.
2014-08-09 20:20:32 +00:00
83aa817f71
Exact stack rooting for simulation message type conversions.
...
Also replaces some deprecated API (jsval typedef and OBJECT_TO_JSVAL) in
that part of the code.
Refs #2415
This was SVN commit r15624.
2014-08-09 20:02:49 +00:00
8ce8e6ba9a
Exact stack rooting for IGUIObject.
...
Refs #2415
Refs #2462
This was SVN commit r15623.
2014-08-08 13:41:47 +00:00
9872f5741f
Exact stack rooting for ScriptInterface::FreezeObject.
...
Refs #2415
This was SVN commit r15622.
2014-08-08 11:59:49 +00:00
7471662ddc
A small change that increases the performance of most random map generation noticeably.
...
This was SVN commit r15621.
2014-08-07 09:27:22 +00:00
403b3b68af
Fix some errors in WaterManager.
...
This was SVN commit r15620.
2014-08-06 15:24:38 +00:00
e578d215ea
Fix free() of not allocated struct in the UPnP code. Patch by Echelon9. Fixes #2338 , #2418 .
...
This was SVN commit r15619.
2014-08-06 14:11:04 +00:00
5ae040ea54
Fix non-PCH build.
...
This was SVN commit r15618.
2014-08-06 13:23:02 +00:00
e865dc797d
Revert RedFox's changes to Spatial subdivisions in the simplest possible way (hopefully won't cause OOS, but at least we'll get reports). Fixes #2573 , Refs #2430 . There probably are opportunities to remove more things.
...
This was SVN commit r15617.
2014-08-06 09:21:00 +00:00
c0e7208130
Fixes 016d4599e1 by registering the new DisabledTemplatesChanged message.
...
Also fixes a typo.
This was SVN commit r15616.
2014-08-05 21:21:06 +00:00
c662a4e9e9
Fixes #2713
...
This was SVN commit r15615.
2014-08-05 19:03:10 +00:00
016d4599e1
Added the ability to disable training/building of entities by triggers. Changes survival of the fittest random map to work with this. Refs #52
...
This was SVN commit r15614.
2014-08-05 12:49:12 +00:00
f7e591c9f2
Hide changes to buildings in the fog-of-war.
...
To achieve this, mirage entities are created per player, to replace the
real entities when these ones fall into the fog-of-war. These mirage
entities are created on-the-fly, and destroyed when they get back in
sight.
This depends heavily on the VisibilityChanged message added in
2174eaaeee#2709 .
Fixes #599
This was SVN commit r15612.
2014-08-04 22:49:19 +00:00
e41f010f91
Fixes crash when loading maps in Atlas.
...
The ScriptInterface pointer can be NULL there, so using it without
checking is not safe.
This fixes the problem by continuing with the exact stack rooting
changes, which makes the temporary solution unnecessary.
Fixes #2707
Refs #2415
This was SVN commit r15611.
2014-08-04 20:14:17 +00:00
30fa275f9d
Fixed some keys not being recognized after a719696658. Refs #195 .
...
This was SVN commit r15610.
2014-08-04 16:48:54 +00:00
a719696658
Support more mouse buttons. Fixes #195 . Patch by 01d55 with some minor cleanup.
...
This was SVN commit r15609.
2014-08-04 01:06:36 +00:00
be9d69fd24
Link actor editor built in debug mode to debug version of atlasUI. Fixes #2655 . Patch by Echelon9.
...
This was SVN commit r15608.
2014-08-03 22:46:20 +00:00
efb889b79a
Exact stack rooting for WriteStructuredClone and functions that use it.
...
Refs #2415
This was SVN commit r15607.
2014-08-03 19:32:39 +00:00
f4d62152e7
Exact stack rooting for GetClass and GetPrivate.
...
Refs #2415
This was SVN commit r15606.
2014-08-03 17:53:21 +00:00
169174824f
Exact stack rooting for ScriptInterface::ToString.
...
I had to change a few other functions to take JS::MutableHandleValue
because JS::Stringify takes a JS::MutableHandleValue as input parameter.
That seems a bit strange because it should not change that value.
I assume it has historical reasons.
Refs #2415
Refs #2462
This was SVN commit r15605.
2014-08-03 17:29:49 +00:00
1561f55b27
Batch-change RM map water type and waviness settings. Again, this errs on the "not enough" side.
...
This was SVN commit r15604.
2014-08-03 11:01:41 +00:00
a2bd44b23a
Exact stack rooting for JSON related ScriptInterface functions.
...
Refs #2415
Refs #2462
This was SVN commit r15603.
2014-08-02 22:21:50 +00:00
15fa9e2c2e
(semi-auto) update scenarios and skirmishes water settings (type and waviness). Probably errs on the "not enough" side.
...
This was SVN commit r15602.
2014-08-02 17:08:42 +00:00
c818b8e475
Exact rooting for CallConstructor.
...
Refs #2415
Refs #2462
This was SVN commit r15601.
2014-08-02 16:30:15 +00:00
736d934107
Removes an unused codepath for AI deserialization and related ScriptInterface code.
...
It might actually be needed again in the future, but I think even then
it would be easier to rewrite it than having to update the code in the
meantime.
Refs #2462
This was SVN commit r15600.
2014-08-02 13:22:02 +00:00
4028cd425e
Actually fix bugs on ATI cards. Switch reflection and refractions to use POT textures in an attempt to improve compatibility.
...
This was SVN commit r15598.
2014-08-02 12:54:45 +00:00
608c27fe10
Exact stack rooting for structured cloning functions.
...
Refs #2415
Refs #2462
This was SVN commit r15597.
2014-08-01 20:55:16 +00:00
7dbbb4e419
some cleaning of petra code
...
This was SVN commit r15596.
2014-08-01 14:32:31 +00:00
2b0af756f6
Temporary reversion for a graphic problems with some ATI cards when disabling water reflections.
...
This was SVN commit r15595.
2014-08-01 13:26:45 +00:00
e50147fd96
Metaprogramming 9ce51f4357.
...
Change something on water shaders to see if it works better on ATI
cards.
This was SVN commit r15594.
2014-08-01 10:15:29 +00:00
ec6b098dd4
Petra: some adjustements on naval transport
...
This was SVN commit r15593.
2014-07-31 21:35:28 +00:00
5c07a25ddc
More exact stack rooting (CallFunction object).
...
Changes CallFunction and CallFunctionVoid to use a HandleValue as object
parameter. Also changes some JS serialization/deserialization functions
to only support the JSAPI rooted types (drop support for CScriptVal and
CScriptValRooted there). Some other functions got changed too because
they were closely related.
Refs #2415
Refs #2462
This was SVN commit r15592.
2014-07-31 19:18:40 +00:00
d677a30c39
Adds support for passing JS::HandleValue and JS::RootedValue& to CallFunction.
...
Also adds tests for these cases.
Refs #2415
This was SVN commit r15591.
2014-07-31 16:34:15 +00:00
af8b76e227
Avoids dividing by zero when generating Gulf of Bothnia random map with one player. Patch by FeXoR, fixes #2699 .
...
This was SVN commit r15590.
2014-07-31 16:03:35 +00:00
2ae74221c7
Fixes saving/loading problems introduced in 28bdd8540f.
...
* CGameLoader created a new JS::Value when assigning to m_Metadata.
This means it didn't actually update metadata in SavedGames::Load. The
new approach solves this problem and should work well if
CScriptValRooted gets replaced in the future.
* The cloning in ScriptFunctions.cpp was required. Removing it caused
compartment mismatches.
* Now CGameLoader loads the metadata unconditinally because we didn't
actually use the option to not load load it.
Ref #2415
This was SVN commit r15589.
2014-07-31 14:44:51 +00:00
cf563657b6
Add some information about gathered resources to the multiple selection panel's tooltips. Refs #2695
...
This was SVN commit r15588.
2014-07-31 12:46:33 +00:00
cf121baa1d
Petra: small changes in naval transport to (hopefully) make it more robust
...
This was SVN commit r15587.
2014-07-30 21:36:48 +00:00
f85272e3de
Small code style fix, related to a typo in the documentation. Also updates the Example component's copyright to match the current year.
...
This was SVN commit r15586.
2014-07-30 17:34:40 +00:00
15e536dbb6
remove the hardcoded StartingCamera of player 3 which was pointing to player 1 location
...
This was SVN commit r15585.
2014-07-30 16:56:45 +00:00
cd3b35ed52
Handle callback functions when using the "leave" hotkey (by default Esc) to close a message box.
...
Fixes #2635
This was SVN commit r15584.
2014-07-30 09:27:46 +00:00
707b255e2b
Petra: prevent overseas attack to try to start before dock construction
...
This was SVN commit r15583.
2014-07-29 20:55:16 +00:00
58a19e8e30
Petra: prevent stuck units when a transport ship is destroyed
...
This was SVN commit r15582.
2014-07-29 17:32:59 +00:00
c2579c3c22
let allies build and repair stuff
...
This was SVN commit r15581.
2014-07-29 15:57:42 +00:00
00b072ea14
Fix a UnitAI issue where a builder would become idle if, upon completion of a foundation, it was close enough to immediately start working on another foundation. This was particularly infuriating with palisades.
...
This was SVN commit r15580.
2014-07-29 11:34:58 +00:00
a57747472c
Petra: proper fix for the juggernaut limit reported by brian
...
This was SVN commit r15579.
2014-07-28 20:15:06 +00:00
3ed6681aa4
fix #2691 , Petra should not try to unload allied garrisoned inside its buildings
...
This was SVN commit r15578.
2014-07-28 18:13:49 +00:00
9ce51f4357
Commit coastal waves when activating fancy effects, and incidentally completely change how this effect work. Refs #48 .
...
This was SVN commit r15576.
2014-07-28 10:14:00 +00:00
91ead32b1a
petra: temporary fix, waiting to be able to deal with training restrictions
...
This was SVN commit r15575.
2014-07-27 21:48:02 +00:00
afa769f873
fixes #2690 in Petra AI
...
This was SVN commit r15574.
2014-07-27 20:45:40 +00:00
2be86ef79e
Fix crash when starting Atlas (introduced in 28bdd8540f).
...
This was SVN commit r15573.
2014-07-27 18:38:31 +00:00
07653c9a70
Fixes crash when generating random maps.
...
We must not be in a request when calling the ScriptInterface destructor.
This was SVN commit r15572.
2014-07-27 18:17:16 +00:00
cef9e7d4f0
Fixes crash in replay mode introduced in 28bdd8540f.
...
This was SVN commit r15571.
2014-07-27 17:28:36 +00:00
fe8e19ebfe
Bunch of petra bug fixes: fixes #2685 , #2686 and makes 074cf06803 really working
...
This was SVN commit r15570.
2014-07-27 15:25:26 +00:00
64efbfeae3
Fixes small memory leak introduced in 28bdd8540f.
...
Thanks to leper for pointing it out.
This was SVN commit r15569.
2014-07-26 23:09:24 +00:00
28bdd8540f
Quite a lot of stack rooting related changes.
...
Changes GetProperty, SetProperty and HasProperty and a few other
functions to take handles. The conversions to CScriptVal or
CScriptValRooted at some places should be removed in the future. I've
done that to avoid an even larger patch.
Refs #2415
Refs #2462
This was SVN commit r15568.
2014-07-26 22:33:16 +00:00
e818b08344
Better support for SpiderMonkey rooted types in the ScriptInterface.
...
* Adds additional overloads/specializations which are required when
passing JS::Handle<T>/JS::MutableHandle<T> types to different functions.
* Replaces GetPropertyJS with a GetProperty specialization.
* Allows us to avoid the implementation of ToJSVal specializations for
JS::Value and JS::HandleValue. Such conversions should only happen if
there's no way around it and if you are aware of it.
* Adds test to make sure that all potentially required specializations
with custom implementations are instantiated. This should help prevent
introducing bugs in temporarily unused code.
Refs #2415
This was SVN commit r15567.
2014-07-26 20:31:29 +00:00
30f7837c44
Should be workaround for issue #2684
...
This was SVN commit r15566.
2014-07-26 17:12:45 +00:00
9cd75067bc
Workaround for issue #2486
...
This was SVN commit r15565.
2014-07-26 17:09:49 +00:00
ea708e14bf
Some changes on the VisibilityUpdate message system, aimed at correcting recent OOS problems.
...
I still experience troubles with serialization tests but I played a few
games without OOS. At least these changes will help us to debug more
efficiently the remaining problems.
Fixes initialization of visibility data and update order for LoS-related
systems (territory borders, etc).
Also removes a C-like array and fixes a player ID shifting.
Refs #599
This was SVN commit r15563.
2014-07-26 16:02:18 +00:00
e3888448c4
Removes rooting test.
...
Rooting works different now and the CScriptVal types are going to be
removed. We will need rooting tests again, but they will have to work
completely different than this test implementation.
Refs #2415
This was SVN commit r15562.
2014-07-26 14:07:56 +00:00
f41d4fa48e
Fixes compartment mismatch introduced in a5ebd8dafd.
...
Also modifies some related functions to use SpiderMonkey stack rooting
types instead of CScriptValRooted.
Refs #2415
This was SVN commit r15561.
2014-07-26 10:58:24 +00:00
5c3f1b6dba
fix previous commit
...
This was SVN commit r15560.
2014-07-25 21:24:05 +00:00
074cf06803
Petra: deals more efficiently with naval transport
...
This was SVN commit r15559.
2014-07-25 18:16:33 +00:00
05de9def0b
Remove unused --with-system-enet option (see 6bec648833) from premake.
...
Sort options in premake.
This was SVN commit r15558.
2014-07-25 13:50:59 +00:00
f017922910
Update system icons to the newer logo and add higher resolution images to the ico/icns sets. (the OS X icon might need to be checked as I had to use an online converter to get that.)
...
This was SVN commit r15557.
2014-07-24 23:12:46 +00:00
7c82e59ce5
Replace or remove uses of Engine.Console_Write. Patch by Adrian Fatol. Fixes #2141 .
...
Cleans up list utility functions a bit.
Removes Engine.Console_Write.
This was SVN commit r15556.
2014-07-24 21:27:24 +00:00
4278e93b97
Petra: improve AI behaviour in scenarios without building possibility
...
This was SVN commit r15555.
2014-07-24 21:26:53 +00:00
f8cbef8379
fix previous commit
...
This was SVN commit r15554.
2014-07-24 21:05:16 +00:00
c5929ca7d5
make tooltip agree with buildrestrictions
...
This was SVN commit r15553.
2014-07-24 20:59:25 +00:00
a574ca2e8f
Petra: improve use of garrisoning for defense + some cleanings
...
This was SVN commit r15552.
2014-07-23 17:57:32 +00:00
2eb12c13ec
give war ships at dock for carthage, for better balance of naval maps
...
This was SVN commit r15551.
2014-07-23 17:18:22 +00:00
600e0a4081
Fix an oversight in CcmpPosition from the turret changes. Reported on IRC by Falsevision.
...
This was SVN commit r15550.
2014-07-23 13:02:42 +00:00
a5ebd8dafd
Load trigger scripts in serialization test mode.
...
This was SVN commit r15549.
2014-07-22 23:30:27 +00:00
bfe1e9f182
fix #2603
...
This was SVN commit r15548.
2014-07-22 21:23:25 +00:00
a7b18d02bf
Add serialization test support for replays.
...
This was SVN commit r15547.
2014-07-22 19:41:49 +00:00
b41289807a
fix a rare JS warning
...
This was SVN commit r15546.
2014-07-22 18:20:47 +00:00
68121f387c
Don't cache (and serialise) all technology templates multiple times. It's still cached once in the TechnologyTemplateManager.
...
This was SVN commit r15545.
2014-07-22 16:18:37 +00:00
9d505f2fd1
fixes petra javascript warnings
...
This was SVN commit r15543.
2014-07-21 16:19:59 +00:00
a9048fa43d
Adds support for passing JS::HandleValue to SetProperty and CallFunctionVoid without using ugly casing.
...
Also includes one little "demo-usecase", but additional code will be
changed to use that in future commits.
Refs #2415
Refs #2462
This was SVN commit r15542.
2014-07-20 19:45:18 +00:00
31f9ca9ebf
Implements CallFunction with JS::MutableHandle<T> return type.
...
Changes the CallFunction implementation to use macros because otherwise
we'd have to write twice as many functions manually.
Adapts GetSavedGameData to use the new function template. Additional
callers will be changed in future commits.
Refs #2415
Refs #2462
This was SVN commit r15541.
2014-07-20 15:08:28 +00:00
3782857333
Petra: small fixes + reformat debug outputs
...
This was SVN commit r15540.
2014-07-19 16:17:09 +00:00
1d35d22a7b
let the AI know when a building is decaying
...
This was SVN commit r15539.
2014-07-17 19:56:54 +00:00
e1d4c10f13
Recompute the number of LoS tiles whenever these tiles are reset (especially when loading serialized data).
...
Also add a verification about LoS tiles in the tests.
Fixes #2678
Refs #599
This was SVN commit r15538.
2014-07-17 19:08:06 +00:00
98281689f2
Petra: fix a rare bug where the AI would never attack + some attack tunings
...
This was SVN commit r15537.
2014-07-17 17:04:13 +00:00
de9ae66326
Petra: improve support for wonder games
...
This was SVN commit r15535.
2014-07-15 19:07:11 +00:00
52f4cda439
Changes ToJSVal to take JS::MutableHandleValue instead of JS::Value&.
...
JS::MutableHandleValue is similar to JS::HandleValue, but the whole
JS::Value it points to can be replaced.
This change is needed for support of exact stack rooting and moving GC.
Contains a few other trivial API adjustments and style improvements too.
Refs #2462
Refs #2415
This was SVN commit r15534.
2014-07-14 19:52:35 +00:00
17634d7507
Move the minimap to only use the shader pipeline. Should make it OpenGL ES compatible (untested).
...
This was SVN commit r15533.
2014-07-14 17:15:22 +00:00
47426b2dad
Per scythetwirler's suggestion, add some tables on my template analyzer script to compare units to their parent template.
...
This was SVN commit r15532.
2014-07-14 16:25:39 +00:00
09e04cb741
Adds missing request (fixes tests in debug mode).
...
This was SVN commit r15530.
2014-07-13 22:08:29 +00:00
882f3406e3
Syncs _test.sim required simulation data with public mod, copies RelaxNG schemas for future use
...
This was SVN commit r15528.
2014-07-13 21:29:30 +00:00
a47dda7d66
Disables MSVC CRT deprecation warnings when building Atlas w/ wxWidgets 3.0
...
This was SVN commit r15527.
2014-07-13 21:19:30 +00:00
a82d32bd3c
Fixes MSVC warning C4189: 'componentManager' : local variable is initialized but not referenced (Script_RegisterComponentType_Common is a static member function, so an instance of CComponentManager isn't needed)
...
This was SVN commit r15526.
2014-07-13 20:38:34 +00:00
7b15b526ac
Fixes tests.
...
Changes direct access of EndGameManager.gameType to getter function, by
convention
This was SVN commit r15525.
2014-07-13 19:45:44 +00:00
1b5ab8142e
Makes custom JS objects compatible with SpiderMonkey ESR31.
...
In v24 you called JS_InitClass and passed in a definition of JSNative
functions. Later you could call JS_NewObject with this class and the
object would get a prototype with the specified JSNative functions.
In ESR31 you now have to explicitly store the prototype object returned
by JS_InitClass and pass it as prototype argument to JS_NewObject to
achieve the same.
This change modifies our existing ScriptInterface implementation for
custom object types a bit and uses it at places where the JSAPI was used
directly before.
Refs #2462
This was SVN commit r15524.
2014-07-13 15:31:48 +00:00
f4949c82ff
Fix how the template analyzer scripts takes walkspeed into account to some extent for ranged units, add a new script to create a RM to check balance using triggers, and add a readme file to try and explain the outputs and parameters better.
...
This was SVN commit r15523.
2014-07-13 14:22:32 +00:00
0cf5f57a68
Update of the template analyzer tool with more parameters and probably a more accurate representation of civs (with the right settings).
...
This was SVN commit r15522.
2014-07-13 10:20:35 +00:00
83d37f7857
Re-allow placing skirmish entities in Atlas. Refs #1696
...
This was SVN commit r15521.
2014-07-13 09:35:00 +00:00
7531a417e5
Fix re-garrisoning on visible garrison points after killing the units on that spot. Issue found by Stan.
...
This was SVN commit r15520.
2014-07-12 21:38:10 +00:00
eebc2f07bb
Move some trees to accessible locations. Issue found by willsmith182.
...
This was SVN commit r15519.
2014-07-12 20:08:43 +00:00
5a3f07b3d9
Forgot to use excnObj in db9c20e0a9. Also roots an additional jsval.
...
This was SVN commit r15518.
2014-07-12 19:46:12 +00:00
db9c20e0a9
Changes FromJSVal to take a JS::HandleValue instead of JS::Value.
...
JS::HandleValue is basically a wrapper around a JS::Value that is safe
for exact stack rooting and moving GC.
I've tried to keep this changeset rather small and isolated and
therefore create additional JS::Rooted<T> values at some places where
the function should eventually directly take a JS::Handle<T>.
The functions "CallFunction" and "CallFunctionVoid" put their arguments
inside a JS::AutoValueVector because this will be passed directly to
"CallFunction_" with ESR31.
Refs #2462
Refs #2415
This was SVN commit r15517.
2014-07-12 19:08:39 +00:00
cfa59fc4e1
Changes our JSNative functions to use JS::CallReceiver/JS::CallArgs.
...
This is the new way for working with arguments in JSNative functions.
JS_THIS_VALUE, JS_ARGV, JS_SET_RVAL and direct access to vp or argc are
deprecated and will probably be removed in future versions of
SpiderMonkey.
CallArgs also takes care of proper rooting and you can get the values as
Handles or MutableHandles. The interface changes a little bit for ESR
31, but commiting this now still makes it easier and the changes shout
be straigtforward (search and replace more or less).
Refs #2462
Refs #2415
This was SVN commit r15516.
2014-07-12 16:55:09 +00:00
7a1b92bffc
Update my "Template Analyzer" script to have output about civ too. Try to guess if they are balanced against each other.
...
This was SVN commit r15515.
2014-07-12 16:08:35 +00:00
319cf16b5a
Small cleanup, including a correction in the templates documentation, and the removal of residues from the culling changes.
...
This was SVN commit r15514.
2014-07-12 16:03:37 +00:00
5279f9625e
Add a new tool to make some quick template analysis to try and detect imbalances or see if our balancing works. WIP.
...
This was SVN commit r15513.
2014-07-11 22:24:58 +00:00
42591ef4cb
Fix previous commit, refs #1257
...
This was SVN commit r15512.
2014-07-11 18:29:18 +00:00
f5cc99f78b
Fix OOS problems caused by an unwanted modification of the simulation state by the GUI.
...
Refs #1257
This was SVN commit r15511.
2014-07-11 18:11:32 +00:00
a4e3422a22
Fix the hero flickering overlay after healing. Fixes #2666 . Patch by Adrian
...
This was SVN commit r15510.
2014-07-11 17:48:01 +00:00
2174eaaeee
Add a VisibilityChanged message sent by the range manager whenever an entity changes visibility for any player.
...
This will be necessary for hiding buildings/trees/etc in fog-of-war, and
may be useful for AIs and for UnitAI.
Refs #599 .
This was SVN commit r15508.
2014-07-10 20:51:39 +00:00
9d335f2e22
Fix typos found by FalseVision
...
This was SVN commit r15507.
2014-07-10 19:17:45 +00:00
255ab52725
fix previous commit
...
This was SVN commit r15506.
2014-07-10 06:30:08 +00:00
e2d893103b
make the AI aware of the game type and start interfacing with wonder victory condition + some fixes
...
This was SVN commit r15505.
2014-07-09 21:41:14 +00:00
689272d4bd
Remove collision in global namespace.
...
Fixes config/vfs deadlocks on OSX.
This was SVN commit r15504.
2014-07-09 19:16:03 +00:00
77e9e58a32
Petra: fixes + changes on the attack management
...
This was SVN commit r15503.
2014-07-08 19:01:27 +00:00
7e81f4f52a
Update the "number of builders" tooltip to be slightly more helpful.
...
This was SVN commit r15502.
2014-07-08 18:48:08 +00:00
3ba325f9e8
Remove the HQDOF since it did not really work properly and we already have DOF. Fixes #2111
...
This was SVN commit r15501.
2014-07-08 18:23:53 +00:00
56bcbd59a0
Fix allied garrison issue.
...
This was SVN commit r15500.
2014-07-07 09:28:34 +00:00
27c700ce3a
Petra: various small tunings or fixes
...
This was SVN commit r15499.
2014-07-06 17:31:02 +00:00
8b45f453e5
Fix non-PCH build.
...
This was SVN commit r15498.
2014-07-06 16:35:41 +00:00
62c1ac310d
It would appear like I inadvertently committed a version of the water with some debug information in that made it look black.
...
This was SVN commit r15497.
2014-07-06 15:22:44 +00:00
334ba4b740
SpiderMonkey now supports default parameters!
...
I've just modified those places with TODO comments, but there are most
likely others that could benefit of the feature to make the code a bit
cleaner and easier to understand.
Thanks to Fabio for pointing it out.
Refs #1886
This was SVN commit r15496.
2014-07-05 13:58:51 +00:00
8b493c2739
Revert obsolete workaround for structured clones.
...
Reverts 8195e767ef#2241
Refs #1886
This was SVN commit r15495.
2014-07-05 11:35:00 +00:00
de6823d23f
Makes tinygettext handle missing plural forms more sanely.
...
Print an error to the console and return the original (untranslated)
string instead of triggering an assertion in debug builds or a crash and
memory corruption in release builds.
Works around a crash on the history screen. Why the plural form is
missing is another topic and will have to be solved separately.
This was SVN commit r15493.
2014-07-05 10:29:24 +00:00
5571f7a7f9
Fix "Wind Angle" parameter not working properly. Add a precomputed "wind strength" variable so that waves look smaller behind islands. Some tweaks. Refs #48 as usual.
...
This was SVN commit r15492.
2014-07-05 10:20:30 +00:00
aa99f98fce
Fix rmgen for my changes, I had missed that, thanks mimo.
...
This was SVN commit r15491.
2014-07-04 18:24:39 +00:00
4852fad86a
Petra: adapt the AI to gaia now able to launch attacks (with triggers) + cleaning of unused functions
...
This was SVN commit r15490.
2014-07-04 16:12:09 +00:00
9d4665248b
Check water FBOs creation correctly to detect some errors. Use two depth textures since I have a hunch the issues people encounter are caused by my using only one.
...
This was SVN commit r15488.
2014-07-04 10:14:35 +00:00
991d5bbd63
Fix random maps for my water changes. Fix the replay mode after I had broken it. Fix an occasional crash (that might have crashed Atlas, need someone to check).
...
Improve debugging slightly in case of framebuffer errors. Fix a few
style issues.
This was SVN commit r15486.
2014-07-04 09:03:21 +00:00
326290463e
Further WIP water improvements. Add 3 different textures for different looks. Update some oasis maps for that. Streamline water settings (some removed, some added). Update Atlas for those (needs to be tested). Fix an issue with HQ water effects.
...
Please report any issue and/or crash. Those will get fixed in commits to
come. Refs #48 .
This was SVN commit r15484.
2014-07-03 20:07:15 +00:00
eb7955599a
Optimise silhouette rendering.
...
Do some intersection tests on the CPU so that the silhouette render
passes only have to draw models/patches that might actually contribute
to silhouettes, saving the CPU and GPU cost of rendering more objects
than necessary.
This was SVN commit r15483.
2014-07-03 01:00:25 +00:00
ffd6e10edf
Make CGUIManager register a callback function for hotloading instead of specifically calling it.
...
This was SVN commit r15482.
2014-07-02 23:44:39 +00:00
30e851ab90
Forward-declare CShaderProgramPtr, to avoid pulling in more headers than necessary and to hypothetically reduce build times by a minuscule amount.
...
This was SVN commit r15481.
2014-07-02 22:36:45 +00:00
404e808ed5
Add yes-no dialog and general dialog code to present choices to players. Can be used by triggers.
...
This was SVN commit r15480.
2014-07-02 14:48:22 +00:00
c844589f48
Add missing translate() call.
...
This was SVN commit r15479.
2014-07-01 21:05:33 +00:00
a5065b523d
Petra: refrain AI to build/repair under enemy fire and few fixes on economy management
...
This was SVN commit r15478.
2014-07-01 19:48:38 +00:00
343066040f
Remove inconsistent checks for pSimulation2 when saving maps and ensure that it is set.
...
Remove commented out code writing triggers that has nothing to do with
the actual triggers implementation.
Free memory that was allocated for error reporting when when fork()
fails.
Remove dead initialization.
This was SVN commit r15477.
2014-07-01 19:00:41 +00:00
89c6487ffe
Forgot to remove my fake radiosity changes.
...
This was SVN commit r15476.
2014-07-01 16:53:13 +00:00
f8d53d9a1d
Clean up of the last commit.
...
This was SVN commit r15474.
2014-07-01 16:15:03 +00:00
ab30e0d4fb
Change the water texture to a new, bigger one, created in Blender (thanks to Enrique). Change settings so that they are more logical, yet allow reverting back to an even lower quality setting. Add a WIP high setting (with foam) which isn't finished yet.
...
Change the shader itself so that the effects look nicer and are more
consistent across settings.
Rework the water mesh generation (simpler system). Fix a few issues.
May work oddly with Atlas since I haven't been able to compile yet.
Refs #1875 (maybe fix), Fixes #2077 (I'll assume it does), Fixes #2114
(assumption again), refs #48 .
This was SVN commit r15473.
2014-07-01 16:05:05 +00:00
0bde61fa5b
Simplify 'survival of the fittest' map by using Gaia as attacker, and using the trigger point ownership to differentiate between different players, instead of hardcoding a list.
...
This was SVN commit r15471.
2014-07-01 09:29:45 +00:00
fa5b373698
Add some missing semicolons.
...
This was SVN commit r15470.
2014-06-30 21:38:45 +00:00
66485bcd17
Check that at least one assignment exists before tryintg to copy it.
...
This was SVN commit r15469.
2014-06-30 17:21:12 +00:00
00fa45161d
Added "Survival of the Fittest", a demo random map with triggers. Refs #52
...
This was SVN commit r15468.
2014-06-30 13:59:34 +00:00
c339928c6f
Disallow placing some special entities in Atlas. Fixes #1696 . Patch by trompetin17
...
This was SVN commit r15467.
2014-06-30 10:20:20 +00:00
b4fc393f18
Change camera rotation in Atlas to be the same as in the game. Refs #1066 .
...
This was SVN commit r15466.
2014-06-29 21:30:51 +00:00
fd91398a95
Petra: fix the fix preventing the AI to be stuck trying to produce unavailable units
...
This was SVN commit r15465.
2014-06-29 19:16:18 +00:00
6ed07ef4d9
Petra: hopefully improve the gatherers management + some cleanings
...
This was SVN commit r15464.
2014-06-28 20:02:18 +00:00
97118f39b3
remove predefined AI in some skirmish maps, so that the default is taken
...
This was SVN commit r15463.
2014-06-28 19:46:10 +00:00
d90020e88e
This was SVN commit r15462.
2014-06-28 11:01:59 +00:00
c626cf66f9
Fix build-osx-libs properly for mavericks after learning some Bash.
...
Fix a long-standing typo in TerrainRenderer for water rendering that
apparently had no effect.
Don't compress the water textures to make it look better. They will be
changed anyhow.
This was SVN commit r15461.
2014-06-28 08:54:59 +00:00
789922b15a
Updates LICENSE.txt files for recent changes
...
This was SVN commit r15459.
2014-06-28 06:21:27 +00:00
59b2493990
Missed changes from 304a7c1201
...
This was SVN commit r15458.
2014-06-28 05:50:32 +00:00
6bec648833
Removes bundled ENet source. NOTE: system libenet (1.3) is now required on *nix, see BuildInstructions for updates. This change requires running update-workspaces. Fixes #1568 .
...
Updates update-workspaces.sh and build-osx-libs.sh for this change.
Updates precompiled win32 ENet to 1.3.12, built with VC++ 2010, and
moves it to libraries/win32, refs #864 .
This was SVN commit r15457.
2014-06-28 05:48:51 +00:00
304a7c1201
Updates precompiled win32 libpng to 1.6.12, built with VC++ 2010, refs #864 .
...
Removes unused ffmpeg definition from extern_libs4.lua
This was SVN commit r15456.
2014-06-28 05:34:39 +00:00
dd3fdf6800
Correct assignment dropdowns to always be adjustable by the game controller.
...
This was SVN commit r15454.
2014-06-28 05:02:29 +00:00
c2763dca24
This was SVN commit r15453.
2014-06-27 05:31:47 +00:00
b1307c83be
fix guard command broken in recent commits
...
This was SVN commit r15452.
2014-06-26 21:15:16 +00:00
58932825a6
Petra: some tunings and cleanings
...
This was SVN commit r15451.
2014-06-26 20:50:24 +00:00
ae93c02ba8
Fixes a bug that caused script filenames to be defined as properties of the global object.
...
This was SVN commit r15450.
2014-06-26 17:08:46 +00:00
217a399ee3
Carthaginian ballista
...
This was SVN commit r15449.
2014-06-26 12:10:36 +00:00
05693744cc
Hellenistic ranged siege animations commit
...
This was SVN commit r15448.
2014-06-26 06:37:08 +00:00
fd6b199606
Fix compiling on Mavericks. Users on older systems will need to change a few lines in either of those scripts, but it should not break their build. For now, I'm saying it Fixes #2304 .
...
This was SVN commit r15447.
2014-06-25 18:01:00 +00:00
3b35afeeee
typo
...
This was SVN commit r15446.
2014-06-25 15:19:31 +00:00
b1b96a89d6
Fix culling for shadows and reflections.
...
Previously we had a single culling frustum based on the main camera, and
any object outside the frustum would never get rendered, even if it
should actually contribute to shadows or reflections/refractions. This
caused ugly pop-in effects in the shadows and reflections while
scrolling.
Extend the renderer to support multiple cull groups, each with a
separate frustum and with separate lists of submitted objects, so that
shadows and reflections will render the correctly culled sets of
objects.
Update the shadow map generation to compute the (hopefully) correct
bounds and matrices for this new scheme.
Include terrain patches in the shadow bounds, so hills can cast shadows
correctly.
Remove the code that tried to render objects slightly outside the camera
frustum in order to reduce the pop-in effect, since that was a
workaround for the lack of a proper fix.
Remove the model/patch filtering code, which was used to cull objects
that were in the normal camera frustum but should be excluded from
reflections/refractions, since that's redundant now too.
Inline DistanceToPlane to save a few hundred usecs per frame inside
CCmpUnitRenderer::RenderSubmit.
Fixes #504 , #579 .
This was SVN commit r15445.
2014-06-25 01:11:10 +00:00
bb4b911e99
Remove remaining warnings about AI naval map support. Also hide player assignment dropdowns on network clients.
...
This was SVN commit r15444.
2014-06-24 22:53:02 +00:00
ec5215f843
Petra: avoid doing some unused stuff
...
This was SVN commit r15443.
2014-06-24 20:44:37 +00:00
067a1d4829
Latin female sound files from Itms
...
This was SVN commit r15442.
2014-06-24 19:40:48 +00:00
06c1f9f972
Fix canyon rms when you for some reason want to start as the only player.
...
This was SVN commit r15441.
2014-06-24 19:12:44 +00:00
3013b35c13
Petra fixes
...
This was SVN commit r15440.
2014-06-24 18:31:36 +00:00
be767e7983
Fix dog bark xml files
...
This was SVN commit r15439.
2014-06-24 11:14:13 +00:00
5509e8e51c
This shouldn't have been comitted
...
This was SVN commit r15438.
2014-06-24 11:09:04 +00:00
006bf42809
Fix segmentation fault in the sound destructor. Happened when the sound file doesn't exist. Errors are shown by other code.
...
This was SVN commit r15437.
2014-06-24 11:07:39 +00:00
7d8a4c3a88
Improve the hawk with a gliding animation and a better flapping animation.
...
This was SVN commit r15436.
2014-06-24 11:06:04 +00:00
4ad2677920
Adding latin voice files by Itms
...
This was SVN commit r15435.
2014-06-23 23:41:23 +00:00
ed1fb3058f
Small audio folder restructure and further deletes
...
This was SVN commit r15434.
2014-06-23 23:22:53 +00:00
a6e6fd6591
Removing redundant placeholder audio
...
This was SVN commit r15433.
2014-06-23 22:59:43 +00:00
3746d7c3d9
Adds a playable trigger demo mission for multiplayer and TreasureCollected events.
...
Search treasures on small islands and on water. Collect more treasures
than your opponent to win.
I've used the Cycladic Archipelago scenario map with some minor
adjustments, mainly treasure placement and civ preselection for even
chances (both need townphase to build trading boats that can collect
floating treasures).
There's still some room for improvement to make it more fun and add
additional triggers, but I'll leave that for modders. :)
This was SVN commit r15432.
2014-06-23 20:14:43 +00:00
7e9d6f8ebe
Adds translation message extraction for map specific trigger scripts.
...
This was SVN commit r15431.
2014-06-23 19:59:37 +00:00
692cc8240d
Remove empty comment + turn delay times into 0.
...
This was SVN commit r15430.
2014-06-23 18:25:19 +00:00
17c473f2f3
Add a trigger to the gallic fields map + fix a typo.
...
This was SVN commit r15429.
2014-06-23 18:12:51 +00:00
fcc4d7433a
Petra: fix a bug and some typos
...
This was SVN commit r15428.
2014-06-23 17:54:32 +00:00
8915037631
Turn victory conditions into trigger scripts. Gui needs to be updated to allow combining of different victory conditions + to allow different lists per map. So there are no specific missions yet.
...
This was SVN commit r15427.
2014-06-23 17:37:27 +00:00
b811066b85
Add ownership changed event to Triggers.
...
This was SVN commit r15426.
2014-06-23 16:32:44 +00:00
e33e70e626
Change trigger initialisation as it's not compatible with multiple trigger files (functions would overwrite each other)
...
This was SVN commit r15425.
2014-06-23 15:55:07 +00:00
49c7efad4f
Add demo triggers map. Showing all triggers with a minimum amount of code.
...
This was SVN commit r15423.
2014-06-23 14:19:42 +00:00
f94491a1d1
Forgot to remove some debug info
...
This was SVN commit r15422.
2014-06-23 13:52:52 +00:00
9f47ed536d
Add engine support to triggers + a component to provide an easy interface and to be extended by triggers. Thanks to SpahBod for the biggest part of the code, and Yves for the review.
...
This was SVN commit r15421.
2014-06-23 13:42:59 +00:00
213732d5af
Updates some precompiled win32 libraries with VC++ 2010 (note: requires update-workspaces), refs #864 :
...
Updates libiconv to v1.14.
Updates libxml2 to v2.9.1.
Updates zlib to v1.2.8.
Rebuilds FCollada.
Updates libxml2 to use same libiconv as tinygettext.
Cleans up unneeded libiconv files.
This was SVN commit r15416.
2014-06-23 01:07:16 +00:00
600e8bd226
Fixes MSVC warning about uninitialized playerId in Atlas entity pasting code (using 0 as a sensible default value), refs #96
...
This was SVN commit r15415.
2014-06-22 22:19:02 +00:00
09637ea0cf
Fix selection issue with mace champ cav.
...
This was SVN commit r15414.
2014-06-22 21:45:00 +00:00
7b781f82d3
Fix capitalisation issue
...
This was SVN commit r15413.
2014-06-22 20:35:16 +00:00
f1e077d7e9
Fix hero overlay by requiring at least one unit to be trained
...
This was SVN commit r15412.
2014-06-22 20:00:34 +00:00
144cb0e44a
Petra: fix trying to barter while market is still a foundation
...
This was SVN commit r15411.
2014-06-22 12:10:51 +00:00
0e6f6576dc
Fix compilation on Mavericks when running build-osx-bundle.sh.
...
Fixes to build-osx-libs.sh.
Support gloox properly on OSX.
Refs #2304 (not fixed since afaik xCode still runs into some issues)
This was SVN commit r15410.
2014-06-22 08:27:58 +00:00
4e996de883
Fix UnitAI bug found by FalseVision
...
This was SVN commit r15409.
2014-06-21 21:03:44 +00:00
67d81996f6
petra: various (small) changes in attack and economic management + cleanings
...
This was SVN commit r15408.
2014-06-21 16:21:11 +00:00
8f0772034e
Don't process tokens starting with a '-' into translatable strings.
...
This was SVN commit r15407.
2014-06-21 08:09:24 +00:00
c793da5368
Don't allow changeing disabled dropdowns using the scrollwheel. Also corrects some things in b9a4af4cc6.
...
This was SVN commit r15406.
2014-06-21 00:25:12 +00:00
b9a4af4cc6
Fix #2595 by validating cheats are disabled in rated games. Also forces locked teams in ranked games and adds a scrollbar to the lobby subject.
...
This was SVN commit r15405.
2014-06-20 23:59:04 +00:00
160a83b73f
Bits of cleanup
...
This was SVN commit r15403.
2014-06-20 03:45:19 +00:00
1659a28aa0
Correctly remove players who cancel while rejoining. Fixes #2240
...
This was SVN commit r15402.
2014-06-20 03:22:40 +00:00
754e76e4a1
Fix non-PCH build
...
This was SVN commit r15401.
2014-06-19 23:36:09 +00:00
d936bde74a
Dynamic message subscriptions.
...
Allow components to individually subscribe/unsubscribe to messages,
instead of statically subscribing the entire component type. Use this
for most Interpolate/RenderSubmit messages, to avoid the performance
cost of passing those messages to a large number of components that will
just ignore them anyway.
On Azure Coast this reduces total time per frame by about 30% on a
CPU-bound system.
This was SVN commit r15400.
2014-06-19 23:20:12 +00:00
ec7a452d4e
Convert multiplayer connection dialog to only use 'modern' styles and make it larger for languge-friendliness and consistancy.
...
This was SVN commit r15399.
2014-06-19 19:22:31 +00:00
bee865416b
Fixes small issues in 81d1f5f71f.
...
This was SVN commit r15398.
2014-06-19 18:50:41 +00:00
b8078deea8
Splitted the PO and POT files
...
Fixes #2494
This was SVN commit r15397.
2014-06-19 18:45:11 +00:00
8817bd394b
Fix the check if the script is beeing exectued as root for sh (== comparision seems to work for bash but not for sh).
...
This was SVN commit r15396.
2014-06-19 15:19:08 +00:00
e529e551d9
fix typo
...
This was SVN commit r15395.
2014-06-19 14:48:48 +00:00
81d1f5f71f
Clean up notifications. Merge the timed and untimed text notifications, allow passing a list of players to all notifications, make modification types moddable. Refs #52
...
This was SVN commit r15394.
2014-06-19 14:37:08 +00:00
6d5039791f
Fix barter panel. Reported by Gameboy
...
This was SVN commit r15393.
2014-06-19 12:34:52 +00:00
12c7fe2bc7
fix a bug in petra attack preparation
...
This was SVN commit r15392.
2014-06-18 20:22:18 +00:00
c9f2ac4b12
Fix giving foundations a population bonus after a tech research. Reported by bouke
...
This was SVN commit r15391.
2014-06-18 15:58:04 +00:00
a76364f825
fix previous commit
...
This was SVN commit r15390.
2014-06-18 15:42:19 +00:00
7baaf382ed
Organise the session helper functions a bit per topic
...
This was SVN commit r15389.
2014-06-18 15:27:28 +00:00
1307a9038a
Split the selection panels in session.xml into multiple xml files
...
This was SVN commit r15388.
2014-06-18 13:03:59 +00:00
7266ea681b
Allow mixing the buttons for the right pane, so make it possible to have a structure that can pack and produce units. Refs #1919
...
This was SVN commit r15387.
2014-06-18 11:23:22 +00:00
054706a114
Allow showing the productionqueue for multiple selected buildings at once
...
This was SVN commit r15386.
2014-06-18 10:46:41 +00:00
7d92890900
Updates wxWidgets to 3.0.1 in OS X libs build script (hopefully fixes the crash when starting Atlas), refs #2356
...
This was SVN commit r15385.
2014-06-18 01:32:39 +00:00
f1379a77b5
Fix build for wxWidgets version 2.8.10 and older.
...
This was SVN commit r15383.
2014-06-17 19:32:33 +00:00
94b49a01a9
Adapt the relaxNG files to new gui changes
...
This was SVN commit r15382.
2014-06-17 18:45:40 +00:00
7d265cec80
Add copy-paste (CTRL+C/V) to Atlas. Patch by trompetin17. Fixes #96
...
This was SVN commit r15381.
2014-06-17 13:14:25 +00:00
02fd235bbd
Make hotkeys and top panel fully moddable by splitting up the xml file. Allow entire directories to be loaded via an 'include' to provide extra moddability (modders don't have to edit any files, they can just add new ones).
...
This was SVN commit r15380.
2014-06-17 13:03:55 +00:00
8c547a3fad
Fixes a few other invalid XML files reported by the validator script, refs #245
...
This was SVN commit r15379.
2014-06-17 03:53:13 +00:00
aa04b6d782
Fixes invalid actors reported by XML validator script. Some were only technically invalid but others were broken. Refs #245
...
This was SVN commit r15378.
2014-06-17 03:49:37 +00:00
2c9939ac74
Adds Relax NG Compact syntax grammars for most of the XML formats in the engine.
...
Adds converted Relax NG XML grammars for each (Note: don't edit these
directly, modify the compact syntax .rnc files instead, then use a
conversion tool http://relaxng.org/#conversion to generate the .rng
files).
Adds Perl script to validate the XML files using the new grammars
This was SVN commit r15377.
2014-06-17 03:31:40 +00:00
d11e48cd85
Petra: bugfixes + improved attack/defense behaviour
...
This was SVN commit r15376.
2014-06-16 22:03:30 +00:00
013ab4bda7
Make the barter panel uniform with the others, clean up more gui code.
...
This was SVN commit r15375.
2014-06-16 18:34:27 +00:00
ce3b11a3fe
fix the fix of setHeldPosition in b17ffaeb7e
...
This was SVN commit r15374.
2014-06-15 17:27:03 +00:00
190f3b0ce1
Exclude .git dirs when adding subfolders to the VFS.
...
This was SVN commit r15373.
2014-06-15 17:06:24 +00:00
f115759901
Handle mods specified on the command line when using the archive builder.
...
This was SVN commit r15372.
2014-06-15 16:43:08 +00:00
bec1e1edfd
fix b17ffaeb7e + fixes from FalseVision on setHeldPosition
...
This was SVN commit r15371.
2014-06-15 16:41:01 +00:00
74e5c8ae26
fix e2b493bb67
...
This was SVN commit r15370.
2014-06-15 16:13:12 +00:00
519c00c1a6
Don't allow users to build workspaces as root user
...
This was SVN commit r15369.
2014-06-15 15:23:03 +00:00
86aa30e0d9
Remove useless line in UnitAI, found by FalseVision
...
This was SVN commit r15368.
2014-06-15 14:38:25 +00:00
1e38fa7b58
UnitAI fix by FalseVision
...
This was SVN commit r15367.
2014-06-15 14:23:49 +00:00
ef7e19c13e
reset petra debug left in previous commit
...
This was SVN commit r15365.
2014-06-15 12:59:19 +00:00
b17ffaeb7e
Petra: make better use of garrisoning when attacked
...
This was SVN commit r15364.
2014-06-15 12:57:12 +00:00
9a743d65fe
Fix to unitAI by FalseVision + fix a mistake of my own
...
This was SVN commit r15363.
2014-06-15 12:43:52 +00:00
89f33e7579
Fix group number rendering
...
This was SVN commit r15362.
2014-06-15 12:08:58 +00:00
e042fa8768
Make trigger points templates
...
This was SVN commit r15361.
2014-06-15 11:25:25 +00:00
beaf3139c0
Move position calculation of buttons to something cleaner.
...
This was SVN commit r15360.
2014-06-15 09:56:54 +00:00
5064f2728f
Fix tech pairing visuals + hiding
...
This was SVN commit r15359.
2014-06-15 07:56:40 +00:00
e12d4b880a
Add XMB file format version to the XMB files and check it when loading a file.
...
This was SVN commit r15358.
2014-06-14 23:41:33 +00:00
f460057700
Fix error for entities that require a technology to be trainable.
...
This was SVN commit r15357.
2014-06-14 22:28:06 +00:00
2766ae7eb5
Marker objects for Atlas
...
This was SVN commit r15356.
2014-06-14 18:44:18 +00:00
e152223a53
fix fix
...
This was SVN commit r15355.
2014-06-14 18:21:48 +00:00
b93877571f
Add missing quotation mark to quote.
...
This was SVN commit r15354.
2014-06-14 17:20:09 +00:00
b469983c58
Fix for 89f5e7b260. Refs #2622
...
This was SVN commit r15353.
2014-06-14 16:12:41 +00:00
86ca3b2142
Small cleanup: i, numbButtons and numberOfItems all contain the same value anyway
...
This was SVN commit r15352.
2014-06-14 15:57:42 +00:00
7f172037ac
Clean up a big part of unit_commands.js, and bring most data to a separate JS object (instead of having deep nests of switches and if-else structures)
...
This was SVN commit r15351.
2014-06-14 15:35:13 +00:00
5903935e4a
let the AIs know when a training has started
...
This was SVN commit r15350.
2014-06-14 14:34:37 +00:00
4e6a21e9da
fix promotion of autogarrisoned units (forgot in previous tag)
...
This was SVN commit r15349.
2014-06-14 14:26:51 +00:00
e2b493bb67
fix double-click on a garrisoned hero button should select its holder, even if from autogarrison
...
This was SVN commit r15348.
2014-06-14 14:21:30 +00:00
7cf927baec
fix typo from 2b8758745f
...
This was SVN commit r15347.
2014-06-14 14:14:33 +00:00
8d164ca5d1
Add civ requirement to tech that was missed in the previous commit. Refs #2580 .
...
This was SVN commit r15346.
2014-06-13 21:02:32 +00:00
121f14d521
Add civ requirements to civ specific techs. Patch by s0600204. Refs #2580 .
...
This was SVN commit r15345.
2014-06-13 16:16:31 +00:00
1142fc55ca
Clean up Commands.js a bit.
...
This was SVN commit r15344.
2014-06-13 16:16:25 +00:00
58e628338c
Also check if a technology was already researched when checking requirements. Fixes #2580 .
...
This was SVN commit r15343.
2014-06-13 16:16:10 +00:00
9990d4c885
Actually call the function instead of testing if it exists. Patch by falsevision. Fixes #2626 .
...
This was SVN commit r15342.
2014-06-13 12:54:57 +00:00
55247e926a
Remove legacy trading pane
...
This was SVN commit r15341.
2014-06-13 12:06:57 +00:00
2b8758745f
put the unit commands in a JS object
...
This was SVN commit r15340.
2014-06-13 11:35:16 +00:00
2b408e766b
Fix problem with setting up trade routes
...
This was SVN commit r15339.
2014-06-13 08:01:06 +00:00
350d4a6b7e
add rally points for the AIs
...
This was SVN commit r15338.
2014-06-12 18:41:13 +00:00
e3f3051b2a
Petra: code cleaning and minor improvments
...
This was SVN commit r15337.
2014-06-12 16:47:43 +00:00
2e00628562
Take the action definitions out of input.js, and in a separate JS object that can be edited by other scripts. This makes it possible to easier add new actions by editing this new script, or (in mods) even by editing the object in other scripts.
...
This was SVN commit r15336.
2014-06-12 13:47:37 +00:00
2e4441b528
Minor typos in text strings
...
This was SVN commit r15335.
2014-06-12 13:24:36 +00:00
85e2e72eb7
Fix TestHeaderless failure on GCC 4.9.
...
Once 'delete' is called on an object, that object no longer exists, and
accessing its member variables is undefined behaviour. GCC 4.9's
optimiser recognises this, and eliminates any writes to member variables
inside the destructor, since it knows they cannot legally be read later.
BoundaryTagManager relied on ~FreedBlock resetting its memory to 0, so
this optimisation broke it. Replace the placement new/delete with plain
non-magic Setup/Reset functions, to avoid the optimisation.
Fixes #2481 .
This was SVN commit r15334.
2014-06-11 19:50:38 +00:00
548f50b071
Give gaia back it's vision.
...
This was SVN commit r15332.
2014-06-11 18:20:02 +00:00
89f5e7b260
Improve gui moddability by allowing to load an entire directory of scripts at once, and being able to split up big gui XML files. Fixes #2622
...
This was SVN commit r15330.
2014-06-11 17:14:35 +00:00
791eba9451
Fix Splash damage calculation. Patch by falsevision. Fixes #2623
...
This was SVN commit r15329.
2014-06-11 14:02:02 +00:00
b289303c25
Fix setting rallypoint via the minimap + fix out-of-world problem when the targeted entity for a rallypoint disappeared
...
This was SVN commit r15328.
2014-06-11 13:36:12 +00:00
49194819f6
Schwarzwald random map. Script by niektb, with random terrain generation from FeXoR.
...
This was SVN commit r15327.
2014-06-10 19:59:17 +00:00
6d0df59697
Fix theatrons
...
This was SVN commit r15326.
2014-06-10 14:27:43 +00:00
8551a799d0
Petra: prevent gatherers to stay blocked when UnitAI make them return resource in an inaccessible dropsite, see #2563
...
This was SVN commit r15325.
2014-06-10 13:45:23 +00:00
57a7bbcb90
fix javascript warning
...
This was SVN commit r15324.
2014-06-10 13:34:49 +00:00
3b519b132a
fix undefined variable in petra
...
This was SVN commit r15323.
2014-06-10 13:27:49 +00:00
60212b0418
Fix Iberian monument.
...
This was SVN commit r15322.
2014-06-10 13:18:33 +00:00
7cb6768132
fix productionTime computation on AI common-api
...
This was SVN commit r15321.
2014-06-10 12:59:42 +00:00
9723f73262
Fix tests
...
This was SVN commit r15320.
2014-06-09 18:13:29 +00:00
1d7001c8cd
Fix walls + remove debug warning
...
This was SVN commit r15319.
2014-06-09 17:51:23 +00:00
2fb0262142
Futher clean up heroes tooltips + move auras to the templates. Hope they have a bigger chance of staying consistent now.
...
This was SVN commit r15318.
2014-06-09 17:35:37 +00:00
3a2670f7fa
Take aura descriptions out of tooltip, let auras be defined in the entity template rather than in JSON files, as they can't be reused anyway. Fix tooltips and auras for all heroes from athen to gaul.
...
This was SVN commit r15317.
2014-06-09 14:15:05 +00:00
d6b8f1989e
Petra: complete and improve 2c0daaf80b
...
This was SVN commit r15316.
2014-06-09 13:30:41 +00:00
1776aa4750
Continue the transition to the usage of visible classes. Fix Hero inheritance for that.
...
This was SVN commit r15315.
2014-06-09 09:32:36 +00:00
2c0daaf80b
Petra: improve choice of ships to train and some style cleaning
...
This was SVN commit r15314.
2014-06-09 07:54:59 +00:00
5f42834710
some aegis fixes, patch by falsevision, close #2617
...
This was SVN commit r15313.
2014-06-09 07:48:29 +00:00
91a511560c
remove code dupplication for dock angle computation
...
This was SVN commit r15312.
2014-06-08 16:00:00 +00:00
049caba9f9
Let the timer hold the latest turnLength instead of the Attack component. Reduces a lot of messages
...
This was SVN commit r15311.
2014-06-08 09:39:57 +00:00
cb9d0733ef
Changes XMB format to store UTF-8 strings and removes pointless UTF-16 conversions, refs #204 , #244 .
...
Bumps XMB version to 2.
This was SVN commit r15309.
2014-06-08 03:23:37 +00:00
40b351a99a
Fixes error in silhouettes hotkey handler
...
This was SVN commit r15308.
2014-06-08 02:04:29 +00:00
72706f708b
Some unfinished maps for others to finish if they wish.
...
Tweaked Siwa Oasis.
This was SVN commit r15307.
2014-06-07 14:39:01 +00:00
567917bf41
Give RMS access to the simulation templates. Fixes #1589 . Patch by Itms.
...
This was SVN commit r15306.
2014-06-07 12:12:53 +00:00
27ca5fe19d
Iberians now have the Celtic war barge.
...
This was SVN commit r15304.
2014-06-07 11:21:42 +00:00
67a4af0fe0
fix typo from a4f2c2ac90
...
This was SVN commit r15303.
2014-06-05 18:29:11 +00:00
a96953efea
remove dupplicated (and buggy) line introduced in 0fcc074a65
...
This was SVN commit r15302.
2014-06-05 17:51:06 +00:00
53ea269af0
Add the ability to specify a log level when using dlopen and change it to normal for Atlas.
...
This way we do not have two error messages when starting Atlas, but the
dynamic Atlas lib is not available.
Patch by Gallaecio. Fixes #1540 .
This was SVN commit r15301.
2014-06-05 17:07:04 +00:00
fd8ffb506b
Remove commented out code and add licence headers to COList.cpp/.h.
...
This was SVN commit r15300.
2014-06-05 14:33:44 +00:00
c699409246
Add translation context to stances.
...
This was SVN commit r15299.
2014-06-05 14:06:15 +00:00
55760f6413
cache the affected players in order to remove the template bonuses given by auras from the right players before adding them again.
...
This was SVN commit r15298.
2014-06-05 11:24:31 +00:00
2d1f9c33dc
Bring healable classes to the uniform class matching
...
This was SVN commit r15297.
2014-06-05 10:34:41 +00:00
638123950c
Check if the position changed before updating it for rally points set on entities. Refs #1257 .
...
This was SVN commit r15296.
2014-06-05 10:27:40 +00:00
fd615c4c54
Round some alpha values for overlays.
...
This was SVN commit r15295.
2014-06-05 10:22:16 +00:00
a4f2c2ac90
Allow for unification in identity class matching + add the opportunity to combine with AND and OR. Fixes #2612
...
This was SVN commit r15294.
2014-06-05 09:39:36 +00:00
cbfbc72d36
Other auras fix
...
This was SVN commit r15293.
2014-06-05 07:57:05 +00:00
02c68064ed
Fix syntax errors in two auras.
...
Some code style cleanup in aura related files.
This was SVN commit r15290.
2014-06-04 22:27:36 +00:00
d5b4dbcb71
Retain corpses in FoW. Patch by Itms. Fixes #1366 .
...
This was SVN commit r15289.
2014-06-04 22:13:47 +00:00
b09a702c60
Recompute rally point lines when the rally point is set on a moving unit.
...
Does not account for setting rally points on units that can move into
the FoW/SoD.
Recalculates paths even if the rally points are not displayed.
Refactors UpdateMarkers() to remove some indentation levels.
Based on patch by Itms. Fixes #1257 .
This was SVN commit r15288.
2014-06-04 22:07:58 +00:00
6b015e935e
remove a forgotten debug warning in petra
...
This was SVN commit r15287.
2014-06-04 20:52:21 +00:00
0fcc074a65
Petra: try to improve cart shipyard placement
...
This was SVN commit r15286.
2014-06-04 20:13:15 +00:00
d883fc332d
Correct mime-types and end-of-lines for the XML files in simulation/templates
...
This was SVN commit r15285.
2014-06-04 17:21:24 +00:00
b67aca01c8
Fix color fade to not go beyond 255 and be integer.
...
This was SVN commit r15284.
2014-06-04 16:23:56 +00:00
8d2835d9e0
Fixed resource balance for players 3 and 4. (they didn't have chickens or huntable fauna before).
...
This was SVN commit r15283.
2014-06-04 15:59:43 +00:00
685d5e0197
Switch default AI to Petra and remove an old Aegis warning.
...
This was SVN commit r15282.
2014-06-04 15:29:20 +00:00
9a7984c544
Fix class checking for technologies
...
This was SVN commit r15281.
2014-06-04 12:07:35 +00:00
b6870bf415
Move the extraction of the classes from templates to the global scripts, and let the AI use it to reduce redundancy.
...
This was SVN commit r15280.
2014-06-04 08:42:48 +00:00
c07d394999
Fix GCC build of 2c14d94559. Refs #2589
...
This was SVN commit r15279.
2014-06-04 03:03:58 +00:00
2c14d94559
Replace usage of CParser for CColor.
...
Switches format to use integers only.
Adds logging if the string is invalid.
Refs #2589 .
This was SVN commit r15278.
2014-06-04 00:58:05 +00:00
db39d742f0
Fix units falling off the edge of the world.
...
I guess changes to the map loading sequence caused the TerrainChanged
message to be sent before the map was switched from square to circular
instead of after. The pathfinder didn't notice the switch, so it
continued treating the map as if it were square, allowing units to walk
into the permanent map-corner SOD and vanish, and allowing territories
to expand into the SOD.
Tell the pathfinder explicitly when the map shape changes, so it can
discard its cached data correctly.
This was SVN commit r15277.
2014-06-03 22:35:40 +00:00
0900005e5b
fix #2605
...
This was SVN commit r15276.
2014-06-03 19:41:11 +00:00
86a99b745e
Petra: code rearrangement + small improvments
...
This was SVN commit r15275.
2014-06-02 20:21:28 +00:00
4f6afbc0bf
Fix non-PCH build.
...
This was SVN commit r15274.
2014-06-02 20:06:27 +00:00
b4f3b503f2
code style cleanup
...
This was SVN commit r15273.
2014-06-02 15:48:37 +00:00
a500826ae4
Since the VFS logs the missing files now, there's no reason to crash on it.
...
This was SVN commit r15272.
2014-06-02 15:41:41 +00:00
49ca719049
Reinitialize music when hotloading. Fixes crash when hotloading GUI files.
...
This was SVN commit r15271.
2014-06-02 15:13:16 +00:00
a63ed4e4c4
Fixes rare crash in sound manager, due to worker thread dereferencing global pointer before it had been assigned. Fixes #2333 , refs #2387 , #2317 .
...
Fixes potential infinite loop if worker thread was running but not
enabled.
Fixes apparent bug in fading sound smoothness.
Cleans up worker class slightly.
Cleans up weird and inconsistent whitespace.
This was SVN commit r15269.
2014-06-02 02:09:58 +00:00
c17bf75cbb
Fix bad merge.
...
This was SVN commit r15268.
2014-06-01 19:06:58 +00:00
fb0b4572ab
Fix Valgrind complaint about delete vs delete[].
...
This was SVN commit r15267.
2014-06-01 18:46:14 +00:00
e6b8339103
Minor optimisation for non-animated units.
...
This was SVN commit r15266.
2014-06-01 18:25:20 +00:00
1882f28504
New unit renderer.
...
Instead of each CCmpVisualActor rendering itself individually, collect
all the units in a single CCmpUnitRenderer. This avoids the overhead of
doing Interpolate/RenderSubmit calls every frame for every object in the
world. It also allows more efficient culling.
CCmpUnitRenderer knows the positions of each object at the start and end
of each turn, and computes the bounding sphere of the object along that
path. That allows quick culling without recomputing the precise
interpolated transform every frame. (In the future it could be improved
much more.)
Clarify and clean up the sending of PositionChanged messages, and add
new InterpolatedPositionChanged.
Remove the forceFloating parameter from GetInterpolatedTransform, since
it doesn't fit the new design. Replace it with a (non-synchronised) flag
in CCmpPosition.
Move construction progress from CCmpVisualActor to CCmpPosition, so that
it consistently affects all position/transform computation.
Refs #2337 .
This was SVN commit r15265.
2014-06-01 18:24:50 +00:00
d117d96d22
Simplify component deserialization.
...
Deserialize SYSTEM_ENTITY before any other entities. This makes it safe
for Deserialize() methods to access system components (mirroring how
Init() can already access system components).
Add a Deserialized message, sent after all entities have been
deserialized, to help with some other sequencing problems.
This was SVN commit r15264.
2014-06-01 18:14:09 +00:00
b30a9a6384
Remove m_NeedInitialXZRotation - not needed after changes to map loading order.
...
This was SVN commit r15263.
2014-06-01 18:10:00 +00:00
ceb3c3d366
MapReader: Load terrain before entities.
...
This allows component Init functions to make use of the terrain
immediately, instead of delaying some computations until the first
frame.
This was SVN commit r15262.
2014-06-01 18:08:11 +00:00
fe3315376c
Add BoundingSphere, SOverlaySphere.
...
BoundingSphere is similar to a bounding box, but more spherical.
SOverlaySphere is useful for visualising BoundingSphere (it's quite
inefficient and should only be used for debug functionality).
Normalise the camera frustum clipping planes, so that IsSphereVisible
gives the correct result.
This was SVN commit r15261.
2014-06-01 18:05:46 +00:00
3b0fee9073
This was SVN commit r15260.
2014-06-01 13:15:16 +00:00
ac925ed1b6
fix 8efc3b0241
...
This was SVN commit r15259.
2014-06-01 12:49:34 +00:00
8efc3b0241
code rearrangement
...
This was SVN commit r15258.
2014-06-01 09:47:12 +00:00
6f11097c00
Allow the CLI to load skirmish maps. From now on, the directory must be included in the map path to load any maps (see the readme). Patch by Teiresias. Fixes #2572
...
This was SVN commit r15257.
2014-06-01 08:18:46 +00:00
38130e5b94
Brit woman can build rotary mill now.
...
Spartan commando can build the Theatron now.
Sibylline Books tech from Roman Wonder to Roman Temple.
This was SVN commit r15256.
2014-06-01 04:13:19 +00:00
608ab456d5
fix tests
...
This was SVN commit r15255.
2014-05-31 14:57:14 +00:00
59c9ae670f
Stop VFS from causing a crash when the AI player isn't found. Patch by Itms. Fixes #2558
...
This was SVN commit r15254.
2014-05-31 14:55:09 +00:00
bb16a8ee98
Fix ungarrisoning via ungarrisoning pane
...
This was SVN commit r15253.
2014-05-31 14:03:00 +00:00
17d83a8b4c
Add ungarrison button to ungarrison specific entities
...
This was SVN commit r15252.
2014-05-31 13:58:16 +00:00
e2aa24fc9a
Clean up the turret interface a bit + fix serialisation for turrets
...
This was SVN commit r15250.
2014-05-31 11:35:07 +00:00
8ef7278306
Add a bonus to units on walls + disable placing units on palisades (which was enabled by accident due to inheritance)
...
This was SVN commit r15249.
2014-05-31 11:02:58 +00:00
f5c5bbe26d
some fixes for Petra AI
...
This was SVN commit r15247.
2014-05-30 15:24:19 +00:00
cfec28e553
Add the Engine code for turrets + use them to get units on walls. The scripted TurretHolder isn't included due to lack of usability for now. Refs #2577
...
This was SVN commit r15246.
2014-05-30 14:46:06 +00:00
d05bd656e7
Added Sibylline Books tech for Romans.
...
Tweaked Roman Logistics tech. Tweaked Siwa Oasis skirmish.
Balance changes: -5 attack, -4 range, -10 health for cavalry
skirmishers, after discussion with alpha123.
This was SVN commit r15245.
2014-05-30 04:18:05 +00:00
84d799ed9f
Petra: reduce the CPU time for building placement
...
This was SVN commit r15244.
2014-05-29 20:39:09 +00:00
7105dabca7
fix failing unit training in Aegis and Petra
...
This was SVN commit r15243.
2014-05-29 20:18:29 +00:00
e0218fff8d
New final fix?
...
This was SVN commit r15242.
2014-05-27 14:54:51 +00:00
7c39259ee5
Now I should get it right
...
This was SVN commit r15241.
2014-05-27 14:00:21 +00:00
5762721b09
Strange how I'm able to make that many mistakes
...
This was SVN commit r15240.
2014-05-27 13:42:04 +00:00
82db905b8e
Fix previous commit
...
This was SVN commit r15239.
2014-05-27 12:32:57 +00:00
3413dc84a1
make it possible for mods to add new unit commands
...
This was SVN commit r15238.
2014-05-27 11:17:29 +00:00
b9f3a95e17
Make UnitAI moddable by exposing the FSM spec and calculated FSM as part of the prototype
...
This was SVN commit r15237.
2014-05-27 07:24:07 +00:00
e4d3189494
Lots of GUI fixes to issues pointed out by alpha123 on IRC.
...
This was SVN commit r15235.
2014-05-27 05:34:28 +00:00
a75342e2c7
minor changes in petra: cleanings and timing optimization
...
This was SVN commit r15234.
2014-05-26 19:52:51 +00:00
a0913cbc75
Fix the interpolation changes from the previous commit, as they weren't smooth
...
This was SVN commit r15232.
2014-05-26 17:12:05 +00:00
85a1f880ab
Fix compatibility with LLVM libc++ (used on OS X).
...
libc++ vector asserts that allocator::value_type is correct, so we have
to pass in the correct types.
This was SVN commit r15231.
2014-05-26 16:48:28 +00:00
5ae9f678b0
Clean up position height methods + add new. Now we have the ability to losslessly read and write positions to entities from the scripts.
...
This was SVN commit r15230.
2014-05-26 16:23:46 +00:00
c3a0ac43bf
Broadcast TerrainChanged message, so CCmpSelectable can actually see it.
...
This was SVN commit r15229.
2014-05-26 15:44:35 +00:00
4ca40116ed
Fix building selection rings not being recomputed when the terrain or water under them is changed.
...
This was SVN commit r15228.
2014-05-26 13:45:49 +00:00
1871daab0d
Fix pathfinding and territories not being recomputed when water height changes.
...
This was SVN commit r15227.
2014-05-26 13:45:10 +00:00
41f62cd3ff
Add WaterChanged message, for things that need to be recomputed when the water height changes.
...
This was SVN commit r15226.
2014-05-26 13:44:24 +00:00
6407b593d6
Make displayFrustum controllable from scripts.
...
This was SVN commit r15225.
2014-05-26 13:42:32 +00:00
1936abad98
Remove length limits on script output in console.
...
This was SVN commit r15224.
2014-05-26 13:39:45 +00:00
b78c38b935
Disable GCC warning triggered by wxWidgets.
...
This was SVN commit r15223.
2014-05-26 13:38:09 +00:00
b7281c629c
Rocks -> Arrows. Fixes #2565 .
...
This was SVN commit r15222.
2014-05-26 04:48:33 +00:00
bc8792ba96
Proper double-click behavior for these champion units. Fixes #2586 .
...
This was SVN commit r15221.
2014-05-26 04:41:35 +00:00
39cfb6748d
Fixes flickering in main menu backgrounds on old Intel GPUs, by manually setting the z-values for each layer, fixes #2143
...
This was SVN commit r15220.
2014-05-26 04:38:47 +00:00
4dd90a1ef3
A new skirmish map.
...
This was SVN commit r15219.
2014-05-26 04:23:10 +00:00
d7f1427c9b
Tweaked Ptolemies sandbox scenario.
...
This was SVN commit r15218.
2014-05-26 01:28:56 +00:00
7bc0f611b3
Auras for Roman heroes Marcellus and Maximus.
...
This was SVN commit r15217.
2014-05-26 01:26:53 +00:00
e79adae921
Attempt to work around LOS texture alignment bug.
...
For unknown reasons, sometimes glTexSubImage2D acts as if
GL_UNPACK_ALIGNMENT = 2 or 4, instead of 1. This causes the odd-sized
array uploaded for the LOS texture to be interpreted incorrectly, and
the LOS texture gets rendered very incorrectly.
Pad the array to a multiple of 4 in all cases, so that
GL_UNPACK_ALIGNMENT shouldn't affect it.
Hopefully fixes #2594 .
This was SVN commit r15216.
2014-05-25 13:30:39 +00:00
3d306702df
Petra: recover some cases where units are blocked because of pathfinder
...
This was SVN commit r15215.
2014-05-25 10:00:55 +00:00
072e4a614e
Bump lobby version string.
...
This was SVN commit r15214.
2014-05-25 03:21:32 +00:00
5ce12c2263
Start phasing out the use of CParser in the GUI. Makes GUI parsing generally faster and stricter while adding better tests and debug information.
...
This was SVN commit r15213.
2014-05-25 03:16:52 +00:00
9c908a5f46
improve 6764b15ae2 by allowing a selected button to be selected again
...
This was SVN commit r15212.
2014-05-24 16:23:11 +00:00
6764b15ae2
ease switch to 100% trade of one resource using Shift-click
...
This was SVN commit r15211.
2014-05-24 15:37:19 +00:00
874ceb76a5
fix JS warning in Petra
...
This was SVN commit r15210.
2014-05-24 14:52:05 +00:00
8589003ac6
Let for loop return early. Small code style fix.
...
This was SVN commit r15209.
2014-05-24 10:18:15 +00:00
7f5264d3be
Fix test for unhealable and healable classes. Make healers able to heal again
...
This was SVN commit r15208.
2014-05-24 09:50:10 +00:00
1e3ba2d438
Let formations use the UnitAI.AddOrder method, instead of directly deciding if ReplaceOrder or PushOrder should be used. This replaces the expectedRoute, and might lead to units behaving more as demanded. Refs #2568
...
This was SVN commit r15207.
2014-05-24 09:40:21 +00:00
2fbc55ec96
Update lobby server README.
...
This was SVN commit r15206.
2014-05-23 15:52:29 +00:00
9ee17342b1
Change developer overlay to only be openable through Alt+D shortcut. Fixes #2569
...
This was SVN commit r15205.
2014-05-23 00:18:16 +00:00
84b53933ff
fix the AIs broken after b55b6a9cf1
...
This was SVN commit r15204.
2014-05-22 20:40:14 +00:00
27104a4f33
Remove MaxDistance from Roman merchant ship. See 1207b146bb.
...
This was SVN commit r15203.
2014-05-22 16:39:00 +00:00
52e807a207
Healers should not heal animals.
...
If we want war dogs to be healable we should change the class to
Domestic.
This was SVN commit r15202.
2014-05-22 16:38:57 +00:00
ea334e3716
Fix class counting
...
This was SVN commit r15201.
2014-05-22 16:20:36 +00:00
41de9f6e84
Petra fixes for maps without cc
...
This was SVN commit r15200.
2014-05-22 15:09:42 +00:00
3fc2574ecf
Disable syntagma and testudo for champion cavalry
...
This was SVN commit r15199.
2014-05-22 14:50:53 +00:00
d20e244a37
fix tests
...
This was SVN commit r15198.
2014-05-22 14:38:49 +00:00
16c5bc96dc
Add ptol and sele hero auras. Fixes #2444 . Patch by Silk.
...
This was SVN commit r15197.
2014-05-22 14:37:11 +00:00
b55b6a9cf1
Add visible class names to all common buildings
...
This was SVN commit r15196.
2014-05-22 14:31:48 +00:00
ac1a9bf8d1
Clean up class parsing + add visible classes to be displayed in the GUI without adding them separatedly to our tooltips
...
This was SVN commit r15195.
2014-05-22 10:20:02 +00:00
eaa382a60c
This was SVN commit r15194.
2014-05-22 01:38:46 +00:00
ee50168096
Removes errant text from GUI XML files, fixes some untranslated text per [wiki:Internationalization]. Refs #2507
...
This was SVN commit r15193.
2014-05-22 01:36:45 +00:00
eae7978868
Makes a word consistent with American English
...
This was SVN commit r15192.
2014-05-21 20:24:37 +00:00
3e985225fc
Remove remaining MaxDistance. See 1207b146bb
...
This was SVN commit r15191.
2014-05-21 14:20:00 +00:00
1207b146bb
Let trading range depend on obstruction. Fixes #2556
...
This was SVN commit r15190.
2014-05-21 14:03:57 +00:00
0a3eb92d62
Add slower game options. Might be usefull for slow players or development. Fixes #2499 . Patch by DanCar.
...
This was SVN commit r15189.
2014-05-21 13:46:42 +00:00
01777a7ade
fix tests
...
This was SVN commit r15188.
2014-05-21 12:28:39 +00:00
2303ad97cf
petra: test on cc existence before trying to build
...
This was SVN commit r15187.
2014-05-21 09:37:41 +00:00
e0fb1223d6
Put the colon inside the translate tag.
...
This was SVN commit r15186.
2014-05-21 03:02:54 +00:00
153b1162fb
changes for the AI to deal with maps with celts and change comment on naval maps
...
This was SVN commit r15185.
2014-05-20 21:30:48 +00:00
5dbf7ffa1e
Portraits for these two Ptol boats.
...
This was SVN commit r15184.
2014-05-20 21:09:25 +00:00
4707f11b07
Petra AI: fix a bug in naval transport and adapt strategy to initial available resources
...
This was SVN commit r15183.
2014-05-20 19:48:54 +00:00
99a7bc67ac
Fix 672f5a8b11 when sloppyness is 0
...
This was SVN commit r15182.
2014-05-20 18:45:36 +00:00
317c6057ed
Remove members from a formation when they garrison. Fixes #2545
...
This was SVN commit r15181.
2014-05-20 17:47:47 +00:00
672f5a8b11
Add sloppyness and separate icon path to formation templates (makes it possible to have multiple formation templates - like different settings for different civs - with only one icon file)
...
This was SVN commit r15180.
2014-05-20 17:18:40 +00:00
4c9d99ff68
Add plural forms for Gaelic. Fixes #2575 .
...
This was SVN commit r15179.
2014-05-20 17:11:47 +00:00
41bc9fa65e
Remove a newline in a tooltip.
...
There is no need for it.
Some translations also add the newline that, due to different words
length, appears in an unwanted place.
This was SVN commit r15178.
2014-05-20 10:41:09 +00:00
d8dbd499f8
Probably fixes uninitialized variable warning in GLSL model shader on some drivers
...
This was SVN commit r15177.
2014-05-20 03:41:46 +00:00
d0e18900ae
avoid new harmless spidermonkey warnings
...
This was SVN commit r15176.
2014-05-19 22:09:44 +00:00
2081c62ab4
Support newer version of miniupnpc api. Refs #2552 .
...
This was SVN commit r15174.
2014-05-19 21:01:06 +00:00
940868398c
Use Boost.Signals2 for Atlas. Patch by fabio. Fixes #2469 .
...
This was SVN commit r15173.
2014-05-19 21:01:02 +00:00
15472f7797
fix Petra not gathering already dead animals and remove forgotten debug printout
...
This was SVN commit r15172.
2014-05-19 19:45:08 +00:00
dfc7567561
Fix multiple observers on multiplayer games to work more reliably. Fixes #2529
...
This was SVN commit r15171.
2014-05-19 16:02:42 +00:00
f4edb8dce5
Simplify and improve x86/amd64 CPU build flag
...
On amd64 removes the "-msse" flag, which is already
enabled by default.
On x86 changes the flags from "-march=i686 -msse" to
"-march=pentium3 -mtune=generic". This should also enable
other CPU features like MMX, while keeping the same
minimun supported CPU (Intel Pentium3 or AMD Athlon 4)
previously required by "-msse".
Fixes #2329 .
This was SVN commit r15170.
2014-05-19 12:18:55 +00:00
4a3df1c8c5
Add extra check so units can't attack entities out of range. Fixes #2570
...
This was SVN commit r15168.
2014-05-19 09:05:18 +00:00
196eebe803
Fix partial internationalisation of the limit changers
...
This was SVN commit r15167.
2014-05-19 08:22:20 +00:00
5ae4619b81
Internationalize the AllowedToCreate method from EntityLimits. Fixes #2546 .
...
This was SVN commit r15165.
2014-05-19 07:35:05 +00:00
81da366268
Deletes some obsolete and broken old art files, refs #2524
...
This was SVN commit r15164.
2014-05-19 01:47:22 +00:00
ae29becb37
Removes pointless minimap state change during attack notification, it broke synchronized simulation state and caused some OOS errors. Fixes #2525 . Refs #1719 , #2526 .
...
This was SVN commit r15163.
2014-05-19 01:35:14 +00:00
e6d762882a
Add the tooltip option to default.cfg. Refs #2549 .
...
This was SVN commit r15162.
2014-05-19 01:00:30 +00:00
61b6eba4c1
Adds a config option for more detailed tooltips. Fixes #2549 .
...
This was SVN commit r15161.
2014-05-19 00:01:47 +00:00
8e6b624ea5
fix civ in template
...
This was SVN commit r15160.
2014-05-18 17:00:54 +00:00
bd7ebe268e
Make skirmish entities better moddable. Fixes #2523 . Patch by Idanwin.
...
This was SVN commit r15159.
2014-05-18 15:53:57 +00:00
7ff5fbda2b
Allow system components to be registered on the scripting side (so mods can make their own system components).
...
This was SVN commit r15157.
2014-05-18 13:44:08 +00:00
2b05a8d233
Reenable JS warnings that were disabled in db0376fdc2.
...
This was SVN commit r15156.
2014-05-18 13:25:08 +00:00
1432e082bf
Update room and bot name.
...
This was SVN commit r15155.
2014-05-18 13:25:00 +00:00
814d3dc0e8
fix previous commit
...
This was SVN commit r15154.
2014-05-18 12:39:58 +00:00
3273720776
major update of Petra AI with first version of naval map support
...
This was SVN commit r15153.
2014-05-18 11:34:36 +00:00
3596f1c341
modify AI common-api to allow fishing and minor fixes
...
This was SVN commit r15152.
2014-05-18 10:50:44 +00:00
b7f6c00c2b
Mark all components as global variables and allow to re-register existing components to update their schema and/or message receiving methods.
...
This allows for components to be extended in other files, so mods don't
have to overwrite entire components.
Fixes #2517 . Thanks to Rada for helping on this
(also fix some tests broken in the previous commit)
This was SVN commit r15150.
2014-05-18 08:20:02 +00:00
86196212e2
Improve navigation for ship formations by setting the formation controller to the right passability class
...
This was SVN commit r15149.
2014-05-18 07:59:43 +00:00
96c806841d
Fixes the packaging script for some changes related to l10n and SpiderMonkey
...
This was SVN commit r15148.
2014-05-12 01:36:32 +00:00
3ecbb7667b
Restrict set of translations included in releases
...
This was SVN commit r15147.
2014-05-11 17:43:36 +00:00
0a880413fe
Fix the out-of-world error we saw in the team game yesterday
...
This was SVN commit r15145.
2014-05-11 09:36:12 +00:00
d70abd548a
Move yellow modern buttons to their own style to correct naming issues (eg. ModernButtonRed was yellow). New name is ModernButtonYellow. Also switched the default button color back to red due to complaints by team members on IRC.
...
This was SVN commit r15144.
2014-05-11 03:25:34 +00:00
056d740e7f
Fixes #2542
...
This was SVN commit r15143.
2014-05-10 23:40:53 +00:00
fb2cda5aba
prevent weird behaviour when the ship in which we want to garrison is selected with the units to garrison
...
This was SVN commit r15142.
2014-05-10 22:21:24 +00:00
b2ec4e0e2a
Portrait for Roman bireme.
...
Modern button from red to yellow.
This was SVN commit r15141.
2014-05-10 21:33:46 +00:00
f287a7da12
Elephants can transport aboard Medium and Heavy warships.
...
This was SVN commit r15140.
2014-05-10 16:15:26 +00:00
da8843127c
Fix displaying wrong text when no tooltip was defined, as reported by Kanetaka. Also cleans up the code to make it shorter.
...
This was SVN commit r15139.
2014-05-10 13:37:38 +00:00
f15160412a
Enlarge the ideographic ranges in the word boundaries, fixes Japanese rendering a bit
...
This was SVN commit r15138.
2014-05-09 12:13:42 +00:00
e79ad6b30b
Switch Military Colonies to use the mercenary camp actor.
...
Update a few tech names (shouldn't affect translations).
This was SVN commit r15137.
2014-05-09 00:18:23 +00:00
a5708873db
set the right civ for mace dock
...
This was SVN commit r15136.
2014-05-08 23:15:01 +00:00
2c1917176a
Use untranslated playerState.civ, if the civName 'Gaia' happened to be translated, this resulted in an undefined texture, which was the case in Chinese, and reported by Gameboy.
...
This was SVN commit r15135.
2014-05-08 14:07:48 +00:00
8cec641156
Replace strictness test by a different one, as the old test wasn't considered non-strict anymore.
...
This was SVN commit r15134.
2014-05-08 13:26:21 +00:00
955e6e788a
Fix counting foundations as concuestCritical.
...
This was SVN commit r15133.
2014-05-08 11:27:09 +00:00
8e39a2297d
fix delete selection broken (again) in bb65358dac. Code is changed to prevent this to happen again
...
This was SVN commit r15131.
2014-05-08 08:21:20 +00:00
a620cf8e17
Fixes an issue with unassigned players being functionally ready but not having the green marker
...
This was SVN commit r15130.
2014-05-08 04:47:57 +00:00
bb65358dac
After discussion with scythetwirler with input from Philip and Mythos, popup dialogs (like for delete, resign, and exit) should have no on the right as we want the user to click no in most of those cases. It's the 'recommended' action. In the case of save/cancel or continue/back, save and continue should always be on the right as that's the 'recommended' action. With some review, this placement seems consistant across operating systems.
...
This was SVN commit r15129.
2014-05-08 03:43:03 +00:00
c37a8cafc3
Fixes a few building warnings and convention issues from 19ca1e3ebf
...
This was SVN commit r15128.
2014-05-07 23:33:21 +00:00
db0376fdc2
Temporarily disable the Spidermonkey warnings for release
...
This was SVN commit r15127.
2014-05-07 19:42:12 +00:00
83b6175358
Added a script to check translations for URLs that are not in the original strings.
...
This was SVN commit r15126.
2014-05-07 19:02:17 +00:00
cbeb40a14b
Fix foundations changing entity limits. Fixes #2536
...
This was SVN commit r15123.
2014-05-07 08:24:31 +00:00
19ca1e3ebf
Fix locale verification to also allow ICU locales without data, but still don't allow bogus locales. Patch by Yves. Fixes #2533 .
...
This was SVN commit r15122.
2014-05-07 08:14:57 +00:00
c5b184744c
stop failed attack in aegis, see #2486
...
This was SVN commit r15121.
2014-05-07 07:03:21 +00:00
27382a7d78
Swap OK and Cancel positions on the AI config GUI page. (Also cleanup the XML a bit)
...
This was SVN commit r15120.
2014-05-06 19:02:34 +00:00
9fadc2709c
Clean up the gate transformation tooltips as it caused problems for mods.
...
This was SVN commit r15119.
2014-05-06 18:52:05 +00:00
34a9b8c260
New song by Omri to the Celtic civs.
...
This was SVN commit r15118.
2014-05-06 12:28:25 +00:00
93cfdce090
This was SVN commit r15116.
2014-05-06 08:19:45 +00:00
f181a89c34
fixes wrong test
...
This was SVN commit r15115.
2014-05-05 19:22:54 +00:00
3a008ba532
Mask lobby password so it doesn't appear in any logs
...
This was SVN commit r15113.
2014-05-05 15:41:17 +00:00
bb43a71460
Updates checkrefs.pl to support skirmish maps
...
This was SVN commit r15112.
2014-05-05 01:09:53 +00:00
48bb533895
temporarily disable trader formation, see #2528
...
This was SVN commit r15111.
2014-05-04 21:38:31 +00:00
06685a3f9b
Fix small issue
...
This was SVN commit r15110.
2014-05-04 20:22:31 +00:00
44b40a85bb
Fixes some broken actor references
...
This was SVN commit r15109.
2014-05-04 08:08:48 +00:00
ba5e6d9168
Removes duplicate FleeDistance property from template_unit_fauna_decorative (found by checkrefs.pl)
...
This was SVN commit r15108.
2014-05-04 05:52:51 +00:00
d2ecbecf32
Fixes tex_codec typo that broke BMP writing and big screenshots, fixes #2515
...
This was SVN commit r15107.
2014-05-04 05:49:31 +00:00
9b136a45fc
Fixes a couple dialog buttons
...
This was SVN commit r15106.
2014-05-04 02:44:14 +00:00
2eb2845c29
Extra check on the existance of a replacement, be more forgiving in the skirmish replacer.
...
This was SVN commit r15104.
2014-05-03 17:53:37 +00:00
dd13e01ac6
Extra check on existance of template, to be more forgiving if some template in the productionqueue doesn't exist.
...
This was SVN commit r15103.
2014-05-03 17:29:22 +00:00
e70eccf0ca
Added Stan's contributor ptol_corral details in Lordgood's model
...
Added Stan's Cleopatra texture
This was SVN commit r15102.
2014-05-03 13:05:34 +00:00
575cdd7979
A spearman isn't ranged
...
This was SVN commit r15101.
2014-05-03 13:04:08 +00:00
b09925b27e
switch the game setup confirmation buttons and move the welcome screen buttons
...
This was SVN commit r15100.
2014-05-03 09:21:05 +00:00
542bc1b273
Further fix switched buttons
...
This was SVN commit r15099.
2014-05-03 09:07:31 +00:00
c1d5f6882c
Also switch the button name to disable the correct one.
...
4e0a588456
2014-05-03 08:59:31 +00:00
12ec51783d
Fix in-game manual display
...
This was SVN commit r15097.
2014-05-03 08:53:06 +00:00
4e0a588456
Switch more buttons, see 911be4e860
...
This was SVN commit r15096.
2014-05-03 08:45:19 +00:00
f066549523
Makes the other players default to unassigned instead of Default AI in a sandbox map.
...
This was SVN commit r15095.
2014-05-03 04:00:14 +00:00
122dae799b
Don't allow returning an invalid locale from the advanced language menu.
...
This was SVN commit r15094.
2014-05-02 21:14:28 +00:00
99486ed7ab
Add camera to the second player, somehow avoids strange errors.
...
This was SVN commit r15093.
2014-05-02 20:08:48 +00:00
b8e9bae75e
fixes Petra trying to keep going with a canceled attack
...
This was SVN commit r15092.
2014-05-02 11:03:24 +00:00
15f56cd984
Fix armour and attack display of heroes
...
This was SVN commit r15091.
2014-05-02 10:32:21 +00:00
ace3269768
Fix problem with sprintf errors being thrown when the AI places structures on the wrong places, make the code more uniform. Fixes #2485
...
This was SVN commit r15090.
2014-05-02 10:09:53 +00:00
a36a0bbd87
Improve my previous fix by throwing error objects instead of strings
...
This was SVN commit r15089.
2014-05-02 07:34:05 +00:00
aaf92409c9
Fix sprintf error reporting by printing the stack trace, and not trying to translate the calls
...
This was SVN commit r15088.
2014-05-02 07:27:44 +00:00
5658bb391b
fix delete selection no more working after #15074
...
This was SVN commit r15087.
2014-05-01 21:06:43 +00:00
210374d86d
Fixes Aegis not training additional units when no starting units are around.
...
Patch by Teiresias.
Fixes #2460
This was SVN commit r15086.
2014-05-01 13:13:38 +00:00
b9af0ac0e4
Enlarge various elements of the lobby login page to fit other languages.
...
This was SVN commit r15085.
2014-05-01 12:59:50 +00:00
a64456e6d8
Fix small space issue in the lobby (still some work to do there)
...
This was SVN commit r15084.
2014-05-01 11:38:53 +00:00
47fc05d696
String freeze? Who said that?
...
Fix typo: avalible → available.
This was SVN commit r15082.
2014-05-01 01:22:59 +00:00
d51f2a0c35
Version bump and regeneration of translation templates accordingly.
...
This was SVN commit r15081.
2014-05-01 00:44:47 +00:00
c7b0261860
Fix the numbering in the Terms of Use for the lobby. Reverts 813db55b08.
...
This was SVN commit r15079.
2014-04-30 23:24:24 +00:00
62f5476dec
Add support for adding translation context to XML elements. Patch by Gallaecio.
...
Add translation context to some lobby headers.
This was SVN commit r15078.
2014-04-30 22:33:08 +00:00
057fa79bdb
Revert db6c3f86f2. Changing something like that right before release is dangerous.
...
This was SVN commit r15077.
2014-04-30 17:53:51 +00:00
11865a8865
Revert a hack that snuck into an earlier commit of mine.
...
This was SVN commit r15076.
2014-04-30 17:22:38 +00:00
db6c3f86f2
Missing file
...
This was SVN commit r15075.
2014-04-30 06:29:42 +00:00
911be4e860
The convention is confirm button on right, decline button on left (updates some in-game dialogs). Also enables GLSL.
...
This was SVN commit r15074.
2014-04-30 06:28:57 +00:00
90581f366c
This was SVN commit r15073.
2014-04-30 05:36:50 +00:00
e7b4c8b92a
Make game automatically resume after closing the options menu. Refs #2507
...
This was SVN commit r15072.
2014-04-30 05:31:44 +00:00
a88f1222c0
Update AI descriptions, closes #2500 . Also correct some capitalization and developer overlay transparency for #2507 .
...
This was SVN commit r15071.
2014-04-30 05:04:12 +00:00
748ebdfdb0
Various GUI fixes and cleanup.
...
This was SVN commit r15070.
2014-04-30 04:38:53 +00:00
dfacf5358c
New lobby connect/registration page. Not perfect but fixes most of the outstanding issues. Refs #2312
...
This was SVN commit r15069.
2014-04-30 00:46:57 +00:00
15e9ffa21b
Converts the save dialog to the modern UI. Refs #2507 .
...
This was SVN commit r15068.
2014-04-29 21:45:00 +00:00
29cab5f5ed
Also change reveal map to revealed map.
...
Fix typo in tutorial map. Remove message refering to finite fields.
This was SVN commit r15066.
2014-04-29 14:51:21 +00:00
b246017f9f
Explore_d_ map.
...
This was SVN commit r15065.
2014-04-29 13:10:56 +00:00
b3ab49bb30
Really remove the minimum damage of 1, what 37c8e77d8e was supposed to do
...
This was SVN commit r15064.
2014-04-29 07:15:10 +00:00
1e6614918b
Initial modern buttons. Lobby/prelobby now only rely on the modern common files.
...
This was SVN commit r15063.
2014-04-29 00:07:27 +00:00
c77826e9aa
Translate some message boxes when opening websites.
...
Fix a typo. Refs #2501 .
This was SVN commit r15062.
2014-04-28 22:30:40 +00:00
683170ea19
Enable/disable GenTangents when enabling/disabling PreferGLSL. Fixes #2505 .
...
This was SVN commit r15061.
2014-04-28 22:30:27 +00:00
876d0e4e66
Forgot to fix some strings
...
This was SVN commit r15060.
2014-04-28 20:19:32 +00:00
e6e5b9f11f
Add a link in the main menu to for translators. Patch by Stan, fixes #2501
...
This was SVN commit r15059.
2014-04-28 20:17:39 +00:00
64d3d0b4b2
Remove falsely attributed quote.
...
This was SVN commit r15058.
2014-04-28 17:59:02 +00:00
4695f3425b
Add the possibility to show the welcome screen on every update, next to the possibility to disable it completely. Patch by Itms, fixes #2116
...
This was SVN commit r15057.
2014-04-28 17:18:46 +00:00
f26a2917d3
Translate map name in the summary page
...
This was SVN commit r15056.
2014-04-28 15:54:47 +00:00
b8245da606
Improve disabled technology tooltip. Fixes #2497
...
This was SVN commit r15055.
2014-04-28 15:17:26 +00:00
a49b359748
Fix formations attacking by adding a combat.approaching state. Fixes #2496
...
This was SVN commit r15054.
2014-04-28 13:05:47 +00:00
b5dfacbf18
Translated map name in the loading screen, regenerated translation templates and updated translations from Transifex
...
This was SVN commit r15053.
2014-04-28 12:31:28 +00:00
fb80e29d41
Changes to English tooltips for consistency
...
Reported by an Italian translator, Fabio, at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#it/public/13718374
https://www.transifex.com/projects/p/0ad/translate/#it/public/24494405
The periods were added in the main menu (only 2 tooltips without them)
and removed from the options menu (only 1 tooltip with it). In the
future, we might want to be consistent with tooltips through all the
GUI.
This was SVN commit r15052.
2014-04-28 10:11:11 +00:00
75713cc101
Don't display 'UNR' in the gamesetup on unranked players. This makes unranked lobby playernames consistant with those of rankless players who join via IP.
...
This was SVN commit r15051.
2014-04-28 05:39:18 +00:00
3014df2280
Disable wireframe mode in ranked games. Fixes #2401 .
...
This was SVN commit r15050.
2014-04-28 05:02:20 +00:00
da7526dbd4
Tweaked button.
...
This was SVN commit r15049.
2014-04-27 23:48:15 +00:00
e6ec0b2fc9
Add the limit back to provisionality in the rating system.
...
This was SVN commit r15048.
2014-04-27 23:42:56 +00:00
fde558b4b2
Implements a (hopefully) better rating system with an inflation test.
...
This was SVN commit r15047.
2014-04-27 23:13:29 +00:00
a8b50a66da
Fixes to the lobby internationalization by sanderd17 and me
...
All strings are now translated at the last point, right before they are
added to the GUI.
Some other fixes are included.
This was SVN commit r15046.
2014-04-27 20:24:48 +00:00
b3acb5657f
Fix moderater prefixes in the lobby.
...
This was SVN commit r15045.
2014-04-27 19:26:12 +00:00
251372a062
Missing var statement.
...
This was SVN commit r15044.
2014-04-27 19:10:28 +00:00
cfb72e990b
Make gamesetup chat formatting more similar to the lobby and note that all players must be ready before starting a multiplayer game.
...
This was SVN commit r15043.
2014-04-27 19:06:21 +00:00
8f53ddd6b9
Unifies some translatable strings on the gamesetup screen.
...
This was SVN commit r15042.
2014-04-27 19:03:15 +00:00
2f8487b84b
Adds translation support for the "More options" window on the gamesetup screen.
...
This was SVN commit r15041.
2014-04-27 18:41:56 +00:00
983abd1952
Updates splashscreen style and adds a background to the scrollbar to match the dropdown
...
This was SVN commit r15040.
2014-04-27 18:30:40 +00:00
a163ac1c11
Reverts a rogue copy-paste in the last commit.
...
This was SVN commit r15039.
2014-04-27 18:23:15 +00:00
b8d3ef71f7
Fixes the updated dropdowns for multiplayer clients broken in 65f4c8b0e8
...
This was SVN commit r15038.
2014-04-27 18:18:05 +00:00
461a17c95d
Reverted d91756b251 after breaking the fix for the lobby that sanders17 had implemented
...
This was SVN commit r15037.
2014-04-27 17:38:19 +00:00
65f4c8b0e8
Moves Select number of players to a more fitting and translation-friendly location. Also makes the map selection texts more translation-friendly in terms of space.
...
This was SVN commit r15036.
2014-04-27 17:24:37 +00:00
f9ccf05aa8
Change the style of dropdowns as per Mythos_Ruler. Also moves the rating list to the right side of the leaderboard (where it is on most rating lists).
...
This was SVN commit r15035.
2014-04-27 16:28:59 +00:00
60334f05c8
Fix error introduced in 95b0a8d9bf while fixing a warning
...
This was SVN commit r15034.
2014-04-27 15:56:10 +00:00
63bcf2fef6
Don't display I'm ready in single player setup. Refs #2447 .
...
This was SVN commit r15033.
2014-04-27 15:32:22 +00:00
ce0f439817
Adjusts the lobby gamelist and dropdowns to support more translations (space-wise).
...
This was SVN commit r15032.
2014-04-27 14:52:32 +00:00
95b0a8d9bf
Fixed warnings in ‘gui’ due to the new SpiderMonkey
...
Refs #2372
This was SVN commit r15030.
2014-04-27 13:51:43 +00:00
60e1ff59f5
Fix warning about msg.guid not being defined
...
This was SVN commit r15029.
2014-04-27 13:38:17 +00:00
341bcb1cf9
Fix unfinished change in accidental commit d4109916a3
...
This was SVN commit r15028.
2014-04-27 13:37:26 +00:00
d4109916a3
Moved the translation of AI messages to a later point
...
This avoids attempts to translate messages prefixed with keywords,
such as “/team Message prefixed with a keyword”, and translates them
only after the keyword has been removed. Some keywords may hide the
message, removing the need for a translation altogether.
This was SVN commit r15027.
2014-04-27 13:33:15 +00:00
d91756b251
Moved the translation of map data to the loadMap() function
...
This avoids the translation of strings that had been previously
translated later in the code.
This was SVN commit r15026.
2014-04-27 13:28:47 +00:00
e344225b72
Tweaked this description.
...
This was SVN commit r15025.
2014-04-27 13:11:50 +00:00
ad5fb85de3
A bunch of tech tweaks.
...
Tweaked Belgian Bog environment.
This was SVN commit r15024.
2014-04-27 13:10:38 +00:00
813db55b08
Fixed the numbering in the terms of user of the lobby
...
Reported by ‘tema’ (Italian translator) at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#it/public/24566468
This was SVN commit r15022.
2014-04-27 10:02:23 +00:00
243411f0c5
Internationalization of the lobby terms of service and terms of use
...
This was SVN commit r15021.
2014-04-27 09:13:28 +00:00
0db4cc690e
Check for hero attack before querying it. Fixes #2490
...
This was SVN commit r15020.
2014-04-27 08:03:15 +00:00
81883806ec
First version of the lobby Terms of Service and Terms of Use.
...
This was SVN commit r15019.
2014-04-27 05:59:48 +00:00
2ad7187f92
Move XMPP polling to the mainloop. Should reduce lobby disconnects. Fixes #2491
...
This was SVN commit r15018.
2014-04-27 05:37:34 +00:00
fe490df93a
Revert an unnecessary part of the last commit ( bc9b7f9af3).
...
This was SVN commit r15017.
2014-04-27 03:26:45 +00:00
bc9b7f9af3
Fixes the tutorial AI and updates the tutorial with the blacksmith.
...
This was SVN commit r15016.
2014-04-27 03:22:02 +00:00
98905af6eb
Added a context to some very generic strings and regenerated the public mod POT file
...
This was SVN commit r15015.
2014-04-27 00:23:19 +00:00
0d3c608b05
Increases title bar width for internationalization support and unsquishes map preview in the lobby
...
This was SVN commit r15014.
2014-04-27 00:07:27 +00:00
f9dec493fc
Changed Ptolemaic and Seleucid Military Colonies to use the merc camp actor for now until proper Military Colony meshes are modeled.
...
Shrank the size of the gear icon.
Added a "seeds" particle. Doesn't seem to be working though.
This was SVN commit r15013.
2014-04-26 22:49:33 +00:00
aaf5ad1a63
Cosmetic cleanup - Delete full stop and make scrollbar a circle
...
This was SVN commit r15012.
2014-04-26 22:45:48 +00:00
9a809c3131
Revert overlay resizing (forgot about translations) and minor fixes to my last changes.
...
This was SVN commit r15010.
2014-04-26 19:52:56 +00:00
2ae1e16628
Fix translation of some game setup elements in multiplayer games
...
This was SVN commit r15009.
2014-04-26 19:52:16 +00:00
abf12fb503
Enhance the main menu options page and use it to replace the in-game settings page..
...
This was SVN commit r15007.
2014-04-26 19:31:23 +00:00
d1d7afe46c
Implements ready status into gamesetup. Fixes #2447 .
...
This was SVN commit r15006.
2014-04-26 18:34:34 +00:00
4770e64449
Some i18n fixed on the JavaScript side
...
Do not try to translate empty strings in translateObjectKeys().
Do not try to translate empty formation tooltips.
Do not translate player names at a point where they are already
translated.
This was SVN commit r15005.
2014-04-26 18:27:53 +00:00
f5b0fc1076
Swap button placement on options page to be more consistant with other parts of the GUI.
...
This was SVN commit r15004.
2014-04-26 18:03:29 +00:00
2b192a4fb5
Do not call Translate() on empty lines
...
Reported by Yves at Github:
https://github.com/leper/0ad/issues/11
This was SVN commit r15003.
2014-04-26 16:05:41 +00:00
8fea36cdd0
Made tinygettext’s debug output optional
...
You can now enable tinygettext’s output from the user.cfg file
(tinygettext.debug).
This enhancement also solved a warning due to the previous workaround,
which was
to uncomment the output line to avoid the debug messages.
This issue was reported by Yves at Github:
https://github.com/leper/0ad/issues/10
This was SVN commit r15002.
2014-04-26 15:32:18 +00:00
baf04bad53
Added support for message extraction from INI files
...
Refs #2487
This was SVN commit r15001.
2014-04-26 14:06:00 +00:00
3dd76c84bc
Added a translation comment to the ‘Locale:’ string of the language menu
...
In order to do this, I added support for extracting the ‘comment’
attribute of translatable XML elements.
This was SVN commit r15000.
2014-04-26 12:51:12 +00:00
c82544be9f
Use an early return in L10n::GetDictionaryLocale()
...
Suggested by l777 on the IRC.
This was SVN commit r14999.
2014-04-26 12:29:01 +00:00
d4f701d5f5
Remove MarkToTranslate from the JavaScript interface
...
The ‘l10n.js’ global JavaScript file already defines this function as
markForTranslation(),
and defines a context-aware twin function as well. Those two functions
are the only ones
currently used in the mod code (as it should be), and there are no
remaining calls to the
engine for that.
This was SVN commit r14998.
2014-04-26 12:26:04 +00:00
d6e37321d5
Removed an obsolete TODO comment in the L10n class implementation
...
This was SVN commit r14997.
2014-04-26 12:11:08 +00:00
fc793609eb
Added API documentation to ‘source/i18n/’
...
This was SVN commit r14996.
2014-04-26 12:10:15 +00:00
7acdde5c86
Changes tests to use global g_ScriptRuntime instead of creating a new JSRuntime for each test.
...
The tests crashed on my Debian systems but not on my Ubuntu system.
The crash happened in line 142 of SpiderMonkey's ThreadLocal.h.
I know that I had to use a workarounnd for contexts to avoid destroying
the context that was created first. I also had in mind that in newer
versions a JS_Init function got introduced which presumably solves this
kind of issues.
Based on this experience I assumed runtimes could have a similar problem
and this patch indeed fixes the issues.
Unfortunately the correct usage of JSRuntimes in that regard is not
documented.
There's only a rater misterious comment in JSAPI.h which hasn't been
cleared up so far and is most likely completely outdated
(https://bugzilla.mozilla.org/show_bug.cgi?id=992641 ).
This was SVN commit r14995.
2014-04-25 21:19:51 +00:00
49fc88ff81
Fixed typos on the English strings of the tutorial AI
...
This was SVN commit r14994.
2014-04-25 19:47:41 +00:00
4cbaba418b
Improved syntagma animations
...
Added seeding animation for farms. Only applied in Macedonian women at
the moment.
This was SVN commit r14993.
2014-04-25 14:29:05 +00:00
e92bf0c89d
Show translated player name in chat messages
...
This should only affect player names that users do not define, such as
“Player 2”.
I’ve checked that:
• This change translate the name of the AI player in chat messages of
tutorial scenarios.
• If I name myself “Player 1” and host a multiplayer game, “Player 1” is
not translated.
This was SVN commit r14992.
2014-04-25 04:28:06 +00:00
7afe0afbca
Internationalized the messages of the tutorial AI
...
This was SVN commit r14991.
2014-04-25 03:41:01 +00:00
abed1b1734
Made the developer overlay wide enough for the Long Strings locale
...
This was SVN commit r14990.
2014-04-25 03:11:22 +00:00
dc0deb5f52
Fixed bad fix in bc1ed335e2
...
Note: l777 had given me the right fix (%s), I fixed it wrong for no good
reason…
This was SVN commit r14989.
2014-04-25 02:56:08 +00:00
c1c10667df
Improved the internationalization of the construction “Insufficient resources” message
...
This was SVN commit r14988.
2014-04-25 02:45:19 +00:00
0c04b90a2d
Fixed the extraction of messages with leading spaces from plain text files
...
This was SVN commit r14987.
2014-04-25 01:55:43 +00:00
0c88edc2f2
Internationalized rank names
...
In order to do so, I had to extend the XML message extractor to support
using XML tags as context.
This is because one of the ranks is “Advanced”, which is a pretty common
string.
This was SVN commit r14986.
2014-04-25 01:47:42 +00:00
bc1ed335e2
Fix GCC warning on “source/gui/scripting/ScriptFunctions.cpp”
...
Reported by JoshuaJB at Github: https://github.com/leper/0ad/issues/27
Fix provided by l777 (who I believe to be leper but I don’t really know)
on IRC.
This was SVN commit r14985.
2014-04-25 00:38:30 +00:00
fd3d335265
Sacrifices a goat to the gods of insanity.
...
Fixes random crashes on Windows due to differences of STL types on the
binary level between different static libraries.
The differences are caused by the definition of _HAS_ITERATOR_DEBUGGING
and _SECURE_SCL in lib/precompiled.h.
All our engine static libs use precompiled headers but we didn't use
them for tinygettext because they aren't needed (except for these two
defines).
I've decided to add precompiled headers to tinygettext too instead of
just copying these defines. That should cause less headaches in the
future.
This was SVN commit r14983.
2014-04-24 20:05:48 +00:00
0027dcef31
Remove the actual serif fonts from the repo (they're completely unused now, and keeping them makes the package bigger)
...
This was SVN commit r14981.
2014-04-24 13:36:29 +00:00
73470a3610
Remove all references to serif fonts in the GUI files (see cde72788a2)
...
Rebuild the sans fonts to include the missing glyph character (fixes
#2483 )
Update the pot files
This was SVN commit r14980.
2014-04-24 13:33:15 +00:00
bfa6bbd0e0
Internationalized the wall cost string
...
Also, added a check for the getCostComponentDisplayName() function, as I
once got an empty string, although I was not able to reproduce it.
This was SVN commit r14979.
2014-04-24 06:16:43 +00:00
1fa5f13133
Improved the internationalization of the Diplomacy dialog box
...
You can now translate resource names differently depending on whether
they are in the middle of a sentence or at the beginning.
The Close button in the Diplomacy dialog box is now internationalized.
This was SVN commit r14978.
2014-04-24 05:48:23 +00:00
d2cbda3755
Fixed an English string in the Celtic and Gaul civilization files
...
Reported by kanetaka, a Japanese translator, at Transifex:
https://www.transifex.com/projects/p/0ad/translate/#ja/public/17634039
This was SVN commit r14976.
2014-04-24 04:41:03 +00:00
92f2a16a88
Suppresses MSVC warning C4005 'macro redefinition' from SpiderMonkey upgrade
...
This was SVN commit r14975.
2014-04-23 21:12:28 +00:00
0d33f6412d
Fixes #2482
...
This was SVN commit r14974.
2014-04-23 08:22:55 +00:00
311acea712
Fit UI for longer translations
...
This was SVN commit r14973.
2014-04-23 07:47:46 +00:00
3b571406f8
Enlarge tooltip size to fit all locales
...
This was SVN commit r14972.
2014-04-22 17:51:56 +00:00
9b9a96382c
Fix boolean type
...
This was SVN commit r14971.
2014-04-22 12:52:49 +00:00
21362de6ac
Add workaround for testing long strings with the separate po. ICU wouldn't accept a non-existing language.
...
This was SVN commit r14969.
2014-04-22 11:38:15 +00:00
9dd4e71f1d
Internationalized some messages
...
• You can now translate “The production queue is full”.
• Internationalized the “Pause” and “Resume” buttons. Only the initial
label was internationalized, it would switch to English as soon as you
pause the game for the first time.
• Internationalized the “Screenshot written to” message in the engine.
This was SVN commit r14968.
2014-04-22 06:35:51 +00:00
5a8bc1158a
Add some more GUI graphics settings while fixing some persistence issues. Refs #2310
...
This was SVN commit r14967.
2014-04-22 05:09:31 +00:00
93c94e45b7
“All nearby bipedal melee units” → “All nearby soldiers” (suggested by Mythos_Ruler on the IRC)
...
This was SVN commit r14966.
2014-04-21 14:37:42 +00:00
46d7d5eb23
Removed trailing spaces detected in translatable strings
...
This was SVN commit r14965.
2014-04-21 14:35:33 +00:00
21cb76b9f9
centre → center
...
This was SVN commit r14964.
2014-04-21 14:32:52 +00:00
e82a9f1a4d
Removed a line break to make more space for translations
...
This was SVN commit r14963.
2014-04-21 14:27:02 +00:00
510ad15e6c
Adds missing libs, fixes some svn properties and a build-problem on Windows.
...
In 1b3261b8f4
2014-04-20 23:47:52 +00:00
5aab36670c
Give some more space to the labels in the advanced localization menu.
...
This was SVN commit r14958.
2014-04-20 22:38:29 +00:00
6b1cde8f52
Added Micket's wolf mesh with Strannik's animations. Thank you guys!
...
Added two texture variations.
This was SVN commit r14957.
2014-04-20 22:24:37 +00:00
bba60424b0
Moved tinygettext licensing information
...
Moved from libraries/LICENSE.txt to LICENSE.txt. Reported by l777 on
IRC.
This was SVN commit r14956.
2014-04-20 22:04:16 +00:00
64d204228a
Message extraction and localization
...
It includes the translation template files (POT) as well as translation
files
(PO) developer through the Transifex platform by our awesome
translators.
It also includes tools to generate the translation template files,
generate a
special translation file with the longest strigns of all translations,
and a
tool to download translations from Transifex into the right game folders
automatically.
Fixes #67
This was SVN commit r14955.
2014-04-20 21:48:23 +00:00
e05c8263c5
Internationalization of the public mod (JavaScript and GUI XML side)
...
It includes a marvelous language selection menu developed by Yves.
It also includes the introduction of a sprintf implementation for
JavaScript, as well as
translation helper functions that use JavaScript-side translation
caching.
This patch includes code by Yves, sanderd17, leper and Gallaecio.
Ref #67
This was SVN commit r14954.
2014-04-20 20:51:48 +00:00
d6db5a466d
Internationalization of the C++ side
...
Provides the logic to detect the system language, load translations, and
use
loaded translations both in the C++ and the JavaScript side.
This patch includes code by Yves, sanderd17, leper, historic_bruno and
Gallaecio. It’s worth noting that Yves and historic_bruno were also the
main
contributors behind the changes in 1b3261b8f4
2014-04-20 20:03:57 +00:00
30d5b572a6
Remove tinygettext from the build-osx-libs.sh file.
...
That's not needed anymore in the latest i18n branch. We build
tinygettext as a static library with the game now.
This was SVN commit r14952.
2014-04-20 19:30:01 +00:00
1b3261b8f4
Added third-party libraries for internationalization and localization: ICU and tinygettext
...
This was SVN commit r14951.
2014-04-20 19:17:32 +00:00
52c0a9b908
Changes to English strings after reports in Transifex by translators
...
This was SVN commit r14950.
2014-04-20 19:00:37 +00:00
130a394e27
a few fixes and some tweaks to petra
...
This was SVN commit r14949.
2014-04-20 17:19:56 +00:00
f9e980ba5f
Trying to blend some old UI assets with the new look.
...
Darkened the croc texture a bit.
This was SVN commit r14948.
2014-04-20 16:58:47 +00:00
f27640de9b
Minor tweaks to some maps.
...
This was SVN commit r14947.
2014-04-20 14:38:24 +00:00
dde91b8c66
The attack notification should be less frequent.
...
This was SVN commit r14946.
2014-04-20 14:35:02 +00:00
2336f97ead
Spartans get Oxybeles (but no Lithobolos).
...
This was SVN commit r14945.
2014-04-20 12:50:59 +00:00
ff77676c60
Fixed auras and tooltips for some heroes.
...
Added some techs for houses and removed some from the Civic Center.
Makes a lot more sense this way.
This was SVN commit r14944.
2014-04-20 11:36:23 +00:00
0bbf43dc5f
upgraded sarissa's models
...
This was SVN commit r14943.
2014-04-20 00:34:48 +00:00
cf04dc9601
Missing units to use the new pikemen attack animation
...
This was SVN commit r14942.
2014-04-20 00:09:40 +00:00
78f8afd912
Changed some formation spacing.
...
This was SVN commit r14941.
2014-04-20 00:01:50 +00:00
4f4455ec3a
Added new attack animation for pikemen
...
This was SVN commit r14940.
2014-04-19 23:56:05 +00:00
b387458e33
Syntagma formation animations added to all hellenic pikemen.
...
This was SVN commit r14939.
2014-04-19 23:35:25 +00:00
2e7e46b399
Moves some blacksmith techs to Village Phase for Celtic civs. Fixes #2473
...
This was SVN commit r14938.
2014-04-18 11:28:28 +00:00
831d3ae69f
This was SVN commit r14937.
2014-04-16 16:32:15 +00:00
fe4f17fd73
Only send game report if ranking is enabled.
...
This was SVN commit r14936.
2014-04-16 14:00:09 +00:00
a9b34da617
Fix some merge conflicts 9e2d0b9506 missed.
...
This was SVN commit r14935.
2014-04-16 13:58:56 +00:00
9e2d0b9506
Fix #2404 . Rating auto-configure TODO (eg 2v2 games do not automatically show as being unrated). See #2276 .
...
This was SVN commit r14934.
2014-04-16 06:03:49 +00:00
47a516df34
Fix some JS warnings. Refs #2372 .
...
This was SVN commit r14933.
2014-04-15 01:12:48 +00:00
e1488fee56
Add an 'explore map' option to the game setup.
...
This was SVN commit r14931.
2014-04-14 19:52:49 +00:00
a9d0a3bcae
Fix how per tech modification affects work + fix the technologies that implement it. Fixes #2366
...
This was SVN commit r14930.
2014-04-14 16:33:00 +00:00
bb71823aee
Make the actor tech-modifiable. Fixes #2243
...
This was SVN commit r14928.
2014-04-14 15:00:49 +00:00
1073382e3b
Sorts the lobby player list, ignoring case
...
This was SVN commit r14927.
2014-04-13 18:29:32 +00:00
b08e364e81
New shipwreck models
...
This was SVN commit r14926.
2014-04-13 11:16:30 +00:00
106638a9b8
This was SVN commit r14925.
2014-04-13 09:42:55 +00:00
01decbcd90
Train time changes.
...
Unlock champions tech more expensive.
This was SVN commit r14924.
2014-04-13 09:05:02 +00:00
40e2a1e065
Fixes some javascript warnings in the lobby.
...
This was SVN commit r14923.
2014-04-13 01:48:24 +00:00
180aa5c60d
Makes the moderator prefix visible in the chatbox.
...
This was SVN commit r14922.
2014-04-12 23:40:36 +00:00
5a0c1a799b
Some more portraits. Updated the portrait for the Macedonian siege workshop.
...
Tweaked some sandbox maps.
This was SVN commit r14921.
2014-04-12 14:55:04 +00:00
f02a8a4c59
Some population techs.
...
Tweaking some training techs.
This was SVN commit r14920.
2014-04-12 13:39:19 +00:00
5740e22cd5
Fix health for these cavalry spearmen.
...
This was SVN commit r14919.
2014-04-12 11:52:39 +00:00
c2d1aece02
Fixed female citizen selections.
...
This was SVN commit r14918.
2014-04-12 10:36:37 +00:00
08c1c8ed2d
Minor tweaks to some particles.
...
Updated quinquereme tip image and text.
Minor updates to some maps.
Seleucids now use some Ptolemies ship actors temporarily.
This was SVN commit r14917.
2014-04-12 07:13:37 +00:00
ad36c0eb7b
Parse entity ids to numbers again
...
This was SVN commit r14916.
2014-04-11 12:35:50 +00:00
41b8d06e27
remove forgotten debug printouts
...
This was SVN commit r14915.
2014-04-10 21:00:40 +00:00
f41c51359f
Mauryan trader actor missing
...
This was SVN commit r14914.
2014-04-10 20:56:12 +00:00
bb8e14fae1
some minor tweaks to petra ai
...
This was SVN commit r14913.
2014-04-10 20:25:02 +00:00
7840fd3049
fix capitalisation
...
This was SVN commit r14912.
2014-04-10 14:00:44 +00:00
7f77bb7cb0
Small improvements to entitycollection + add a serialization method (serialization is never executed though)
...
This was SVN commit r14911.
2014-04-10 09:51:43 +00:00
ff2979ca68
Save formation rotation when loading a new formation
...
This was SVN commit r14910.
2014-04-09 18:01:12 +00:00
1f63325ede
Rotate entities to the right angle when forming a formation
...
This was SVN commit r14909.
2014-04-09 11:15:00 +00:00
4ddf1ac4dc
Added rowing, gathering, 3Idles and death animations for ptolemaic fisherman.
...
This was SVN commit r14908.
2014-04-06 21:06:17 +00:00
d27dffa31d
Now really fix the issue with promoting and formation animations
...
This was SVN commit r14906.
2014-04-06 18:43:06 +00:00
833c2bac7a
save/restore camera position and orientation in saved games, fixes #2354
...
This was SVN commit r14905.
2014-04-06 16:27:57 +00:00
fbfd87e7f7
Replace hawk with duplicated head bone with fixed version by stanislas69. Fixes #2454 .
...
This was SVN commit r14904.
2014-04-06 16:00:12 +00:00
fb1827bee7
Fix ungarrisoning bug caused by promoting garrisoned entities. Fixes #2471 .
...
This now uses the Autogarrsion order as both already work with an
already garrisoned entity.
This was SVN commit r14903.
2014-04-06 03:04:30 +00:00
fd4cd56224
fixed petra map management when not circular
...
This was SVN commit r14901.
2014-04-05 12:18:37 +00:00
c5e59d02e1
Fix formation animations with promoted units
...
This was SVN commit r14900.
2014-04-05 09:48:57 +00:00
1908723188
Testudo for a few more Roman units.
...
This was SVN commit r14899.
2014-04-05 08:47:29 +00:00
61da102371
Add testudo animations to the right actor files and use it in the formation template
...
This was SVN commit r14898.
2014-04-04 18:38:13 +00:00
776a098a1c
Tetsudo formation test animation. Front and middle stances.
...
This was SVN commit r14897.
2014-04-04 10:17:15 +00:00
d04f035f9a
numerous fixes and improvments to petra ai
...
This was SVN commit r14896.
2014-04-03 20:48:54 +00:00
ac9aaaa369
supplement the ai common-api
...
This was SVN commit r14895.
2014-04-03 20:31:59 +00:00
26fdf74de3
Mauryan trader basic commit with idle and move animations. Needs zebu animation and trader texture or use a mauryan one.
...
Model and texture by paperkat, move animation by Wijitmaker, blender
exportation by stan
This was SVN commit r14894.
2014-04-03 18:31:56 +00:00
3e03c9d08a
Return something valid in a mock function to fix a warning while running tests.
...
This was SVN commit r14893.
2014-04-02 23:10:07 +00:00
b8b3542d25
Fix tests.
...
This was SVN commit r14892.
2014-04-02 23:09:59 +00:00
b287cbf805
New ptolemaic sail for merchant ship based on Lion's eagle.
...
fixes #2236
This was SVN commit r14891.
2014-04-02 02:52:13 +00:00
2f12068a8f
Ptolemaic merchant ship commit.
...
Model by Stanislas69 with some fixes.
This was SVN commit r14890.
2014-04-01 20:35:49 +00:00
55bb33dec8
Particle tweaks.
...
Mediterranean Cove skirmish map.
This was SVN commit r14888.
2014-03-30 01:56:35 +00:00
84016df11c
Map tweaks and map preview changes.
...
This was SVN commit r14887.
2014-03-30 01:38:20 +00:00
e715c60942
Cleaning up the scenarios folder.
...
This was SVN commit r14886.
2014-03-30 00:10:07 +00:00
a7b2f6ba47
Fix more then one observer by allowing a game to have multiple players with the -1 ID.
...
This was SVN commit r14885.
2014-03-29 15:09:42 +00:00
22867fa9a3
Further complete the definitition of the entity state
...
This was SVN commit r14884.
2014-03-29 13:56:03 +00:00
8615f38803
Always define the entire entity state, but initialize it to null
...
This was SVN commit r14883.
2014-03-29 13:37:48 +00:00
132020f88e
Fix some of the undefined warnings reported by the new SpiderMonkey. Initialize the player diplomacy arrays earlier in PlayerManager.
...
This was SVN commit r14882.
2014-03-29 11:03:00 +00:00
120f71d944
a couple a bugfixes
...
This was SVN commit r14881.
2014-03-29 08:51:09 +00:00
b815fa8dd9
Portraits for the Ptolemaic dieres, penteres, and octeres.
...
Actor and texture for Antiochus the Great.
Histories for the Ptolemaic warships.
This was SVN commit r14880.
2014-03-29 00:16:16 +00:00
e9e05f4efc
Second (main) commit for the SpiderMonkey upgrade.
...
This commit contains all the required changes to our source files and
build scripts (hopefully).
A next commit will remove the old stuff of SpiderMonkey 1.8.5.
Spcial thanks to:
- H4writer who helped a lot mainly with the performance issues we
had/have, but also with other problems or questions.
- Leper for the review.
- Historic_bruno for implementing the build scripts on Mac OS X and
testing on the Mac.
- The people from the #jsapi channel and from
mozilla.dev.tech.js-engine who answered a lot of questions and helped
solving problems.
- All the other people who helped
Refs #1886
Fixes #2442
Fixes #2416
This was SVN commit r14877.
2014-03-28 20:26:32 +00:00
6f6b841af3
Upgraded ptoemaic quinquereme textures and made the model narrower.
...
This was SVN commit r14875.
2014-03-28 16:03:32 +00:00
0d9a7dab6b
Works around infinite recursion problem.
...
This problems occurs with the new SpiderMonkey in debug mode, but it's
not a SpiderMonkey issue.
Unfortunately I couldn't find a clean solution, so I just documented the
problem in an extensive comment block and applied a workaround.
A clean solution would probably require changing the approach for
counting allocations completely.
This was SVN commit r14874.
2014-03-28 11:33:37 +00:00
0419f5500e
another set of petra improvments, main one is a first try to place markets for trade (was random before)
...
This was SVN commit r14873.
2014-03-27 22:10:03 +00:00
0a32b2d687
Ptolemaic trireme commit.
...
Fixed some texture stretching in the bireme.
This was SVN commit r14872.
2014-03-27 18:13:07 +00:00
bc428e1649
some fixes (i.e.building placement) and cleanings of petra
...
This was SVN commit r14871.
2014-03-26 21:07:47 +00:00
52af5b29a1
Ptolemaic bireme commit.
...
Fixed error in sparten temple when destroyed found bi Sanderd17
This was SVN commit r14870.
2014-03-26 20:34:54 +00:00
7c0c294814
Move some resources to passable terrain
...
This was SVN commit r14869.
2014-03-26 18:28:00 +00:00
d5ff29d181
fix a flaw in UnitAI trade management
...
This was SVN commit r14868.
2014-03-26 09:11:06 +00:00
3dfa858229
remove some leftover warnings in petra
...
This was SVN commit r14867.
2014-03-25 19:26:45 +00:00
5de3b30742
fix previous tag
...
This was SVN commit r14866.
2014-03-24 22:51:15 +00:00
97afd25171
commit first version of new ai bot (named Petra)
...
This was SVN commit r14865.
2014-03-24 22:33:50 +00:00
b03e3644ac
add a few usefull functions in ai/common-api
...
This was SVN commit r14864.
2014-03-24 22:15:40 +00:00
90b9926ca1
Fixes warning showing up with the new SpiderMonkey.
...
The changed return value isn't related but returning false makes more
sense there IMO.
Refs #2372
This was SVN commit r14863.
2014-03-22 23:31:40 +00:00
5372b27142
Silences some warnings that show up on the gamesetup screen with the new SpiderMonkey without changing any behaviour.
...
Refs #2372
This was SVN commit r14862.
2014-03-22 13:54:10 +00:00
3fb46640cc
Fix civ for Ptol Military Colony.
...
This was SVN commit r14861.
2014-03-21 22:51:47 +00:00
907ef01322
Added starting units to Deccan Plateau.
...
Added some detail to Nile River.
Updated Syria a little bit.
Added Pureons new tech portraits to some techs.
Portrait for Ptol champ elephant.
Gave the Military Settlement system to the Ptolemies. We'll use their
merc camp for a developing merc camp system. Ptol heroes can found civic
centers just like the Sele heroes.
This was SVN commit r14860.
2014-03-21 00:47:23 +00:00
2eeb7c2ba1
Workaround to reduce the impact of AI performance problems when planning new bases.
...
When no free territory was left on the map, the AI tried to place a CC
every 10th AI turn.
That's about all 10 seconds and it freezed the game for about a second.
Now when you played against 4 players it freezed aobut 4 seconds every
10 seconds, which is very bad.
I wanted to solve this properly but realized that I'd have to change a
lot in the terrain analysis code that will probably be replaced anyway
when we have a new pathfinder with a proper interface.
Also removes an unused variable (creating a territory map and not using
it can't be good for performance either).
This was SVN commit r14859.
2014-03-20 14:26:15 +00:00
6eaad6cbb6
new tech portraits
...
This was SVN commit r14858.
2014-03-20 00:58:54 +00:00
1c81a96a50
fix bug in AI
...
This was SVN commit r14857.
2014-03-18 21:34:23 +00:00
63248bdc33
Fix issue with GUI reveal map status display.
...
This was SVN commit r14856.
2014-03-18 01:13:02 +00:00
209799aa4c
fix 94c02ec33c for AI
...
This was SVN commit r14855.
2014-03-17 21:23:40 +00:00
5c4282a21c
Fixes a small memory leak in the profiler shutdown code.
...
This was SVN commit r14854.
2014-03-17 21:16:38 +00:00
cde72788a2
* Add support for fallback fonts in the font builder.
...
* Replace DejaVu with Biolinium for the existign sans-styles.
* Add additional sans-styles using Biolinum.
* Update the GUI style definitions to use the sans-styles instead of
serif styles.
(Wait with updating custom defined fonts in strings, as it will cause a
mess with the internationalisation that's about to be included)
* Add fonts from the quite complete FreeFont family as fallback fonts.
* Render all glyphs supported by the different fonts to support as many
scripts as possible.
* Fixes #2457 .
(Now hope I included all needed files)
This was SVN commit r14853.
2014-03-17 10:13:49 +00:00
c1b839c21b
Military Colony's territory weight reduced.
...
Updated icon for Syria map. Updated nisian war horses portrait from
Pureon.
Reduced the volume of the attack notification a little.
This was SVN commit r14852.
2014-03-17 00:10:13 +00:00
84ef2c1335
A test for Latin names for animals. Won't complete this until after next alpha.
...
This was SVN commit r14851.
2014-03-17 00:08:24 +00:00
883f307b40
Implement a basic observer mode. Any player which joins a multiplayer game but is not assigned a player slot automatically becomes an observer. Refs #69
...
This was SVN commit r14849.
2014-03-16 23:29:27 +00:00
94c02ec33c
Revert gather limits to be global instead of per-player. Refs #1387
...
This was SVN commit r14848.
2014-03-16 20:35:23 +00:00
19724f7f41
"Syria" skirmish map.
...
This was SVN commit r14846.
2014-03-15 23:10:06 +00:00
ffe0faeca4
Move the skybox up per Mythos' ruler recommendation. This should probably be a map setting.
...
This was SVN commit r14844.
2014-03-15 21:07:02 +00:00
caeaf62723
Adjust widths in the lobby to make the map size dropdown fit.
...
This was SVN commit r14843.
2014-03-15 20:58:59 +00:00
722ad7264d
Some updated maps. Acropolis Bay especially.
...
This was SVN commit r14842.
2014-03-15 19:56:51 +00:00
49b0e1ce42
Eliminates some duplication in build-osx-libs.sh and sets more useful variables
...
This was SVN commit r14841.
2014-03-14 05:18:40 +00:00
dfa4766dab
Reverts [[SVN:14831]] - wasn't a valid fix.
...
Patches MiniUPnPc to explicitly export symbols for GCC/Clang, fixes
build when -fvisibility=hidden is used, refs #2304 .
Fixes incorrect use of CPPFLAGS in build-osx-libs.sh, it should be
CXXFLAGS. CPPFLAGS get passed to the C/C++ preprocessor, CXXFLAGS get
passed to the C++ compiler.
This was SVN commit r14840.
2014-03-14 04:17:42 +00:00
b18a899287
Added Ptolemaic healer body and head textures. Fixes #2234
...
This was SVN commit r14839.
2014-03-13 19:46:15 +00:00
6ab578a6eb
Fix out of date comments in Tex and ITexCodec, Fixes #2458 .
...
This was SVN commit r14838.
2014-03-13 19:00:22 +00:00
e17dd1ac12
Applying the new improvements: Gulf of Bothnia.
...
This was SVN commit r14837.
2014-03-13 09:45:09 +00:00
ef888367aa
Cleanup tex_codec, fixes #2456 , patch by IronNerd.
...
This was SVN commit r14836.
2014-03-13 04:16:20 +00:00
a5639631ee
Texture system refactoring and cleanup, fixes #2455 , patch by IronNerd.
...
This was SVN commit r14835.
2014-03-13 02:37:05 +00:00
a068935789
Ptolemaic dock upgrade. Fixes #2217
...
This was SVN commit r14834.
2014-03-12 18:38:16 +00:00
180b44e565
let the AI know that a unit has no more orders
...
This was SVN commit r14832.
2014-03-11 22:42:41 +00:00
6274c7ffe8
Added ptolemaic quinquereme. Fixes #2232
...
This was SVN commit r14830.
2014-03-10 13:37:18 +00:00
9f1bcc2475
fix AI error
...
This was SVN commit r14829.
2014-03-09 22:26:41 +00:00
0e0cd65134
Some GUI alignment/sizing improvements.
...
This was SVN commit r14828.
2014-03-09 19:24:17 +00:00
0e7c92e1e6
Fixes behaviour change in Atlas' JSON serialization after the switch to JSON Spirit ( #2434 ).
...
This caused problems setting the starting camera.
Refs #2434
This was SVN commit r14827.
2014-03-09 17:55:54 +00:00
8959e63a53
Add back unintentionally removed idle workers button tooltip.
...
This was SVN commit r14826.
2014-03-09 02:42:42 +00:00
e6f7ef78dc
Removes legacy "technologies" folder.
...
This was SVN commit r14824.
2014-03-09 00:10:41 +00:00
7698e75962
Pyrrhus template.
...
This was SVN commit r14823.
2014-03-09 00:08:25 +00:00
0603392f03
Acropolis Bay.
...
This was SVN commit r14822.
2014-03-09 00:08:00 +00:00
119849defc
Pyrrhus hero.
...
Some map stuff and actor changes (remove the elephants from Pericles).
This was SVN commit r14821.
2014-03-09 00:07:28 +00:00
d214d8f61c
Some map changes.
...
This was SVN commit r14820.
2014-03-09 00:02:33 +00:00
fb65288463
Fix hover effect not regenerating after mousedown events, minor GUI code cleanup, and fix #2414
...
This was SVN commit r14819.
2014-03-07 22:43:57 +00:00
c8bdd993c0
Upgrades cxxtest.
...
Switches to the already committed new cxxtest sources and deletes the
old sources.
Applies the changes from 6374080b604a57fed5a7Fixes #2450
This was SVN commit r14818.
2014-03-07 20:58:17 +00:00
a9368a4463
Updated tooltip to reflect the new max gatherer limit
...
This was SVN commit r14816.
2014-03-07 12:09:39 +00:00
66942c74fa
Be more forgiving for training spaces (which cause empty strings on splitting) and avoid using bigger fonts for non-capitalisable signs in headings
...
This was SVN commit r14815.
2014-03-07 11:11:45 +00:00
32cf46f01c
Fix some 'undefined' problems reported by Lion.Kanzen + improve coding style.
...
This was SVN commit r14814.
2014-03-07 08:27:13 +00:00
29f94a759c
Fix an issue with lobby registration and a minor wording tweak.
...
This was SVN commit r14813.
2014-03-07 01:52:06 +00:00
abbd6efef1
Updates outdated/incorrect hotkeys.
...
This was SVN commit r14812.
2014-03-06 23:57:02 +00:00
8a98bca9b2
Fixes the last z order (hopefully) and a style inconsistency.
...
This was SVN commit r14811.
2014-03-06 22:45:13 +00:00
ec26f1de83
Reduces z order to fix ai dialog.
...
This was SVN commit r14810.
2014-03-06 22:34:15 +00:00
8f30e722ab
Some inconsequential style adjustments.
...
This was SVN commit r14809.
2014-03-06 02:24:06 +00:00
ef76d24e66
Fixes z order and a capitalization error.
...
This was SVN commit r14808.
2014-03-06 02:00:12 +00:00
5f5cfb10ee
Fixes a typo and makes naming of the fading consistent with other sprites.
...
This was SVN commit r14807.
2014-03-05 21:24:48 +00:00
f3714a7075
Fix invalid count for entityMaps
...
Improve error reporting on failed deserializations
Fixes #2328
This was SVN commit r14806.
2014-03-05 14:58:17 +00:00
02024370d8
Fix a warning in Visual Studio 2010 related to some of my recent changes.
...
This was SVN commit r14805.
2014-03-05 01:06:13 +00:00
5582409973
Converts most parts of the game to use Pureon's new UI
...
This was SVN commit r14804.
2014-03-04 02:23:01 +00:00
1a2f889bb9
7cba43c9db changed the behaviour in case of undefined values which was not intended even if there's a warning now.
...
This should revert to correct behaviour for undefined values again (even
though this value should never be undefined).
Refs 2372
This was SVN commit r14803.
2014-03-03 23:01:49 +00:00
7cba43c9db
Fixes warnings printed by the new SpiderMonkey.
...
Sets SelectableInGameSetup to true in all civ json files that didn't
have it set.
Having this value set to undefined (not set) was interpreted as true,
which is quite arbitrary.
With the new SpiderMonkey a warning will be printed if the value is
undefined.
This avoids ambiguity but makes the setting mandatory.
Refs #2372
This was SVN commit r14802.
2014-03-03 21:58:15 +00:00
df43e32a59
Second try fixing the eol-styles
...
This was SVN commit r14801.
2014-03-03 21:36:24 +00:00
234f2003a3
Fix inconsistent line endings and add svn:eol-style property
...
This was SVN commit r14800.
2014-03-03 21:13:36 +00:00
2d0e996725
Added modified Stanislas69 Pyrrhus helmet with textures.
...
Added an extra variation for brass and iron textures variations of
ptolemaic_romanized and thracian horned helmets.
Added playercolor to the thracian horned helmet crest.
This was SVN commit r14799.
2014-03-02 10:59:36 +00:00
e290abc40f
Should fix the Atlas build issues with the autobuilder.
...
For some reason the autobuilder does not know uint32_t but my Windows
system with VC2010 and my Linux system both do.
Refs #2434
This was SVN commit r14797.
2014-03-01 14:41:32 +00:00
c2c172271f
fix AI error, not reseting all units after a successful attack
...
This was SVN commit r14796.
2014-03-01 14:36:35 +00:00
05225a66ac
Horned helmet to Thracian cavalry.
...
This was SVN commit r14794.
2014-03-01 10:37:45 +00:00
57e995e618
fix AI error, the freeze of this collection prevented promoted and packed units to be updated during attack
...
This was SVN commit r14793.
2014-03-01 09:35:30 +00:00
4e5eeba27b
Fix the skybox.
...
This was SVN commit r14792.
2014-02-28 18:23:24 +00:00
999490bbf5
Added playercolor to ptolemaic romanized crest helmet.
...
This was SVN commit r14791.
2014-02-28 11:46:23 +00:00
162a4c42f3
Stan's helmets ptolemaic romanized with and without crest, thracian horned cavalry and perseus hero. Heavily modified.
...
playercolor in crests still pending. Added brass and iron variations,
more subtle variations to come.
This was SVN commit r14790.
2014-02-28 11:32:23 +00:00
02860690eb
fix unused parameter warning.
...
This was SVN commit r14789.
2014-02-26 19:16:44 +00:00
3f78042f45
Fix tests and C++11 build.
...
This was SVN commit r14788.
2014-02-26 19:08:03 +00:00
3573a6e9a8
Updated some portraits.
...
Added a Mercenary Thracian Swordsman.
Tweaked some textures.
Added a "gray skin" variation to the Ptolemaic elephant.
Added Saharan Oases skirm map.
This was SVN commit r14787.
2014-02-26 14:29:42 +00:00
6b94ae9f59
Added two ptolemaic howdah variations for the champion elephant.
...
This was SVN commit r14786.
2014-02-26 13:53:36 +00:00
d8903c0c6f
fix AI error
...
This was SVN commit r14785.
2014-02-25 22:43:03 +00:00
e2f4379e9a
Fix an issue with corruption of water data when the actor editor opened in Atlas.
...
Potential marginal optimizations to the water data creation code.
This was SVN commit r14784.
2014-02-25 06:27:15 +00:00
17f8f09399
Removes the ScriptInterface and SpiderMonkey dependencies from Atlas.
...
Replaces the code for JSON parsing and writing with an implementation
using the JSON Spirit library.
Fixes #2434
Refs #1886
This was SVN commit r14783.
2014-02-24 20:22:02 +00:00
33918a5c41
Fix AI error (with 3eaa9ac4d3) preventing promoted units to stay idle
...
This was SVN commit r14779.
2014-02-24 14:03:13 +00:00
50d93b4332
Was messed up by b3201acd93
...
This was SVN commit r14778.
2014-02-24 12:10:38 +00:00
c5f15a13d0
Modified Stanislas69 Seleucid romanized helmet and thracian helmet with several texture variations and organized in actors with variations.
...
Applied the romanized brass helmet with crest to the Seleucid heavy
swordman infantry.
This was SVN commit r14777.
2014-02-23 16:51:10 +00:00
3eaa9ac4d3
fix AI error
...
This was SVN commit r14776.
2014-02-23 09:51:07 +00:00
43377fdc5e
Fixes an assertion when DEBUG_SERIALIZER_ANNOTATE is set to 1 and you click on "Host Game" from the main menu.
...
The reason was that CSimulationMessage uses the CBufferBinarySerializer
which did not add debugging annotations and deserialized the created
data with the CStdDeserializer which expects these annotations.
I did not fix the tests which remain broken as before this patch when
annotation is enabled.
This was SVN commit r14775.
2014-02-22 14:30:29 +00:00
e38fc5f861
Increased Fanatic armor.
...
This was SVN commit r14774.
2014-02-22 13:10:54 +00:00
554cd510f2
Basic and Advanced Egyptian Pikemen textures.
...
Spec and norm maps for Mediterranean forest floor terrain.
This was SVN commit r14773.
2014-02-22 12:16:20 +00:00
a3e1c68b9a
Fix #2373 . Have player resign if not returning to a networked game. Also notify host of networked game that by leaving all other players will be disconnected. Based off patch by boeseRaupe
...
This was SVN commit r14772.
2014-02-21 20:02:23 +00:00
8c21ec4dfd
Quilted helms for Egyptian pikemen, based on work by Enrique.
...
This was SVN commit r14771.
2014-02-21 14:38:09 +00:00
42d31da1bb
ptolemaic quilted helmet commit.
...
This was SVN commit r14770.
2014-02-21 14:13:46 +00:00
c44b48bd59
Fix Atlas lag due to Position component that listens to the territoriesChanged message
...
This was SVN commit r14768.
2014-02-21 13:42:46 +00:00
0ea3b7b7dd
Adds the moderator prefix to the playerlist in the lobby.
...
This was SVN commit r14767.
2014-02-20 23:26:36 +00:00
a725266337
Slightly better options menu.
...
This was SVN commit r14766.
2014-02-20 22:45:43 +00:00
e182b4ddd2
Fix a valgrind warning about uninitilized variables in the scrollbar code and some comment/style fixes.
...
This was SVN commit r14764.
2014-02-19 21:59:07 +00:00
facf119241
Farm fields back to 5 workers.
...
This was SVN commit r14763.
2014-02-19 17:54:34 +00:00
2429f1e93c
Displays ratings on the gamesetup page and formats ratings less than 1000 correctly.
...
This was SVN commit r14762.
2014-02-19 00:40:35 +00:00
a4ec034bb5
fixes some AI errors
...
This was SVN commit r14761.
2014-02-18 18:19:33 +00:00
039b06e012
Enable selection of dogs when selecting idle warriors. Patch by tau. Fixes #2436
...
This was SVN commit r14760.
2014-02-17 21:40:47 +00:00
b5c8faa367
Aura tooltip for Ptolemaic heroes. Auras themselves are not complete.
...
This was SVN commit r14759.
2014-02-17 15:54:17 +00:00
41534b1eda
Arrow shooting buildings only increase arrows when ranged infantry are garrisoned inside.
...
Removing some unused textures.
This was SVN commit r14758.
2014-02-17 15:11:47 +00:00
c3dd79aa22
Ptolemaic mercenary camp commit.
...
This was SVN commit r14757.
2014-02-17 13:13:25 +00:00
322d78b9a5
remove debug warning
...
This was SVN commit r14755.
2014-02-16 15:23:50 +00:00
19965ce37a
Fix missing territory decay when moving out of territory without changing the actual territory. Add possibility to check movement over territory boders in the JS simulation part. Based on patch by niektb
...
This was SVN commit r14754.
2014-02-16 15:22:11 +00:00
f92a46330d
Anti-disconnect addition to the gamesetup screen. Also fixes typo in the lobby bot README.
...
This was SVN commit r14753.
2014-02-16 06:22:16 +00:00
be881dc420
Reformat the database to accept the additional summary counters as well as adding a couple summary counters. Also deletes unnecessary welcome message and deletes whitespace. Refs #686 .
...
This was SVN commit r14752.
2014-02-16 06:06:16 +00:00
ab9a6b6303
Stanislas69' iberian tower modification commit.
...
This was SVN commit r14751.
2014-02-14 21:46:37 +00:00
05bfe7dca0
Ptolemaic market commit
...
This was SVN commit r14750.
2014-02-14 17:18:29 +00:00
35f3dd03d9
improve ship behaviour when picking units
...
This was SVN commit r14749.
2014-02-13 20:21:27 +00:00
581c7635e1
Makes our favourite example of escaping even more awesome.
...
Codeblocks 12.11 requires an additional $ sign. This will break 10.05
and I haven't tested it with 13.12 or on other systems than Ubuntu.
This was SVN commit r14748.
2014-02-13 15:21:14 +00:00
a921c5c2fb
Portrait for Egyptian Pikeman.
...
Fixed a thing with the Ptolemies sandbox map.
Tweaked the elite Egyptian pikeman shield.
This was SVN commit r14747.
2014-02-13 15:08:01 +00:00
14a7e60bd5
Elite Egyptian Pikeman.
...
This was SVN commit r14746.
2014-02-11 17:51:01 +00:00
e49b1e1ceb
fix AI error
...
This was SVN commit r14745.
2014-02-09 19:54:50 +00:00
d8152f1eda
exchange if order otherwise we can't make a trade route with a damaged market
...
This was SVN commit r14744.
2014-02-09 18:42:06 +00:00
44eb336dfe
Added 4 stall variations as eyecandy with different cloth textures.
...
Added material for barley/wheat props.
Modified spec and normal maps of ptolemaic struct (for matching last
edit adding carpets)
This was SVN commit r14743.
2014-02-09 16:51:33 +00:00
9780d7177d
Adds some missing vars.
...
This was SVN commit r14742.
2014-02-09 16:04:30 +00:00
dea18ed318
4-player Greek Acropolis skirmish map
...
This was SVN commit r14741.
2014-02-09 13:07:33 +00:00
c5beeb7a02
rename Median Oasis maps, fixes #2425
...
This was SVN commit r14740.
2014-02-09 09:48:14 +00:00
df1221e9f5
Correct inverted sprites on modern tickbox and add a default modern tooltip style.
...
This was SVN commit r14739.
2014-02-09 05:31:25 +00:00
01611c1675
Fixes AI error when building a new base, and improves the AI's early game and tendency to grab terrain. Fixes incorrect release of some units by the defense manager.
...
This was SVN commit r14738.
2014-02-07 18:36:37 +00:00
05f13bb1d8
fix ai bug
...
This was SVN commit r14737.
2014-02-07 18:00:41 +00:00
563768363b
clean useless formations
...
This was SVN commit r14736.
2014-02-07 17:01:01 +00:00
a0b0b6d74e
Applying the new improvements: Gear, Guadalquivir River.
...
This was SVN commit r14735.
2014-02-07 09:23:14 +00:00
7277385891
fix typo
...
This was SVN commit r14734.
2014-02-07 07:52:10 +00:00
31e98e5c03
Reverts f25edfd8f1. Structured clones don't support cyclic references in SpiderMonkey v1.8.5.
...
SpiderMonkey v24 supports it and I'll add this change to #1886 instead.
Refs #2416
Refs #2415
Refs #1886
This was SVN commit r14733.
2014-02-06 13:32:09 +00:00
fa85527baf
Send messages in queue before closing connection, patch by boeseRaupe. Fixes #2420
...
This was SVN commit r14732.
2014-02-05 02:44:25 +00:00
035078c317
Disables checks in os_cpu_LargePageSize Windows implementation, since they failed on Vista SP2 with old Xeon CPU, fixes #2346
...
This was SVN commit r14731.
2014-02-04 22:30:29 +00:00
72d306873f
Correctly handle the keypad enter in CInput.cpp and make the return key case catch SDLK_RETURN instead of '/r' for consistancy and readability.
...
This was SVN commit r14730.
2014-02-03 21:46:27 +00:00
91be7d9bd1
New history blurb for Skiritai by forum contributor Thorfinn.
...
This was SVN commit r14729.
2014-02-03 16:25:08 +00:00
e408ac46b1
2 player skirmish Median Oasis.
...
This was SVN commit r14728.
2014-02-03 16:16:31 +00:00
e329a93978
Ghost commit for fields
...
This was SVN commit r14727.
2014-02-03 05:12:36 +00:00
9971e3cfab
Add formation check
...
This was SVN commit r14726.
2014-02-02 09:15:34 +00:00
4be80f9322
Improves error handling in sound manager. Fixes some crashes and errors that could occur when OpenAL failed to init properly, fixes #2183 , #2345
...
This was SVN commit r14725.
2014-02-02 05:58:27 +00:00
f25edfd8f1
Removes ValueCloner.
...
Fixes #2416
Refs #2415
Refs #1886
This was SVN commit r14724.
2014-02-01 20:37:33 +00:00
c9aeaa1612
Fix a "big typo" in the attack plans, thanks mimo.
...
This was SVN commit r14723.
2014-02-01 18:34:24 +00:00
ddf9d948cf
Fix some more debug in the AI.
...
This was SVN commit r14722.
2014-02-01 18:05:39 +00:00
5b506ceee3
prevent AI to try to attack its allies, fix #2393
...
This was SVN commit r14721.
2014-02-01 17:59:29 +00:00
e21f052803
prevent error when an animal changes ownership
...
This was SVN commit r14720.
2014-02-01 17:55:27 +00:00
94a240737c
Added more territory auras.
...
Fixed the Theatron for Hellenic civs. It now uses the Hellenization
effect correctly!
This was SVN commit r14719.
2014-02-01 12:09:06 +00:00
1f1a2ead44
Adding the missing cheats from [14712]. Refs #2072
...
This was SVN commit r14718.
2014-02-01 09:11:38 +00:00
e4e32c8cd7
Fixes a typo from 1d3ac14d35.
...
This was SVN commit r14717.
2014-02-01 03:55:24 +00:00
e6cf2f23c5
Fix AI debug mode.
...
This was SVN commit r14716.
2014-02-01 03:29:55 +00:00
c3cdf40f33
Somewhat experimental rewrite and simplification of the worker's logic to choose dropsites. Might behave unexpectedly now and then.
...
Error fixes here and there.
This was SVN commit r14715.
2014-02-01 00:44:12 +00:00
12aa170c58
Trying different territory weights.
...
This was SVN commit r14713.
2014-01-31 18:47:08 +00:00
60619dbf3f
Add technologies cheat. Fixes #2072 . Patch by boeseRaupe
...
This was SVN commit r14712.
2014-01-31 15:30:16 +00:00
1fad924411
Checking if cmpPlayer is valid.
...
This was SVN commit r14711.
2014-01-31 14:47:23 +00:00
9fe465884d
Implements resource trickle. Allows decimal player resources. Fixes #2413 .
...
This was SVN commit r14710.
2014-01-31 12:01:49 +00:00
0157e640cc
Make my last commit C++98 compatible.
...
This was SVN commit r14709.
2014-01-31 01:26:08 +00:00
c3d9769622
Fixed iberian corral cloth ao texture assigned
...
This was SVN commit r14708.
2014-01-30 19:36:38 +00:00
708f003df3
Applying the new improvements: English Channel, Fortress
...
More cleanup and tweaks.
This was SVN commit r14707.
2014-01-30 17:09:45 +00:00
ff4ed09b6f
Backend for special formatting of moderaters in the lobby userlist.
...
This was SVN commit r14706.
2014-01-30 15:46:19 +00:00
bab3a08643
Fixes a crash introduced in fd187f466f by ensuring that the CScriptValRooted values are destroyed before calling JS_DestroyContext.
...
I've tested the performance on Combat Demo (Huge) again with the code
from #2394 .
It's very close but probably a little bit lower (hard to tell because
it's so close).
Closes #2408
Refs #2394
This was SVN commit r14705.
2014-01-30 13:21:36 +00:00
b9eea330d0
Strip some whitespace and fix a warning in session.js
...
This was SVN commit r14704.
2014-01-29 19:00:47 +00:00
1d3ac14d35
Better summary screen. Fixes #686 . Patch by Bajter and Kabzerek
...
This was SVN commit r14703.
2014-01-29 18:30:56 +00:00
459f13e72b
Clean up the colorfade code. Patch by boeseRaupe, fixes #2395
...
This was SVN commit r14702.
2014-01-29 14:49:36 +00:00
7395d9c75a
Applying the new improvements: Canyon, Continent, Corinthian Isthmus
...
Some cleanup and small tweaks.
This was SVN commit r14701.
2014-01-29 14:21:48 +00:00
639b583d31
Fix scatter formation
...
This was SVN commit r14700.
2014-01-29 14:01:21 +00:00
d6f8742f9b
Change hawk and boar skeletons so that the root identifiers are unique. Fixes #2332 .
...
Also adjust the DAEs to fit the new identifiers.
This was SVN commit r14699.
2014-01-29 04:14:24 +00:00
f097078d46
Send the move command directly instead of going through the FSM. That way, the failure can be catched earlier on. Should fix #2410
...
This was SVN commit r14698.
2014-01-28 20:40:38 +00:00
8953179e1a
allow the possibility to define route with waypoints when doing trade, fixes #1207 , #1821 and #1822
...
This was SVN commit r14697.
2014-01-28 18:56:39 +00:00
23777ba736
fix cbc1c9f0ab
...
This was SVN commit r14696.
2014-01-27 19:25:38 +00:00
325f9ca9a9
Sorry Brits. Changed "plough" (British spelling) to "plow" (American/Canadian spelling) after seeing more than one person on Youtube mispronounce the word.
...
Can only build 1 Juggernaut.
All champion cavalry now cost Food and Metal.
This was SVN commit r14695.
2014-01-27 16:16:32 +00:00
c751500907
Refactor some formation code to let it make use of the prototypes
...
This was SVN commit r14693.
2014-01-27 12:34:59 +00:00
7bcdb9f46d
Remove two un-needed string initilizations from my earlier changes.
...
This was SVN commit r14692.
2014-01-27 05:46:21 +00:00
78ff9a8480
Fix compilation failures with wxWidgets 3.0. Fixes #2375 .
...
This was SVN commit r14691.
2014-01-27 00:02:03 +00:00
0406c89908
Implements GetMonitorSize for OS X, patch by Echelon9, fixes #2390
...
This was SVN commit r14690.
2014-01-26 23:03:45 +00:00
cbc1c9f0ab
fixes remaining town bell defects, closes #2353 , patch by Itms
...
This was SVN commit r14689.
2014-01-26 20:37:39 +00:00
c61badb04c
Fix typo.
...
This was SVN commit r14688.
2014-01-26 19:29:21 +00:00
2a1240008c
Make my previous changes < C++11 compatible.
...
This was SVN commit r14687.
2014-01-26 19:23:50 +00:00
5e70bd3628
Fix and cleanup my recent changes.
...
This was SVN commit r14686.
2014-01-26 19:01:21 +00:00
cb3a8d868a
fix bug when garrisoning under alert and garrisonHolder is full, patch by Itms, see #2353
...
This was SVN commit r14685.
2014-01-26 18:28:55 +00:00
3e1fc74add
improve alert tooltip, see #2353
...
This was SVN commit r14684.
2014-01-26 18:17:13 +00:00
9ed11bc404
keep work orders when in alert, patch by Itms, addresses #2353
...
This was SVN commit r14683.
2014-01-26 18:01:29 +00:00
09a2729503
fix a fix
...
This was SVN commit r14682.
2014-01-26 09:40:54 +00:00
f1ab9b8e57
Check isInWorld before asking position
...
This was SVN commit r14681.
2014-01-26 09:24:32 +00:00
5ec0dc8ae8
Fix a bug with one of the lobby settings I added to the options window.
...
This was SVN commit r14680.
2014-01-26 05:51:48 +00:00
39fef5c299
Add the ability to display chat messages when joining the lobby and quickly mostly update the options window to the new UI style.
...
This was SVN commit r14679.
2014-01-26 05:39:55 +00:00
a8fbe4eedc
Centralizes centering rating into one function.
...
This was SVN commit r14678.
2014-01-26 05:27:00 +00:00
041c6ab1b3
More lobby cleanup.
...
This was SVN commit r14677.
2014-01-26 04:25:35 +00:00
58a44bfbcb
Adds missing comment in build-osx-libs.sh
...
This was SVN commit r14676.
2014-01-26 03:40:54 +00:00
5187c6e4a5
Explicitly disables SDL X video driver in build-osx-libs.sh, to fix SDL_VIDEO_DRIVER_X11 definition used in HWDetect.cpp
...
This was SVN commit r14675.
2014-01-26 03:12:05 +00:00
937ee8f77c
Fixes clang "hidden overloaded virtual function" warning, patch by Echelon9, fixes #2388
...
This was SVN commit r14674.
2014-01-26 01:20:34 +00:00
0db9a18d39
Fix issue where lobby spam was being sent to external clients.
...
This was SVN commit r14672.
2014-01-25 21:58:22 +00:00
851c05a038
Cleanup and spam blocker redesign in lobby.js.
...
This was SVN commit r14671.
2014-01-25 20:51:01 +00:00
41a7c78e62
Fix some stuff in XmppClient.cpp on leper's recommendation.
...
This was SVN commit r14670.
2014-01-25 20:49:48 +00:00
28a707f98f
small cleaning
...
This was SVN commit r14669.
2014-01-25 19:58:59 +00:00
69991cd110
Deletes extra whitespace from last commit.
...
This was SVN commit r14668.
2014-01-25 19:00:22 +00:00
e183e87333
Adds a message that is triggered whenever the bot's name is mentioned when a user doesn't recognize the bot isn't human (which happens quite a lot)
...
This was SVN commit r14667.
2014-01-25 18:57:28 +00:00
2b407a03eb
Added Stanislas69 iberian corral with several fixes.
...
Fixed iberian struct normal and specmap.
This was SVN commit r14666.
2014-01-25 16:50:21 +00:00
9eb26c2622
Fix infinite loop when attacking a formation without valid targets
...
This was SVN commit r14665.
2014-01-25 16:27:55 +00:00
0f5e5fddd6
This was SVN commit r14664.
2014-01-25 14:45:58 +00:00
12a691edc2
Make my previous changes support < C++11 and Windows.
...
This was SVN commit r14661.
2014-01-24 20:31:39 +00:00
3f00d0cc9c
Fix some broken maps. Delete some others.
...
This was SVN commit r14660.
2014-01-24 20:23:11 +00:00
ecaded076f
Improve the Vector prototype with static functions. Replace the usage of the Math vector functions with functions from the Vector class.
...
This was SVN commit r14659.
2014-01-24 19:51:00 +00:00
5d4f509810
Update existing minimap idle button, add minimap idle button highlight and disabled, and some style fixes in session.xml. Refs #823 and refs #2357
...
This was SVN commit r14658.
2014-01-24 18:40:01 +00:00
2f145b1578
Iron Spearheads tech now affects all spear units (not just infantry spearmen).
...
Javelin Thong tech now affects all javelin units (not just infantry
javelinists).
Some shield tweaking.
Some more portraits.
This was SVN commit r14657.
2014-01-24 18:28:26 +00:00
b46a6de335
Allow using the XMPP room subject to display lobby information to user, make the lobby GUI code more readable, and cleanup the modern styles.
...
This was SVN commit r14656.
2014-01-24 18:20:15 +00:00
dd274113bc
Fix #2403
...
This was SVN commit r14655.
2014-01-24 18:15:42 +00:00
d5609e33a6
Fixed elephant african bush actor and mesh
...
This was SVN commit r14654.
2014-01-24 15:04:58 +00:00
609e789cea
Fixing the bug with the ramp in Cantabrian Highlands.
...
Applying the new improvements: Archipelago, Atlas Mountains, Cantabrian
Highlands.
This was SVN commit r14653.
2014-01-24 12:28:30 +00:00
f94a1aeac0
Checks for game end after toggling diplomacy. Also adds a comment for clarification to the lobby bot. Refs #2402 .
...
This was SVN commit r14652.
2014-01-24 00:38:08 +00:00
53900c082b
Added some criteria for rated games. Fixes #2402 .
...
This was SVN commit r14651.
2014-01-24 00:22:50 +00:00
e5e634f768
Displays ratings in the userlist. Fixes #2371 .
...
This was SVN commit r14650.
2014-01-23 23:13:13 +00:00
d82282e358
Added animations for african bush elephant.
...
This was SVN commit r14649.
2014-01-23 21:41:58 +00:00
cf851a7789
A bunch of naming stuff.
...
This was SVN commit r14648.
2014-01-23 18:32:21 +00:00
35517f2cd6
commited basic_glow.xml material for self-illumination objects.
...
This was SVN commit r14647.
2014-01-23 17:50:00 +00:00
fd187f466f
Add vector prototype to vector-like return values from C++ to JS. Fixes #2394 .
...
This was SVN commit r14645.
2014-01-23 11:32:08 +00:00
d677033c4c
Serialise Cost component since the population bonus is tech-modifiable. Fixes #2399
...
This was SVN commit r14644.
2014-01-23 08:56:22 +00:00
df0cdf8561
Fix typo in the Lake random map script.
...
This was SVN commit r14643.
2014-01-23 04:48:52 +00:00
8d5c02091a
Added greek, arabic and big tents as eyecandy, they will be used in the ptolemaic mercenary camp.
...
Added Stanislas69's new gaul farmstead with some fixes. (Thanks
Stanislas69!)
Added carpet texture fragments to the ptolemaic struct texture
This was SVN commit r14642.
2014-01-22 22:59:06 +00:00
ef79e8305b
An addition to bd3f5a8085, also refs #1964
...
This was SVN commit r14641.
2014-01-22 20:56:14 +00:00
bd3f5a8085
Removing the AI check for producing un-allowed units. Should be fixed in the AI side with ad8fa37f17. Refs #1964 .
...
This was SVN commit r14640.
2014-01-22 20:47:51 +00:00
ad8fa37f17
Improve some building placement. May improve dropsite usage slightly.
...
Should fix #1964
This was SVN commit r14639.
2014-01-22 20:26:45 +00:00
1fedf11e9e
Use a filter to pick a new attack target in the same turn, while still avoiding an infinite loop
...
This was SVN commit r14638.
2014-01-22 18:38:15 +00:00
a58acb28f0
Style improvements (thanks Leper).
...
Fix AI building its buildings closer together by properly moving failed
foundations out of the world.
This was SVN commit r14637.
2014-01-22 17:54:20 +00:00
546a26467f
Cavalry Spearmen for Sparta. Gives them a melee cavalry for proper anti-siege.
...
This was SVN commit r14636.
2014-01-22 16:34:00 +00:00
01ec56cc0c
A bunch of updated portraits. Thinking of going this color-coded route: Blue for citizen-soldiers. Red for champions and heroes. Maybe green for mercenary soldiers.
...
Tweaked a couple footprints.
This was SVN commit r14635.
2014-01-22 15:42:28 +00:00
32844e9a16
Fix tests + improve behaviour of attacking when not in formation
...
This was SVN commit r14634.
2014-01-22 15:13:07 +00:00
04aba0e41a
Let certain formations stay in formation while attacking
...
This was SVN commit r14633.
2014-01-22 13:20:55 +00:00
de02ab2e53
Fix various bugs. Try to make the AI build its buildings closer together (WIP, and it's brute-force).
...
This was SVN commit r14632.
2014-01-22 03:11:19 +00:00
df3bdcf8ca
add back some lines removed unintentionally by previous tag
...
This was SVN commit r14631.
2014-01-21 22:59:21 +00:00
41d3366f6a
check version and mods before loading a file, fixes #2361 and #2385 .
...
This was SVN commit r14630.
2014-01-21 22:49:42 +00:00
7d18fecbcd
Fix some errors reported by Gildas, Lion_Kanzen and Gameboy. Prepare for formation fighting in the attack plans by having a more generic "army" component.
...
This was SVN commit r14629.
2014-01-21 20:24:51 +00:00
e466565c35
Let formations attack other formations (still without keeping their formation position though)
...
This was SVN commit r14628.
2014-01-21 16:50:58 +00:00
2ca25a6d3e
differentiate between formations that can attack, and formations that can only move. Use the differentiation in the range calculation.
...
This was SVN commit r14627.
2014-01-21 09:10:17 +00:00
453bd6c8a0
Fix typo (Cepio -> Caepio), reported by qwertz.
...
This was SVN commit r14626.
2014-01-21 00:41:17 +00:00
3955447b5b
Applying the new improvements: Alpine Lakes, Anatolian Plateau
...
This was SVN commit r14625.
2014-01-20 15:44:28 +00:00
7763a22c08
revert having giving the attack state to formation controllers as it caused too much trouble
...
This was SVN commit r14624.
2014-01-19 18:03:43 +00:00
72ad5467e8
Applying the new improvements: Aegean Sea, Lake, Rivers
...
This was SVN commit r14623.
2014-01-19 15:38:02 +00:00
8b2037e5ee
Some naming stuff.
...
Reduced the size of a spec map.
This was SVN commit r14622.
2014-01-19 12:58:18 +00:00
6036b48c1d
WIP: Completing the unified random map syntax.
...
This was SVN commit r14621.
2014-01-19 11:58:24 +00:00
d06ab6514b
WIP: Setting ground for a unified random map syntax. Might break some current random maps.
...
Faster generation.
Better mountains.
Larger forests.
Should make it easier to design/tweak random maps.
This was SVN commit r14620.
2014-01-19 06:51:41 +00:00
8845910f9c
Of course the time I don't test before committing is the time I make a syntax error. I think the RNG hates me.
...
This was SVN commit r14619.
2014-01-19 02:57:40 +00:00
7a520adbf3
Improve the wording of attack tooltips.
...
This was SVN commit r14618.
2014-01-19 02:01:21 +00:00
3c04cdb8e0
Updates LICENSE.txt for 29a8df5029, refs #2308 .
...
Sets svn:ignore property on generated cpp from encryption tests.
This was SVN commit r14617.
2014-01-18 23:41:27 +00:00
f2f0307a25
fix typo.
...
This was SVN commit r14616.
2014-01-18 21:05:53 +00:00
c2d43b009c
Fix asking for non-existing templates of killed units
...
This was SVN commit r14614.
2014-01-18 20:56:21 +00:00
3cde5632ff
Fix StoneCrossBox sizing.
...
This was SVN commit r14613.
2014-01-18 20:29:21 +00:00
9330975d54
Fix Athens not researching civ phase. Make the AI adapt automatically to changing the max gatherers on fields.
...
Fix auto-researched technologies not being properly researched on init.
Fix the tests (amazing!).
GarrisonHolder sends which entities were added or removed (mostly for AI
purposes but could benefit other things).
Streamline AIInterface events.
This was SVN commit r14612.
2014-01-18 20:26:52 +00:00
76451a297e
This was SVN commit r14611.
2014-01-18 20:21:06 +00:00
c4643d925d
Fix two bugs in attack tooltips. Add an extra Math.round to ensure we don't get huge decimals, and use a building's default arrow count as a minimum in rate calculation.
...
This was SVN commit r14610.
2014-01-18 19:20:17 +00:00
ea526eedd1
Adjust the attack tooltips. Make the formatting for attack rate more consistent and use meters instead of tiles for range.
...
This was SVN commit r14609.
2014-01-18 18:59:51 +00:00
046c5ef74c
Make chariots faster, and give them a more consistent (and slightly smaller) obstruction radius.
...
Citizen chariots are now 15.0 speed (1 faster than cavalry), champion
chariots 16.0, and hero chariots 18.0.
This was SVN commit r14608.
2014-01-18 18:08:02 +00:00
ca6301c399
Reduced number of gatherers for farms from 5 to 3 for testing.
...
This was SVN commit r14607.
2014-01-18 16:47:04 +00:00
c02dafec74
Move simulation Vector math to globalscripts/Math.js. Refs #2032 .
...
This was SVN commit r14606.
2014-01-18 15:27:30 +00:00
ae35ed255f
For the Celts, moved Blacksmith to the Village Phase. This isn't much of a bonus yet until we get some unique tech trees for the Blacksmith.
...
This was SVN commit r14605.
2014-01-18 15:04:20 +00:00
061c5f8ced
Fixing pop cost for advanced Persian chariot.
...
This was SVN commit r14604.
2014-01-18 15:03:08 +00:00
36edaa5635
Siege Workshop for the Macedonians. Needs a new model.
...
Persians get the Nisean War Horses tech.
This was SVN commit r14603.
2014-01-18 15:02:16 +00:00
29a8df5029
Change the licence of sha.h to match the licence of sha.cpp. Refs #2308
...
This was SVN commit r14602.
2014-01-18 13:12:29 +00:00
8c971c4a10
Trying to make elephant attack sounds not so crazy. Unsuccessful.
...
This was SVN commit r14601.
2014-01-18 12:35:55 +00:00
c316079cc7
Updated names for female citizens.
...
Updated Seleucid rally banner (still not happy with it).
Fixed name of Nisean War Horses tech.
This was SVN commit r14600.
2014-01-18 12:33:19 +00:00
1040cf2034
Add back a new minimap overlay, re-add and implement the original idle button, little whitespace cleanup, and delete some old unused ui images.
...
This was SVN commit r14599.
2014-01-18 02:38:07 +00:00
82ab190c5d
Do what my previous commit was supposed to do.
...
This was SVN commit r14598.
2014-01-18 00:37:00 +00:00
9ad01e52fb
Add third_party/encryption in premake as required for the lobby.
...
This was SVN commit r14597.
2014-01-17 23:51:23 +00:00
94822b791f
Remove automatically generated test .cpp files.
...
This was SVN commit r14596.
2014-01-17 20:17:56 +00:00
32258b2ba3
Move lobby encryption code to third_party/encryption and add tests. Fixes #2308
...
This was SVN commit r14595.
2014-01-17 20:14:41 +00:00
d80967111d
Fixes a problem with the renderpath screen not being displayed.
...
Refs #2241
This was SVN commit r14593.
2014-01-17 18:40:36 +00:00
377c780ddd
Fixes the problem that functions in globalscripts aren't available from GUI scripts anymore since 4b1297b328.
...
Refs #2241
This was SVN commit r14592.
2014-01-17 18:21:27 +00:00
c094e72ede
Fixes scoping for icons in GUI text, instead of using only the top page on the stack, which caused errors when dialog boxes popped up over text containing icons
...
This was SVN commit r14591.
2014-01-17 02:54:57 +00:00
c39b541714
Fixes some typoes in the bot README
...
This was SVN commit r14590.
2014-01-16 23:22:14 +00:00
aba3d8d9d5
Shield tweaking for the Bronze Shield and Gold Shield pikemen.
...
Adjusted hero health.
Made champions use arrow selections, while citizen soldiers use circles.
A bunch of updated portraits.
Seleucids changes.
Map updates.
New techs.
Roman siege walls a little weaker.
This was SVN commit r14589.
2014-01-16 23:21:57 +00:00
c1e86161b5
AIs now properly receive aura and technology updates. Fixes #2377 , Refs #1520 . Consequently reimplement repairing for AIs.
...
Fix a few style issues and a bug with the gatherer count.
Still need to fix the entity.js file to handle properly some things as
this uses raw templates values.
Cache the AIinterface in AIProxy.js, please report if this works
properly.
This was SVN commit r14588.
2014-01-16 20:32:44 +00:00
4b828ae6bf
Fix gaul fortress death variation. Fixes #2374
...
This was SVN commit r14587.
2014-01-16 19:26:39 +00:00
4a133264f5
Fix unit tests
...
This was SVN commit r14586.
2014-01-15 13:36:33 +00:00
786afd9fcc
Implement the number of gaia gatherers (it probably won't happen but it's safer that way).
...
Change UnitAI to call "leave" handlers on a conversion, like on a
destruction, so a unit will safely go to idle state on
resignation/conversions. Might fix some very weird bugs that probably
haven't been reported yet.
Reported by AlThePhoenix.
Fixes #2383 .
This was SVN commit r14585.
2014-01-15 00:04:25 +00:00
a6dbf6a268
instead of removing members from formations as in e98478b68c, let the members stay in formation, but disable formation rearrangement in those cases.
...
This fixes issues with queueing orders, and should also fix #2380
This was SVN commit r14584.
2014-01-14 21:32:51 +00:00
13105132a4
http://gifrific.com/wp-content/uploads/2012/06/You-Didnt-See-Anything-Madagascar.gif
...
This was SVN commit r14583.
2014-01-14 20:20:53 +00:00
d23b7deb98
Various improvements to AI's early game. Simplify some code and improve on other. Add a few different strategies (Rush/normal/boom, quite basic for now, refs #2344 ).
...
Aegis should mostly respect tech limitations so I'll ref #1964 .
I'm going to go with #2364 is fixed, the AI should be more efficient in
early-game, and late-game is a known problem.
Fixes #2274 and fixes #2379 .
Refs #2372 as it should fix several of those warnings for AIs.
Fixes #2256 with a new bartering system, in parts taken from mimo's
patch.
This was SVN commit r14582.
2014-01-14 19:54:31 +00:00
e98478b68c
Make sure units in INDIVIDUAL state don't belong to a formation. Should fix #2380
...
This was SVN commit r14581.
2014-01-14 08:58:11 +00:00
0f56dceef2
Give the minimap 20px more on eack side and remove the ugly overlay. Also cleanup some nearby code.
...
This was SVN commit r14580.
2014-01-14 03:25:12 +00:00
2ca0a20f81
Fix a bug in TestAllMemberFunction and initialize a variable in cmpBattleDetection. Refs #2372 .
...
This was SVN commit r14579.
2014-01-12 23:13:24 +00:00
a26ab7b1e7
Should fix AI warnings (refs #2372 ).
...
Slight configuration changes to improve the early-game slightly, WIP.
This was SVN commit r14578.
2014-01-12 19:12:55 +00:00
0521d936a1
reduce a GuiInterface call for displaying formation tooltip
...
This was SVN commit r14577.
2014-01-12 18:39:47 +00:00
34949b0943
Fixes some AI errors and missing VARs.
...
This was SVN commit r14576.
2014-01-12 17:34:18 +00:00
6c3bd4db1e
Fix previous AI commit.
...
This was SVN commit r14575.
2014-01-12 02:40:42 +00:00
9d02495a96
Fix a few bugs.
...
Improve the AI gamestate to make better use of entity collections,
should be very slightly faster, and it's cleaner.
Remove enemy watchers that were no longer used.
This was SVN commit r14574.
2014-01-12 01:07:07 +00:00
8195e767ef
Fixes an occasional crash when hotloading GUI files.
...
Refs #2241
This was SVN commit r14573.
2014-01-11 20:53:01 +00:00
bc9b76c86b
Fix an error in defense.js (thanks mimo), and an issue in the HQ that made the AI start super slowly on some maps.
...
This was SVN commit r14572.
2014-01-11 18:51:37 +00:00
4ef80d26aa
Proper fix for the gatherer count. Fix an AI bug. Thanks to Gameboy and Gildas for reporting.
...
This was SVN commit r14571.
2014-01-11 18:14:13 +00:00
0e0b4e3057
make population bonus technology modifiable
...
This was SVN commit r14570.
2014-01-11 14:55:22 +00:00
96448bfa4e
* add a (currently useless) attack state to formations
...
* add a formation attack component that will be used in the future to
coordinate formation attacks
* clean up some related methods, and move some to more appropriate
places
This was SVN commit r14569.
2014-01-11 12:19:43 +00:00
20692a26b0
Fix some undefined errors with unknown presences in the lobby and recougnize the 'gone' presence as away.
...
This was SVN commit r14568.
2014-01-11 03:53:41 +00:00
eee6ed65dc
still another fix to the gatherer count
...
This was SVN commit r14567.
2014-01-10 22:50:13 +00:00
82fa27bad4
http://i.imgur.com/iAwfubL.gif
...
This was SVN commit r14566.
2014-01-10 20:33:47 +00:00
df9fb05689
Fix the gatherer count per player further and some style niceness.
...
This was SVN commit r14565.
2014-01-10 20:27:34 +00:00
7606230158
Vars and style fixes.
...
This was SVN commit r14564.
2014-01-10 20:04:37 +00:00
9f243a3372
Disabling the OFFSET_LINE doesn't change any functionality as far as seen, while it fixes #2368 .
...
This was SVN commit r14563.
2014-01-10 19:56:36 +00:00
11430cf927
Remove scripting directory from premake4.lua
...
(I forgot that in cbc0650a79
2014-01-10 19:52:57 +00:00
cbc0650a79
Removes some unused files
...
This was SVN commit r14561.
2014-01-10 19:38:34 +00:00
bd22432fe8
Rename common-api-v3 to common-api.
...
Fix warnings with the new AI.
Fix an error with the per-player gatherer counts.
This was SVN commit r14559.
2014-01-10 17:46:48 +00:00
87250a79c9
delete groups with a right click. Fixes #2341 . Patch by boeseRaupe
...
This was SVN commit r14558.
2014-01-10 16:51:13 +00:00
f9a2c30a17
fix tests
...
This was SVN commit r14557.
2014-01-10 16:36:04 +00:00
ee39f21b52
Fixes a problem when messageboxes were called without callback function.
...
Fixes #2367
Refs #2241
This was SVN commit r14556.
2014-01-10 16:25:09 +00:00
3d23f81696
Show the number of attacks per second to show users some attack speed, without showing the actual timers, or calcualtion of the number of arrows. Fixes #2352
...
This was SVN commit r14555.
2014-01-10 09:17:40 +00:00
72c2853563
Update the tutorial AI (somewhat untested and hacky).
...
This was SVN commit r14554.
2014-01-10 02:08:59 +00:00
a6032ddd3f
Removes older AIs and APIs.
...
For the sake of it, we should have a minimal AI sometimes.
This was SVN commit r14553.
2014-01-10 01:48:09 +00:00
ede4f32bf2
Change the defense system used by Aegis to use more modular armies. This should be faster and easier to extend, though right now it might not be as efficient as before.
...
Fix a few bugs, including a few bad ones in the economy.
Change the way messages are handled, should be marginally faster in the
later game.
Makes gatherers count limit be per-player (refs #1387 and #643 ).
This was SVN commit r14552.
2014-01-10 01:46:27 +00:00
22a85b0eb4
add dummy setspeed method to UnitMotionFlying
...
This was SVN commit r14551.
2014-01-09 12:53:28 +00:00
ec36222b20
add more flexibility to eject units when garrisonHolder is destroyed, fixes #2242
...
This was SVN commit r14550.
2014-01-08 18:27:58 +00:00
2d806f81f0
If at first you don't succeed…
...
Refs #2359
This was SVN commit r14549.
2014-01-08 18:18:52 +00:00
641c65b1dd
Give some explanation to my change in 0c336649e6
...
This was SVN commit r14548.
2014-01-08 17:57:12 +00:00
0c336649e6
fix repairing buildings
...
This was SVN commit r14547.
2014-01-08 15:39:32 +00:00
774d56af7e
Carthaginian farmstead remake
...
This was SVN commit r14546.
2014-01-08 15:19:35 +00:00
9229cea9cc
allow repairing of moving objects
...
This was SVN commit r14545.
2014-01-08 13:39:33 +00:00
f9b950aa96
improve rearrange of idle formation when units are tasked away from the formation + fix formation-settable idle animations
...
This was SVN commit r14544.
2014-01-08 10:55:44 +00:00
e8c4031bea
Don't disband idle formations anymore, but give the formations a decent idle state. Formationmembers still need to leave the formation to anything other than walking, but this is a small step towards attacking formations.
...
This was SVN commit r14543.
2014-01-08 09:47:27 +00:00
4585f7322c
Make the tooltips and the required members part of the formation template + fix allowing the wedge formation only for cavalry
...
This was SVN commit r14542.
2014-01-08 08:02:15 +00:00
bec7cfd520
Another attempt to fix the lobby disconnects.
...
This was SVN commit r14541.
2014-01-08 04:22:34 +00:00
7e87211d91
Attempts to fix crash reported on OS X Mavericks by not calling SDL_SetGamma in that case (this patch was included in the A15 bundles), refs #2272
...
This was SVN commit r14540.
2014-01-08 01:29:04 +00:00
0482038af2
Another go at #2359
...
This was SVN commit r14539.
2014-01-08 00:06:26 +00:00
ad6ed949ee
Fixes unreferenced formal parameter warning in MSVC
...
This was SVN commit r14538.
2014-01-07 23:10:06 +00:00
aadd297cce
Implement the ability to switch animations based on the formation position
...
This was SVN commit r14537.
2014-01-07 20:21:55 +00:00
ff2a7d6bad
fix spelling mistakes
...
This was SVN commit r14536.
2014-01-07 19:43:32 +00:00
83c5d40cfb
fix compiling problem caused by 8226d75715
...
This was SVN commit r14535.
2014-01-07 14:37:02 +00:00
b1e0f1b62a
Clean up the mess of different ways to note the formations (capitalised, with spaces, with underscores, concatenated ...) by always referring to the template name.
...
This was SVN commit r14534.
2014-01-07 13:33:08 +00:00
94907897a7
Fix tests + fix classes Ashoka. Fixes #2362
...
This was SVN commit r14533.
2014-01-07 09:23:59 +00:00
8226d75715
Make PickEntitiesAtPoint faster yielding 1-3% overall performance improvement. Fixes #2358 . Also removes some trailing whitespace.
...
This was SVN commit r14532.
2014-01-07 04:05:10 +00:00
729a795a44
of course, 7a3b1fe47e can be simplified
...
This was SVN commit r14531.
2014-01-06 23:23:18 +00:00
7a3b1fe47e
Improve speed of territory computation, fixes #2360
...
This was SVN commit r14530.
2014-01-06 22:49:57 +00:00
d0e57cb0ff
Change a few things to avoid warnings with gcc. Should fix #2359
...
This was SVN commit r14529.
2014-01-06 22:14:27 +00:00
baf6925b66
Tactical varfare.
...
This was SVN commit r14528.
2014-01-06 20:55:22 +00:00
8cc1ddf6de
Small code style fix
...
This was SVN commit r14527.
2014-01-06 20:13:55 +00:00
b4fa090435
fix losRangeQuery broken in e096df0070
...
This was SVN commit r14526.
2014-01-06 19:35:51 +00:00
3406f2f3e8
Fix code style of files committed too soon in f19a8d6b41
...
Adds blinking overlay to ther hero icon when he's attacked
Adds a health bar to the hero icon
Fixes #1902
Patch by boeseRaupe
This was SVN commit r14525.
2014-01-06 13:48:17 +00:00
f19a8d6b41
Take the box formation out of the special case formations
...
This was SVN commit r14524.
2014-01-06 13:32:48 +00:00
5cde6f7046
small rome tower edit
...
This was SVN commit r14523.
2014-01-06 12:50:50 +00:00
9989359c46
Small code cleanup + fixed default formation orientation
...
This was SVN commit r14522.
2014-01-06 10:16:28 +00:00
2f077fd9e1
Remove wedge formation from being a special case in the formation code
...
This was SVN commit r14521.
2014-01-06 09:10:46 +00:00
9ccaa42a54
Fixes MSVC warning C4706: assignment within conditional expression
...
This was SVN commit r14519.
2014-01-06 02:16:09 +00:00
92ed27e3c5
Treat the flank formation as a regular formation, rather than a special implementation.
...
This was SVN commit r14518.
2014-01-05 18:50:31 +00:00
f814510b2e
revise the chase and flee
...
This was SVN commit r14517.
2014-01-05 18:29:38 +00:00
b8ee766cd3
Remove some hardcoded formation shapes. Some special formations still have a special treatment though. Also implement speed modifiers for formations, so we can have faster and slower formations.
...
This was SVN commit r14516.
2014-01-05 17:13:22 +00:00
aa0d485d72
Fix improper disabling of waves.
...
This was SVN commit r14515.
2014-01-05 16:41:50 +00:00
15ec863aec
Substantial speed-up of the foam generation code.
...
Remove waves for now as they were unsatisfactory.
Removes "shininess" as a water parameter as it was basically useless.
Add a button in Atlas to recompute water parameters so you can now see
fog in Atlas.
Fixes #1743 , #1803 (invalid)
Refs #1875 , #2114 , #48 .
This was SVN commit r14514.
2014-01-05 16:15:20 +00:00
d56595c802
Put into alert units trained during an alert, fixes #2342 , patch by Itms
...
This was SVN commit r14513.
2014-01-05 15:12:17 +00:00
7193e29961
Adds precompiled.h include because Visual Studio checks for that even though the file only contains comments.
...
Thanks to boeseRaupe for reporting.
Refs #2348
This was SVN commit r14512.
2014-01-05 13:58:38 +00:00
b20955436b
I completely missed the header files when disabling the JS debugger.
...
Refs #2348
This was SVN commit r14511.
2014-01-05 10:26:27 +00:00
d0497c83f1
Split the formation template in different templates. This can be used later to remove hard-coded formation statistics and forms to attributes in those templates
...
This was SVN commit r14510.
2014-01-05 10:09:42 +00:00
d4f35f1061
Revised roman tower
...
This was SVN commit r14509.
2014-01-05 02:11:00 +00:00
6ca6a5f779
The patch in 4b65f77438 seems to have fixed the crash, but the initData value doesn't match the JSContext's compartment, so it's theoretically wrong.
...
This should fix it correctly.
#Refs 2241
This was SVN commit r14508.
2014-01-04 21:49:36 +00:00
4b65f77438
Fixes an occasional crash introduced in #2241 (hopefully).
...
Refs #2241
This was SVN commit r14507.
2014-01-04 21:36:12 +00:00
7d516e7e7a
Disables the JS debugger.
...
It's completely broken since 4b1297b328Closes #2348
Refs #2241
Refs #1886
This was SVN commit r14506.
2014-01-04 20:47:56 +00:00
da1a2eaba6
This was SVN commit r14505.
2014-01-04 20:42:34 +00:00
d8e839daec
Reduced armor for Roman siege walls.
...
This was SVN commit r14504.
2014-01-04 16:53:01 +00:00
58dd223018
Now really fix the temple aura. See d4b2c1285c
...
This was SVN commit r14503.
2014-01-04 15:43:05 +00:00
9fb6620edd
Use an actual flee order to move animals away from the foundation. Fixes #2347
...
This was SVN commit r14502.
2014-01-04 15:36:20 +00:00
1e33dd1d5e
fix targetPosition != null check
...
This was SVN commit r14501.
2014-01-04 13:15:44 +00:00
3d5f661447
Fixes assertion failure when opening the ingame manual.
...
This problem happens because callback functions need to be passed to GUI
pages differently since 4b1297b328#2241
This was SVN commit r14499.
2014-01-04 11:48:28 +00:00
4a11b30b39
Fixes assertion failure when clicking the settings button (aiconfig) on the match setup screen.
...
This problem happens because callback functions need to be passed to GUI
pages differently since 4b1297b328#2241
This was SVN commit r14498.
2014-01-04 11:29:35 +00:00
d4b2c1285c
add the ability to exclude props from the selection size + add aura visualisation rings again
...
This was SVN commit r14497.
2014-01-04 10:41:32 +00:00
4b1297b328
Removes g_ScriptingHost and implements global to compartment 1 to 1 relation.
...
Each GUI Page gets its own compartment and all ScriptInterfaces in the
same thread should now use the same JS Runtime.
This is required for the SpiderMonkey upgrade.
Check the ticket for details.
Closes #2241
Refs #1886
Refs #1966
This was SVN commit r14496.
2014-01-04 10:14:53 +00:00
743644f5ce
Roman tower remake
...
This was SVN commit r14495.
2014-01-04 04:14:29 +00:00
e096df0070
fix units attacking harmless gaia buildings
...
This was SVN commit r14494.
2014-01-03 20:24:02 +00:00
fb8032043b
Use pointers instead of copying sprites in the GUI. Fixes #1984 . Patch by jP_wanN.
...
This was SVN commit r14493.
2014-01-03 20:19:43 +00:00
28f022993a
Fix template typos and inconsistaint whitespace.
...
This was SVN commit r14492.
2014-01-03 19:55:29 +00:00
e85c3de782
Removed the Cavalry Stables from the Seleucids. Their training buildings started to get unwieldy compared to other civs.
...
This was SVN commit r14491.
2014-01-03 19:30:25 +00:00
9a41c588fe
prevent traders to cycle between two adjacent markets
...
This was SVN commit r14490.
2014-01-03 14:03:12 +00:00
1eb5d730fc
allow garissoning a small number of support units in houses as protection against early raids. Patch and suggestion from dumbo
...
This was SVN commit r14489.
2014-01-03 13:11:12 +00:00
f634a8db3e
fix units fleeing too far
...
This was SVN commit r14488.
2014-01-03 12:49:04 +00:00
6e4adcba52
add missing rallypoint to garrisonholder wonders
...
This was SVN commit r14487.
2014-01-03 11:24:23 +00:00
1c3da82869
New Carthaginian wonder commit
...
This was SVN commit r14486.
2014-01-03 03:17:53 +00:00
f7c1b73a01
Some more tweaks for the Seleucids.
...
Updated portraits.
This was SVN commit r14485.
2014-01-02 23:24:18 +00:00
66de76e026
fixes #2340 , patch by itms
...
This was SVN commit r14484.
2014-01-02 23:11:18 +00:00
8269f0cfd4
Group units in clusters of separate formations when they're too far apart.
...
This was SVN commit r14483.
2014-01-02 20:04:50 +00:00
8b98e2d513
Fix osx libraries build script for WXwidgets and libiconv.
...
This was SVN commit r14482.
2014-01-02 17:24:48 +00:00
e73738d794
Do not pause multiplayer games if one player opens a dialog. Patch by boeseRaupe. Fixes #2275 .
...
This was SVN commit r14481.
2014-01-02 16:30:24 +00:00
dd86995f77
Fix some newlines.
...
This was SVN commit r14480.
2014-01-02 16:22:03 +00:00
b3d799d950
Replace inconsistent separators in quotes. Fixes #2247 . Patch by boeseRaupe.
...
This was SVN commit r14479.
2014-01-02 14:46:47 +00:00
7d26f93666
fix animals taken as target in move-attack after 66770feed6, use the same filter as in AttackEntitiesByPreference
...
This was SVN commit r14478.
2014-01-02 14:17:46 +00:00
5b2cb0e72f
small code fix
...
This was SVN commit r14477.
2014-01-02 08:40:51 +00:00
b1422137e5
Cleanup GUI Checkbox C++ code by removing broken, non-obvious internal text rendering.
...
This was SVN commit r14476.
2014-01-02 03:28:15 +00:00
d8e8f613cd
small code cleanup
...
This was SVN commit r14475.
2014-01-01 19:56:27 +00:00
59525414ee
fix automatically attacking buildings caused by 66770feed6
...
This was SVN commit r14474.
2014-01-01 19:54:15 +00:00
66770feed6
include gaia range query of UnitAI in general range query. Fixes #2156 . Patch by dumbo
...
This was SVN commit r14473.
2014-01-01 18:59:16 +00:00
05baeae5bd
fix units not dropping resources when they are already at the resource dropsite (e.g. fields right next to a farmstead). Fixes #2336
...
This was SVN commit r14472.
2014-01-01 18:17:47 +00:00
9cf55a5ed0
fix productionQueue failing to produce units while the upgrade tech is running
...
This was SVN commit r14471.
2014-01-01 16:35:49 +00:00
2197b80747
fix oos problem mentioned by Yves on IRC
...
This was SVN commit r14470.
2014-01-01 16:15:26 +00:00
3d171b54c9
New ModernTickBox style for the GUI. Replace the use of StoneCrossBox in the lobby GUI with the new style.
...
This was SVN commit r14469.
2014-01-01 06:15:06 +00:00
67570be8fa
Make GUI button-based objects to behave more expectedly when doubleclicked, also some style tweaks.
...
This was SVN commit r14468.
2014-01-01 06:05:41 +00:00
1e522f9b2c
Fix bug with rating in lobby bot, remove superfluous GUI typedef, and change the lobby chat autocompletion to use tab.
...
This was SVN commit r14467.
2014-01-01 00:23:18 +00:00
9d9361ae44
Why you should test your code before committing, exhibit A.
...
This was SVN commit r14466.
2013-12-31 21:45:11 +00:00
a7cafe75aa
"Reveal all player" id back to -1, add some "ensure" to catch invalid player ids and be safer.
...
This was SVN commit r14465.
2013-12-31 21:30:48 +00:00
fe2a97b0c9
Change some useless std::map into std::vector for LOS. Player "0" now reveals the LOS for all.
...
This was SVN commit r14463.
2013-12-31 16:38:11 +00:00
d7f18c10de
Add visual indicator when unsetting rally-points, closes #2117
...
This was SVN commit r14462.
2013-12-31 13:21:06 +00:00
75b8952d04
Delete help.txt.
...
I wanted to update it first for some function names I changed.
Then I noticed that nearly all the functions described there don't exist
anymore or have changed. There are much better descriptions at the
places where the functions are declared/implemented.
We should either do it right (and force everyone to update that file for
every change) or don't to it at all. At this stage of development it
doesn't make sense and when we start documenting all the functions at a
central place, there are better locations than this file.
This was SVN commit r14461.
2013-12-31 12:21:56 +00:00
c0472f0de5
Fix trivial comment typo caught by wraitii.
...
This was SVN commit r14460.
2013-12-31 11:06:00 +00:00
f8ca47913d
fix division by zero for zero-time technologies. Fixes #2334
...
This was SVN commit r14459.
2013-12-31 09:02:58 +00:00
c7ff0bb486
Tweak some lobby login UI bits, rework scrollbar mousewheel handling, add ability to scroll through closed dropdowns with scrollwheel, general C++ GUI cleanup, and fix broken random map script 'Unknown Nomad'.
...
This was SVN commit r14458.
2013-12-31 04:54:16 +00:00
b3a74e8f72
Add message to help new users register for the lobby.
...
This was SVN commit r14457.
2013-12-31 01:14:09 +00:00
2008ebc9d6
Use ACLs in the ipstamp module to support multiple lobby bots.
...
This was SVN commit r14456.
2013-12-31 00:25:33 +00:00
b2a535d838
Change the lobby registration to the new UI style and try to make it more ergonomic.
...
This was SVN commit r14455.
2013-12-31 00:01:27 +00:00
e21464d960
Try to fix some errors in the bot by checking a player id's validity before using it as an index.
...
This was SVN commit r14454.
2013-12-30 20:48:15 +00:00
1c9965999b
Use another muc room for svn/a16.
...
This was SVN commit r14453.
2013-12-30 19:44:42 +00:00
dddc9bab7f
Fix tests.
...
This was SVN commit r14452.
2013-12-30 18:55:37 +00:00
4776d85301
use UnitMotionFlying for the hawks
...
This was SVN commit r14451.
2013-12-30 18:03:01 +00:00
298115f4c5
Fix units chasing each other. Fixes #1537
...
This was SVN commit r14449.
2013-12-30 16:07:19 +00:00
ddee36e0a8
Hide map size for skirmish and scenarios. Refs #2301 .
...
Also fix my previous commit because obviously I had committed the wrong
default value.
This was SVN commit r14448.
2013-12-30 15:59:00 +00:00
08b44fe647
Fix water rendering (transparent objects now appear correctly when underwater/in reflections)
...
Add a new config option (renderactors) that, if set to false, will
prevent actors from rendering in-game (grass…)
This was SVN commit r14447.
2013-12-30 15:52:42 +00:00
4a15ac406b
Move debug function and debug flag to API3 and use them from Aegis.
...
Remove copyPrototype from Aegis because that function is currently not
used and is already in API3.
Refs #2322
This was SVN commit r14446.
2013-12-30 14:28:30 +00:00
5febe42aa9
Fix [14444]
...
This was SVN commit r14445.
2013-12-30 12:50:06 +00:00
bc136137fc
Make hawks selectable in Atlas and alleviate their tendency to congregate in the upper right corner of maps.
...
This was SVN commit r14444.
2013-12-30 12:43:57 +00:00
bd2cd235fd
Commit Micket's hawk model/rigging, textures using photos by unarmed, add an entity that moves around the map, change maps to use the entity and not the idle actor. Fixes #1228 , Fixes #1975 .
...
This was SVN commit r14443.
2013-12-30 11:10:54 +00:00
533f908f15
Some missing changes in #2322 .
...
Refs #2322
This was SVN commit r14442.
2013-12-30 10:25:50 +00:00
3362c591f5
Moves AI players to one global using the module pattern.
...
This avoids wrapping overhead that would otherwise be required because
multiple globals per compartment aren't supported anymore in newer
versions of SpiderMonkey.
Check the ticket for a detailed explanation.
Closes #2322
Refs #2241
Refs #1886
This was SVN commit r14441.
2013-12-30 10:04:59 +00:00
9a8d5312d4
Removed Civic Center from the Seleucid female. They don't build civic centers (heroes can though). Citizen-Infantry build Military Colonies instead to expand.
...
This was SVN commit r14440.
2013-12-30 05:47:26 +00:00
3c630c2e63
Fixed Seleucid thureophoros accidentally calling on the Ptolemaic one.
...
Made the 4th level of armor techs apply to champions instead of all
infantry.
This was SVN commit r14439.
2013-12-30 05:38:24 +00:00
91bbc925e2
Completing the playability phase of the Seleucids. Now starts the long road of creating art and balancing and implementing bonuses (hero auras, unique techs, etc.).
...
This was SVN commit r14438.
2013-12-30 04:25:33 +00:00
5e23445339
Make ConfigDB properly thread-safe.
...
Replace CreateValue with SetValueString so we don't pass pointers to
internal
ConfigDB structures around. Refs #1810 .
Remove some splash screen related functions since we can achieve the
same
with the ConfigDB functions exposed to scripts.
This was SVN commit r14437.
2013-12-29 23:56:18 +00:00
92fba32c5e
Some more C++ GUI cleanup.
...
This was SVN commit r14436.
2013-12-29 20:46:02 +00:00
e729f46789
Make button-type GUI elements more responsive and cleanup in IGUIButtonBehavior.cpp
...
This was SVN commit r14435.
2013-12-29 19:31:48 +00:00
d756e8d70e
Add proper licences to lobby bot files. Also remove extranious config file.
...
This was SVN commit r14434.
2013-12-29 18:46:00 +00:00
45cfdf47f1
fix carthagian buildings being constructed with garrison flag up. Fixes #2318
...
This was SVN commit r14433.
2013-12-29 18:16:31 +00:00
3746690f82
Define GLX_MESA_query_renderer functions unconditionally. Fixes #2325 .
...
This was SVN commit r14432.
2013-12-29 17:13:55 +00:00
517e83b331
New map: Savanna River. Very defensive. Only 1 crossing, unless you cut through the trees around the river.
...
Tweaked Gambia River for pathing.
Tweaked the obstruction of Farm Fields so that they don't overlap so
much.
Increased build time of Wonders.
This was SVN commit r14431.
2013-12-29 16:36:25 +00:00
2146fa27c8
forgot to rename reference
...
This was SVN commit r14429.
2013-12-29 12:40:34 +00:00
4158283fd4
Take unit obstruction size into account when checking if in range for garrisoning. Reduce CC loading range in consequence. Fixes #2190 .
...
This was SVN commit r14428.
2013-12-29 10:17:09 +00:00
10e8fb9105
remove debug message
...
This was SVN commit r14427.
2013-12-29 10:09:58 +00:00
cd125a94e2
fix tests + code style cleanup
...
This was SVN commit r14426.
2013-12-29 10:01:39 +00:00
433293c7b2
Spread is now linearly tied to distance to target. Fixes #2093 .
...
This was SVN commit r14425.
2013-12-29 08:09:44 +00:00
04d0f424df
added wonder placeholders for generic hellenes and celts
...
This was SVN commit r14424.
2013-12-28 17:13:24 +00:00
ce7235a6aa
Various art fixes.
...
Polynesia map is back to hdr mode.
Improve shark animations, improve crocodile walking animation.
Fix mauryan bamboo bow prop (for some reason it had two models).
This was SVN commit r14423.
2013-12-28 16:34:10 +00:00
0029103153
Ptolemy fishing boat (along with props). fixes #2237
...
This was SVN commit r14422.
2013-12-28 15:59:08 +00:00
15b42f0be5
Added wonder placeholders for civs without wonder.
...
This was SVN commit r14421.
2013-12-28 15:21:11 +00:00
139a1fd5ca
Updated a bunch of civ jsons.
...
Fixed a few other things.
This was SVN commit r14420.
2013-12-28 15:07:19 +00:00
bf58f04511
add wonder victory condition. Refs #1649
...
This was SVN commit r14418.
2013-12-28 13:40:39 +00:00
749c4d5270
change the way to manage trade, closes #2311
...
This was SVN commit r14417.
2013-12-28 10:44:59 +00:00
6accb6faf6
Fixed bell icons.
...
Seleucid Military Reforms.
Fixed inheritance for Ptol healers.
This was SVN commit r14416.
2013-12-28 05:32:16 +00:00
f254478d1b
Revert accidentily committed changes.
...
This was SVN commit r14415.
2013-12-28 03:34:40 +00:00
177a7cd99d
Make uninitilized players not show in the lobby leaderboard.
...
This was SVN commit r14414.
2013-12-28 03:32:31 +00:00
121345bd6a
Name stuff.
...
This was SVN commit r14413.
2013-12-28 02:35:19 +00:00
b3201acd93
Trimmed the descriptions for most of the random maps, per Josh's request.
...
This was SVN commit r14412.
2013-12-28 02:17:08 +00:00
5f1714dd83
Seleucids now have what used to be the Ptolemies' Military Settlement system (now called a Military Colony; needs a new model).
...
Fixed a few other templates.
This was SVN commit r14411.
2013-12-28 00:34:37 +00:00
02d38ceecd
Fixed elephant stables class element.
...
This was SVN commit r14410.
2013-12-27 15:21:15 +00:00
bfa7f60251
add outpost skirmish entity, and apply it to the Gambia River skirmish map
...
This was SVN commit r14409.
2013-12-27 14:48:24 +00:00
659736301a
define the limit changing elements together with the limits, so they can be queried by the GUI and the AI. Fixes #2187
...
This was SVN commit r14408.
2013-12-27 10:58:48 +00:00
040e15ed51
Change shark model, skeleton, and change its animations. Add a shark entity that will roam the map and can be attacked, but will not attack and yields no food. Change Polynesia demo map to have a shark.
...
This was SVN commit r14407.
2013-12-27 10:32:53 +00:00
81f901d473
make the elphant stables count as town phase structure. Mentionned by Zeta1127 on the forums
...
This was SVN commit r14406.
2013-12-27 09:38:44 +00:00
f33d3193ca
fix tests ( fixes #2326 )
...
+ small code cleanup
+ move guiInterface call to GetEntityState
refs #2154
This was SVN commit r14405.
2013-12-27 08:49:47 +00:00
e4a124e768
WIP: Making the forests in random maps bigger as per people's request.
...
This was SVN commit r14404.
2013-12-27 08:07:05 +00:00
dca3393195
Fix 'Carrier Pidgons' technology by checking that rawClasses is not NULL before operating on it.
...
This was SVN commit r14403.
2013-12-27 04:01:03 +00:00
f42bf782bb
Bactria map updated.
...
This was SVN commit r14402.
2013-12-27 00:47:26 +00:00
c9b48c6e53
Updated a couple African maps with the new crocodiles.
...
This was SVN commit r14401.
2013-12-26 22:55:48 +00:00
60bcebf5b6
Fixed crocodile actor.
...
This was SVN commit r14400.
2013-12-26 22:45:04 +00:00
e942768b4d
Add textured, normal-mapped, animated Nile crocodile to the game. Need to do a female version, possibly a saltwater croc version for mauryan maps?
...
Add crocodile entity, which is about similar to the lion.
Add a (temporary?) crocodile portrait.
It uses the lion sounds which are probably the closest we have right
now.
This was SVN commit r14399.
2013-12-26 22:33:06 +00:00
7688e9c93e
Properly round rating calculation in the lobby bot to an integer.
...
This was SVN commit r14398.
2013-12-26 20:16:43 +00:00
4ac5aacc87
Strip some trailing spaces in the lobby bot.
...
This was SVN commit r14397.
2013-12-26 19:52:07 +00:00
ad0d81cb8a
Various lobby changes and some optimizations in the lobby bot by scythetwirler.
...
This was SVN commit r14396.
2013-12-26 19:45:20 +00:00
0780becb8a
fix attack-move not working for packed units
...
This was SVN commit r14395.
2013-12-26 16:09:32 +00:00
e9a269c01c
Remove attack from Military Settlement for now.
...
This was SVN commit r14394.
2013-12-26 16:04:04 +00:00
953e44d9f8
try using footprint instead of obstruction for separation space between formation members + Fix some footprint sizes of siege units
...
This was SVN commit r14393.
2013-12-26 12:24:52 +00:00
41b3dfc89c
Implement town bell
...
* the icons are temporary, and can be replaced later
* The sounds are created by LAVS, but may also need some polishing, so
the current ones are placeholders too
* The patch code is created by Itms
fixes #2154
This was SVN commit r14392.
2013-12-26 10:43:51 +00:00
9dcc3ee89e
fix always picking the same processor core on some systems. Based on code hits by Philip
...
This was SVN commit r14391.
2013-12-26 10:05:44 +00:00
1de1e2d5ba
Fix typo.
...
This was SVN commit r14390.
2013-12-26 01:05:35 +00:00
bdeae5d474
Don't send superfluous chat / commands in the lobby, also fix issues with the lobby system messages. Merge from my github branch.
...
This was SVN commit r14389.
2013-12-25 19:28:53 +00:00
4658cfa775
Mythos_Ruler's Christmas update for SVN users!
...
Includes:
- Unit rank upgrades, based on a patch by Sanderd. Not all civs get all
rank upgrades. For instance, Spartans get the Infantry rank upgrades,
but not the cavalry rank upgrades. Conversely, the Persians get the
cavalry rank upgrades, but not the infantry rank upgrades. Carthaginians
get rank upgrades for their mercenaries, but not their native units.
etc.
- Updated and tweaked many of the skirmish maps. Too many tweaks to
mention. But I did add Iberian circuit walls to many of them! New
"Bactria" Skirmish Map. Will continue to tweak this one to make it more
unique. It's based on modern-day Afghanistan, which the ancients called
"Bactria." A 2nd Ptolemies sandbox demo map.
- Moved the Ptolemaic Lighthouse to Town Phase to have more impact for
the Ptolemy player on maps with water.
- New Thureos shield patterns by Enrique for a NEW unit: Mercenary
Thureos Spearman.
- TECHNOLOGIES: Some techs renamed and tweaked. Plus, a new "Iron Armor"
tech for Heroes. A new "Roman Logistics" tech for the Roman Army Camp
and Siege Walls. A new "Battlefield Medics" tech for the temple that
unlocks (slow) health regeneration for units. The portrait for this tech
is placeholder and needs replaced ASAP.
- Cavalry now have oval selection rings. Eventually I will implement a
selection ring system where the citizen-soldiers and support units have
round rings, while champions have arrows, and heroes have stars. This
helps visually differentiate the roles of these 3 classes of units. Not
yet implemented.
- Vision radius for infantry slightly reduced.
- Fixed sounds for Persian Wonder.
- Fixed footprint sizes for a few buildings and Ptolemaic walls.
- Ptolemies now have the "Military Settlement" system in place. But this
system might go to the Seleucids instead later for historical reasons.
- Cost of fields reduced. Gathering rates for grain reduced.
- Fixed some selection group names for some templates. (Double clicking
didn't select them all as it should have).
- Fixed/Changed/Added some unit and building names, specifically for the
Ptolemies, but for some others as well.
- Some new temp portraits for Ptolemaic units. Ongoing task.
Lastly, I hope these changes don't break anything. They are heavily
tested on my end, but I can't promise I caught all bugs.
This was SVN commit r14388.
2013-12-25 15:49:49 +00:00
f7e68a4d4c
Bot optimizations by scythetwirler.
...
This was SVN commit r14387.
2013-12-25 15:13:58 +00:00
40d407e8c6
use ptol fortress in random maps with the wall builder
...
This was SVN commit r14385.
2013-12-18 18:32:25 +00:00
42bc5165ab
Add compile time flag to disable use of miniupnpc.
...
This was SVN commit r14384.
2013-12-18 16:08:56 +00:00
7f5c2c4b83
enlarge the units demo map, so all units can be checked out again
...
This was SVN commit r14383.
2013-12-18 15:46:09 +00:00
eb7215ecaf
This was SVN commit r14381.
2013-12-18 14:14:37 +00:00
3d9fe04ab5
Added Egyptian names for Ptolemaic buildings.
...
Deleted a bunch of maps. Added Lorraine Plain skirmish map.
This was SVN commit r14380.
2013-12-18 13:54:30 +00:00
1b17ac50cc
remove the aura visualisation from the actors, as it causes selection problems
...
This was SVN commit r14379.
2013-12-18 10:43:32 +00:00
63f2f85b01
make sure the non-garrisoned variant of the persian models is always picked while constructing
...
This was SVN commit r14378.
2013-12-18 10:28:32 +00:00
6bc5e3f3a5
Ptolemies corral draft commit
...
This was SVN commit r14377.
2013-12-18 05:29:54 +00:00
0b80cbe3ec
Hide the password field by default on the lobby login box if there is a remembered password. Since we only store hashed passwords, this avoids potential confusing from seeing a password much longer than the user’s in the field.
...
This was SVN commit r14376.
2013-12-18 00:56:59 +00:00
3c248e7501
Change the "Away" color in the lobby to be much easier to read on the dark background.
...
This was SVN commit r14375.
2013-12-17 23:58:53 +00:00
c8fb750e43
Balance fix for CCs. Decrease build time from 600 to 500 and increase foundation armor from 3h/10p/3c to 5h/15p/3c.
...
This was SVN commit r14374.
2013-12-17 21:20:31 +00:00
c6d454ff2d
Make ConfigDB threadsafe.
...
This was SVN commit r14373.
2013-12-17 19:58:39 +00:00
e83f24e3a6
Move UPnP port forwarding to a thread.
...
Fix some typos.
Do not return the result, as we would need to allocate it, but we never
use it.
This was SVN commit r14372.
2013-12-17 17:03:49 +00:00
4df4c0dec0
Try to actually do the threading my previous commit said it did.
...
This was SVN commit r14371.
2013-12-17 14:57:26 +00:00
0ba25e9968
Cache UPnP root URL to try to avoid searching each time. Also make searching asyncronous with the GUI to avoid hanging.
...
This was SVN commit r14370.
2013-12-17 14:21:49 +00:00
60bbb50625
Ptolemaic dock draft commit
...
This was SVN commit r14369.
2013-12-17 03:17:35 +00:00
fa03aadaa5
Updated fixed unit icons
...
This was SVN commit r14368.
2013-12-16 04:09:35 +00:00
8c5f583845
Ptolemaic blacksmith draft commit
...
This was SVN commit r14367.
2013-12-16 02:05:43 +00:00
678d338670
Change bot name.
...
This was SVN commit r14366.
2013-12-15 21:02:58 +00:00
2cdef4023c
Fixes OS X libs build script
...
This was SVN commit r14365.
2013-12-15 20:56:58 +00:00
d2e671392b
Fix bug in ipstamp module.
...
Sync with server. Refs #2307 .
This was SVN commit r14363.
2013-12-15 18:33:01 +00:00
79252043ae
fix the fish gatherer from b91ec9b449
...
This was SVN commit r14362.
2013-12-15 17:32:20 +00:00
b91ec9b449
Added new Ptolemies track to the Ptolemies civ json.
...
Removed fishing from land units. However, they still try to go fish
after building a dock. Looks like it needs a deeper fix.
Portrait for Ptol camel archer.
This was SVN commit r14361.
2013-12-15 15:33:35 +00:00
542861ba36
This was SVN commit r14359.
2013-12-15 14:14:22 +00:00
bcba922893
fix switching between column and other formations
...
This was SVN commit r14358.
2013-12-15 09:51:13 +00:00
e7d57136ef
Updates license files for gloox, MiniUPnPc, and pkcs5_pbkdf2. Refs #2308
...
This was SVN commit r14357.
2013-12-15 02:49:11 +00:00
2c3c8737e0
OS X libs build script improvements:
...
* fixes failed build when using --force-rebuild
* cleans up old build output before starting new builds
* improves separation of libogg and vorbis
* updates wxWidgets to 3.0.0
This was SVN commit r14356.
2013-12-15 02:14:45 +00:00
99f44ff7a0
Reorganizes extern libs in alphabetical order
...
This was SVN commit r14355.
2013-12-15 01:34:16 +00:00
99f90dd6de
Adds MiniUPnPc to build-osx-libs.sh
...
This was SVN commit r14354.
2013-12-15 01:26:55 +00:00
c2c2177be4
forgot the death particles
...
This was SVN commit r14353.
2013-12-15 01:10:39 +00:00
62a10ab938
Fixes Windows build.
...
Fixes UPnP error handling to be more correct and conventional, refs
#2305
This was SVN commit r14352.
2013-12-15 01:02:26 +00:00
b1a73d3c0e
Ptolemaic market draft commit
...
This was SVN commit r14351.
2013-12-14 22:14:24 +00:00
f890856c6d
Seperate differently licenced portions of sha.cpp/h into pkcs5_pdkdf2.cpp/h and remove some extra std includes in sha.cpp. Refs #2308
...
This was SVN commit r14350.
2013-12-14 16:58:21 +00:00
bf97148ddc
Add proper licence header and remove tyedefs in sha.cpp/h. Refs #2308
...
This was SVN commit r14349.
2013-12-14 16:22:48 +00:00
5876ec38d1
Make sure we properly free some UPnP-related variables.
...
This was SVN commit r14348.
2013-12-14 03:21:21 +00:00
551eb3919d
Change UPnP lease duration to 0 (permanent) and update comments.
...
This was SVN commit r14347.
2013-12-14 03:03:22 +00:00
63622a85d7
Fixed missing elephants in some maps, thanks mimo for catching it.
...
This was SVN commit r14345.
2013-12-13 19:10:04 +00:00
44587963e6
Reduced armor for palisade fort.
...
Tweaked ptolemies sandbox, Alpine Valleys (removed player command of
some deer), and added a Greek Acropolis "Night" map for fun.
This was SVN commit r14344.
2013-12-13 16:26:26 +00:00
685d37ddfa
New Roman emblem.
...
This was SVN commit r14342.
2013-12-13 14:18:46 +00:00
fd47e6caee
Name.
...
This was SVN commit r14341.
2013-12-13 13:30:59 +00:00
619c59fd3f
Read the default MUC room from the config file and set it to arena15. Fixes #2306 .
...
Change the jid of xpartamupp to WFGbot to make it work on the new
server. Refs #2307 .
This was SVN commit r14339.
2013-12-13 12:14:17 +00:00
5b9dfaef8f
Tweaked Gallic Fields.
...
Made the palisade spikes not lose health when outside territory.
Changed ptol military settlement actor from Athenian barracks to
Macedonian barracks.
Lowered the height of the farm field status bar slightly.
This was SVN commit r14338.
2013-12-13 11:34:19 +00:00
8dab478691
Bundle miniUPnPc with 0AD.
...
This was SVN commit r14333.
2013-12-13 02:59:35 +00:00
667537ee49
UPnP-based automatic port-forwarding using miniupnpc. Breaks windows build at the moment. Refs #2305
...
This was SVN commit r14332.
2013-12-13 02:23:02 +00:00
b508fe848a
Fixed celtic embassy textures in its actor
...
This was SVN commit r14331.
2013-12-12 10:09:14 +00:00
1efd47c1ad
Fix errors when loading a saved game with Aegis by making sure the AI re-inits properly. Still no real saved game support.
...
This was SVN commit r14329.
2013-12-11 17:10:14 +00:00
1c890d64ee
Fixed persian gate messed up in previous commit
...
This was SVN commit r14328.
2013-12-11 15:59:11 +00:00
c6cf074e7a
Fix unitAI warning when member left the formation
...
This was SVN commit r14327.
2013-12-11 15:17:43 +00:00
2a824acae6
Made ptolemaic walls thinner. Added door to the gate (no animations yet) fixed some stretched UVs
...
This was SVN commit r14326.
2013-12-11 01:53:10 +00:00
8db3ada87f
Improves debugging output to help troubleshoot some WSDL bugs, refs #2146 , #1733
...
This was SVN commit r14325.
2013-12-10 18:54:18 +00:00
c661bb01c3
Temp fix for Nubian archer.
...
This was SVN commit r14324.
2013-12-10 01:27:09 +00:00
f3e53bfb7c
Reduce splash radius of catapults from the rather ridiculous 20m to 10m.
...
This was SVN commit r14322.
2013-12-09 19:22:45 +00:00
683349333b
tune the guard behaviour
...
This was SVN commit r14321.
2013-12-09 18:15:24 +00:00
a44e88fa42
Check for "Destroy" messages beforehand in the base manager to avoid a rare error.
...
This was SVN commit r14320.
2013-12-09 16:35:06 +00:00
ed93cebd28
garrison flag fixing in ptolemaic civic centre, edfu wonder and macedonian temple.
...
Centered athenian temple, selection and obstruction adjusted.
This was SVN commit r14319.
2013-12-09 14:46:35 +00:00
c3ef9b3685
Forgot I had renamed a file…
...
This was SVN commit r14318.
2013-12-09 14:23:56 +00:00
f9bee5d3ec
Slight de-obfuscation of the AI code.
...
This was SVN commit r14317.
2013-12-09 14:20:11 +00:00
9339e658a5
Two new head models for ptolemaic support females. Fixes #2235
...
This was SVN commit r14316.
2013-12-09 12:38:46 +00:00
8351e794fa
Added different textures for each ptolemaic camel rank
...
This was SVN commit r14315.
2013-12-09 02:01:21 +00:00
a04dfcf836
Camel rider tweaking
...
This was SVN commit r14314.
2013-12-09 00:33:33 +00:00
3c70f25ca4
Final edfu temple normal and spec.
...
Ptolemaic camel rider fix
This was SVN commit r14313.
2013-12-09 00:21:45 +00:00
208200db28
fix querying unitAI of non-existing members
...
This was SVN commit r14312.
2013-12-08 19:57:34 +00:00
966f7c7145
Removes some duplicated code.
...
This was SVN commit r14311.
2013-12-08 19:23:09 +00:00
36334a6fa7
Fix the AI incorrectly trying to place Civil Centres too close to each other.
...
This was SVN commit r14310.
2013-12-08 16:24:09 +00:00
ad157ad325
fix test broken by #14306
...
This was SVN commit r14309.
2013-12-08 13:01:59 +00:00
71d378b7a5
A bunch of stuff.
...
This was SVN commit r14308.
2013-12-08 13:01:14 +00:00
332e23ee9c
Edfu temple commit. Needs normal and spec map tweaking (coming soon). Fixes #2220
...
This was SVN commit r14307.
2013-12-08 11:21:19 +00:00
e173493621
separate gui entityState in two parts to improve gui timing, adresses #2179
...
This was SVN commit r14306.
2013-12-08 10:02:19 +00:00
1f7019f8e6
Might fix an issue on Acropolis where Aegis tried to build a CC too close to his main one.
...
This was SVN commit r14305.
2013-12-08 09:07:33 +00:00
3182d6c8ee
Reverts 4c9cd2921d fundraiser splash screen now that the fundraiser has ended
...
This was SVN commit r14304.
2013-12-08 01:35:06 +00:00
f0fe2acdcb
Disables JIT compiling of a loop to work around OOS errors in multiplayer games with AI players.
...
Fixes #2000
This was SVN commit r14303.
2013-12-07 11:49:11 +00:00
ca3f697f9d
add iberian monument aura
...
This was SVN commit r14301.
2013-12-06 18:14:22 +00:00
783907264f
cache the offset positions for formations, and only recalculate if the rotation towards a new target is big enough
...
This was SVN commit r14300.
2013-12-06 10:21:07 +00:00
b1c081e36d
Set svn:eol-style=native, fix some inconsistent line endings
...
This was SVN commit r14299.
2013-12-06 00:42:50 +00:00
8d56504778
fix switching between line and column formation
...
This was SVN commit r14298.
2013-12-05 20:26:51 +00:00
d3f7da1e27
Let formation attack from the moment the first unit is in range
...
This was SVN commit r14297.
2013-12-05 19:26:55 +00:00
9678cf547a
cache quantities depending only on the selection, adresses #2179
...
This was SVN commit r14296.
2013-12-05 18:50:29 +00:00
2f3ce82dc3
Fix Aegis no longer building dropsites after the skirmish fix.
...
This was SVN commit r14295.
2013-12-05 17:34:24 +00:00
56c805ae93
Texture stuff.
...
This was SVN commit r14294.
2013-12-05 13:23:22 +00:00
7b82fba8d0
remove distance sorting for formation place assignment, as it made the center of the formation run + remove debug warning in AI code
...
This was SVN commit r14292.
2013-12-05 12:31:04 +00:00
03d9db0bb7
fix comment
...
This was SVN commit r14291.
2013-12-05 10:44:39 +00:00
7a1dbca390
make the movement of formations and ships more natural
...
This was SVN commit r14290.
2013-12-05 10:38:39 +00:00
cf88da5829
improve formations a bit more
...
* Take obstruction size into account, so bigger units have more space in
formations
* Minimize the maximum walk distance to get in formation by letting the
units far away from the centre pick their positions first
This was SVN commit r14289.
2013-12-05 10:23:49 +00:00
4062e2011f
fix tests
...
This was SVN commit r14288.
2013-12-05 08:53:40 +00:00
0ef6397545
Optimize the "Move()" function by removing unnecessary message broadcast. Fixes #2094
...
This was SVN commit r14287.
2013-12-04 17:38:46 +00:00
5f8b6be833
Some additions to the particle system:
...
This was SVN commit r14286.
2013-12-04 17:21:59 +00:00
189ef85538
Fix AI errors on skirmish maps.
...
This was SVN commit r14285.
2013-12-04 16:52:44 +00:00
60c986c135
* Add method to rangemanager to query around a position instead of an entity
...
* Use that method in the splash damage calculation
Fixes #2285
This was SVN commit r14283.
2013-12-04 15:30:01 +00:00
367614343b
add two files that were deleted by accident in 3afd8e9d9e
...
This was SVN commit r14282.
2013-12-04 13:15:43 +00:00
3afd8e9d9e
better formation place assignments (units run around less)
...
This was SVN commit r14281.
2013-12-04 13:14:31 +00:00
3c6045308a
Fixing some cursor issues.
...
This was SVN commit r14280.
2013-12-04 01:56:40 +00:00
a549d5a08b
Fixed aura rays actor
...
This was SVN commit r14279.
2013-12-04 00:38:09 +00:00
cd32fafd63
Fixed shader in aura material
...
This was SVN commit r14278.
2013-12-04 00:35:05 +00:00
e268c059e5
Healing aura effect placeholder, applied only in athenian temple
...
This was SVN commit r14277.
2013-12-04 00:25:03 +00:00
bddcd57dea
- Fixed a prop typo in the Athenian temple.xml
...
- Added the first Egyptian music track to the Ptolemies.
- Adjusted the Sacred Band tip text. New pic coming soon.
- Still trying to figure out what to do with "Wasteland" map.
This was SVN commit r14276.
2013-12-04 00:18:52 +00:00
a96a333b47
Small cleanup.
...
This was SVN commit r14274.
2013-12-03 01:01:12 +00:00
68880ca5d5
Make atlas player assignment apply to all of the currently selected units
...
This was SVN commit r14273.
2013-12-02 22:46:33 +00:00
f09d56fb28
This was SVN commit r14271.
2013-12-02 20:46:25 +00:00
7c3c78f6c9
make sure target has health before taking damage
...
This was SVN commit r14270.
2013-12-01 20:55:54 +00:00
3fea8d7c1e
Some tips tweaks and new tips.
...
This was SVN commit r14269.
2013-12-01 18:22:28 +00:00
168f92e1e9
"Equine Transports" tech for the Persians.
...
Updated tip images.
This was SVN commit r14268.
2013-12-01 02:49:26 +00:00
d2fccef696
New 4-player skirmish map for Scythetwirler: Watering Holes.
...
This was SVN commit r14267.
2013-11-30 22:49:54 +00:00
cb7a4fe39c
Minor things.
...
This was SVN commit r14266.
2013-11-30 21:53:56 +00:00
c134108154
remove duplicated code
...
This was SVN commit r14264.
2013-11-30 18:23:32 +00:00
e88d05e0e4
allow units to guard/escort buildings or units, fixes #2034
...
This was SVN commit r14263.
2013-11-30 17:30:08 +00:00
1d914c4613
testing visualisation of auras (the elephants need to be replaced with some iconic meshes)
...
This was SVN commit r14262.
2013-11-30 12:36:48 +00:00
495716b3ed
Reduced the size of a bunch of massive specular maps.
...
Tweaked some maps.
A new map called "Wasteland". Don't know what to do with it yet.
Dust storm and other particles changes and tweaks.
Tweaks to some maps.
Spec and Norm maps for the Great Pyramid.
New Mace shield prop textures for buildings.
This was SVN commit r14261.
2013-11-30 07:57:29 +00:00
d8362700f0
4 new Successor/Hellenistic shield designs by Enrique. Each has a bronze, silver, bronze player color, and silver player color variation.
...
Added final Seleucid unit, the Thracian Mercenary Swordsman.
Added spec and normal mapping to the Spartiate shields.
New Seleucid emblem.
This was SVN commit r14260.
2013-11-30 02:58:43 +00:00
61c9df2847
Increased ptolemaic barracks size
...
This was SVN commit r14259.
2013-11-30 01:34:15 +00:00
44c134e03f
Cavalry Archer templates for Seleucids.
...
This was SVN commit r14258.
2013-11-29 22:24:11 +00:00
15d87b9ad1
Garrison and Waypoint flags for Seleucids.
...
Cavalry Archer actors for Seleucids.
This was SVN commit r14257.
2013-11-29 22:23:32 +00:00
2e2b1b04ff
Fix #2285 by using the original design with additional checks.
...
This was SVN commit r14256.
2013-11-29 20:34:56 +00:00
5ce3880d53
Some more Seleucid units.
...
Tweaked maps.
This was SVN commit r14255.
2013-11-29 19:04:07 +00:00
860875c835
Triage #2285 . Not the most efficiant, but it works.
...
This was SVN commit r14254.
2013-11-29 17:46:24 +00:00
25b92ec652
implement spart auras + female boost for males
...
This was SVN commit r14253.
2013-11-29 13:06:58 +00:00
d18444344c
implement pers auras
...
This was SVN commit r14252.
2013-11-29 12:56:44 +00:00
7bab5421c6
implement mace auras
...
This was SVN commit r14251.
2013-11-29 12:47:39 +00:00
bb5515a9ee
implement hele auras + fix vircengetorix (part 2)
...
This was SVN commit r14250.
2013-11-29 12:36:18 +00:00
53f376cdc2
implement hele auras + fix vircengetorix
...
This was SVN commit r14249.
2013-11-29 12:35:58 +00:00
b0f00d4836
Improved Ptolemaic flag emblem with retouched LionKranzen's eagle
...
This was SVN commit r14248.
2013-11-29 12:16:15 +00:00
d672c6cf7d
make loot tech aware + implement celt and gaul hero auras
...
This was SVN commit r14247.
2013-11-29 12:13:37 +00:00
ca9944b09c
brit + cart hero auras + small code fixes
...
This was SVN commit r14246.
2013-11-29 10:57:44 +00:00
d403545620
implement all athen auras + add missing files from previous commit
...
This was SVN commit r14245.
2013-11-29 09:02:41 +00:00
1784e6b9b1
fix some aura typos + implement iphicrates aura
...
This was SVN commit r14244.
2013-11-29 08:37:15 +00:00
6c81f23cc8
This was SVN commit r14243.
2013-11-29 04:10:57 +00:00
7ea031964c
A /bunch/ more Seleucid entities and actors. They still need tons of props, textures, and models. Also, not all unit templates are there yet.
...
Updated the Seleucid civ json.
Tweaked some tooltips to show their unit classes better.
Balancing: Slingers are now 1.5x vs. ranged infantry and 1.25x vs. melee
infantry.
This was SVN commit r14242.
2013-11-29 04:04:10 +00:00
f54fe9a7d2
Fixed persian and carthaginian camel trader prop position.
...
Scaled down several AO textures bigger than 1024
Ptolemaic barracks commited
This was SVN commit r14241.
2013-11-29 02:25:47 +00:00
351468dbe5
fix initialisation of developper overlay for saved games
...
This was SVN commit r14240.
2013-11-28 18:08:41 +00:00
65f5fffd9e
Partial commit of Seleucid entities and actors.
...
Testing cost balance for cav skirms.
Reduce Town Phase cost to 800/800.
A bunch of other minor things.
This was SVN commit r14239.
2013-11-28 15:52:18 +00:00
a6ec62c85d
fix ptol cav archer upgrade. Fixes #2282
...
This was SVN commit r14238.
2013-11-28 12:54:28 +00:00
64c9f84f10
Tweaked Alpine Valleys.
...
This was SVN commit r14237.
2013-11-28 01:30:18 +00:00
acf1c420c1
Moves management of GL viewports to CRenderer, letting it store the current viewport; calling code can retrieve and restore it later (instead of using deprecated glPush/PopAttrib, previously removed for GLES compatibility by 7dec618898)
...
This was SVN commit r14235.
2013-11-28 00:57:39 +00:00
8b0f1c3f1f
cleaning
...
This was SVN commit r14234.
2013-11-27 16:30:14 +00:00
43c2219b22
Fix my fix.
...
This was SVN commit r14233.
2013-11-26 21:38:48 +00:00
10b9ace654
Add missing line.
...
This was SVN commit r14232.
2013-11-26 20:01:09 +00:00
4b7ab63172
Fix #1496 with a revised version of my patch. Also moves damage-related functions from Attack.js to a seperate file in the global namespace.
...
This was SVN commit r14231.
2013-11-26 18:33:42 +00:00
7345d27c84
Summon planes back from the emptyness
...
This was SVN commit r14230.
2013-11-26 15:12:16 +00:00
433b32bdcd
Various XpartaMuPP cleanup.
...
This was SVN commit r14229.
2013-11-25 04:05:41 +00:00
c3ebb50711
Fix ratings and print rating changes in the lobby.
...
Fix game listings.
Fix non-hosts unregistering games.
Patch by scythetwirler.
This was SVN commit r14228.
2013-11-25 02:55:47 +00:00
d6a9489ccb
Ptolemaic walls commit
...
This was SVN commit r14227.
2013-11-25 00:34:31 +00:00
2db4f3fe40
A few new portraits from Pureon.
...
This was SVN commit r14226.
2013-11-24 23:53:29 +00:00
ff0eb70f4a
Portrait tweaks for NAF Ele and Tiger.
...
Added tigers to these maps.
This was SVN commit r14225.
2013-11-24 23:19:41 +00:00
b08b478403
tweaked tiger animations ratio
...
This was SVN commit r14224.
2013-11-24 23:07:11 +00:00
dc8cea3fa4
New tiger mesh, texture and animations
...
This was SVN commit r14223.
2013-11-24 21:38:36 +00:00
9fc30533d4
This was SVN commit r14222.
2013-11-24 15:29:23 +00:00
7109c34297
Observer Hack attempt.
...
Tweaks to Alpine Valleys and Greek Acropolis.
This was SVN commit r14221.
2013-11-24 15:27:03 +00:00
6a58044cc6
add missing protection to previous fix, fixes #1052
...
This was SVN commit r14220.
2013-11-24 10:37:23 +00:00
b7c3efac50
Ptol camel archer a little faster.
...
Brand new Alpine Valleys skirm map. My take on it anyway. 1v1.
This was SVN commit r14219.
2013-11-23 21:34:03 +00:00
d930244f02
update RallyPoint targets when renamed, fixes #1052
...
This was SVN commit r14218.
2013-11-23 19:32:59 +00:00
26c2ded9c5
New specific name for "Hellenization" = Exellinismós
...
More accurate names for Spartiate and Spartan Woman.
Tweaked some maps.
This was SVN commit r14217.
2013-11-23 15:50:15 +00:00
3d75d4e69c
do not show carrying resources animation in attack-move
...
This was SVN commit r14216.
2013-11-22 17:43:26 +00:00
5da63764e0
Fix compilation with wxWidgets 3.0.
...
This was SVN commit r14215.
2013-11-20 19:29:10 +00:00
09d5507ecb
clean some useless code
...
This was SVN commit r14214.
2013-11-19 21:27:23 +00:00
e8d8673734
let non-fighting units flee when attacked even if the attacker is not visible
...
This was SVN commit r14213.
2013-11-19 21:20:25 +00:00
95d5a25be1
Fixed carry_meat animations for mauryan elephant archers and ptolemaic camel rider
...
This was SVN commit r14212.
2013-11-18 03:43:36 +00:00
5ce8de1f0a
Removes unused var from JS debugger, from patch by Markus. Fixes #1852
...
This was SVN commit r14211.
2013-11-17 23:41:19 +00:00
d672d9625d
Changes update-workspaces.bat to not generate a vc2013 workspace by default, since the game won't successfully build yet, refs #2271
...
This was SVN commit r14210.
2013-11-17 23:11:56 +00:00
c1609697d7
camel armature rider fix.
...
This was SVN commit r14209.
2013-11-17 22:48:03 +00:00
e397993dae
Deleting a bunch of scenarios.
...
Made peacock easier to hunt.
Fixed elite Ptolemaic slinger promotion.
Reduced the health of basic ranged citizen soldiers slightly.
Updated Deccan Plateau with moar forestry.
Fixed Athenian Marine specific name.
This was SVN commit r14207.
2013-11-17 20:16:57 +00:00
e881099d43
Use functions to change variables. Remove broken branding of cheating player.
...
This was SVN commit r14206.
2013-11-17 18:24:09 +00:00
3a24eab0f0
Cache technology modifiers based on original value. Patch from sanderd17 based on work by Spahbod. Fixes #2045 .
...
This was SVN commit r14205.
2013-11-17 18:24:04 +00:00
0d876adc13
add some var
...
This was SVN commit r14204.
2013-11-17 12:28:26 +00:00
294aa142d8
Fixes compiling with the flag "--without-lobby".
...
Refs #2267
This was SVN commit r14203.
2013-11-17 11:52:11 +00:00
7595ea4534
2 player Badlands skirmish.
...
This was SVN commit r14202.
2013-11-17 01:40:39 +00:00
d5e7c1c44a
Fixed Ptolemies and Macedonians death variations in these actors. They were previously throwing an error.
...
Champion spearmen -> 80 metal instead of 80 wood.
This was SVN commit r14201.
2013-11-16 23:30:34 +00:00
6fba293088
In #2241 I'm going to change the GUI to have one ScriptInterface for each GUI page because that will be required for the Spidermonkey upgrade ( #1886 ).
...
The Multiplayer lobby needs some changes to avoid compartment
mismatches. Instead of initializing it with a ScriptInterface and
storing script values at different locations, it takes a ScriptInterface
argument in the functions that really need to read or write some script
values and avoids storing values as script values with an associated
compartment where possible.
The scripting interface of the lobby is also adjusted to use
JSInterface_Lobby.h/cpp files as other components instead of adding all
functions to ScriptFunctions.cpp. This makes it a bit more clearly
arranged IMO.
Fixes #2267
Refs #2241
Refs #1886
This was SVN commit r14199.
2013-11-16 18:38:40 +00:00
451e801f6a
Minor things.
...
This was SVN commit r14198.
2013-11-16 18:36:35 +00:00
1f677c17b1
Fixed deccan plateau.
...
This was SVN commit r14197.
2013-11-16 17:37:13 +00:00
30c2abd529
Hannibal now rides an Asian elephant.
...
This was SVN commit r14196.
2013-11-16 17:26:30 +00:00
6794bc5258
Made tropic forest floor darker.
...
Tweaked Deccan Plateau skirmish map.
Tweaked Sahel skim map.
This was SVN commit r14195.
2013-11-16 17:24:28 +00:00
bde9d19b7a
Adding wbg to more maps.
...
This was SVN commit r14194.
2013-11-16 16:11:43 +00:00
d7ef47959d
Sahel random map.
...
This was SVN commit r14193.
2013-11-16 15:17:18 +00:00
7ab15cb721
Building animation for mauryan support elephant
...
This was SVN commit r14192.
2013-11-16 15:05:55 +00:00
b8e9f74070
Added animations to gaia asian elephant male.
...
Maur support elephant is now asian, it has new texture.
Added normal texture for the skin of all asian elephants. (only armors
before)
This was SVN commit r14191.
2013-11-16 13:03:58 +00:00
19bd71af5d
fixed unecessary prop point
...
This was SVN commit r14190.
2013-11-15 23:52:28 +00:00
51b1de2dee
Carthaginian Fortress commit!
...
This was SVN commit r14189.
2013-11-15 23:44:02 +00:00
3ab983f8a1
Some "varfare" again plus a call to initMusic because that will be needed for the Spidermonkey upgrade.
...
This was SVN commit r14188.
2013-11-15 18:35:19 +00:00
54fcb3b4ca
Updated (and completed) Sahel skirmish map.
...
This was SVN commit r14187.
2013-11-15 16:41:05 +00:00
1cd4e6ffdd
Round footprint for lighthouse.
...
Some spec and normal maps for some shields.
Updated some skirmish maps.
This was SVN commit r14186.
2013-11-15 15:26:57 +00:00
9dbd8dbb26
Fixing the broken water on gulf of bothnia.
...
This was SVN commit r14185.
2013-11-15 14:42:18 +00:00
5dc7d8dc9f
missing lighthouse files
...
This was SVN commit r14184.
2013-11-15 13:52:57 +00:00
ca0575e422
Increasing thIncreasing the generation speed of the maps: Phoenician Levant
...
This was SVN commit r14183.
2013-11-15 08:57:32 +00:00
98638a2d2f
Ptolemaic lighthouse and LordGood's new carthaginian defense tower.
...
Fixed ptolemaic fortress garrison flag
This was SVN commit r14182.
2013-11-15 02:52:04 +00:00
47b26e56d3
Remove unused VideoRecorder from Atlas.
...
This was SVN commit r14181.
2013-11-14 23:05:07 +00:00
d459e97d33
Remove unnecessary Territory element from the fortress and defense tower templates.
...
This was SVN commit r14180.
2013-11-14 21:58:49 +00:00
9266d30e17
Build on cf4f7d18a7 based on discussion on IRC. Allow fortresses, towers, and wall towers to attack siege again, but debonus them 0.5x against it. Bonus catapults 1.25x vs fortresses, but reduce their attack vs buildings slightly in order to make them effective against all buildings but slightly better against fortresses' huge HP. They still have far less DPS than rams, even against fortresses, but are more flexible and are ranged. Enforce a minimum distance of 60 between fortresses, meaning that fewer can fire on siege weapons at once, and turtling is slightly less effective in general. Minor stat changes dealing with range of towers, fortresses, and catapults. Increase catapult splash radius and decrease splash damage, to make catapults more effective as semi-static defense against large numbers of infantry.
...
This was SVN commit r14179.
2013-11-14 21:49:02 +00:00
a3a7f1cd22
Adjust siege ram.
...
- Decrease attack from 50c with 2x vs buildings (3x vs gates) to 80c
with 1.5x vs gates.
- Increase charge attack from 40c with 2x vs buildings (3x vs gates) to
100c with 1.5x vs gates.
This was SVN commit r14178.
2013-11-14 21:15:51 +00:00
8ecfbd0899
Remove unused includes of tr1/unordered_map etc.
...
They cause build errors with libc++, and we always use
boost::unordered_map instead.
This was SVN commit r14177.
2013-11-14 20:47:59 +00:00
cfba68f8d2
Increase Advanced Siege tech from +3 crush to +5 crush.
...
This was SVN commit r14176.
2013-11-14 20:36:05 +00:00
cf4f7d18a7
Buff catapults slightly.
...
- Add 'Siege' to the RestrictedClasses of towers, wall towers, and
fortresses. A fortress by itself should not be able to shoot down a
catapult, it should require some defense. This also nerfs building a ton
of towers and fortresses, which was previously very difficult to
penetrate and led to long, boring wars of attrition.
- Increase armor from 2h/10p/5c to 2h/30p/10c (matches siege rams).
- Increase attack from 30h/0p/30c to 0h/20p/35c. Would like to add techs
to increase damage further.
- Reduce splash damage to 0h/15p/30c from 40h/0p/40c.
- Increase maximum range from 68 to 75. May increase this more or add
techs.
Motivation is that siege catapults are relatively weak late-game, as
they have great difficulting penetrating fortified positions, leading to
both sides turtling. Additionally, this makes them roughly as strong as
siege rams, having less damage output than rams but having the ability
to attack from a distance. This balances out the civs without rams and
gives the ones with both rams and catapults an additional choice to
make.
This was SVN commit r14174.
2013-11-14 20:30:00 +00:00
a04cc9f01b
Increasing the generation speed of the maps: Northern Lights, Rhine Marshlands
...
This was SVN commit r14173.
2013-11-14 18:58:55 +00:00
8dedf7bc3d
Fixes a graphics issue on Linux (probably a driver bug) by scaling the images from 1x1024 px to 4x1024 px.
...
Fixes #2265
This was SVN commit r14172.
2013-11-14 17:19:49 +00:00
b4174664c6
hellenic walltower door fixed
...
This was SVN commit r14171.
2013-11-14 16:26:46 +00:00
0170db4a53
Adding advanced graphical features into random maps. Fixes #2262 .
...
This was SVN commit r14170.
2013-11-14 14:33:55 +00:00
11c471273c
Committing the fix for undefined civs in atlas, and the problem with ptolemics in Fortress map by FeXoR. Fixes #2258 .
...
This was SVN commit r14169.
2013-11-14 12:27:56 +00:00
321e61617b
Improve MoveToTarget when the target is moving, fixes #2253
...
This was SVN commit r14168.
2013-11-14 07:25:56 +00:00
4915116ccc
Fix glooxwrapper build on gcc 4.2 and warning on clang.
...
This was SVN commit r14167.
2013-11-14 00:32:28 +00:00
4c395f4bf2
Remove Trigger and Cinematic sections from Atlas.
...
This was SVN commit r14166.
2013-11-14 00:10:04 +00:00
bd900362ea
Rebuild premake4.exe with VC++ 2008 again, so that it works on WinXP/2003
...
This was SVN commit r14164.
2013-11-13 21:16:06 +00:00
e58fa107cc
Fix skeleton caching.
...
This was SVN commit r14163.
2013-11-13 20:05:57 +00:00
49721cff33
Increasing the generation speed of the maps: Unknown Land
...
This was SVN commit r14162.
2013-11-13 14:30:27 +00:00
62551be685
New Random Map: Mainland. A simple map without any body of water. Also the space between the forests is increased. Optimizing the map for relatively lag-free games.
...
This was SVN commit r14161.
2013-11-13 13:36:47 +00:00
0d323c020b
Increasing the generation speed of the maps: Archipelago, Gulf of Bothnia, Lorraine Plain
...
This was SVN commit r14160.
2013-11-13 13:17:22 +00:00
5dac329c78
Increasing the generation speed of the maps: Aegean Sea
...
This was SVN commit r14159.
2013-11-13 10:20:22 +00:00
65bd13ac1e
Increasing the generation speed of the maps: Syria
...
This was SVN commit r14158.
2013-11-13 08:07:05 +00:00
4acbf86ffb
Trying to fix crazy elephant armature
...
This was SVN commit r14157.
2013-11-12 21:30:25 +00:00
2f0d6ee1e8
Upgraded asian elephant animations.
...
This was SVN commit r14156.
2013-11-12 19:13:45 +00:00
17fdb515f4
fix error when selecting multiple elephants
...
This was SVN commit r14155.
2013-11-12 19:03:12 +00:00
7cb4c0dcfc
Partial fix of minimap rendering for GLES.
...
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
modifies shaders as needed.
This was SVN commit r14153.
2013-11-12 01:31:52 +00:00
7dec618898
Some attempts to fix GLES build in smooth LOS and post proc manager.
...
Replaces glBegin/End with glDrawArrays, GL_QUADS with GL_TRIANGLES, and
replaces glPush/PopAttrib by resetting the viewport manually.
Adjusts GLSL shaders for these changes.
This was SVN commit r14152.
2013-11-12 01:30:17 +00:00
f1613a3c90
Fixes fancy waves build on GLES (replaces GL_QUADS with GL_TRIANGLES)
...
This was SVN commit r14151.
2013-11-12 01:25:32 +00:00
81eabfc934
Fixes basic water rendering on GLES (replaces GL_QUADS with GL_TRIANGLES).
...
Sets SDL2 to use correct profile for GLES.
Cleans up some old SDL 1.3 version checks.
This was SVN commit r14150.
2013-11-12 01:24:04 +00:00
5771bee032
First pass at fixing GLES build - more to come
...
This was SVN commit r14149.
2013-11-12 01:17:16 +00:00
0682c23fe3
Replaces BGRA textures with RGBA textures supported by GLES
...
This was SVN commit r14148.
2013-11-12 01:11:08 +00:00
54abce1a3c
hellenic walltower rotated 180 to match the droppoint with the wall RMS
...
This was SVN commit r14147.
2013-11-12 00:05:26 +00:00
df1d5d2260
fix tag 2102648f7c which had unwanted changes
...
This was SVN commit r14146.
2013-11-11 16:29:44 +00:00
0e74e3a521
Removed Ostorius.
...
This was SVN commit r14145.
2013-11-11 16:09:00 +00:00
2102648f7c
Allows autogarrison of newly trained units, fixes #1044
...
This was SVN commit r14144.
2013-11-11 15:37:16 +00:00
fad8f7fce0
adds some needed protection
...
This was SVN commit r14143.
2013-11-11 15:03:22 +00:00
3d8865f10b
Adds gloox to OS X libs build script, with patch to fix build (fixed upstream in 5de9ed7444).
...
Fixes lobby build on OS X.
Fixes zlib not building as static lib.
This was SVN commit r14142.
2013-11-11 04:41:44 +00:00
29ef5f3ce9
Adds patch for SDL 1.2 build on OS X 10.9 (Mavericks), CGDirectPaletteRef was deprecated and has now been removed. See https://bugzilla.libsdl.org/show_bug.cgi?id=2085
...
This was SVN commit r14141.
2013-11-11 01:19:55 +00:00
45a7f577d3
A bunch of OS X SDK-related fixes.
...
Adds runtime support for 10.5 APIs: display modes, bundle paths, system
paths, pasteboards. Previously this was compile-time support only, which
prevented building on later SDKs while targeting earlier APIs.
Adds hardcoded version for pre-10.6 builds, to avoid messing with
deprecated Gestalt or having to add a 10.5 non-dispatch singleton (Grand
Central Dispatch didn't exist in 10.5)
This was SVN commit r14140.
2013-11-11 00:11:25 +00:00
011cbb5725
Fixes OS X STL incompatibilities when building against later SDKs and targeting 10.5 (fixes stringstream build errors in these conditions)
...
This was SVN commit r14139.
2013-11-11 00:09:16 +00:00
5c2c7248b1
Adds zlib, curl, iconv and libxml2 to OS X libs build script, to avoid using the non-backward-compatible versions provided by Apple.
...
Adds patch for zlib configure to pick up CFLAGS/LDFLAGS, to better
support SDK builds.
Cleans up OS X libs build script, hides some extraneous output.
This was SVN commit r14138.
2013-11-11 00:04:07 +00:00
4406be3a69
Fix crash when trying to join the lobby again if the host disconnected in the game setup screen.
...
This was SVN commit r14137.
2013-11-10 22:42:48 +00:00
f070bf9d1e
Prohibit the user from picking the 'system' lobby name, as that's reserved for special messages.
...
This was SVN commit r14136.
2013-11-10 21:52:38 +00:00
e01445818a
Nerf/rebalance siege towers.
...
- Armor changed from 2h/20p/10c to 5h/20p/2c
- Attack changed from 25p to 10p/5c
- Bonus added: 2x vs structures
- Ranged reduced from 65 to 55
- Elevation bonus of 10 added
- PreferredClasses is now 'Structure'
- Ungarrisoned arrow count decreased to 0 from 2
- Build time increased to 60 from 50
- BuffHeal is now 0 (decreased from 1)
- Health reduced from 800 to 500
- Walking speed reduced to 5 from 6
The idea is for siege towers to be useful for siege, but also for
cleaning out large numbers of units. Previously they were very good at
the latter and useless for the former. They should still be very
powerful units, but not uncounterable and massing siege towers
(previously unbeatable if enough were acquired) should no longer be
feasible.
This was SVN commit r14135.
2013-11-10 20:21:50 +00:00
2811d4c367
Fixed this map.
...
This was SVN commit r14134.
2013-11-10 19:22:24 +00:00
912e485a64
Elephant changes and tweaks.
...
This was SVN commit r14133.
2013-11-10 19:08:38 +00:00
85e9a2b0ce
Added 3 idle animations and attack, death and walk animations for all asian elephants.
...
Maurya hero howdah added with normal and specular maps
This was SVN commit r14132.
2013-11-10 17:39:04 +00:00
a2477f9d40
Increasing the generation speed of the maps: Alpine Lakes
...
This was SVN commit r14131.
2013-11-10 17:29:40 +00:00
a96ed190a5
Add GLX_MESA_query_renderer support to hwdetect
...
This was SVN commit r14130.
2013-11-10 16:24:03 +00:00
d178f32698
Fix Unicode in JS print() on Linux
...
This was SVN commit r14129.
2013-11-10 16:13:40 +00:00
c27c663697
Print a traceback after an exception in the bot.
...
This was SVN commit r14128.
2013-11-10 04:28:18 +00:00
59da5fad2a
Fix some spidermonkey lobby complaints when run in strict mode.
...
This was SVN commit r14127.
2013-11-10 04:09:03 +00:00
174f636fd2
Fixes tests
...
This was SVN commit r14126.
2013-11-10 03:24:29 +00:00
37cedb8133
Make filters work and add a skirmish map filter.
...
This was SVN commit r14125.
2013-11-10 00:45:19 +00:00
4fb6896fd8
Fix warning when the hosted game is a random rms.
...
This was SVN commit r14124.
2013-11-09 23:57:31 +00:00
d7ec8c47a6
Fix Unicode support in lobby.
...
Fix EncryptPassword being called with the wrong argument order, and
encrypting username instead of password. (This will break all existing
lobby accounts.)
Fix EncryptPassword not using all of salt_base.
This was SVN commit r14123.
2013-11-09 23:26:17 +00:00
35d48d2fe8
...and increase HDATA_USER_SIZE so OglTex actually fits
...
This was SVN commit r14122.
2013-11-09 18:49:35 +00:00
1ad9d5424a
Fix error at startup on 64-bit builds.
...
OglTex had a size_t added, which pushed it over HDATA_USER_SIZE.
Use u32 instead to minimise the difference between platforms.
This was SVN commit r14121.
2013-11-09 18:39:45 +00:00
dcb3c0ad7a
Increasing the generation speed of the maps: Continent
...
This was SVN commit r14120.
2013-11-09 16:00:01 +00:00
d3fade285b
Basic Nubian archer textures.
...
Map preview for Corsica and Sardinia.
This was SVN commit r14119.
2013-11-09 14:42:32 +00:00
2d2853dd6f
Fix problems with EndGameManager in Atlas by waiting for the first turn
...
This was SVN commit r14118.
2013-11-09 10:09:28 +00:00
9cc172b164
Fixes --without-lobby for MSVC and clang, refs #2249 .
...
Cleans up some whitespace.
Removes obsolete PCH files.
This was SVN commit r14117.
2013-11-09 02:57:10 +00:00
3c47b12cbe
Display texture memory usage in profiler's renderer stats
...
This was SVN commit r14116.
2013-11-09 01:03:23 +00:00
3a278df3f7
Move ship to shoreline when tasking units to garrison inside, fixes #1391
...
This was SVN commit r14115.
2013-11-08 23:22:59 +00:00
5dfc3746e3
Remove old and unused archive stats.
...
This was SVN commit r14114.
2013-11-08 17:27:21 +00:00
81cf02cc13
Fix building with --without-lobby. Fixes #2249 .
...
This was SVN commit r14113.
2013-11-08 15:28:44 +00:00
0f8d3e23db
;
...
This was SVN commit r14112.
2013-11-08 15:28:38 +00:00
1a32a10f52
Updated premake to support VS2013. Also changed platform toolsets to vc110_xp and vc120_xp for VS2012 and VS2013 respectively. This way the builds will also work on WinXP.
...
This was SVN commit r14111.
2013-11-08 14:08:16 +00:00
da6abe630a
Fix error message on starting game due to missing global variable.
...
This was SVN commit r14110.
2013-11-08 09:52:48 +00:00
7547dae0e2
Fixing the revert by the previous commit.
...
This was SVN commit r14109.
2013-11-08 08:04:35 +00:00
f88b5be079
Increasing the generation speed of the maps: Islands, Lake.
...
This was SVN commit r14108.
2013-11-08 08:02:32 +00:00
bb28e0eb70
Fix some system message/spam filter bugs in the lobby.
...
This was SVN commit r14107.
2013-11-08 00:57:58 +00:00
1138419017
Remove broken build script
...
This was SVN commit r14106.
2013-11-07 22:20:38 +00:00
62b92af925
Fix lobby registration errors.
...
This was SVN commit r14105.
2013-11-07 22:07:26 +00:00
f53bd8974c
Add autobuilder support for glooxwrapper
...
This was SVN commit r14103.
2013-11-07 21:45:59 +00:00
93cffe9deb
Remove the old and no longer used archive builder that rebuilt the archive while the game is running.
...
This approach isn't used anymore. Now we start the archive building with
parameters to pyrogeneis.
Refs #2241 (the code used g_ScriptingHost which is going to be removed)
This was SVN commit r14102.
2013-11-07 21:06:18 +00:00
87e9c5694e
Change the LOGWARNING when a config setting doesn't exist to a LOGMESSAGE.
...
This was SVN commit r14101.
2013-11-07 21:02:22 +00:00
8d5d66e57b
Fix error that slipped into the lobby commit.
...
This was SVN commit r14099.
2013-11-07 20:10:59 +00:00
bffe917914
Multiplayer lobby based on the XmPP protocol. Special thanks to Philip, alpha123, scythetwirler, and anyone else who has helped build, debug or test the lobby.
...
This was SVN commit r14098.
2013-11-07 20:07:24 +00:00
d7121f4f55
glooxwrapper by Philip to support building gloox on Windows.
...
This was SVN commit r14097.
2013-11-07 19:38:09 +00:00
10e23c173d
Add gloox library files.
...
This was SVN commit r14096.
2013-11-07 19:04:30 +00:00
fe0510c079
Again increasing the generation speed of Islands random map by using the new chain placer. As a side effect, the map is more beautiful.
...
This was SVN commit r14095.
2013-11-07 19:02:09 +00:00
b416de9b7c
Remove the unused crypto++ library files.
...
This was SVN commit r14094.
2013-11-07 18:50:52 +00:00
3298dce158
Remove the unused crypto++ library.
...
This was SVN commit r14093.
2013-11-07 18:49:43 +00:00
3743e58f9a
allow enabling the game clock as a persistent setting
...
This was SVN commit r14092.
2013-11-07 18:06:52 +00:00
6d62b3bf40
Added a new "placer" function for the rmgen library.
...
This new placer generates terrain features that are less "predictable".
It also increases the map generation time considerably.
Currently it is only implemented on Persian Highlands random map.
This was SVN commit r14091.
2013-11-07 14:50:16 +00:00
b7751a277c
Cleanup
...
This was SVN commit r14090.
2013-11-07 12:38:41 +00:00
5ec4962184
Decreasing the generation time of Islands random map to about 2/3 of the original.
...
This was SVN commit r14089.
2013-11-07 12:00:04 +00:00
9b98585275
Remember the last market for back-to-order trading, fixes #2248
...
This was SVN commit r14088.
2013-11-06 21:07:19 +00:00
9ffe235b2f
Clean up EndGameManager. Fixes #2130
...
This was SVN commit r14087.
2013-11-05 19:40:50 +00:00
68fa9f4631
Fix building contstruction, but still don't allow positive regenrate for unhealable entities
...
This was SVN commit r14086.
2013-11-05 17:45:39 +00:00
24bc451852
Corsica and Sardinia skirmish map. Needs Iberian circuit wall.
...
This was SVN commit r14085.
2013-11-05 16:12:58 +00:00
8540740b35
disallow healing of unhealable entities via all ways
...
This was SVN commit r14084.
2013-11-05 07:07:10 +00:00
6fae05b5f6
fix
...
This was SVN commit r14083.
2013-11-03 17:41:59 +00:00
0362453035
test some components before use, adresses #2206
...
This was SVN commit r14082.
2013-11-03 17:18:43 +00:00
53a270347a
Map preview for Zagros Mtns.
...
Changed preview for Greek acrpolis.
Fixed quote attribution. Thanks anfialro.
This was SVN commit r14081.
2013-11-03 16:39:28 +00:00
f1100f10c1
Standardized Cav Spearmen animations.
...
This was SVN commit r14080.
2013-11-03 14:17:33 +00:00
c62cc3ee44
rename technology modifier 'multiplier' to 'multiply' for consistency with auras, and it looks better next to the existing 'add'
...
This was SVN commit r14079.
2013-11-03 14:09:32 +00:00
e4f2ddb738
Renamed a bunch of maps.
...
This was SVN commit r14078.
2013-11-03 14:06:49 +00:00
5dc553bf91
More shield changes.
...
Tweaked number of 5-pop houses on Sicilia skirmish map.
New "Sahel" Skirmish map.
This was SVN commit r14077.
2013-11-03 14:01:45 +00:00
34e09220a4
Normal and spec maps for a bunch of shields.
...
This was SVN commit r14076.
2013-11-03 13:36:16 +00:00
e0161bd355
small code style fix
...
This was SVN commit r14075.
2013-11-03 13:15:44 +00:00
6dca6910c3
Recursively count garrisoned units to avoid overcapacity
...
This was SVN commit r14074.
2013-11-03 13:13:30 +00:00
72e11a2dea
Fix VS2013 build errors, warnings
...
This was SVN commit r14073.
2013-11-03 12:46:07 +00:00
37f5aa5351
Standardized animations for cavalry swordsmen. Will do the same for cavalry spearmen. This is to help the player differentiate the unit types better.
...
This was SVN commit r14072.
2013-11-03 10:31:57 +00:00
768c821f13
Acropolis 7 scenario renamed to "Acropolis Night."
...
Cycladic Archipelago 06 and Deccan Plateau 01 scenarios deleted.
Gambia River skirmish map (still needs 2 out of 3 Iberian wall
circuits).
This was SVN commit r14071.
2013-11-03 10:14:43 +00:00
096fc43f9e
Three new skirmish maps. 2 need Iberians walls though.
...
Deleted a couple of scenarios.
This was SVN commit r14070.
2013-11-03 09:51:16 +00:00
f4bd08427c
Trader speed tech!
...
This was SVN commit r14069.
2013-11-03 05:40:43 +00:00
29e4b1a17c
Update Android support
...
This was SVN commit r14068.
2013-11-02 23:05:38 +00:00
8aa6485d78
Fix shader errors with OpenGL ES
...
This was SVN commit r14067.
2013-11-02 22:58:38 +00:00
ba5b572ccc
Iberian walls for Caspian Sea skirmish map.
...
Rubble for these houses.
This was SVN commit r14066.
2013-11-02 16:54:15 +00:00
c1c45bd7c8
Caspian Sea skirmish map.
...
Clouds.
This was SVN commit r14065.
2013-11-02 15:28:33 +00:00
1fa2fc9739
CClientArea parsing test
...
This was SVN commit r14064.
2013-11-02 14:39:08 +00:00
ce7c97b79f
Improve back to work behaviour (queues taken into account), fix #2206 , patch from Itms
...
This was SVN commit r14063.
2013-11-01 22:00:06 +00:00
358e8f5992
Remove ResourceGatherer for animals
...
This was SVN commit r14062.
2013-10-31 19:37:42 +00:00
552a4527ca
Iberian walls for Deccan Plateau skirmish map.
...
Specific Name for Mauryan maiden guards (Visha Kanya).
Clarified the Iberian json a bit.
Some tooltip tweaking.
This was SVN commit r14060.
2013-10-31 17:21:10 +00:00
543ec3a8c7
Fix launching skirmish maps without selecting a civ
...
This was SVN commit r14059.
2013-10-30 17:01:11 +00:00
60fb5ed1c3
- Fix garisson and formation aura types
...
- Implement tech mods for UnitMotion speeds, Fixes #1958 , based on patch
by wraitii
- Implement athen_hero_themistocles ship speed aura as a test
This was SVN commit r14058.
2013-10-30 16:12:53 +00:00
2d1be3d47e
Improve correctness of hotkeys at low framerates.
...
SDL queues up all the input events received in a frame. When the hotkey
system saw a key up/down event, it immediately updated its
HotkeyIsPressed state and then pushed a hotkey event onto the end of the
queue.
If the initial queue was e.g. [key-down shift, key-press Z, key-up
shift], the hotkey event triggered by Z would be processed after the
key-up shift had updated the HotkeyIsPressed state, so the handler of
the Z hotkey would not think the shift hotkey was pressed.
If the initial queue was e.g. [key-press Z, mouse-click], the hotkey
triggered by Z would be processed after the mouse-click event, so it
could apply to the wrong building selection.
Fix by pushing the hotkey events onto a special queue that gets
processed before any subsequent SDL input events.
Also update the HotkeyIsPressed status when the HOTKEYDOWN/HOTKEYUP
events are processed, not when they are generated, to guarantee they are
consistent with the DOWN/UP events.
Fixes #1869 .
This was SVN commit r14057.
2013-10-30 01:38:32 +00:00
11c7c44a0b
Fixed typos reported in Transifex by qwertz and Loki.
...
This was SVN commit r14056.
2013-10-29 23:22:09 +00:00
b67c411b33
Fix typos in template files. Refs #2185 .
...
This was SVN commit r14055.
2013-10-28 20:26:35 +00:00
15f09f7005
Fix typos in civilization files. Refs #2185 .
...
This was SVN commit r14054.
2013-10-28 20:21:27 +00:00
538c250d67
Fix typos in descriptions of random maps. Refs #2185 .
...
This was SVN commit r14053.
2013-10-28 20:19:09 +00:00
dd7445262c
Typo: enemey → enemy.
...
This was SVN commit r14052.
2013-10-28 20:01:51 +00:00
fcde137b30
Viriato.
...
This was SVN commit r14051.
2013-10-28 14:35:25 +00:00
e2f475b86a
Make the *nix ARM support a little sturdier, Fixes #2121
...
This was SVN commit r14050.
2013-10-27 21:06:15 +00:00
3173722099
Copy this.entites in GarrisonHolder before passing and modifying it. Patch by mimo. Fixes #2238 .
...
This was SVN commit r14049.
2013-10-27 16:37:51 +00:00
31e79e6709
Reorders the game setup drop list for maps.
...
This was SVN commit r14048.
2013-10-26 15:20:13 +00:00
30af350e31
New Neareastern Badlands skirmish map and it's awesome with Whizbang Graphics (WBG) enabled.
...
Tweaked some stuff on a few maps.
Fixed Iberian Walls for Nile River skirmish.
Changed names for Ptolemaic warships.
A couple of technology portraits for Advanced and Elite upgrades (these
techs are not implemented, but planned).
This was SVN commit r14047.
2013-10-26 15:10:15 +00:00
597da2ff9d
Alpha 14 remake
...
This was SVN commit r14045.
2013-10-26 11:10:21 +00:00
a45b074b07
Renamed the Arabian Oasis maps to Libyan Oasis, because the Egyptian eye candy assets insinuate the Libyan Desert instead of the Arabian Desert.
...
Changed Nile River maps to "naval" maps because the AI gets stuck trying
to cross the river.
Renamed the "ptol" statue ruins to "egyptian" statue ruins. Makes them
more generically "Egyptian".
Ensured siege engines can only be built in City Phase.
This was SVN commit r14044.
2013-10-26 10:31:52 +00:00
64dc783a18
Simplified the Spartan population penalty.
...
Changed costs on a few units.
New tooltips and hero auras for Carthaginian heroes Hannibal, Hamilcar,
and Maharbal. (see: wiki civ profile)
Fixed specificname for some Carthaginian units.
Added a field entity for "skirmish" maps.
This was SVN commit r14043.
2013-10-26 09:40:21 +00:00
fe6d508a82
Punjab skirmish map.
...
Some map tweaks.
This was SVN commit r14042.
2013-10-26 03:07:03 +00:00
1ee4c52779
All 4 players on Nile River skirmish map now have Iberian walls.
...
This was SVN commit r14041.
2013-10-25 09:00:46 +00:00
10ddc2aed6
Fixed starting unit for Ptolemies.
...
Nile River skirmish map (still needs Iberian walls for 2 of the
players).
New map preview for Arabian Oasis.
Moved Civic Center back to Town Phase, but made it take twice as long to
build.
Fixed elephant template.
Fixed up Persian Highlands skirmish map based on some notes from
Alpha123.
This was SVN commit r14040.
2013-10-25 08:02:55 +00:00
14166af0ac
This was SVN commit r14038.
2013-10-24 09:46:26 +00:00
4e86b00a05
Remove inconsistencies in the manual. Refs #2185 .
...
Fix player name.
Make log messages when saving games use quotes around paths.
This was SVN commit r14037.
2013-10-23 22:18:40 +00:00
20ed5b118c
Unify script conversions and remove JSInterface_Vector3D.
...
Because it was historically grown, we have some duplicated code for
converting script types to native types.
This patch removes the file JSConversions.cpp and moves some code to
ScriptConversions.cpp.
The places using JSConversions.cpp are changed to use the
ScriptInterface's conversion functions in ScriptConversions.cpp.
I also removed JSInterface_Vector3D because it had additional
requirements to the conversion code that no other code has and because
it's currently not used. I think it doesn't make sense to maintain code
just because it could possibly be used again later.
Closes #2213
Refs #1886
This was SVN commit r14036.
2013-10-20 17:13:53 +00:00
a4cd90ddfc
Avoid non-ASCII characters in source code, since tools don't decode them consistently.
...
Fixes #2198 .
This was SVN commit r14035.
2013-10-20 09:27:44 +00:00
d6f6d2b145
Remove useless error messages.
...
This was SVN commit r14034.
2013-10-20 01:47:16 +00:00
2117f77812
Fixed some resource placement.
...
This was SVN commit r14033.
2013-10-20 01:18:59 +00:00
50a2bddf77
Fixed some goats.
...
This was SVN commit r14032.
2013-10-20 01:10:02 +00:00
34d927f25c
These two skirmish maps are now complete with walls for Iberians.
...
This was SVN commit r14031.
2013-10-19 23:52:28 +00:00
15f565f316
Corinthian Isthmus and Persian Highlands skirmish maps (wip).
...
This was SVN commit r14030.
2013-10-19 20:54:41 +00:00
742c489353
Fix typos, remove BOMs and add newlines before EOF. Refs #2185 . Patch by Gallaecio.
...
This was SVN commit r14029.
2013-10-19 20:13:48 +00:00
71a41ba401
Line endings. Refs #2185 .
...
This was SVN commit r14028.
2013-10-19 20:07:20 +00:00
45d4e92782
Fixed building requirements for Town Phase.
...
Changed Brit Wonder to the new Stonehenge model. :)
Trying out some new hunting changes from sanderd. Might just be
temporary. Refs #2092
This was SVN commit r14027.
2013-10-19 18:20:25 +00:00
b9892bc73a
Remove ScriptableObject/CJSObject
...
Since all remaining uses of ScriptableObject/CJSObject have been
removed, the related files can now also be removed.
Closes #2212
Refs #2126
Refs #2137
Refs #1886
This was SVN commit r14026.
2013-10-19 10:14:08 +00:00
024dd82209
Fix non-PCH build
...
This was SVN commit r14024.
2013-10-19 01:11:20 +00:00
ac335f37c8
Fix some Clang warnings about unused private members
...
This was SVN commit r14023.
2013-10-19 00:53:58 +00:00
c0b628bcac
Fix some typos. Patches by Swyter (Spanish translator). Fixes #2210 , #2211 .
...
This was SVN commit r14022.
2013-10-18 20:33:08 +00:00
701508922f
Use CStrIntern for font names to reduce lookup cost
...
This was SVN commit r14020.
2013-10-18 16:15:42 +00:00
91169c82c7
Optimise rendering of scrollable text boxes by clipping
...
Add optional clipping rectangle to CTextRenderer. Strings that are
printed
outside the vertical extent of the clipping rectangle will be
immediately
skipped. This greatly reduces the cost of large scrollable text boxes.
This was SVN commit r14019.
2013-10-18 16:05:02 +00:00
751558d894
Optimise text rendering by batching
...
When CTextRenderer is given multiple strings with no differences other
than position, render them in a single glDrawElements call to reduce
driver overhead.
Also avoid some unnecessary copies of std::wstrings.
This helps performance a bit with large GUI text boxes.
This was SVN commit r14018.
2013-10-18 16:02:48 +00:00
b6c7c0d799
Optimise glyph lookup in text renderer
...
std::map lookup was a major cost when rendering large amounts of text.
Replace it with a more efficient 2-level array.
This was SVN commit r14017.
2013-10-18 15:56:12 +00:00
5778484a77
Refactor text renderer
...
Replace unifont with CFont and CFontManager, since the h_mgr interface
was
needlessly inconvenient.
Load the font textures through CTextureManager, to support dynamic
reloading (e.g. when resetting GL state - see #741 ).
Add CFontMetrics as a convenient wrapper for code that just wants to
measure text.
Fixes #1117 .
This was SVN commit r14016.
2013-10-18 15:53:07 +00:00
8799bd98b0
Support 8bpp textures
...
When textures.xml specifies format="alpha", the input is expected to be
an
8-bit greyscale PNG, and the output will be an 8-bit uncompressed
alpha-only DDS.
Add format override to CTextureProperties, to select between e.g.
GL_ALPHA
and GL_LUMINANCE for 8-bit textures.
This is needed so fonts can use the new texture system.
This was SVN commit r14015.
2013-10-18 15:36:31 +00:00
6a2fac7a58
Add hotkeys for JSDebugger commands. Patch by sathyam. Fixes #2208 .
...
This was SVN commit r14014.
2013-10-18 14:41:08 +00:00
9802adf92f
celt_stonehenge with normal and spec maps. Fixes #2053
...
This was SVN commit r14013.
2013-10-18 14:29:10 +00:00
f3968c0d4c
fix some flaws in the preferred classes. Patch by Jammus, Fixes #1985
...
This was SVN commit r14011.
2013-10-16 19:08:01 +00:00
e6d9094c98
Remove InitSavedGame, but keep the rallypoint problem it solved. Fixes #1762 , Patch by mimo.
...
This was SVN commit r14010.
2013-10-16 17:58:12 +00:00
6c3c6cfd3a
This was SVN commit r14009.
2013-10-16 14:08:47 +00:00
a2f836c393
Prevent bogus -Wmaybe-uninitialized warnings in GCC
...
This was SVN commit r14008.
2013-10-16 12:22:50 +00:00
eb33d0fd61
New unit for Romans: "Italian Allied Cavalry" which can help counter archers.
...
Persians and Mauryans still have uber archers, but must first pay for
them by researching "Archery Tradition" at the Barracks for 200F 300W.
This technology adds +10 meters to the range of all bow-using units,
plus makes archer units train faster (but have less health).
This was SVN commit r14007.
2013-10-16 01:04:55 +00:00
8456d50015
Found a couple more. (removing stonewall attack restriction).
...
This was SVN commit r14006.
2013-10-15 22:43:59 +00:00
8053cbd474
Remove the attack restriction for units against stone walls. May add it back for ranged units like archers and javelinists, after some discussion. I also feel it would be kind of weird to "charge" a stone wall (except for battering rams and elephants). So, we'll have to talk about it some more. But for now, let's test this out.
...
This was SVN commit r14005.
2013-10-15 22:43:06 +00:00
40db79df33
greek docks do not show warships in the foundation until construction is finished.
...
Different actor variations of the building can be displayed while
construction naming their variation to "scaffold"
This was SVN commit r14004.
2013-10-15 21:24:20 +00:00
2bbbcff811
fix tests, breaking caused by renaming files.
...
This was SVN commit r14003.
2013-10-15 16:10:06 +00:00
5f5eedc513
Rename technology related files, methods and messages so their names represent the shared data flow between technologies and auras (and maybe future components). Implement the C++ part of auras through these generalised files. Fixes #2154
...
This was SVN commit r14001.
2013-10-15 10:05:08 +00:00
a4ce8dac34
fix technologies broken by 379a7b208f
...
This was SVN commit r14000.
2013-10-14 20:36:57 +00:00
379a7b208f
Implement the js side of auras. Refs #2048 . Patch with the help of Alpha123. Only the temple aura is added as example, all other aura components are removed from the templates to be created from scratch again.
...
This was SVN commit r13998.
2013-10-14 15:51:21 +00:00
57d47f23c9
This was SVN commit r13997.
2013-10-13 18:11:54 +00:00
417e2455a0
Added ptolemaic ptolemaic storehouse and Lordgood's new cart temple and ptolemaic defense tower with little fixes.
...
This was SVN commit r13996.
2013-10-13 15:26:43 +00:00
ce5c43fe03
Fix typo
...
This was SVN commit r13995.
2013-10-13 11:41:30 +00:00
3a28caed03
Rebuilt premake4.exe with VC++ 2008 to avoid VC++ 2012 issues targeting XP
...
This was SVN commit r13994.
2013-10-12 23:47:09 +00:00
41de5440e0
Added and applied normal and spec maps for ptolemaic struct, paintings and statues, added ptolemaic temple and farmstead. Fixed ptolemaic CC footprint + little fixes
...
This was SVN commit r13993.
2013-10-12 21:33:21 +00:00
7335c32c7e
Some updated sounds from LAVS.
...
This was SVN commit r13992.
2013-10-12 01:27:10 +00:00
9b8667a9aa
Really add special starting unit.
...
This was SVN commit r13991.
2013-10-11 23:37:04 +00:00
4f03550adf
Create a special starting unit entity for skimish maps.
...
This was SVN commit r13990.
2013-10-11 23:36:02 +00:00
396bd844dd
Remove duplication between getActionInfo and determineAction. Allow setting rally points if not all selected buildings can do so. Patch by mimo. Fixes #2189 .
...
This was SVN commit r13989.
2013-10-11 22:43:22 +00:00
801cac87dd
Properly queue rally points when setting them via the minimap. Patch by mimo. Fixes #2203 .
...
This was SVN commit r13988.
2013-10-11 21:50:45 +00:00
c5669e2c4e
Add a back to work button. Patch by Itms. Fixes #799
...
This was SVN commit r13987.
2013-10-11 19:11:07 +00:00
e2d28c8894
Add AppData file, for use by some Linux package installers.
...
Fixes #2202 .
This was SVN commit r13986.
2013-10-11 18:55:46 +00:00
7791c4c61d
This was SVN commit r13985.
2013-10-11 11:01:55 +00:00
f22e47a743
This was SVN commit r13984.
2013-10-11 11:01:06 +00:00
644135b9f3
Fixes variable name conflict in session UI, patch by Itms, fixes #2199
...
This was SVN commit r13982.
2013-10-11 00:22:27 +00:00
f5eeed9cf7
Clears selections when loading saved game, patch by RefinedCode (fixes buggy selection behavior when using quicksave/quickload), fixes #2178
...
This was SVN commit r13981.
2013-10-10 23:58:29 +00:00
a00e57df72
Fixes hypothetical mem leak in network code (and an error in Cppcheck), patch by Riemer, fixes #2122
...
This was SVN commit r13980.
2013-10-10 23:46:42 +00:00
f6c9db33d6
Focus on the building a hero is garrisoned in when the hero button is double-clicked. Patch by mimo. Fixes #2131
...
This was SVN commit r13978.
2013-10-10 21:23:19 +00:00
c7e3c1499f
Fixed typo.
...
This was SVN commit r13977.
2013-10-09 20:07:36 +00:00
cd5a2aa527
Ptolemy IV.
...
Ptolemaic heroes added to Ptolemaic Fortress.
Seleucid Romanized Infantry Champion.
This was SVN commit r13976.
2013-10-09 13:42:34 +00:00
5c3ff86219
add different skirmish structures + skirmish demo map containing all skirmish templates so far
...
This was SVN commit r13975.
2013-10-08 18:02:35 +00:00
f3d83e0616
add skirmish defense tower and houses
...
This was SVN commit r13974.
2013-10-08 09:13:55 +00:00
f3d088dd5c
Fixes JS debugger, fixes VS 2013 build error, re-fixes #2127 , #2175
...
This was SVN commit r13973.
2013-10-07 22:55:30 +00:00
8464777759
Fixed premake4 build incorrectly ignoring vs2010 action.
...
fixes #2191
This was SVN commit r13972.
2013-10-07 22:45:08 +00:00
a97cd73cf8
Adds EnableSSE2 for Visual Studio builds on windows.
...
Adds optional "--with-c++11" flag for GCC/ICC builds. For possible
future C++11 migration.
refs #2191
This was SVN commit r13971.
2013-10-07 22:39:13 +00:00
055ea57468
ref #2191
...
Adds VS2012 support for premake4. Also adds
update-workspace-with-atlas.bat for VS2012 builds that need to compile
AtlasUI.dll, too.
This was SVN commit r13970.
2013-10-07 22:10:16 +00:00
79af6fb17f
Newly updated Ptolemaic champion cavalry.
...
This was SVN commit r13969.
2013-10-07 20:47:06 +00:00
b9268fbdcd
Fixes error logging in the JS debugger, based on patch by RefinedCode. Fixes #2175
...
This was SVN commit r13967.
2013-10-07 02:10:41 +00:00
d3e0fb4f84
Fixes crannóc spelling, thanks to GunChleoc
...
This was SVN commit r13966.
2013-10-07 00:46:58 +00:00
1408a0be83
This was SVN commit r13965.
2013-10-06 23:29:03 +00:00
74216a5825
Reverts field limits from f4abcd2ef9 until we can fix AI and UI problems, refs #2187
...
This was SVN commit r13964.
2013-10-06 23:25:55 +00:00
6d67957db2
Prevents buildings from getting attack-move orders and implements attack-move rally points, patch by mimo. Fixes #2171
...
This was SVN commit r13963.
2013-10-06 22:50:30 +00:00
35fa527814
Adds attacking player's name to attack notification messages.
...
Cleans up some duplicate username/color code in messages.js
This was SVN commit r13962.
2013-10-06 22:07:55 +00:00
7d92b3459b
Turns on Attack notification text.
...
This was SVN commit r13961.
2013-10-06 21:17:56 +00:00
573215dad8
Fixed the player names on this map.
...
This was SVN commit r13960.
2013-10-06 20:51:30 +00:00
4cfee05c31
New skirmish templates for Brit war dog and Maur Worker Elephant. Added to current Skirmish maps.
...
This was SVN commit r13959.
2013-10-06 20:23:21 +00:00
efc84a9cce
Adjusting time costs for these Ptol buildings.
...
This was SVN commit r13958.
2013-10-06 19:13:20 +00:00
5fc888fdcf
Some more player names for Carthage.
...
Player names for Seleucids.
Fixed names for Celtic docks and merchant ships.
Fixed cavalry health for a few units.
Name stuff for ships, specifically Carthage. Fixes #2106 .
Started work on some Ptolemaic units, specifically the Cav Spearman.
Added LordGood's Sacred Band Cavalry portrait.
This was SVN commit r13957.
2013-10-06 18:28:10 +00:00
b9b923be11
Fixes #2149
...
This was SVN commit r13956.
2013-10-06 14:58:26 +00:00
14b51afc39
Fixes #2152
...
This was SVN commit r13955.
2013-10-06 06:57:50 +00:00
f4e4247f06
Fixed Gallic Outpost name. Fixes #2167 .
...
Fix Ptol civ center footprint.
This was SVN commit r13954.
2013-10-06 06:53:32 +00:00
50782c1c1c
Fixes non-PCH build
...
This was SVN commit r13953.
2013-10-06 05:15:54 +00:00
754e794f9b
Implements attack notifications based on patch by madmax and zoot, fixes #1719
...
This was SVN commit r13951.
2013-10-06 04:49:38 +00:00
2418ae190d
Fixes some erroneous documentation in EntityLimits.
...
Removes previously implemented LimitsPerCivCentre from AI states.
Removes hardcoded categories from TrainingRestrictions
This was SVN commit r13950.
2013-10-06 03:13:46 +00:00
c21953b434
Added some Iberian walls to a couple of skirmish maps.
...
Rethought the naming scheme of the skirmish maps.
This was SVN commit r13949.
2013-10-05 21:58:42 +00:00
a1ceda4012
Polishing the Random Maps: The last batch...
...
This was SVN commit r13948.
2013-10-05 18:29:44 +00:00
fecfda29f6
Remove civ code hardcoding from SkirmishReplacer component. Refs #1198 .
...
This was SVN commit r13947.
2013-10-05 17:54:41 +00:00
3624c591bd
Fix compilation failure without PCH.
...
This was SVN commit r13946.
2013-10-05 16:22:51 +00:00
85253ca3c8
Let corpses cast shadows again. Refs #1771 .
...
This was SVN commit r13945.
2013-10-05 16:22:46 +00:00
ff6b80305c
Rearrange hotkeys a bit. Queue the 8th unit is now Comma, and select idle warrior is forward slash (replacing camera-follows-mouse, which is available by holding middle mouse anyway). Fix #2181 .
...
This was SVN commit r13944.
2013-10-04 23:31:24 +00:00
433b29d6dc
Fix description of Belgian Bog skirmish map.
...
This was SVN commit r13943.
2013-10-04 23:14:52 +00:00
76d9893123
New skirmish maps.
...
Fixed some things.
This was SVN commit r13942.
2013-10-04 18:11:13 +00:00
2283aedc3c
The first Skirmish maps.
...
Temporary selection and complete sounds for Theater, Elephant Stables,
Cavalry Stables, Blacksmith, and Wonder. Sounds by LAVS. He is working
on improving them.
This was SVN commit r13941.
2013-10-04 13:17:21 +00:00
939898c47d
Nerf Iberian champion cavalry a bit.
...
This was SVN commit r13940.
2013-10-04 04:01:58 +00:00
7901ed51d4
Implements skirmish maps, based on patch by sanderd17, fixes #1198 . Skirmish maps are like scenarios, except the player can choose their civ during match setup. To create a skirmish map: place some skirmish entities for each player in Atlas (see templates/skirmish/* for examples), uncheck the player's civ in Atlas' player panel if desired, and save in the maps/skirmishes directory. The map will appear in match setup under the "Skirmish" match type.
...
Implements custom, VFS-based map load/save dialogs for Atlas (replaces
broken native file dialogs), fixes #631 , #889 .
Fixes map loading/saving to handle arbitrary subdirectories for better
organization.
Adds default settings to Atlas player panel, fixes #1872 . Each setting
now has a checkbox to choose whether it should be saved with the map
(avoids writing lots of useless default data for each map).
Adds map preview setting to Atlas, refs #1745 .
Cleans up and simplifies some duplicate code.
Fixes optional serialization performance test.
This was SVN commit r13938.
2013-10-04 02:29:16 +00:00
5c35690309
Fixes broken statue ruins template and replaces old statue treasures with ruins
...
This was SVN commit r13937.
2013-10-04 01:15:16 +00:00
6a97bbd4c3
Fixes dropdowns opening with empty list, caused assertion failure about vector subscript range in MSVC debug build
...
This was SVN commit r13936.
2013-10-04 00:31:36 +00:00
b0e2f6b368
Added obelisks to ptol_cc
...
This was SVN commit r13935.
2013-10-03 18:41:07 +00:00
e700937fd3
Fix non-SSE x86 builds
...
This was SVN commit r13934.
2013-10-03 18:22:10 +00:00
398a32a6ff
Added ptolemiac civic centre with ao and custom decal dirt_7x5
...
This was SVN commit r13933.
2013-10-03 17:18:57 +00:00
739ed00b5e
Added ptolemaic fortress with ao. Updated ptolemaic struct texture
...
This was SVN commit r13932.
2013-10-02 21:29:44 +00:00
e382967e34
Updated a bunch of things.
...
New waypoint and garrison flags for Ptolemies. New texture for Ptolemies
woman. Fixed footprint for statues ruin. etc.
This was SVN commit r13931.
2013-10-02 18:51:49 +00:00
bb78b4c931
Replacing these statue "treasures" with "ruins." Instead of getting the resources immediately, ruins allow the player to "mine" the resources at a fast rate.
...
This was SVN commit r13930.
2013-10-02 16:54:13 +00:00
e0d50b6137
added seleucid thureos texture by request
...
This was SVN commit r13929.
2013-10-02 14:53:59 +00:00
60200f8dbb
fixed ptolemaic statues base.
...
This was SVN commit r13928.
2013-10-02 13:41:53 +00:00
2e24c9f2b7
ptolemaic houses and statues with ao. Added ptolemaic struct texture and 4 ptolemaic round shields variations
...
This was SVN commit r13927.
2013-10-02 12:18:10 +00:00
26af70ec7b
Fixed ptolemaic thureos mesh shape
...
This was SVN commit r13926.
2013-10-01 15:15:39 +00:00
9f5635085e
Fix #1833 : animals spin around needlessly while roaming.
...
Patch from mimo.
This was SVN commit r13924.
2013-09-30 23:52:22 +00:00
e449364408
Recompute system shader defines immediately when the relevant inputs change, instead of delaying until ReloadShaders.
...
This fixes an error with autostart and smoothlos=true, where the system
defines were being accessed before the first rendered frame.
This was SVN commit r13923.
2013-09-30 22:39:06 +00:00
8cf5f61885
Avoids ugly layering of GUI pages when entering match setup
...
This was SVN commit r13922.
2013-09-30 20:51:19 +00:00
cbe103bdfe
ptolemaic galatian shields for basic, advanced and elite with specular maps.
...
This was SVN commit r13921.
2013-09-30 19:03:09 +00:00
1f032b7c59
Added Lordgood's new britons barracks and defense tower with minimal tweaking
...
This was SVN commit r13917.
2013-09-30 08:14:10 +00:00
e24ce51029
Adds DynamicArena allocator that grows by fixed chunk size, fixes #2142 .
...
Changes fixed size arenas to new dynamic arenas with reasonable chunk
sizes (may require tuning), refs #1842
This was SVN commit r13916.
2013-09-30 01:22:44 +00:00
fbee618ac8
Fixes memory leak in sound manager
...
This was SVN commit r13915.
2013-09-30 01:09:16 +00:00
238b7f84d8
Changes the ConfigDB to expose global functions to scripts instead of properties and custom objects.
...
Fixes #2172
Refs #1886
This was SVN commit r13914.
2013-09-29 18:56:50 +00:00
2ea0620abb
Reduce the health drain of the Nubian Archer.
...
Fixed the Lighthouse to not have the Library special tech.
Ptol Military Settlement has better sounds and a different portrait.
Increased defense tower limit since they now have a min distance limit.
Tweaked Ptolemies demo map.
This was SVN commit r13913.
2013-09-29 16:29:38 +00:00
022393a0c6
Spelling fixes from the translation work by Gallaecio and Loki72. Fixes #2150 , #2170 .
...
This was SVN commit r13912.
2013-09-29 16:14:40 +00:00
c2583e42da
Reduce memory allocations in the renderer
...
Use an arena allocator in ShaderModelRenderer::Render, to reduce
the allocation cost in STL containers.
Avoid unnecessary copying of std::vectors.
This was SVN commit r13911.
2013-09-29 14:48:11 +00:00
6b0a0e83eb
Fix profiler malloc count in debug mode on Windows
...
wdbg_heap_NumberOfAllocations doesn't work without the wdbg_heap
leak detector, which is disabled since it's slow and broken.
Use a simple hook via _CrtSetAllocHook instead to count allocations.
This was SVN commit r13910.
2013-09-29 14:43:14 +00:00
f4abcd2ef9
Gauls get: Tavern and Naked Fanatic.
...
Britons get: Rotary Mill.
So, now all Celts get Rotary Mill, but also a unique unit-producing
building.
Britons now have a better demo "sandbox" map.
Ptolemies now play like they are intended. Just need tons of new
artwork. ;) Try them out on the demo map: Sandbox - The Ptolemaic
Egyptians.
Some highlights: Their Nubian Archers train very fast, but have a finite
life. The Lighthouse can be built on the shoreline (but looks like a
library). Their Military Settlement works as intended (can be built in
neutral territory, but min distance of 80 meters).
Testing out: Farm field limits (+8 per Farmstead, +2 per civ center).
This was SVN commit r13909.
2013-09-29 14:37:26 +00:00
eceae8be5c
Fix crash when setting rally point
...
This was SVN commit r13908.
2013-09-29 14:02:47 +00:00
d663dae2d8
New version of Aegis. Huge rewrite for WIP naval support (still very, very buggy at this point.) Features a few bugfixes and might be more efficient than the former version.
...
NEEDS TESTING.
This was SVN commit r13907.
2013-09-29 13:32:52 +00:00
994ebd9836
Add a list of statically-constructed CStrIntern strings
...
Switch all the constant strings in graphics code to use the new
variables.
This avoids the cost of instantiating CStrInterns at runtime every
frame.
This was SVN commit r13906.
2013-09-29 13:19:52 +00:00
08f431fa0d
Ptolemaic entity templates for Enrique.
...
This was SVN commit r13905.
2013-09-29 03:08:59 +00:00
4e9570cd0f
Fix unnecessary CShaderConditionalDefines copy, and inline some functions
...
This was SVN commit r13904.
2013-09-29 02:05:02 +00:00
f075571502
Fix slightly expensive GetSystemShaderDefines()
...
Only recompute when any relevant parameters have changed, then return
the cached value.
This was SVN commit r13903.
2013-09-29 01:00:11 +00:00
555deea136
Fix conditional defines to not construct new CShaderDefines frequently
...
CShaderDefines is designed to be efficient to copy and compare, but not
to construct. Conditional defines were constructing new CShaderDefines
for many models every frame.
Precompute all the possible conditional combinations of CShaderDefines
when a material is first loaded, so they can be looked up at no cost
when rendering.
This was SVN commit r13902.
2013-09-29 00:30:58 +00:00
22f0f2b232
Set _NO_DEBUG_HEAP=1 in VS2010 projects
...
The debug heap has a high performance cost, even in release mode,
when running inside a debugger, which is surprising to people trying
to measure performance. It doesn't seem very useful at finding bugs
either.
Add a NoDebugHeap flag to Premake, to set that environment variable
when running in the VS2010 debugger.
This was SVN commit r13901.
2013-09-28 14:35:28 +00:00
2d1b7914a6
This was SVN commit r13900.
2013-09-28 11:58:05 +00:00
b8a5acfd9e
Preview image for The Gauls demo map.
...
This was SVN commit r13899.
2013-09-26 18:44:45 +00:00
28ce5f3458
It might be better to issue a LOGWARNING when Spatial queries are too large. Opening the crash window seems a bit too much for something that can be recovered from.
...
This was SVN commit r13898.
2013-09-24 21:50:46 +00:00
e370af8d4e
Fix rally point rendering on saved games. Fixes #1762 . Patch by mimo
...
This was SVN commit r13897.
2013-09-24 20:27:18 +00:00
6880fd214f
Fixed name of this map.
...
This was SVN commit r13896.
2013-09-24 18:41:19 +00:00
895f927ff0
Celts corral props missing fix
...
This was SVN commit r13895.
2013-09-24 16:26:26 +00:00
59c8e9e6dc
Big gameplay experiment: Moved Civic Centers from Town Phase to City Phase to see what it does to multiplayer match ups.
...
New "sandbox" demo map for the Gauls.
Renamed "Night's Watch" to "Sentries."
This was SVN commit r13894.
2013-09-24 15:55:35 +00:00
cd51540725
This was SVN commit r13892.
2013-09-22 18:13:19 +00:00
2a613f8236
Removes mostly useless video memory detection, fixes another crash with Nvidia Optimus on Windows, fixes #2145 , #2138
...
This was SVN commit r13891.
2013-09-22 18:07:33 +00:00
e488ed09f5
This was SVN commit r13890.
2013-09-22 11:30:24 +00:00
ae4ccfe050
3D farm fields for all factions.
...
Fixed tooltips for a bunch of units.
Increases pierce armor for elephants.
This was SVN commit r13889.
2013-09-22 08:07:29 +00:00
5287af8967
Increased SpatialQueryArray max results from 1024 to 2048. This is a temporary fix until the Search and Prune solution is implemented.
...
This was SVN commit r13888.
2013-09-22 04:37:46 +00:00
5afb18dda4
fix units ejecting on destroying structure
...
This was SVN commit r13887.
2013-09-21 19:41:13 +00:00
4f6ddfe894
fix theatron build limit
...
This was SVN commit r13886.
2013-09-21 19:05:59 +00:00
636f09053b
celt tavern update
...
This was SVN commit r13885.
2013-09-21 15:24:56 +00:00
9781b67cf4
Changes the Console to expose global functions to scripts instead of properties.
...
Fixes #2140
Refs #1886
This was SVN commit r13884.
2013-09-21 14:48:19 +00:00
bb506fb578
Spec maps and new player color texture for Greek females.
...
This was SVN commit r13883.
2013-09-21 12:41:05 +00:00
21639ce5ea
Normal map and Specular map for warship sails.
...
Fixed Cav Sword tooltip.
Updated the product logo a little bit.
This was SVN commit r13881.
2013-09-21 11:50:04 +00:00
0233bb4877
Temporary Ptolemies emblem.
...
This was SVN commit r13880.
2013-09-21 09:23:21 +00:00
ccc873d9d5
Tech complete sound slightly louder.
...
This was SVN commit r13879.
2013-09-21 09:22:31 +00:00
ec66e59150
Fixed some civ json stuff. Fixed Ptolemaic json.
...
This was SVN commit r13878.
2013-09-21 09:21:48 +00:00
12e2428495
Changes the Renderer to expose global functions to scripts instead of using CJSObject.
...
Fixes #2137
Refs #1886
This was SVN commit r13877.
2013-09-21 08:24:45 +00:00
c0b84fb41f
Added build limits for Theater, Council Chamber, and Library.
...
Added Ptolemies civ json file. I am getting a javascript error in-game
though. Need help trouble shooting it.
This was SVN commit r13876.
2013-09-21 07:33:22 +00:00
9d2f59e80a
Tweaking the Athenian field.
...
Tweaking 0 A.D. logo.
Fixed tooltip for Slinger.
Fixed name for Carthaginian wonder.
This was SVN commit r13874.
2013-09-21 03:58:54 +00:00
d252e245ef
Optimise fixed multiplies on MSVC x86
...
On MSVC, casting i32 to i64 then multiplying gets compiled into a call
to __allmul, which is slow. Use the __emul intrinsic instead.
GCC 4.6+ appears optimise this case automatically and doesn't need any
special handling.
This reduces the cost of ComputeShortPath by about 50% (testing AI vs AI
on Oasis 01).
This was SVN commit r13873.
2013-09-20 20:17:54 +00:00
5a8cfb738b
Commited experimental field for athenians (propped farm field)
...
This was SVN commit r13872.
2013-09-19 15:29:01 +00:00
4b7c1a915d
Celtic corral upgraded. Added more playercolor to gaullic civic centre.
...
This was SVN commit r13871.
2013-09-19 13:58:48 +00:00
bfe0b79b91
Better fix of Grid memory leak, refs #1842
...
This was SVN commit r13869.
2013-09-18 01:21:36 +00:00
e10c4ebaae
Amend 553875ea83: Forgot to include new hotkey in the config.
...
This was SVN commit r13868.
2013-09-17 00:31:18 +00:00
553875ea83
Allow the use of Enter in addition to the OK button in the Join Game dialog.
...
This was SVN commit r13867.
2013-09-17 00:30:11 +00:00
9f2a850a95
Fixes buggy operators and memory leak in Grid class, refs #1842
...
This was SVN commit r13866.
2013-09-17 00:28:22 +00:00
5d9b2b95b0
Ticket #2127 - Performance and style improvements in scriptinterface.
...
No real behavior changes, only code maintenance.
Fixed signed/unsigned mismatch in EntityMap.h
This was SVN commit r13865.
2013-09-16 19:10:06 +00:00
97912dd545
This was SVN commit r13864.
2013-09-16 16:56:26 +00:00
16b615db79
Celt walls upgraded
...
This was SVN commit r13863.
2013-09-16 12:25:03 +00:00
a770ad9467
small code style fixes
...
This was SVN commit r13862.
2013-09-16 09:14:16 +00:00
1b6a5fa802
This was SVN commit r13861.
2013-09-15 21:37:05 +00:00
2a5ec404d1
Further reverted RangeManager sorting to stable_sort, since possibly with different STL implementations, the order of entities might change and cause OOS.
...
Overflowing elements in SpatialQueryArray are now reported with
debug_warn, but can be ignored and the program will continue working,
but further entities will be truncated.
This was SVN commit r13860.
2013-09-15 21:11:20 +00:00
bb799bdd53
upgraded gaul defense towers and celtic storehouse
...
This was SVN commit r13859.
2013-09-15 21:11:14 +00:00
5fe43a0f21
removed non-used duplicated meshes
...
This was SVN commit r13858.
2013-09-15 19:56:13 +00:00
9eedd22b9a
fix garrisoned units count for some special cases. Refs #2096 . Patch by mimo
...
This was SVN commit r13857.
2013-09-15 16:47:40 +00:00
65bddb7fa5
Celtic docks, kennel, farmstead and temple upgrades
...
This was SVN commit r13856.
2013-09-15 16:09:23 +00:00
bdeb358c44
Upgraded britons market and added new gaul market
...
This was SVN commit r13855.
2013-09-15 14:09:25 +00:00
9694eec8b8
As per ticket #1707 . Some minor improvements to spatial subdivision. Makes way for future changes in RangeManager.
...
Right now merely improves memory usage.
This was SVN commit r13854.
2013-09-15 14:03:53 +00:00
6644f224cd
remove warn messages. Now really fixes #2102
...
This was SVN commit r13853.
2013-09-15 09:33:45 +00:00
b16b52492d
change build distance restrictions to work with classes. Fixes #2012 .
...
This was SVN commit r13852.
2013-09-15 09:29:16 +00:00
3016765766
All new techs for the blacksmith.
...
This was SVN commit r13851.
2013-09-15 08:55:28 +00:00
f213761912
let entities change entity limits. Fixes #2076
...
This was SVN commit r13850.
2013-09-15 08:19:50 +00:00
de68973191
Changed the phase up sound.
...
Added a new "tech complete" sound for ALL techs.
Added some new armor techs for infantry and spearmen.
This was SVN commit r13849.
2013-09-15 07:53:01 +00:00
466900b898
Minor template stuff.
...
This was SVN commit r13848.
2013-09-15 05:55:16 +00:00
db39fd059c
Some tooltip tweaks.
...
Further attempts to balance archers. (ongoing)
This was SVN commit r13847.
2013-09-15 04:57:58 +00:00
08849ae6f6
Balance changes after playtesting with Alpha123.
...
This was SVN commit r13846.
2013-09-15 00:28:07 +00:00
4f138eaa12
Made the time icon slightly smaller.
...
Archers have less attack and cost slightly more.
Defense Towers now have a minimum build distance and are weaker.
This was SVN commit r13845.
2013-09-14 23:19:36 +00:00
729e744c2f
Removes yucky hard-coded categories from BuildRestrictions
...
This was SVN commit r13844.
2013-09-14 22:31:41 +00:00
dd60c3a3e2
Restore textures.xml to make grid_subdiv terrain less ugly
...
This was SVN commit r13843.
2013-09-14 18:36:40 +00:00
a9cb79b108
celtic fortresses actor and barracks actor errors fixing reported by Sanderd
...
This was SVN commit r13842.
2013-09-14 13:59:43 +00:00
126e550d68
Delete bogus file
...
This was SVN commit r13841.
2013-09-14 12:19:22 +00:00
ea75cda095
Special case getEntityNamesFormatted to avoid messing with getEntityNames
...
This was SVN commit r13838.
2013-09-14 00:32:50 +00:00
e7fa9a58de
Remove the Costs: prefix from tooltips entirely.
...
This was SVN commit r13837.
2013-09-14 00:07:08 +00:00
e646cf19bf
Fix bug due to some technologies not having separate generic/specific names.
...
This was SVN commit r13836.
2013-09-14 00:00:47 +00:00
c28151c1c1
Put tooltips on a diet.
...
This was SVN commit r13835.
2013-09-13 23:49:46 +00:00
04b4e6af4b
gaul fortress fix
...
This was SVN commit r13834.
2013-09-13 21:44:49 +00:00
014acac9ed
Upgraded britons and gaullic fortresses.
...
This was SVN commit r13833.
2013-09-13 21:41:24 +00:00
532c9dce3e
brit_civic_centre, celt_barracks and brit_crannog upgrade
...
added non-transparency with AO material and non-transparency-parallax-ao
material
This was SVN commit r13832.
2013-09-13 18:46:33 +00:00
5023ff449e
Gaul_civic_centre updated.
...
This was SVN commit r13831.
2013-09-13 14:18:27 +00:00
8b9a0e3919
Added gaul houses, fixed brit houses and added a new variation. New effects applied.
...
Added Ludo's new stonehenge model.
This was SVN commit r13830.
2013-09-13 13:50:19 +00:00
77ca745637
Updated the logo.
...
Updated some Roman words.
This was SVN commit r13829.
2013-09-13 12:07:39 +00:00
82fb0ce6be
Improve game setup GUI performance by switching from main menu instead of pushing the page on top of the stsck
...
This was SVN commit r13828.
2013-09-12 15:12:08 +00:00
176cc55547
Fixing some Roman names. Thanks Robbob (on the forum).
...
Added Organic "preferredClass" to Fortresses, Wall Towers, and Defense
Towers, so that they prefer to shoot at enemy units rather than enemy
structures.
This was SVN commit r13827.
2013-09-12 13:53:00 +00:00
5304bc9d6a
Changes GameView to expose global functions to scripts instead of using CJSObject.
...
Fixes #2126
Refs #1886
This was SVN commit r13826.
2013-09-12 12:40:05 +00:00
05422ad545
Avoid slightly-expensive QueryInterface() calls
...
Add CEntityHandle which wraps an entity_id_t and also has a pointer to a
per-entity array of IComponents. QueryInterface/CmpPtr on a handle just
involve a couple of pointer dereferences instead of a map lookup.
This requires sizeof(void*) per registered interface type per entity,
which is currently ~0.5KB per entity, which shouldn't be a problem.
This was SVN commit r13825.
2013-09-11 20:41:53 +00:00
87753bf3fd
forgot to commit extra change for 508cc0d4c7
...
This was SVN commit r13824.
2013-09-11 18:59:51 +00:00
508cc0d4c7
Add preferred classes to BuildingAI. Patch by jammus. Fixes #1985
...
This was SVN commit r13823.
2013-09-11 17:50:49 +00:00
43df87e56f
This was SVN commit r13822.
2013-09-10 22:05:12 +00:00
b1bd61938e
add file notification to Mac ticket 514, also change name of class FileInfo to CFileInfo to ease Mac development
...
This was SVN commit r13821.
2013-09-10 14:17:04 +00:00
d037d97d55
disable querying of local entities with a component. Avoids OOS problems. Patch thanks to historicbruno. Fixes #2119
...
This was SVN commit r13820.
2013-09-10 12:27:59 +00:00
d51217f718
Fix gazelle in deep water starting position on Oasis 9. Fixes #2123
...
This was SVN commit r13819.
2013-09-10 09:36:27 +00:00
04ed87bf28
Display error messages instead of breaking into the debugger when we don't have rights to save a map in Atlas. Fixes #1941 .
...
This was SVN commit r13818.
2013-09-09 23:31:22 +00:00
b2862f14da
Avoid continual libxml2 memory leak in simulation-test mode
...
This was SVN commit r13817.
2013-09-09 20:22:42 +00:00
3c29c2dccf
Tweaked farm decal color.
...
This was SVN commit r13816.
2013-09-09 18:46:45 +00:00
c3f7a929e0
better garrison flag handling. Refs #2096 .
...
This was SVN commit r13815.
2013-09-09 18:27:20 +00:00
e7ccc28cbc
Enable sound notifications with technology upgrades. Based on patch by mpmoreti. Fixes #2021
...
This was SVN commit r13814.
2013-09-09 12:50:05 +00:00
a406863e0e
fix bridge edge obstruction size and rotation of hele bridge edge
...
This was SVN commit r13813.
2013-09-09 12:11:34 +00:00
f051426a76
fix garrisonHolder flags when units are ejected
...
This was SVN commit r13812.
2013-09-08 19:51:16 +00:00
08514f68be
small clean up of GarrisonHolder code
...
This was SVN commit r13811.
2013-09-08 18:46:29 +00:00
d1a376fd06
fix ejection of garrisoned units on resign. Fix ejection or killing on ownership and deplomacy changes. Patch by mimo. Fixes #2096
...
This was SVN commit r13810.
2013-09-08 16:02:41 +00:00
bc40534777
fix spread technology modifications. Fixes #2110
...
This was SVN commit r13809.
2013-09-08 15:20:54 +00:00
7a0e91ab23
Fixes undefined behavior in Atlas error display, fixes #2115
...
This was SVN commit r13808.
2013-09-08 03:35:05 +00:00
ca1665dde1
Fix some typos in the civ json files. Patch by Gallaecio.
...
This was SVN commit r13807.
2013-09-07 17:40:50 +00:00
f588181004
use better technology script in guiInterface
...
This was SVN commit r13805.
2013-09-07 15:23:03 +00:00
24a4ceb89a
fix carthagian technology. Fixes #2107
...
This was SVN commit r13804.
2013-09-07 09:26:56 +00:00
819a1e7823
Save initial herd position and update the last known position of the hunted animal when hunting. Patch by mimo. Fixes #2047 .
...
This was SVN commit r13803.
2013-09-06 19:47:48 +00:00
16c9724c24
Fix release build scripts
...
Exclude dev.cfg from the Windows installer.
Use the correct filename for the Windows installer.
Update some paths to match the new EC2 build process.
This was SVN commit r13802.
2013-09-06 19:43:45 +00:00
63f28f1a43
Increased build limit of Embassies to 2. This means you can build 2 of the same entity or 2 different out of the 3 available.
...
This was SVN commit r13801.
2013-09-06 19:26:49 +00:00
d6ec0f6dbd
Updated installer image.
...
This was SVN commit r13800.
2013-09-06 19:16:33 +00:00
e19b470a42
fix music glitchyness when game loses focus trac #2090
...
This was SVN commit r13799.
2013-09-06 02:46:13 +00:00
a7132dc66a
Updated Macedonians sandbox demo map.
...
Fixed Carthaginians special tech "Colonization."
Fixed Carthage json file.
This was SVN commit r13797.
2013-09-02 16:26:19 +00:00
4c9cd2921d
Replaces splash screen with fundraiser message
...
This was SVN commit r13796.
2013-09-01 23:56:50 +00:00
53a5781c66
Increase simulation script runtime size again. Refs #1436 , #1966 and #2035 .
...
This was SVN commit r13794.
2013-09-01 23:29:21 +00:00
6070cd01fa
Reduced "grazing" time for whales.
...
This was SVN commit r13793.
2013-09-01 22:06:23 +00:00
c3dcde7e34
Alpha version number.
...
This was SVN commit r13792.
2013-09-01 20:47:02 +00:00
3774b2051d
This was SVN commit r13790.
2013-09-01 04:22:28 +00:00
4ac19dff05
fixed maur_struct
...
This was SVN commit r13789.
2013-08-31 22:08:48 +00:00
4dd1397e15
Mauryans and Britons now start with a cav skirm in addition to their special starting unit (Worker Elephant and War Dog respectively).
...
Fixed a unit availability thing for Macedonians.
This was SVN commit r13788.
2013-08-31 19:27:37 +00:00
cc08c81faf
Tweaks to barracks and blacksmith tips.
...
This was SVN commit r13787.
2013-08-31 19:23:16 +00:00
0bd22649f0
Tweaked Army Camp tip text.
...
Adjusted max gatherers for pyramid ruins.
New 'Blacksmith' loading tip.
This was SVN commit r13786.
2013-08-31 12:26:17 +00:00
66ab19086a
Updated Stoa tip image.
...
Updated Persian Architecture tip text.
Adjusted upward the number of max gatherers for small mines and the
unfinished Greek temple ruin.
Tweaked Cycladic Archipelago 6 (fixed fish and treasure positions).
Tweaked Gold Oasis 1 (made it possible to build a civic center in the
middle of the "Gold Patches."
Adjusted the Spartan House history entry, based on text by contributor
Thorfinn the Shallow Minded.
This was SVN commit r13785.
2013-08-30 22:35:15 +00:00
df190cbbd1
fix issues with menu mode and playlist, harden code and clear out ambient noises at game end, fixes #2066
...
This was SVN commit r13784.
2013-08-29 13:20:55 +00:00
3047470858
Reduced volume for fishing boat movement sound and construction hammering sounds.
...
This was SVN commit r13783.
2013-08-29 12:46:48 +00:00
de85408e3b
Fix fishing boats not being able to gather from whales. Reported on the forums by Gildas.
...
This was SVN commit r13782.
2013-08-29 11:26:02 +00:00
24ff1371b8
Upgraded greek temples an assigned one variation per civ.
...
This was SVN commit r13780.
2013-08-27 23:48:22 +00:00
15586778bb
Disables frame-pointer omission in VC++ 2008 projects, fixes stack dump in release build, fixes #2078
...
This was SVN commit r13779.
2013-08-27 02:42:56 +00:00
56d535b7c5
Effects added to hellenic stoas. Only temples to go yay!
...
This was SVN commit r13778.
2013-08-27 00:04:05 +00:00
c6d361a76f
added effects and upgraded greek docks for each greek civ
...
This was SVN commit r13777.
2013-08-26 23:19:35 +00:00
89e69af987
let maurian elephant corpse sink fast, temporary fix until there is a real corpse
...
This was SVN commit r13776.
2013-08-26 17:42:09 +00:00
e79c2aa953
make all Iberian buildings available in the sandbox map (add walls, blacksmith and fire ship)
...
This was SVN commit r13775.
2013-08-26 11:38:41 +00:00
0b670f88af
Updated spart syssiton, mace lybrary and helenic market with effects and little fixes
...
This was SVN commit r13774.
2013-08-26 08:29:18 +00:00
89430de468
Okay, do what f5ab6255d0 was supposed to do.
...
This was SVN commit r13773.
2013-08-26 04:17:26 +00:00
b10a01645f
Revert f5ab6255d0. I accidentally somehow committed my whole working tree on this computer....
...
This was SVN commit r13772.
2013-08-26 04:15:36 +00:00
f5ab6255d0
General scrollbar improvements. Patch by Josh. Fixes #2080 .
...
- Don't show the scrollbar when the contents aren't overflowing the
visible area.
- Fix bugs in minimum bar sizing.
- Add capability to set a maximum bar size.
- Correct outdated/incorrect comments.
This was SVN commit r13771.
2013-08-26 03:06:08 +00:00
2dc0c40ff0
Fix some errors.
...
This was SVN commit r13770.
2013-08-26 01:26:35 +00:00
e75765faae
Fixed some Greek corral prop problems.
...
Fixed Storehouses tip.
Fixed the names for ALL Iberian units and buildings.
Added a build restriction for the Iberian Monument.
This was SVN commit r13769.
2013-08-25 22:20:09 +00:00
ff6b3e5725
Properly fix #2079 .
...
This was SVN commit r13768.
2013-08-25 22:05:41 +00:00
7a96a3161b
fix whale altitude (no floating whales). See aa95f3420d.
...
This was SVN commit r13767.
2013-08-25 18:59:36 +00:00
035d33dc33
'Crop Rotation' tech for the Gallic Rotary Mill.
...
This was SVN commit r13766.
2013-08-25 17:57:20 +00:00
7c0dfc0d82
Fixed a couple tips.
...
This was SVN commit r13765.
2013-08-25 17:36:55 +00:00
acf899bb47
Fixed some Corral errors.
...
Fixed some Persian building stuff.
This was SVN commit r13764.
2013-08-25 17:36:34 +00:00
292ce925c6
Cast Shadow flag enabled on this actor.
...
This was SVN commit r13763.
2013-08-25 11:04:14 +00:00
2c66383461
Added effects to athen_prytaneion
...
This was SVN commit r13762.
2013-08-25 10:24:34 +00:00
52f947fd77
Check that we still have build orders for our attack plan. Temporarily fixes #2082 for A14.
...
This was SVN commit r13761.
2013-08-25 08:20:40 +00:00
589e8d2ae8
Updated and added effects to greek gymnasion, storehouse, corral and epic temple (athenian wonder parthenon)
...
This was SVN commit r13760.
2013-08-25 01:02:22 +00:00
ce9432bf3d
Proper selection ring for whales.
...
Edited Mauryan civ info.
Added preview image for Cycladic Archipelago 6.
This was SVN commit r13759.
2013-08-24 22:30:28 +00:00
d49476ac8d
Increased armor for promoted Skirmish Cavalry. Previously this was neglected or missed.
...
This was SVN commit r13758.
2013-08-24 21:11:59 +00:00
247e45a6b5
fix quinquereme splash damage
...
This was SVN commit r13757.
2013-08-24 16:07:03 +00:00
11f663d761
fix history description to match with in-game numbers. Reported by scythetwirerler. Part 2
...
This was SVN commit r13756.
2013-08-24 15:33:59 +00:00
087e5f9c3e
fix history description to match with in-game numbers. Reported by scythetwirerler
...
This was SVN commit r13755.
2013-08-24 15:30:52 +00:00
14a73204dd
Disable distance-sorting for most transparent objects
...
Distance-sorting of the alpha-blend pass of objects like trees and grass
is quite expensive (partly the cost of sorting, partly the cost of being
unable to batch efficiently), and the effect on visual quality is
typically very hard to see (the alpha-test pass does most of the work
for
objects that aren't fully translucent). That's not a good tradeoff, so
turn it off.
Leave distance sorting enabled for e.g. waterfalls since it might make a
more noticeable difference for them.
This was SVN commit r13753.
2013-08-24 14:48:02 +00:00
f106d7714a
Fix a swap between reflections and refractions in config.cfg . Disabling "Render Reflections" now reverts to the skybox for better results.
...
Allows to oversaturate in Atlas' HDR settings.
This was SVN commit r13752.
2013-08-24 14:44:38 +00:00
9d933087b3
Fix #2079 .
...
This was SVN commit r13751.
2013-08-24 14:24:37 +00:00
957c51727b
Improve on-water shadows. Fix an issue with foam looking static. Add anisotropic filtering (x4) to the water normal texture for testing.
...
This was SVN commit r13750.
2013-08-24 14:12:39 +00:00
aa95f3420d
Cleaned up and fixed the whale templates. Still need a custom selection ring.
...
Made Carthaginian Sacred Band Infantry and Cavalry cost metal instead of
wood.
Updated Cycladic Archipelago 6.
This was SVN commit r13749.
2013-08-24 13:31:25 +00:00
40af0917ca
let gaul and brit healers upgrade to their local templates instead of the generic celtic templates. Fix double-click to select all healers after one of the healers upgraded.
...
This was SVN commit r13748.
2013-08-24 13:09:53 +00:00
630301918c
Fix the command line -autostart-aidiff to default to 2 (new medium)
...
This was SVN commit r13746.
2013-08-24 09:55:06 +00:00
ced59bcfa1
Updated hellenic defense tower with new effects.
...
This was SVN commit r13745.
2013-08-24 00:19:52 +00:00
6963f8c067
Adjust cavaly swordsmen advanced and elite stats. Change attack from 21 -> 12 and 22 -> 14 (since the basic rank's attack is 10), and change armor from 4 -> 6 and 6 -> 7 (since the basic rank's armor is 5).
...
This was SVN commit r13744.
2013-08-23 18:46:18 +00:00
1544bad62a
Updated greek theatron for all greek civs. (AO + normal + spec)
...
This was SVN commit r13743.
2013-08-23 18:05:56 +00:00
efda9d5e33
Updated greek farmstead
...
This was SVN commit r13742.
2013-08-23 12:36:04 +00:00
c1dcbe4176
update TLB table
...
refs #2074
This was SVN commit r13741.
2013-08-23 06:42:48 +00:00
e19bffa88f
hele fortress gate textures
...
This was SVN commit r13740.
2013-08-22 14:57:14 +00:00
5050dcf261
Upgraded and cleaned up hellenic fortress. Shield props now displays depending on faction. (AO + normal + spec)
...
This was SVN commit r13739.
2013-08-22 14:56:11 +00:00
18c0b17126
Fixes #2069 .
...
This was SVN commit r13738.
2013-08-22 13:10:38 +00:00
0a0bd83cf0
Adds L4 cache detection for some new Haswell CPUs, fixes #2074
...
This was SVN commit r13736.
2013-08-21 23:18:35 +00:00
3174d16256
Updated greek civs barracks, added ao, spec and normals
...
This was SVN commit r13735.
2013-08-21 22:58:31 +00:00
deb64d36fc
Fix rendering artifacts with novbo=true gentangents=true
...
glDrawRangeElements needs to know the range of vertexs that are used
by the index array. With VBOs it doesn't really matter if the range
is wrong (all the vertexes are in GPU memory anyway), but with CPU
vertex arrays the driver has to memcpy the given range of data, so
incorrect bounds will result in garbage data being rendered.
With gentangents, the rendered mesh can have more vertexes than the
original CModelDef, but was rendered with the CModelDef's vertex count.
Use the correct vertex count instead.
Refs #2050 .
This was SVN commit r13734.
2013-08-21 21:01:32 +00:00
9c4801e107
add splash damage to quinquereme
...
This was SVN commit r13733.
2013-08-21 19:52:50 +00:00
73773e61d0
Spart CC small fix
...
This was SVN commit r13732.
2013-08-21 17:48:59 +00:00
827ec20b1f
Made the Cart trade ship avail in Village phase as a kind of "sea trade" bonus for them.
...
This was SVN commit r13731.
2013-08-21 17:27:28 +00:00
d94e1d8ed3
Spartan CC modified. Doric columns adjusted
...
This was SVN commit r13730.
2013-08-21 17:03:47 +00:00
70dfd1f803
Cavalry Swordsmen stats rebalanced.
...
This was SVN commit r13729.
2013-08-21 15:55:13 +00:00
081707039a
Updated Cycladic Archipelago 6. Both sides now playable.
...
This was SVN commit r13728.
2013-08-21 15:20:27 +00:00
035542e76c
revert wrong changes to support and female_citizen template
...
This was SVN commit r13727.
2013-08-21 09:55:42 +00:00
605852fccf
Fix function that decides which units can have which formations, and remove formations for animals and the maurian worker elephant
...
This was SVN commit r13726.
2013-08-21 09:53:59 +00:00
52d6a8036d
This was SVN commit r13725.
2013-08-21 05:37:28 +00:00
f947fa6afe
Fixes stack overflow in stack dump logic, by special-casing boost::unordered types, fixes #1813 .
...
Adds INIT_HAVE_DISPLAY_ERROR init flag to correctly override
ah_display_error in Atlas (InitVfs was overriding it again), but don't
use it because it's ugly and broken, refs #1729
This was SVN commit r13724.
2013-08-20 21:07:42 +00:00
3843ae6bb0
Greek houses upgrade. (eyecandy, ao, normal, spec)
...
This was SVN commit r13723.
2013-08-20 16:41:10 +00:00
c5296b9246
Fix maurian elephants being unable to build stuff. Caused by enlarging the elephant obstruction radius.
...
This was SVN commit r13721.
2013-08-20 09:39:01 +00:00
ee877a46c7
Switch X and Z loops in the foam generation, possible speed improvement.
...
This was SVN commit r13720.
2013-08-20 08:55:33 +00:00
e3b9f17c19
Removes useless "old maps" filter from match setup, refs #2071
...
This was SVN commit r13719.
2013-08-20 02:28:49 +00:00
68822e3418
Adds more information to construction command debugging
...
This was SVN commit r13717.
2013-08-19 23:18:18 +00:00
54bbbb9797
Boost 1.54 deprecates Boost.Signal. Use Boost.Signal2 for >= 1.54.
...
This was SVN commit r13716.
2013-08-19 22:11:54 +00:00
0b4fe2ef94
Tweaks game speed dropdown more, refs #2046
...
This was SVN commit r13715.
2013-08-19 20:00:26 +00:00
1739a381c1
Fix crash when editing terrain near map edges.
...
The values in CMessageTerrainChanged can be overestimates that exceed
the normal map boundaries, and should be clamped before looping over
them.
This was SVN commit r13714.
2013-08-19 19:19:34 +00:00
0ca841b92b
Suppress unused local typedef warnings when including SpiderMonkey headers.
...
This was SVN commit r13713.
2013-08-19 18:26:44 +00:00
4d9b81f40e
This was SVN commit r13712.
2013-08-19 18:09:09 +00:00
30c194a804
Starting units re-adjusted.
...
This was SVN commit r13711.
2013-08-19 15:42:46 +00:00
3783d0e14c
Fix flying unit not crashing in water when they should. Patch by scythewirler. refs #2067
...
This was SVN commit r13710.
2013-08-19 14:44:15 +00:00
0c16980408
Fix tests.
...
This was SVN commit r13709.
2013-08-19 10:55:35 +00:00
03bf727d9a
Fix deactivation of HQ waviness causing the specular effect to go crazy.
...
This was SVN commit r13708.
2013-08-19 10:19:21 +00:00
b770c41f0b
Removes shadow casting and receiving on preview entities, patch started by ericb, fixes #1771
...
This was SVN commit r13706.
2013-08-18 22:17:57 +00:00
63a0b4ae98
projectile point for mauryan elephant archer
...
This was SVN commit r13705.
2013-08-18 20:42:42 +00:00
2637540ce2
Spart CC centre upgrade with doric capitels +AO and effects
...
This was SVN commit r13704.
2013-08-18 18:02:18 +00:00
ab6d15c414
Macedonian CC mesh and AO fix
...
This was SVN commit r13703.
2013-08-18 16:16:53 +00:00
0888cf6c23
Fix Linux build
...
This was SVN commit r13701.
2013-08-18 11:28:52 +00:00
bf7cd1fcbd
Undo-d the commit due to general panic about GLSL.
...
This was SVN commit r13700.
2013-08-18 11:15:29 +00:00
29b5021f97
Fix my previous commit because obviously I had forgotten something.
...
This was SVN commit r13699.
2013-08-18 09:42:02 +00:00
a4707bcc16
Change the water manager so incremental updates to the water information is possible. Streamline a few things (and removes a not-really-used calculation to speed things up further). Fixes #2063 , refs #1743 .
...
This was SVN commit r13698.
2013-08-18 09:27:11 +00:00
557c1fc067
fix (dis)allowing of garrisoning by other components. Refs #2067
...
This was SVN commit r13697.
2013-08-18 08:23:36 +00:00
92f4391f51
Adds tech template support to checkrefs.pl
...
This was SVN commit r13696.
2013-08-18 02:52:05 +00:00
791d392797
Fixes and improves terrain scanning of checkrefs.pl.
...
Removes some useless old actors.
This was SVN commit r13695.
2013-08-18 01:57:37 +00:00
a18262e7b1
Make planes about 20% cooler. Fixes #2067 .
...
This was SVN commit r13694.
2013-08-17 22:55:16 +00:00
abce308281
Renames confusing grass1_spring.png terrain texture, used for fancy grass effect, refs #2069
...
This was SVN commit r13693.
2013-08-17 22:16:01 +00:00
f25bbda672
fix typo for garrisoned archer classes. Reported by scythetwirler.
...
This was SVN commit r13692.
2013-08-17 20:34:28 +00:00
90b75c95ea
Macedonians CC upgraded with corinthian capitel + AO and normals
...
This was SVN commit r13691.
2013-08-17 18:32:41 +00:00
a6c28ae461
Altered footprint of some elephant units.
...
This was SVN commit r13690.
2013-08-17 16:16:37 +00:00
fdc1f3a043
increased mauryan blacksmith size
...
This was SVN commit r13689.
2013-08-17 14:47:44 +00:00
3a2eec841c
Adjusted max gatherers for these trees.
...
This was SVN commit r13688.
2013-08-17 14:26:43 +00:00
998dc21676
Removed old Aegis folder.
...
This was SVN commit r13687.
2013-08-17 14:12:25 +00:00
42d77129cc
rome blacksmith fix
...
This was SVN commit r13686.
2013-08-17 14:07:48 +00:00
9763b9076c
Upgraded roman blacksmith
...
This was SVN commit r13685.
2013-08-17 14:04:08 +00:00
a9c71e39a4
make new elevation tool more drastic + add RMB action
...
This was SVN commit r13684.
2013-08-17 14:02:18 +00:00
bcf7115b5c
Fix Aegis to work properly for A14, also rename the folder from "qbot-wc" to "aegis" (thus apparent huge number of changes). Adds a "sandbox" difficulty setting that will never attack, collect resources 50% slower, and is pop-capped at 70 for beginners.
...
This was SVN commit r13683.
2013-08-17 13:59:53 +00:00
38b52f9ff0
Fixed a broken texture link.
...
This was SVN commit r13682.
2013-08-17 12:51:11 +00:00
723a3ec8b5
Fixed kart_embassy_italiote.dae
...
This was SVN commit r13681.
2013-08-17 12:41:37 +00:00
2d4c3d72c6
Removed the old dds file from these actors.
...
This was SVN commit r13680.
2013-08-17 12:18:50 +00:00
cdd2c74d44
Superfluous textures deleted.
...
This was SVN commit r13679.
2013-08-17 11:38:49 +00:00
960615aa53
PreferGLSL = true as long as GenTangents = true.
...
This is for GLSL migration in the long run.
This was SVN commit r13678.
2013-08-17 11:13:36 +00:00
b818a54b06
Tweaked some maps.
...
Updated some "tips" images.
Tweaked civ center radius and town phase radius boost.
Added some clarification language to the Farm Field tooltip.
This was SVN commit r13677.
2013-08-17 10:15:38 +00:00
b5888f4e45
generalise kill vs eject garrisoned entities on death of garrisonHolder
...
This was SVN commit r13676.
2013-08-17 09:26:17 +00:00
d37d3be5d0
Fixes Attack component schema
...
This was SVN commit r13674.
2013-08-17 06:02:31 +00:00
b820f6e6ae
Add a pike elevation tool to make sharp pointed mountains. Fixes #2059
...
This was SVN commit r13672.
2013-08-16 14:46:54 +00:00
fe0ec1c720
fix coding style for buildingAI. Refs #2010
...
This was SVN commit r13671.
2013-08-16 12:17:18 +00:00
fd2245c53c
Improved building AI. Refs #2010
...
This was SVN commit r13670.
2013-08-16 11:17:36 +00:00
cc0ba8e246
Missing maur blacksmith struct_b
...
This was SVN commit r13669.
2013-08-16 04:50:44 +00:00
d66edf5958
fix a bug that ignored resetting XZ rotation to zero, reported by sythetwirler
...
This was SVN commit r13668.
2013-08-15 22:16:51 +00:00
81b29bf18d
fix line wrapping when big number of gatherers on one resource
...
This was SVN commit r13667.
2013-08-15 20:00:55 +00:00
675b3c40be
fix bouncing projectiles, patch by Markus. Fixes #769
...
This was SVN commit r13664.
2013-08-15 19:01:10 +00:00
7ff167e7de
Removes more unused variables, based on patch by Markus, refs #1852 .
...
Adds TODOs to use POT textures in fancy water rendering.
This was SVN commit r13663.
2013-08-15 18:25:32 +00:00
6d3901faf7
Added mauryan blacksmith with AO. Updated mauryan struct textures
...
This was SVN commit r13662.
2013-08-15 17:17:25 +00:00
6b316f6ce1
fix tests breaking caused by 4421787281. Refs #2062
...
This was SVN commit r13661.
2013-08-15 08:56:14 +00:00
4421787281
interpollate y offset for smooth climbing and landing of flying objects. refs #2062
...
This was SVN commit r13660.
2013-08-15 08:44:06 +00:00
1712b0f42d
Increases simulation script runtime to 32 MB to reduce OOM errors, refs #1436 , #1966 , #2035
...
This was SVN commit r13659.
2013-08-15 05:15:54 +00:00
4e709f2c9c
Implement landing and go-around for UnitMotionFlying. Patch by scythetwirler. Fixes #2062 .
...
This was SVN commit r13658.
2013-08-15 03:10:04 +00:00
b6fe589ae3
fix health regeneration for negative values (reported by Mythos_Ruler)
...
This was SVN commit r13657.
2013-08-14 08:33:29 +00:00
2307509088
Remove the old diminishing returns formula (I accidentally left it as a comment). Also, I forgot to credit scythetwirler (who came up with the new formula) in the previous commit.
...
This was SVN commit r13656.
2013-08-14 05:16:09 +00:00
cc02eabdd0
Change the formula for diminishing returns to something less flawed. Also add a lot of comments explaining how it works.
...
This was SVN commit r13655.
2013-08-14 05:14:20 +00:00
598c05e056
clean UnitAI move to attack range code + fix possible bug
...
This was SVN commit r13654.
2013-08-13 15:11:17 +00:00
ba244b509c
Fixed the portrait for this tech.
...
Adjusted water a little bit for these scenarios.
This was SVN commit r13653.
2013-08-13 00:55:47 +00:00
c709105355
Clarifies control group HotKeys
...
This was SVN commit r13652.
2013-08-12 23:50:18 +00:00
6925d493fe
This was SVN commit r13651.
2013-08-12 23:40:24 +00:00
d74ed3f1ae
Increase farming speed by 46% for females and 42% for males. Combined with diminishing returns it was waaay too slow prior to this commit.
...
This was SVN commit r13650.
2013-08-12 23:17:30 +00:00
3d1e693148
Enable diminishing returns for farms.
...
(Yeah yeah, somehow I forgot this when I committed the actual
functionality.)
This was SVN commit r13649.
2013-08-12 23:11:39 +00:00
c44efe6c8c
Spartan tech "Agoge" altered. Moved to Syssiton from Civ Center.
...
Unit tooltips cleaned up a bit. Made to look neater in-game.
This was SVN commit r13648.
2013-08-12 21:53:53 +00:00
1aaca7e6e3
health regeneration
...
This was SVN commit r13647.
2013-08-12 17:45:18 +00:00
96cef624e3
Fix compiling tests on ARM. Patch by Josh.
...
This was SVN commit r13646.
2013-08-12 03:12:57 +00:00
1ffb74b336
Adjusts session game speed dropdown, fixes #2046
...
This was SVN commit r13645.
2013-08-11 20:49:41 +00:00
066c542e36
Template tweaks to palace
...
This was SVN commit r13644.
2013-08-11 12:09:10 +00:00
a552a3cb8b
Persian Palace structure
...
This was SVN commit r13643.
2013-08-11 12:02:36 +00:00
b8fb2e1697
Added helle_struct_b parallax/normal map and specular. Applied on greek blacksmith. Improved helle_struct specular map
...
This was SVN commit r13642.
2013-08-11 08:49:15 +00:00
46f091a154
Added the Athenian civ bonus "Silver Owls" which gives them +10% metal gathering rates when upgrading phases.
...
Made "Delian League" (faster building ships) a team bonus. Need some new
code to make it apply to allies too.
Made farming slower.
This was SVN commit r13641.
2013-08-09 22:37:05 +00:00
3f0354943f
Polishing thePolishing the Random Maps: Archipelago, English Channel, Islands, Lake, Lorraine Plain, Migration, Neareastern Badlands, Northern Lights, Oasis, Persian Highlands.
...
This was SVN commit r13640.
2013-08-09 12:30:59 +00:00
c8b8dd24e6
This was SVN commit r13639.
2013-08-09 00:03:51 +00:00
b0ceef39b9
Hellenic building bonus deleted from templates and moved to a tech.
...
Some updated portraits.
This was SVN commit r13638.
2013-08-08 23:55:13 +00:00
93abbae435
Fix build issues on ARM. Patch by Josh. Fixes #2049 .
...
This was SVN commit r13634.
2013-08-07 05:00:46 +00:00
dc722d76f3
Fix tests. Refs #1960 .
...
This was SVN commit r13632.
2013-08-06 22:32:46 +00:00
bff070c6cb
Polishing the Random Maps: Gulf of Bothnia, Hyrcanian Shores, Islands, Kerala, Lake, Latium.
...
This was SVN commit r13630.
2013-08-04 12:31:43 +00:00
4a805fb05c
Updates keys.txt with new keynames, refs #2043
...
This was SVN commit r13628.
2013-08-03 20:39:15 +00:00
5a1ddd7cf9
Improves hotkey support for non-QWERTY keyboards, patch by lsdh, fixes #2043
...
This was SVN commit r13627.
2013-08-03 20:09:29 +00:00
8c74df2acd
Give an elevation advantage to ranged units. Patch by sanderd17. Fix #1960 .
...
This was SVN commit r13626.
2013-08-03 19:20:20 +00:00
3b294d3ad4
Revised Persian names.
...
This was SVN commit r13625.
2013-08-03 16:14:17 +00:00
4f7ba84fd6
Modified athens CC to have Ionic columns and AO map.
...
Added normal and spec maps for several greek struct and props textures.
This was SVN commit r13624.
2013-08-02 23:03:55 +00:00
c8830ea769
Specific Name for Mauryan blacksmith.
...
This was SVN commit r13623.
2013-08-01 22:00:20 +00:00
17fd4fab94
Polishing the Random Maps: Fortress, Gear, Guadalquivir River
...
This was SVN commit r13622.
2013-08-01 17:58:51 +00:00
70d072577b
;
...
This was SVN commit r13621.
2013-07-31 22:25:24 +00:00
f6e0c4c5a4
Split up cheats into multiple files. Patch by lsdh/ldsh. Fixes #2019 .
...
Replace buggy hasAllies with the inlined check if we have a team at all.
Fix setting of starting resources (broken in 58fa0c7c58
2013-07-31 22:22:12 +00:00
c438a1eb82
Polishing the Random Maps: Alpine Valley, Archipelago, Cantabrian Highlands, Canyon, Continent, Corinthian Isthmus, English Channel
...
This was SVN commit r13619.
2013-07-31 10:05:48 +00:00
f3823847b0
Polishing the Random Maps: Archipelago, Ardennes Forest, Atlas Mountains, Cantabrian Highlands
...
This was SVN commit r13618.
2013-07-30 11:09:40 +00:00
477855fbf5
Polishing the Random Maps: Alpine Valley, Anatolian Plateau, Archipelago
...
This was SVN commit r13617.
2013-07-30 07:56:09 +00:00
344a149a66
Infinite farms with diminishing returns (but no farmland). Refs #1318 .
...
This was SVN commit r13616.
2013-07-30 06:04:53 +00:00
857ae2dd3e
- Fix a bug from 20e7d2224a where the player ID would always be set to 1.
...
- Make the developer overlay a tad taller.
This was SVN commit r13614.
2013-07-29 20:01:09 +00:00
70e67af87f
Polishing the Random Maps: Alpine Valley
...
This was SVN commit r13613.
2013-07-29 14:22:54 +00:00
4dfe1d6df9
Polishing the Random Maps: Alpine Valley
...
This was SVN commit r13612.
2013-07-29 13:50:20 +00:00
992a8ee0b8
Polishing the Random Maps: Aegean Sea and Alpine Valley
...
This was SVN commit r13611.
2013-07-29 12:52:31 +00:00
629492625f
Some touching up.
...
This was SVN commit r13610.
2013-07-29 12:35:05 +00:00
f3b0417aac
Don't try to interpret Enter as a mouse click in message boxes (makes it really annoying to chat at the end of a game).
...
This was SVN commit r13608.
2013-07-29 05:04:28 +00:00
e3c42a204e
Fixing a bug
...
This was SVN commit r13607.
2013-07-29 04:30:03 +00:00
20e7d2224a
Implement a developer overlay command to change the current player ID (very useful for AI development).
...
This was SVN commit r13606.
2013-07-29 00:53:44 +00:00
53074c7715
Polishing the random maps: Aegean Sea, Alpine Lakes
...
This was SVN commit r13605.
2013-07-28 16:58:09 +00:00
63f766bb2a
Nerfed Hellenization a bit.
...
Changed the portraits of the Cart merc techs.
This was SVN commit r13604.
2013-07-28 16:21:43 +00:00
0774730e2f
-Made starting units start at Elite rank (just for fun and testing).
...
-Some new tech portraits for Divine Offerings and Agoge.
-Fertility Festival technology increased cost.
-New special technology for all Hellenic factions: Hellenization,
researched at the Theatron, increases territory influence for all
buildings +50%. This is a temporary technology until the real
Hellenization effect can be implemented.
-New special technology for the Mauryan and Iberian blacksmiths: Woot
Steel and Toledo Steel respectively.
This was SVN commit r13603.
2013-07-28 13:38:04 +00:00
28db824982
iberian, hellene, roman and celtic blacksmiths with AO maps added.
...
This was SVN commit r13602.
2013-07-28 13:14:42 +00:00
f0310cce58
Reduced Food cost of cavalry from 100 to 80.
...
Reduced Food cost of elephants from 200 to 150.
Reduced Metal cost of elephants from 200 to 150.
Reduced Stone cost of Mauryan elephant stables from 300 to 200.
Reduced Metal cost of Persian chariot archers from 100 to 0.
This was SVN commit r13601.
2013-07-28 10:20:07 +00:00
a146a8ad3b
Fixed some things.
...
This was SVN commit r13600.
2013-07-27 18:52:28 +00:00
fd428cf45b
Fix bug when randomly picking a unit to attack for AI's. Fix from bmwiedemann.
...
This was SVN commit r13599.
2013-07-27 15:08:45 +00:00
0263f17bcc
Polishing the random maps: Aegean Sea
...
This was SVN commit r13598.
2013-07-27 12:13:46 +00:00
a684f7646b
Fixes crash when hotloading main menu while splash screen shown (don't alter GUI page stack in init functions), refs #2042
...
This was SVN commit r13597.
2013-07-26 01:35:01 +00:00
db5c54c7c6
Persian dock update
...
This was SVN commit r13596.
2013-07-25 23:02:51 +00:00
70a3c6c8b4
Supremely blue water on Cycladic Archipelago 2. Enable high graphics and take a look at the depth rendering and specular effect.
...
This was SVN commit r13595.
2013-07-25 17:45:40 +00:00
5bfff54bcb
Unit promotion animation and invulnerability reduced from 4 seconds to 2.8 seconds.
...
This was SVN commit r13594.
2013-07-25 13:57:54 +00:00
e5a9b0eab4
And of course I forgot a file.
...
This was SVN commit r13593.
2013-07-25 08:58:15 +00:00
1f55280fa2
AI-related changes to the AI interface and Command.js, to facilitate debugging of upcoming new version of Aegis.
...
This was SVN commit r13592.
2013-07-25 08:57:07 +00:00
0d8b9b15e1
All animals now visible in Fog of War (FOW). Should help a lot with hunting.
...
Hack armor increased for most buildings.
This was SVN commit r13591.
2013-07-24 18:11:03 +00:00
697b88562c
Game Speeds adjusted.
...
This was SVN commit r13590.
2013-07-24 13:08:45 +00:00
6ed814354e
Fix the fix of the fix. Refs #1914 .
...
This was SVN commit r13589.
2013-07-23 18:48:25 +00:00
9681606d05
Non civ center units that are available at the village phase barracks are now not available until Town phase.
...
House-trained females take 30 seconds to train now.
This was SVN commit r13588.
2013-07-23 15:39:24 +00:00
efc1a678ed
Change my fix from revision [13586] to use something faster. Still Refs #1914
...
This was SVN commit r13587.
2013-07-23 10:37:43 +00:00
dc3c39fd93
Fix a rare issue where units could get stuck in Individual.Gather.Gathering state forever because of worker limits. Refs #1914 (might even fix it).
...
This was SVN commit r13586.
2013-07-23 09:46:49 +00:00
d01d58f70f
Fake randomization of the ship sinking animation to make it look better with ship formations. Refs #1921
...
This was SVN commit r13584.
2013-07-22 10:17:00 +00:00
86a8dd7e6f
Small cleanup.
...
This was SVN commit r13583.
2013-07-21 23:25:15 +00:00
bff7c53a14
Some new hero portraits.
...
This was SVN commit r13582.
2013-07-21 05:53:53 +00:00
3aa9e2f6e0
Technology research time tweaks, and fixes.
...
This was SVN commit r13581.
2013-07-21 02:16:45 +00:00
e0ea53a8ee
Adds saved game descriptions and in-game save dialog, based on patch by Crynux, fixes #2030
...
This was SVN commit r13579.
2013-07-21 00:23:57 +00:00
311403d5ef
Barracks buildable in Village Phase.
...
Fish can now be seen through the fog of war (but not in shroud of
darkness, of course).
This was SVN commit r13578.
2013-07-20 12:01:56 +00:00
9f7a0348bd
New portraiture by LordGood.
...
This was SVN commit r13577.
2013-07-20 07:35:54 +00:00
f5e60157bf
Optimizes GetPercentMapExplored by caching explored vertices per player, patch by scroogie, fixes #2012
...
This was SVN commit r13576.
2013-07-20 00:50:40 +00:00
fc9b19ab47
Pers corral and storehouse updates
...
This was SVN commit r13575.
2013-07-18 22:59:14 +00:00
439603e3fd
Persion civic ao update
...
This was SVN commit r13574.
2013-07-17 23:45:24 +00:00
1a20d47cfb
Updates to the Persian civ centre model
...
This was SVN commit r13573.
2013-07-17 23:26:40 +00:00
38cdc38bba
Fixes a build error with SDL2, refs #2041
...
This was SVN commit r13572.
2013-07-17 06:33:11 +00:00
39c0498811
Changes terrain anchoring to use faster CalcExactNormal instead of CalcNormalFixed, refs #1988 , #2039
...
This was SVN commit r13571.
2013-07-17 05:42:16 +00:00
1cca648b6d
Persian blacksmith building
...
This was SVN commit r13570.
2013-07-16 21:57:49 +00:00
2ea7fb18ea
Backport c011875c5a to the older APIs and allow for empty buildable entites token list.
...
This was SVN commit r13569.
2013-07-16 21:22:05 +00:00
df2458aa39
Allow setting of prop min/max height in the actor Edit. By sanderd17.
...
This was SVN commit r13568.
2013-07-16 13:13:41 +00:00
da4d1916dc
Implements shared trade gain with allies, patch by mimo, fixes #1691
...
This was SVN commit r13567.
2013-07-16 05:59:48 +00:00
f302faf8e4
Implements entity terrain anchoring as a visual effect, based on patch by sanderd17, fixes #1988 .
...
Sets cavalry and quadrupedal animals to 'pitch' anchoring. Cleans up
mine templates.
This was SVN commit r13565.
2013-07-16 03:46:30 +00:00
9a0ab14cf3
Carthaginian blacksmith building
...
This was SVN commit r13564.
2013-07-16 00:00:57 +00:00
c011875c5a
Fixes an issue with Aegis and the iberians
...
This was SVN commit r13563.
2013-07-15 19:47:59 +00:00
de5b584cbf
Fixes #2037
...
This was SVN commit r13562.
2013-07-15 05:54:46 +00:00
047992e61a
Fixes possible memory leaks by only allocating wave vertex buffers once and only when needed, and releasing them before re-allocating (in case CreateSuperfancyInfo is called multiple times).
...
Checks if wave vertex buffers were allocated before rendering, fixes
#2017
This was SVN commit r13561.
2013-07-15 03:26:48 +00:00
6d284e4e56
Applying stwf's sound attribute to ballista + pers fortress decals added
...
This was SVN commit r13560.
2013-07-14 15:41:49 +00:00
c9193b0302
Fix a few templates and techs.
...
This was SVN commit r13559.
2013-07-14 15:01:22 +00:00
5eb670ef82
Med Cove and Persian sandbox map tweaks
...
This was SVN commit r13558.
2013-07-14 13:58:36 +00:00
595c964d77
Make water specular more visible and fixes a few cases where it would actually hardly appear when it should.
...
Adds the ability to access an element in a dropdown box by typing the
first letters (Refs #1532 ).
This was SVN commit r13556.
2013-07-14 12:17:07 +00:00
408c30e061
Probably fixes #2021 . Optimization for foam generation while I'm at it (it's faster now, but there's a new temporary array of the size of the map)
...
This was SVN commit r13555.
2013-07-14 08:06:07 +00:00
071c976693
Sahel. wide open 2v2 scenario.
...
This was SVN commit r13554.
2013-07-13 01:50:46 +00:00
63c19af5dc
Fixes assignment operator warning on MSVC by making CObjectEntry NONCOPYABLE, refs #2033
...
This was SVN commit r13552.
2013-07-12 03:46:40 +00:00
5fb89ac6bc
Fixes prop bugs due to uninitialized variables on MSVC build, refs #2033
...
This was SVN commit r13551.
2013-07-12 03:32:14 +00:00
91effd1ad1
...
...
This was SVN commit r13550.
2013-07-11 23:58:54 +00:00
d5897854be
Allow terrain aligned props. Patch by sanderd17. Fixes #2033 .
...
This was SVN commit r13549.
2013-07-11 22:53:31 +00:00
6cffdacb40
Small cleanup.
...
This was SVN commit r13547.
2013-07-10 00:08:05 +00:00
d1af7ea0ef
Include mod path in the cache path.
...
This was SVN commit r13546.
2013-07-10 00:08:01 +00:00
fb0c1e6cc6
Update to the Carthaginian wonder/mausoleum
...
This was SVN commit r13545.
2013-07-09 23:51:23 +00:00
27086be9c3
Split skeleton definitions into multiple files, adds hotloading support for skeleton files. Fixes #190 .
...
This was SVN commit r13544.
2013-07-08 20:25:06 +00:00
041855e547
Allow building walls along the shore. Patch by sanderd17. Fix #1610 .
...
This was SVN commit r13542.
2013-07-07 22:44:47 +00:00
d479f373aa
Display current/max gatherers or builders when a resource or foundation is selected. Based on a patch by mimo. Fix #1871 .
...
This was SVN commit r13541.
2013-07-07 22:13:58 +00:00
ed3afce81e
- Round attack numbers in the GUI. Patch by scythetwirler. Fix #1997 .
...
- Adjust the siege attack tech to add an integer instead of multiply by
a percentage.
- Fix the siege armor tech so the tooltip and the added value match up.
This was SVN commit r13540.
2013-07-07 21:04:36 +00:00
93e8ccda64
Fix crash in VC++11 debug builds. Fixes #2028 . Patch by RedFox.
...
This was SVN commit r13539.
2013-07-07 20:02:20 +00:00
efc6263cc4
Tech icon tweaks
...
This was SVN commit r13538.
2013-07-07 15:55:35 +00:00
41f1485997
Fixing some missing texture links caused by 80b0106502
...
This was SVN commit r13537.
2013-07-07 15:36:27 +00:00
8aa016a884
Changes graphics card name detection on Windows to use OpenGL, as a workaround for certain WMI related crashes on Nvidia Optimus and netbook systems. Fixes #1952 , #1575
...
This was SVN commit r13536.
2013-07-06 18:30:29 +00:00
30f8d6dae2
Tweaks to some templates and tech portraits.
...
This was SVN commit r13534.
2013-07-06 03:35:03 +00:00
3824b3f89d
Silver shield tech icon
...
This was SVN commit r13533.
2013-07-05 22:26:34 +00:00
4ab38f81f7
Remove player owned sheep when committing the foundation.
...
This was SVN commit r13531.
2013-07-05 15:33:39 +00:00
453389b53a
Generic shield icons
...
This was SVN commit r13530.
2013-07-04 22:40:02 +00:00
485bd75abe
apply patch from ticket 1944 added sound attribute to animations to optionally differentiate sound starting point
...
This was SVN commit r13529.
2013-07-02 11:44:46 +00:00
377cae15f8
Technology to unlock female training at the house.
...
Sacred Band infantry is now a spearman instead of pikeman.
This was SVN commit r13528.
2013-07-02 07:11:01 +00:00
cd7b56faa4
Updated the name of "Porus" on Punjab 1.
...
Updated some Blacksmith templates with histories.
Made a new "pikeman" template to use with pike units. Made pikemen have
extra high armor, but pretty low attack. Basically they'd be used as the
ultimate meat-shield.
Cleaned up some stuff.
Made us of Pureon's new technology portraits.
This was SVN commit r13527.
2013-07-02 00:04:05 +00:00
24b6fb7c3e
Clean up cheat handling a bit. Use setter and getter for cheatTimeMultiplier.
...
This was SVN commit r13526.
2013-07-01 23:46:03 +00:00
78d4a24fba
Hero tech icon
...
This was SVN commit r13525.
2013-07-01 23:42:51 +00:00
40660606aa
Corinthian crest helmet tech icon
...
This was SVN commit r13524.
2013-07-01 21:46:24 +00:00
9565c60a14
Adds UI sounds for buttons, dropdowns, lists, and checkboxes, fixes #948
...
This was SVN commit r13521.
2013-07-01 04:15:09 +00:00
ef66f73a84
Recalculate trader gain when garrisoned entities change. Patch by mimo. Fixes #2018 .
...
This was SVN commit r13520.
2013-06-30 22:19:41 +00:00
c04f887676
Mauryan civ uses Omri's track. Cart sandbox map update
...
This was SVN commit r13519.
2013-06-30 11:06:35 +00:00
2a2daf84e0
Small boats move around quieter than large ships
...
This was SVN commit r13518.
2013-06-30 10:40:59 +00:00
d213f2ba91
This was SVN commit r13516.
2013-06-30 09:24:43 +00:00
0933925d49
Adds JS implementations of Math.pow, exp, and log, by sanderd17, refs #1193 .
...
Fixes #1990 (OOS caused by Math.pow).
Adds tests and documentation for Math functions.
This was SVN commit r13515.
2013-06-30 05:16:20 +00:00
d79ba004da
Fixes OS X build failing to find Boost libs, refs #1938
...
This was SVN commit r13514.
2013-06-30 00:48:34 +00:00
8bccecdb8d
Updates Premake Windows binary
...
This was SVN commit r13513.
2013-06-29 23:36:56 +00:00
bbcfa93dc4
Use os.findlib to find boost. Patch by Markus. Fixes #1938 . Refs #1518 .
...
This was SVN commit r13512.
2013-06-29 22:25:50 +00:00
c6348538ea
Show combined costs in the gate conversion tooltip. Based on patch by Jgwman. Fixes #1591 .
...
This was SVN commit r13511.
2013-06-29 20:55:53 +00:00
123d08eb82
This was SVN commit r13510.
2013-06-29 04:12:17 +00:00
4c22d4631a
Carthaginians can now only build 1 embassy at a time.
...
Each embassy comes with new technology pairs. Metal Costs vs. Training
Time.
Structure pierce armor adjusted upward.
This was SVN commit r13509.
2013-06-29 02:17:33 +00:00
2b02f983a6
Replace decimal with nonNegativeDecimal. Refs #1633
...
This was SVN commit r13508.
2013-06-29 01:59:46 +00:00
37c8e77d8e
Use floats for health. Fix #1633
...
This was SVN commit r13507.
2013-06-29 00:43:08 +00:00
4b3f4c0a1d
This was SVN commit r13506.
2013-06-27 12:00:23 +00:00
623f5d9a9f
Small garrison code clean-up
...
This was SVN commit r13505.
2013-06-26 19:24:56 +00:00
6cbdc13e08
Clarify usage of CheckPlacement. Check if the losRangeQuery exists before disabling it.
...
This was SVN commit r13504.
2013-06-26 18:41:06 +00:00
5e289f51c2
Make attack type a property of the order.
...
This was SVN commit r13503.
2013-06-26 14:15:03 +00:00
d5e081d55f
Fix inconsitency between AttackEntityInZone and ShouldAbandonChase for units in defensive stance. Patch by mimo. Fixes #1866 .
...
This was SVN commit r13502.
2013-06-26 13:24:03 +00:00
2fcd52b657
Let states execute their leave handlers on OnDestroy. Fixes #1999 . Patch by mimo.
...
This was SVN commit r13501.
2013-06-25 21:49:54 +00:00
49b3b0ee9a
Reverts interpolation changes from a7bc7ab50c, 71ae5a19d8, 1778e685ac, c6043779f6, 8777f68aa0, 21f13f9683. Refs #1846 , #1858 , #1865 , #1906
...
This was SVN commit r13500.
2013-06-25 01:09:43 +00:00
699d5c5d79
Fixes possible overflow in terrain position/normal calculation, based on patch by sanderd17. Fixes #1986
...
This was SVN commit r13499.
2013-06-25 00:57:42 +00:00
a981890ab9
Fixes PSA converter to detect broken animations/skeletons.xml slightly better, based on patch by Markus. Fixes #1478
...
This was SVN commit r13498.
2013-06-23 22:58:17 +00:00
ce8457e195
Fixes map name in pathfinder performance test
...
This was SVN commit r13497.
2013-06-23 00:50:24 +00:00
4fc15a9b08
Renames mill to storehouse
...
This was SVN commit r13496.
2013-06-22 02:28:54 +00:00
e5c35beefe
Blacksmith smoke.
...
Persian and Carth blacksmith actors.
This was SVN commit r13495.
2013-06-21 00:16:52 +00:00
5f78bb7318
For most civs, made it so that Champions are unlocked by default in the Fortress at City Phase, but then also available for training at the Barracks, but after they are unlocked with a tech.
...
Removed the minrange for all ranged units until minimum range bugs are
fixed. To fix it will require a multi-pronged approach that will need
discussed and Trac tickets created.
This was SVN commit r13494.
2013-06-21 00:14:00 +00:00
14990ea390
Fixes another possible NaN when invulnerable units are attacked, refs #1881
...
This was SVN commit r13493.
2013-06-18 20:20:37 +00:00
fca1f4c3a7
Persians and Carthaginians receive blacksmiths.
...
This was SVN commit r13492.
2013-06-18 14:20:15 +00:00
1a5d5eb808
Sets remaining unit trained and building completed sounds to HeardBy owner only, refs #1965
...
This was SVN commit r13490.
2013-06-18 05:06:22 +00:00
a7bc7ab50c
Fixes units not rotating correctly during e.g. attacks, patch by sbte, fixes #1906
...
This was SVN commit r13489.
2013-06-18 03:42:06 +00:00
95b51188fa
Fixes possible undefined value returned by CmpHealth, leading to a NaN and serialization test failure. Refs #1881
...
This was SVN commit r13488.
2013-06-18 03:26:08 +00:00
00e21a9898
change 'restricted' flag to 'heardby' in SoundGroup xml files
...
This was SVN commit r13487.
2013-06-17 15:46:28 +00:00
36dec0e789
add restricted flag to SoundGroup xml for sounds thatonly the owning player should hear
...
This was SVN commit r13486.
2013-06-17 02:30:40 +00:00
02b98f3acd
Fixes build with x11 and SDL2
...
This was SVN commit r13485.
2013-06-17 01:43:57 +00:00
f918c9b074
Prevent formation controllers from showing up in range queries. Fixes #1796 .
...
This was SVN commit r13484.
2013-06-16 23:10:01 +00:00
5f90371a1c
Cleans up some float constants and math from #1921
...
This was SVN commit r13482.
2013-06-15 00:42:07 +00:00
9d27cccbcd
Fix Visual Studio build issues.
...
This was SVN commit r13481.
2013-06-15 00:20:40 +00:00
e75877b52f
Adds comment about xorg-x11's glXGetProcAddress not returning NULL for unsupported functions, closes #171
...
This was SVN commit r13480.
2013-06-14 23:49:20 +00:00
c01c8fb2fc
Stop generating VS2005 project files. Refs #1951 .
...
This was SVN commit r13479.
2013-06-14 23:46:12 +00:00
98cac1a10f
Improve ship sinking. Patch by wraitii. Fix #1921
...
This was SVN commit r13478.
2013-06-14 19:19:13 +00:00
9ea830c855
Handle empty token list gracefully.
...
This was SVN commit r13477.
2013-06-14 16:13:59 +00:00
bcf99e2a13
make sound code return faster, code cleaner
...
This was SVN commit r13476.
2013-06-14 16:05:57 +00:00
da17e4329b
cleanup SOundManaer component
...
This was SVN commit r13475.
2013-06-14 00:24:51 +00:00
26dbac8d57
fixes to SoundManager external interface, clean up ifdef situation, and SoundGroup playin
...
This was SVN commit r13474.
2013-06-13 12:12:44 +00:00
b3653cfe16
Updates bundled Valgrind headers to 3.8.1 and fixes test build, patch by Markus, fixes #1971
...
This was SVN commit r13473.
2013-06-12 03:38:37 +00:00
2567fee329
Write mod data correctly. Fixes #1940 .
...
This was SVN commit r13472.
2013-06-11 20:50:09 +00:00
15e75cdfbd
Updated some building tooltips.
...
Removed wall techs from Iberians for balance.
This was SVN commit r13471.
2013-06-11 16:28:42 +00:00
facd447d0f
Hopefully fixes GCC warning about narrowing conversion in C++11, fixes #1851
...
This was SVN commit r13470.
2013-06-11 02:40:49 +00:00
b3391ebe39
Fix build warnings. Patch by Markus. Refs #1851 .
...
This was SVN commit r13469.
2013-06-11 00:05:57 +00:00
2ed10ec033
Changed names and histories for Roman civ center and market.
...
Fixed elephant heroes.
This was SVN commit r13468.
2013-06-10 15:33:18 +00:00
ada7702bec
add UI sound channel, clean up external interface and javascript calls
...
This was SVN commit r13467.
2013-06-10 13:58:43 +00:00
29549561e1
Add flag to VisualActor for entities that should only be visible in Atlas. Patch by KareemErgawy. Fixes #1411 .
...
This was SVN commit r13465.
2013-06-09 23:18:21 +00:00
5246e9a576
Update description of ESC key in the manual. Refs #1928 .
...
This was SVN commit r13464.
2013-06-09 20:38:57 +00:00
6f3a0e1378
Implement location hotkeys. Fix #1882 .
...
This was SVN commit r13463.
2013-06-09 20:21:19 +00:00
356adb1216
Nicer looking particles for Roman Temple. Fixes #1498 .
...
More shield and helmet stuff.
This was SVN commit r13462.
2013-06-09 17:28:46 +00:00
80b0106502
Brand new Macedonian/Ptolemaic shield patterns by Enrique.
...
This was SVN commit r13461.
2013-06-09 15:57:29 +00:00
b40a738c87
Adds Omnipresent flag to more alarm sounds
...
This was SVN commit r13460.
2013-06-08 22:46:26 +00:00
d151a6a304
Fixed war elephants. They can attack walls now.
...
This was SVN commit r13459.
2013-06-08 13:42:49 +00:00
8eae65be2b
Fixed elephants. Can now attack walls.
...
This was SVN commit r13458.
2013-06-08 12:51:15 +00:00
633eab6080
Median Oasis 6 & 7.
...
Updated blowing sand texture.
This was SVN commit r13457.
2013-06-06 14:47:50 +00:00
71b25d5bd4
big SoundManager checkin,futureproof javascript interface, isolate external calls to remove OpenAL references
...
This was SVN commit r13455.
2013-06-06 11:13:57 +00:00
1341b88468
Adds VBO support to minimap entity rendering to improve performance, patch by kuranes. Refs #1923
...
This was SVN commit r13454.
2013-06-06 00:10:58 +00:00
d20849d1c4
Add some checks for the sound manager. Fixes the segfault when using -quickstart.
...
This was SVN commit r13453.
2013-06-05 22:10:11 +00:00
5b1f5dd2c1
Display expected trading gain (GainMultiplier = 1) for market foundations when setting rally points. Fixes #1963 .
...
This was SVN commit r13452.
2013-06-05 21:35:31 +00:00
b2f6a1260e
Sets Distanceless flag on most selection sound groups.
...
Adds new sound groups for gates.
This was SVN commit r13451.
2013-06-04 03:17:46 +00:00
43d2c8be8c
Converts a bunch of stereo sound effects to mono, to fix sounds ignoring entity position, fixes #1956 , refs #1929 .
...
Will require sound group XML updates in some cases.
This was SVN commit r13450.
2013-06-03 21:42:48 +00:00
4d5187bf40
Building completion and unit training sounds are now ubiquitous, meaning you'll hear them even if they are off-screen.
...
This was SVN commit r13449.
2013-06-03 02:50:10 +00:00
8026685a06
Don't display the rally point tooltip for trading for enemy markets.
...
This was SVN commit r13448.
2013-06-02 20:17:44 +00:00
2ef6ec3f73
Rounds trader gain to avoid fractions with garrisoned traders in a merchant ship, patch by Markus, fixes #1954
...
This was SVN commit r13447.
2013-06-01 21:28:31 +00:00
eebe7972df
Lighting tweaks to Mauryan emblem
...
This was SVN commit r13446.
2013-06-01 12:09:34 +00:00
5af503405f
last bunch of ogg files not converted from wav correctly
...
This was SVN commit r13445.
2013-06-01 02:56:31 +00:00
b6e0661b8f
New BRASIDAS Spartan hero.
...
"The Agoge" tech for Spartans.
Fixed Leonidas' selection ring.
This was SVN commit r13444.
2013-06-01 02:33:58 +00:00
67b42210aa
mono ogg sounds rendered from original wav files recommitted
...
This was SVN commit r13443.
2013-06-01 02:30:05 +00:00
004eaf9e75
log warning when stereo sounds are played at position
...
This was SVN commit r13442.
2013-06-01 01:52:05 +00:00
4882aac409
New techs for Carthage: Mercenary Captains, reduce metal costs for merc units, based on ethnicity.
...
Melee cav more starting pierce armor.
This was SVN commit r13441.
2013-05-31 02:52:06 +00:00
690619ce5e
many fauna sounds in stereo converted to mono so the OpenAL can locate them
...
This was SVN commit r13440.
2013-05-31 02:50:47 +00:00
b21de66e40
address issue 1929 Ubiquitous Sound Effects, fixes a bug in determining which units are onscreen, also plays distant items softly if at all
...
This was SVN commit r13439.
2013-05-31 01:03:07 +00:00
d3e40792ff
Added a "wooden structures" civ bonus for the Celtic civs. Their buildings are 20% weaker, but they construct 20% faster than other cultures.
...
Fixed health for "Greek" walls.
Adjusted "preferredclasses" stuff on some templates.
This was SVN commit r13438.
2013-05-30 00:58:07 +00:00
085e9c620d
Tweaked armor stats for battering ram and siege tower.
...
Fixed "rollover" tag to "history".
This was SVN commit r13437.
2013-05-29 23:39:13 +00:00
7a8c8e439b
Fixes warning in VC2012 build (C4706: assignment within conditional expression)
...
This was SVN commit r13434.
2013-05-28 01:23:43 +00:00
d2b0d25457
Fixes macro redefinition of FACILITY_VISUALCPP in VC2012 (it's defined in winerror.h).
...
Removes obsolete hack for old Boost and VC2005 (broke VC2005 build with
modern Boost).
This was SVN commit r13433.
2013-05-28 01:14:41 +00:00
4a8c7e72b5
Lowered crush armor for these buildings.
...
This was SVN commit r13431.
2013-05-27 18:21:57 +00:00
93d0084266
incorporate patch from ticket 1937, fix memory leak in SoundManager
...
This was SVN commit r13430.
2013-05-27 13:36:17 +00:00
88c4e5bdd0
Extends binary serializer to support some standard JS classes: Number, String, Boolean. Fixes #406 .
...
Extends binary serializer to support typed arrays.
Extends binary serializer to support custom JS prototype objects in AIs,
fixes #407 .
Allows full serialization of AIs (not yet implemented). Refs #1089 ,
#1886
Increases binary serializer script backref arena from 8 MB to 16 MB,
refs #1842
This was SVN commit r13429.
2013-05-26 21:57:24 +00:00
e58fe92892
Tweaked Walls stats and costs.
...
Carthaginians' 'Triple Walls' civ bonus moved from wall templates to
auto-researching (free) tech. It just cleans things up quite a bit.
Changed sound groups for "special buildings."
This was SVN commit r13428.
2013-05-25 23:10:16 +00:00
97b28e7343
Some sound file changes to hopefully add more aural variation.
...
Cavalry blacksmith techs moved from City to Town.
Trying to give the female citizen the order_build soundgroup, but it
doesn't seem to work. The game seems to use order_repair for both
repairing and building. These are two different actions so should
support two different sound groups.
This was SVN commit r13427.
2013-05-25 18:07:29 +00:00
2c52099ddd
Fix previous commit because of course there was test code in there. Make Aegis build more farms because of recent changes.
...
This was SVN commit r13426.
2013-05-25 16:24:05 +00:00
f372f9184c
Fix Aegis breaking the profiler after some time ( Fixes #1945 . Fix typo ( Fixes #1947 ). Patches by Markus.
...
Also one other fix for something attack related (probably, code is old
and I can't recall).
This was SVN commit r13425.
2013-05-25 15:56:11 +00:00
17bb997e0e
Fixes memory leak in CVertexBuffer::Release, patch by Markus, fixes #1933
...
This was SVN commit r13423.
2013-05-23 23:16:36 +00:00
bc8d461b81
Display rally point lines when setting rally points using the minimap. Patch by TrinityDeath. Fixes #1848 .
...
This was SVN commit r13422.
2013-05-23 20:34:15 +00:00
a8a968d32c
Catch exceptions by reference (by convention), based on patch from Markus, refs #1852
...
This was SVN commit r13421.
2013-05-22 22:27:53 +00:00
72a8b88b7d
Fixes some unconventional assignment operators, patch by Markus, refs #1852 .
...
Fixes typo in test_ShaderManager
This was SVN commit r13420.
2013-05-22 22:04:58 +00:00
94c57085e9
Makes some classes NONCOPYABLE, based on patch by Markus, refs #1852
...
This was SVN commit r13419.
2013-05-22 21:40:56 +00:00
d7dcd3b26c
Use prefix increment operator for iterators (for consistency), refs #1852 , #1064
...
This was SVN commit r13418.
2013-05-22 18:41:13 +00:00
3ce14e3f4b
fix memory leak in SoundManager, patch taken from ticket #1934
...
This was SVN commit r13417.
2013-05-22 12:13:21 +00:00
56a4d6417c
Small cleanup.
...
This was SVN commit r13416.
2013-05-21 23:50:42 +00:00
e5523754b3
Check if a building is already at full health when trying to repair it. Fixes #1930 .
...
This was SVN commit r13415.
2013-05-21 23:45:20 +00:00
4356badfa9
Pause production if the producing entity is garrisoned. Fixes #1931 .
...
This was SVN commit r13414.
2013-05-21 23:01:53 +00:00
3f00d4d997
Change some size() > 0 to Based on patches by kuranes and Markus. Refs #1852 , #1923 .
...
This was SVN commit r13413.
2013-05-21 22:11:47 +00:00
013fc9558a
Fix typo. Fixes #1935 .
...
This was SVN commit r13412.
2013-05-21 22:11:15 +00:00
136f1891c1
Fixes a fix about a fix on the waterManager. Fixes #1891
...
This was SVN commit r13411.
2013-05-21 08:55:49 +00:00
346df43a43
Persian Apadana build limit.
...
This was SVN commit r13410.
2013-05-19 08:24:36 +00:00
67d072108b
Bloody dead camel.
...
New wall technologies (research at Wall Tower, since for now techs can't
be researched at wall segments).
Adjusted default BatchTrainModifier from 0.7 to 0.8 in all buildings
since the new training techs were making unit batches train insanely
fast.
Added 'Naval Architects' batch training tech to the Dock (and Carth
Super Dock).
Attempting to add "Apadana" build limit, with no success. Need help
here. I thought BuildRestrictions.js and EntityLimits.js were the files
I needed to change, but it's not working (there should be a build limit
of 1 for the Persian Apadana).
Tweaked the levy techs.
Fixed Hero elephant unit RequiredTechnology.
This was SVN commit r13409.
2013-05-19 08:19:16 +00:00
09108e6a97
Some more vars
...
This was SVN commit r13408.
2013-05-16 16:17:37 +00:00
1ea0bac280
New train time techs. For most factions, you choose either faster training infantry or faster training cavalry (either one unlocks Conscription, which boosts batch training considerably). For Persians, you get to research both at the barracks and stables, which unlocks conscription techs for both buildings. For Persians, I also moved the champion unlock tech to their Palace (Apadana), which now unlocks the "Immortals" technology (the tech that makes the Anusiya train twice as fast).
...
This was SVN commit r13407.
2013-05-15 08:11:20 +00:00
ccb4ecc9f2
Renamed this tech.
...
This was SVN commit r13406.
2013-05-15 04:07:07 +00:00
9ceab639f3
Bloody dead sheep.
...
Unlocking tech for champions.
Champions trainable in barracks (after unlocking tech).
Farm Field yield increased from 2000 food to 5000 food. Max gatherers: 5
per field.
This was SVN commit r13405.
2013-05-14 09:48:37 +00:00
de5d4491ab
var-fare
...
This was SVN commit r13404.
2013-05-12 22:28:02 +00:00
f5f0bc701a
Completely changed the "Stockbreeding" tech.
...
Fixed the 'Conscription' tech. It should work as advertised now.
Added some classes to the structures.
Reduced archer bonus vs. cav spears by 50%.
Moves Iphicratean Reforms from the Athenian Trireme to the Athenian
Dock.
This was SVN commit r13403.
2013-05-12 21:30:01 +00:00
2aa3ab8b03
conscription tech fix
...
This was SVN commit r13402.
2013-05-12 16:59:54 +00:00
3bec6ced85
Fix hero button for heroes without attack
...
This was SVN commit r13401.
2013-05-12 16:02:53 +00:00
daf572eb43
Temporary Blacksmith structures for prototyping and playtesting.
...
Lots of new techs. Healing techs. Vision for outpost. "Conscription"
tech boosts batch training speed. Implemented Macedonian "Hellenistic
Metropolis" special tech.
Testing placing Champions in the barracks (unlocked with a tech). Try
this out with the Macedonians.
Reduced archer attack damage. Reduced cost of healer.
Lots of other stuff.
This was SVN commit r13400.
2013-05-12 07:23:05 +00:00
209d8c4fd4
Made death screams slightly quieter. We actually need new male death/battle sounds.
...
This was SVN commit r13399.
2013-05-09 16:36:49 +00:00
eae28bad5a
Gold Oasis 3. Iberians vs. Mauryans.
...
This was SVN commit r13398.
2013-05-06 00:40:40 +00:00
57644fba50
Some art stuff: Scaffolds to other foundations, tweaking some Mauryan animations, new turban for maiden guards, etc.
...
This was SVN commit r13397.
2013-05-05 21:07:40 +00:00
d49cc6fc8b
Some armor changes. Also adds hero training restriction to hero elephant template. Fixes #1927 .
...
This was SVN commit r13396.
2013-05-05 19:25:33 +00:00
47e9431d29
Check if one of the technologies in a pair is already in progress. Fixes #1820 .
...
This was SVN commit r13395.
2013-05-05 13:54:00 +00:00
cb7964a1db
Make some gather techs work.
...
This was SVN commit r13394.
2013-05-05 13:13:38 +00:00
56fa123718
Fix error when constructing with the first selected entity being a building.
...
This was SVN commit r13392.
2013-05-04 21:44:32 +00:00
fc5e2d27c7
Cancel building placement or reset selection on Esc. Patch by Josh. Fixes #1928 .
...
This was SVN commit r13391.
2013-05-04 21:02:11 +00:00
0d09f290d9
Allow setting rally points for foundations. Patch by Josh. Fixes #902 .
...
This was SVN commit r13390.
2013-05-02 20:29:22 +00:00
bf959e1c46
fix build when using --without-audio
...
This was SVN commit r13389.
2013-05-02 13:58:28 +00:00
683f22cdb1
Display entity limits for buildings. Patch by Josh. Fixes #1924 .
...
This was SVN commit r13388.
2013-05-01 19:25:55 +00:00
f42b77919d
Future-proof the code for civ specific non-peace tracks.
...
This was SVN commit r13387.
2013-05-01 16:48:55 +00:00
9a0749f3c9
Make sure to actually prevent Atlas from trying to render coastal waves. Fixes #1925
...
This was SVN commit r13386.
2013-05-01 06:47:49 +00:00
ac3e9d8bc7
clear peace tracks before reloading music from civ files
...
This was SVN commit r13385.
2013-05-01 01:51:30 +00:00
67ff52a07f
More armor adjustments.
...
This was SVN commit r13384.
2013-04-30 08:36:47 +00:00
181db44ab5
Enforce technology restrictions when training units.
...
This was SVN commit r13383.
2013-04-29 21:51:14 +00:00
35daf00336
Snuck through without armor changes. Fixed now.
...
This was SVN commit r13382.
2013-04-29 18:33:03 +00:00
e0a2e5790d
Exponential Armor patch by Alpha123, with new updated armor values.
...
Needs a ton of testing.
This was SVN commit r13381.
2013-04-29 07:51:51 +00:00
4493f2986f
Wonder support for civs currently with Wonders.
...
This was SVN commit r13380.
2013-04-29 02:46:13 +00:00
0686c6a553
Resetting 'default' maps.
...
This was SVN commit r13379.
2013-04-29 02:36:57 +00:00
5a88f0fce0
Fix entity limits for buildings.
...
This was SVN commit r13378.
2013-04-29 00:36:21 +00:00
f4e0007733
Cavalry are a bit faster.
...
Attempting to add Wonders, but no success (need help). Adding files here
to see if someone can fix what I've started.
This was SVN commit r13377.
2013-04-28 22:51:08 +00:00
d9540ad7f6
Fixes MSVC build error and warning
...
This was SVN commit r13375.
2013-04-27 22:43:22 +00:00
4233acfa36
Slight clean up of the water code. Uses vertex data instead of a texture for foam. Should be faster to generate and render. Still no Atlas support.
...
This was SVN commit r13374.
2013-04-27 12:20:42 +00:00
092108b304
Must notify sound manager sources are now available
...
This was SVN commit r13372.
2013-04-26 23:13:11 +00:00
c30f7a40e0
no need to check errors after destroying context, clean up some OpenAL interface calls
...
This was SVN commit r13371.
2013-04-25 10:48:34 +00:00
8324e0f665
add missing music list files
...
This was SVN commit r13369.
2013-04-24 19:27:16 +00:00
71486bd57d
SoundManager supports playlists
...
This was SVN commit r13368.
2013-04-24 12:03:42 +00:00
6115c3fc13
Remove some duplication from ProcessCommand.
...
This was SVN commit r13367.
2013-04-22 17:50:25 +00:00
62f24af68d
Some new portraits by LordGood.
...
This was SVN commit r13366.
2013-04-21 18:47:11 +00:00
3758b64916
Remove hardcoding of path from desktop file and launcher script. Patch by vincent. Fixes #1424 .
...
This was SVN commit r13365.
2013-04-21 16:47:36 +00:00
75f332ce20
Stop hotkey. Patch by alpha123. Fixes #1870 .
...
This was SVN commit r13364.
2013-04-18 19:20:29 +00:00
cd6a76bcaa
Gates now handle allies made using diplomacy.
...
This was SVN commit r13363.
2013-04-18 18:18:34 +00:00
18a2b7d093
Fix roman merchant ship trading distance. Fixes #1874 .
...
This was SVN commit r13362.
2013-04-18 18:18:31 +00:00
dc9889c190
Display number of garrisoned units when trying to garrison. Patch by mimo. Fixes #1915 .
...
This was SVN commit r13361.
2013-04-18 18:18:29 +00:00
a362b41029
Fix grouping of garrisoned units. Patch by mimo. Fixes #1918 .
...
This was SVN commit r13360.
2013-04-18 18:18:24 +00:00
503b481468
handle initialization errors cleanly, clean stuff up
...
This was SVN commit r13359.
2013-04-18 03:24:20 +00:00
b22320a85f
Fix tests. Refs #1807 .
...
This was SVN commit r13358.
2013-04-14 00:52:00 +00:00
d0a695f7fb
Allow mutual allies to garrison in each others buildings. Patch by mimo. Fixes #1807 .
...
This was SVN commit r13357.
2013-04-14 00:34:14 +00:00
2a3f1cb412
eliminate most warnings produced by Cppcheck
...
This was SVN commit r13356.
2013-04-12 03:10:54 +00:00
7562c79e89
Change target for all orders on EntityRenamed. Patch by mimo. Fixes #1903 .
...
This was SVN commit r13355.
2013-04-10 22:48:02 +00:00
95a10e7f42
Reduce duplicate GuiInterfaceCalls some more. Patch by sbte. Fixes #1878 .
...
This was SVN commit r13354.
2013-04-10 21:05:46 +00:00
0cad19ecec
double check that the sound manager has been created before using
...
This was SVN commit r13353.
2013-04-10 12:03:17 +00:00
b301d5c84d
fades music in and out when switching to background, also honors g_PauseOnFocusLoss
...
This was SVN commit r13352.
2013-04-10 11:51:42 +00:00
19ce9657bc
This was SVN commit r13351.
2013-04-10 09:11:08 +00:00
3074b930cc
Tech.
...
This was SVN commit r13350.
2013-04-08 08:27:30 +00:00
789991c5d2
New food gathering tech for village phase.
...
Adjusted some food gather rates.
Adjusted some tech costs.
This was SVN commit r13349.
2013-04-08 07:59:57 +00:00
5429052b06
Lots of normal maps and spec maps. Ongoing project.
...
Added camel death scream (lol) to camel units.
Added sheep sounds to sheep.
Changed over the Mauryan elephant unit actors.
This was SVN commit r13348.
2013-04-07 22:28:36 +00:00
c9a5d5cee5
pause music and ambient sounds when game pauses
...
This was SVN commit r13347.
2013-04-07 04:13:15 +00:00
555f06acbe
Fix errors when the hero is garrisoned. Patch by alpha123. Refs #1802 .
...
This was SVN commit r13346.
2013-04-06 19:32:07 +00:00
c71ddae359
Adds forgotten OpenLogsFolder.vbs to Windows uninstaller
...
This was SVN commit r13345.
2013-04-05 21:40:49 +00:00
2af37c3590
Adds player color to rubble entities, thanks to ericb for the patch, fixes #1887
...
This was SVN commit r13344.
2013-04-05 02:52:01 +00:00
161d6c1ba7
Improves SDL 2.0 support
...
This was SVN commit r13343.
2013-04-05 02:39:30 +00:00
7f9b486a48
This was SVN commit r13341.
2013-04-03 23:28:29 +00:00
16de5c75ac
Adds game speed option to match setup, adds in-game control for single player games, fixes #785 .
...
Refactors some GUI utility functions.
This was SVN commit r13340.
2013-04-03 23:24:22 +00:00
62dc594a71
Hero button. Based on patch by Malcom and edits to that by alpha123. Fixes 1802.
...
This was SVN commit r13339.
2013-04-03 17:27:55 +00:00
f2da77ff72
"Oh myyyyy" -- George Takei. Lots of stuff:
...
- Town Phase cost increased to 1000 Food, 1000 Wood (from 500 of each).
This makes Village Phase longer and more interesting. Still need to
test.
- Lots of new normal maps and spec maps (for a bunch of desert terrains
and cretan date palms). This is an ongoing project.
- Fixed some spec maps for being too 'bright.'
- Changed the attack of melee spear units from a combo of pierce and
hack to just hack. Per discussion with Quantumstate. Needs testing.
- Changed the Median Oasis 1 scenario to include Mauryans and
Carthaginians.
This was SVN commit r13338.
2013-04-03 06:48:38 +00:00
a317cd9cba
Fixes memory leak and removes unused code in WaterManager, fixes #1891 , refs #1852
...
This was SVN commit r13337.
2013-04-03 03:30:10 +00:00
f82adf3ef3
Don't call GetSimulationState too often. Patch by sbte. Fixes #1878 .
...
This was SVN commit r13336.
2013-04-02 21:06:20 +00:00
3c693245bd
Portraits for the Mauryan healer and Chanakya.
...
This was SVN commit r13335.
2013-04-02 17:06:15 +00:00
edea5d04e7
Portraits for Mauryan healer and Chanakya.
...
This was SVN commit r13334.
2013-04-02 17:05:51 +00:00
74df28f952
Fix --without-pch build
...
This was SVN commit r13333.
2013-04-02 15:44:42 +00:00
329b3e3d28
Adds notice of saved game issues to Aegis' description
...
This was SVN commit r13332.
2013-04-01 15:03:31 +00:00
0535cab26f
Added mauryan healer skin and head.
...
Added roman army camp rubble with AO
Added AO map and normal map to roman army camp
This was SVN commit r13331.
2013-04-01 00:48:18 +00:00
afde8b04fd
Deletes "obsolete and rubbish" textureconv
...
This was SVN commit r13330.
2013-03-31 23:53:53 +00:00
3b5ab7ab51
Fixes #1884 . Should Fix #1883 .
...
This was SVN commit r13328.
2013-03-30 07:30:54 +00:00
c2ca0209fa
Fixes multiplayer crash when host disconnects while clients are still loading.
...
Improves client disconnect handling slightly.
This was SVN commit r13327.
2013-03-25 05:01:36 +00:00
475c722327
Fix serialization issues with Aegis.
...
This was SVN commit r13326.
2013-03-24 09:10:32 +00:00
6f78224f8d
Fixes tooltip in Atlas' locked teams checkbox.
...
Adds scrollbar to environment panel and reorganizes controls.
This was SVN commit r13324.
2013-03-23 19:22:11 +00:00
71ae5a19d8
Fixes visual actor interpolation, handling position changes more cleanly, based on patch by sbte.
...
Fixes rally point lines not updating, fixes #1865
This was SVN commit r13323.
2013-03-23 17:59:54 +00:00
6f33003f30
Fixes serialization test failure caused by CmpFoundation's buildMultiplier property sometimes being NaN (which can assume different internal values in Spidermonkey). For now, NaN cannot be reliably serialized. Fixes #1828 , refs #1879
...
This was SVN commit r13322.
2013-03-22 22:23:50 +00:00
0d069954b7
waterfall textures reduced 50%
...
This was SVN commit r13321.
2013-03-22 00:37:33 +00:00
3d94f3a5be
Added 4 geology waterfalls variations.
...
Added water splash particle effect.
This was SVN commit r13320.
2013-03-22 00:24:46 +00:00
4560bb62b0
Updated contributor Paperkat merch ship texture
...
This was SVN commit r13319.
2013-03-19 09:58:06 +00:00
78d1548753
Fixes (un)packing siege units responding to attacks in violent stance, by ignoring attacks while (un)packing. Fixes #1751 , refs #1752
...
This was SVN commit r13318.
2013-03-19 00:53:47 +00:00
807985ac08
Added a base with flowers and playercolor to mauryan pillars.
...
Added contributor Paperkat merchant ship.
This was SVN commit r13317.
2013-03-18 12:34:55 +00:00
e031d71b78
Added chakra wheel to ashoka pillar 4 lions variation-
...
This was SVN commit r13316.
2013-03-18 01:46:44 +00:00
1bcb6140b0
Skirms bonus vs. elephants reduced from 1.5x to 1.25x.
...
Some new elephant templates. Elephant unit entities adjusted.
Spartan female citizen now has a bonus attack vs. siege weapons.
This was SVN commit r13315.
2013-03-18 01:33:20 +00:00
063fa52252
removes chandragupta normal texture line from his actor
...
This was SVN commit r13314.
2013-03-17 23:16:40 +00:00
a7343420f2
Disable fancy water rendering on all Intel devices, since it appears to be very slow.
...
Also recognise Haswell chipsets on Mesa.
This was SVN commit r13313.
2013-03-17 14:27:47 +00:00
cfbde115b8
Maur hero Ashoka skin tone change
...
This was SVN commit r13312.
2013-03-17 12:46:24 +00:00
e367cf0d7e
maur barracks death variation semi-fix
...
This was SVN commit r13311.
2013-03-17 12:34:03 +00:00
6a1a1c16cb
maur market stalls cloth small fix
...
This was SVN commit r13310.
2013-03-17 12:27:15 +00:00
49f52500de
Mauryan ship icons
...
This was SVN commit r13309.
2013-03-17 11:53:09 +00:00
25c800e9c4
Chanakya hero template
...
This was SVN commit r13308.
2013-03-17 10:10:49 +00:00
f8a7692d92
A few final fixes to some AI logic in attack and defense.
...
This was SVN commit r13307.
2013-03-17 08:55:46 +00:00
3f28ade5c6
Hero ashoka added. Fixed maiden holding parasol in chariot.
...
Added hero turban prop
Hero Chanakya now uses elite healer template
This was SVN commit r13306.
2013-03-17 00:39:43 +00:00
9e46759ada
Mauryan actor indent cleanup
...
This was SVN commit r13305.
2013-03-16 16:05:53 +00:00
fc3b5637c8
Ambient occlusion for Mauryan houses
...
This was SVN commit r13304.
2013-03-16 15:53:20 +00:00
03c3b1daa3
Fixes a few changes in my previous commit. Makes "Medium" the default difficulty setting.
...
This was SVN commit r13303.
2013-03-16 12:55:03 +00:00
77999f6b42
Ashoka pillar variations and footprint fix
...
This was SVN commit r13302.
2013-03-16 11:18:33 +00:00
e78da0b3e4
Mauryan mill ambient occlusion
...
This was SVN commit r13301.
2013-03-16 11:00:24 +00:00
5ba7153541
Placeholder Mauryan merchant ship
...
This was SVN commit r13300.
2013-03-16 10:30:29 +00:00
b0f1afa994
Change Punjab 1 water settings.
...
Fix a little mess-up on my last commit.
This was SVN commit r13299.
2013-03-16 10:16:41 +00:00
d709fe50ed
Clean-up of Aegis scripts. Most deprecated functions have been removed, some comments updated. Also makes resource maps 8-bit to save a little memory.
...
Fix the placement of the "civ info" button to avoid overlapping on
1024*768.
This was SVN commit r13298.
2013-03-16 09:59:43 +00:00
d70db48173
Mauryan ship footprints
...
This was SVN commit r13297.
2013-03-16 09:56:22 +00:00
0fc8dba671
Fixed mauryan market stall color.
...
This was SVN commit r13296.
2013-03-16 01:06:51 +00:00
fd74292f2b
Added specular map for Chanakya hero.
...
Fixed defense tower shields when destroyed.
Added Chandragupta texture with spec.
Fixed wall tower projectile and garrisoned prop-points.
This was SVN commit r13295.
2013-03-16 00:32:04 +00:00
3958c03dbc
Changes default scenarios to Punjab 1
...
This was SVN commit r13294.
2013-03-15 23:06:16 +00:00
4bcbd14f71
Resets most land scenarios to default AIs, so they'll use Aegis Bot.
...
Removes AIs from some demo maps.
This was SVN commit r13293.
2013-03-15 23:02:29 +00:00
a96869851c
Replaces force attack hotkey with Ctrl+Alt (AltGr isn't available on US keyboards)
...
This was SVN commit r13292.
2013-03-15 21:59:36 +00:00
4769481796
Makes sure to remove the entity from the Gatherer array of the resource it was gathering from when dying. Fixes #1867 (if all goes well).
...
This was SVN commit r13290.
2013-03-15 18:12:17 +00:00
5af7544918
Bug fixes and small improvements to Aegis. Change the "C" button into a "Settings" button. Fix to -autostart-aidiff.
...
This was SVN commit r13289.
2013-03-15 12:35:16 +00:00
066cfa5893
Improve workers' reactions when they find out that the resource they gathered from is full. Refs #1387
...
This was SVN commit r13288.
2013-03-15 10:26:46 +00:00
d40a66f310
Fix particle to correctly display in the FOW, and to adapt slightly to sunColor settings (both on ARB and GLSL).
...
This was SVN commit r13287.
2013-03-15 10:22:24 +00:00
26cc813cf5
Update for release trailer recording
...
This was SVN commit r13286.
2013-03-14 23:24:53 +00:00
afe87f720a
Mauryan Corral AO
...
This was SVN commit r13285.
2013-03-14 23:13:31 +00:00
c23181a1e0
Make towers weaker by reducing range fro 80 to 70 and decreasing the arrow tech multiplier to 40% more arrows from 100%.
...
This was SVN commit r13284.
2013-03-14 22:57:59 +00:00
4edbd21714
elimate small memory leaks in SoundManager
...
This was SVN commit r13283.
2013-03-14 02:59:31 +00:00
9dac1bf89b
Fixed inverted green channel in elephants normal maps (fixed normals)
...
This was SVN commit r13282.
2013-03-14 00:48:31 +00:00
1cf1707ce7
Added mauryan hero chanakya and mauryan elephants static meshes.
...
This was SVN commit r13281.
2013-03-14 00:05:46 +00:00
163fc7cbfd
Mauryan farmstead AO stuff
...
This was SVN commit r13280.
2013-03-13 23:58:38 +00:00
25293ce0cc
Many small bugfixes for AIs. Adds support for difficulty (and along with that, some behind-the-door architecture for a handicap system).
...
Adds -autostart-aidiff to set the difficulty from the command line from
testing.
This was SVN commit r13278.
2013-03-13 20:44:48 +00:00
8ac9f1d8ea
Limit the number of gatherer per resource, as described in #1387 . Based on work by crezax. Fixes #1387
...
This was SVN commit r13277.
2013-03-13 20:10:46 +00:00
844f71681a
Add notification for missing resources when tributing. Patch by alpha123. Fixes #1839 .
...
This was SVN commit r13276.
2013-03-13 18:37:06 +00:00
637abf8167
Stop following units into FoW. Patch by crezax. Fixes #1827 .
...
This was SVN commit r13275.
2013-03-13 18:17:58 +00:00
56784aceab
Fix signed/unsigned comparison warning.
...
This was SVN commit r13274.
2013-03-13 16:23:27 +00:00
b75183eba2
remove log entries concerning sound manager distress mode
...
This was SVN commit r13273.
2013-03-13 03:55:36 +00:00
60a91cb032
fixes death variation for mauryan walls, fortress, defense tower, and temple.
...
This was SVN commit r13272.
2013-03-12 23:06:20 +00:00
2bcb03f049
Fix messages.js for "/team" messages when no teams were set.
...
Change to AI logic, makes Aegis more efficient with a better attack,
eco, and defense. Bugfixes.
This was SVN commit r13271.
2013-03-12 21:58:25 +00:00
e37012a9fd
Added Omri's latest track to the Hellenic civs
...
This was SVN commit r13270.
2013-03-12 21:55:33 +00:00
21f4a94242
New Mauryan emblem
...
This was SVN commit r13269.
2013-03-12 21:48:42 +00:00
3f6702075b
Fix my previous commit where if you had enough units buildings would never construct (rounding issue).
...
This was SVN commit r13268.
2013-03-12 10:07:53 +00:00
791a901df9
Fix a bug with the foundation changes that caused buildings to be built too fast with multiple units.
...
This was SVN commit r13267.
2013-03-12 08:22:45 +00:00
9b1b8cc8fd
A few bugfixes, slight change in logic for smoother play. Makes Aegis gather with cavalry. Allows it to send chat messages to warn about attacks.
...
This was SVN commit r13266.
2013-03-11 19:58:29 +00:00
ca40764dc6
Fixes bug in map reader that caused actor variations to default to seed 0. Fixes #1861 .
...
Fixes maps that were affected by this bug.
This was SVN commit r13264.
2013-03-11 16:42:41 +00:00
dab9175f30
Foundations now require 100% health for construction to be completed. Progress now linked with health. Patch by Malcom. Fixes #1853
...
This was SVN commit r13263.
2013-03-11 15:47:16 +00:00
c6eea186e8
New Hellenic track - The Hallespont, A13.
...
This was SVN commit r13261.
2013-03-11 12:15:02 +00:00
6431eb63a5
Mauryans now have a cavalry swordsman.
...
This was SVN commit r13260.
2013-03-11 02:29:19 +00:00
ba38a22abe
Renamed some wonder templates. Let us know if it breaks anything.
...
This was SVN commit r13258.
2013-03-11 01:08:48 +00:00
0e6d764162
Mauryan long wall template edit
...
This was SVN commit r13257.
2013-03-11 01:06:45 +00:00
9e511134e6
Updated sandbox with latest Mauryan units
...
This was SVN commit r13256.
2013-03-11 00:48:36 +00:00
0ec860651a
This was SVN commit r13255.
2013-03-11 00:35:33 +00:00
7dda41f693
Mauryan walls cost wood and have roughly 25% less health than stone walls.
...
This was SVN commit r13254.
2013-03-11 00:10:24 +00:00
0d7e6b7880
Use pimpl idiom for ThreadDebugger.
...
This was SVN commit r13253.
2013-03-10 23:08:01 +00:00
eda2802f6d
Simplify construction of the transformation matrix in GetInterpolatedTransform. Patch by sbte. Fixes #1854
...
This was SVN commit r13252.
2013-03-10 20:31:53 +00:00
1778e685ac
Improve detection of when a component needs to be interpolated. Patch by sbte. Fixes #1858 .
...
This was SVN commit r13251.
2013-03-10 20:28:01 +00:00
f3eab4127e
caliper icon and Mauryan wall tweak
...
This was SVN commit r13250.
2013-03-10 16:12:10 +00:00
d2e5d63039
Animations for Mauryan wall gate
...
This was SVN commit r13249.
2013-03-10 12:04:56 +00:00
1368aa4ae9
Fix bugs in the attack manager, fix reparations in enemy territory, change readme.txt to document the new -autostart-civ function.
...
This was SVN commit r13248.
2013-03-10 07:37:05 +00:00
2c17ab70ac
Add support for -autostart-civ to set civilizations when quickstarting.
...
Put the AI memory heap back to 32 MB to avoid OOM errors with numerous
AIs in late game.
Fix a bug that made ProductionQueue not broadcast progress.
Fix many issues with Aegis in defense, pathfinding, foundation
construction, training building choice, strength calculations, building
placement and mostly attack. Aegis should be much more aggressive.
This was SVN commit r13247.
2013-03-09 14:09:06 +00:00
0572ffd3d2
Add support for mauryan walls to the rmgen wall builder. Patch by FeXoR. Fixes #1855 .
...
This was SVN commit r13246.
2013-03-08 23:46:36 +00:00
8c756b507a
Fix non-pch build. Maybe use pimpl idiom instead.
...
This was SVN commit r13245.
2013-03-08 23:46:32 +00:00
c6043779f6
Better fix for the angle interolation issue. Thanks sbte for spotting it. Refs #1846 .
...
This was SVN commit r13244.
2013-03-08 20:01:12 +00:00
8777f68aa0
Fix rotation interpolation. Refs #1846 .
...
This was SVN commit r13243.
2013-03-08 19:34:55 +00:00
d76f570a69
Fix the defense system (it now works as expected, that doesn't mean well). Fix a bug in dropsite placement that caused AIs to go awry. Slight changes here and there to the strategy. Optimizations when running many workers at once. Fix some pathfinding not working. Units in attack plans should be slightly less dumb.
...
This was SVN commit r13242.
2013-03-07 21:33:57 +00:00
940ecd29e8
Mauryan walls added with AO. No gate animation yet.
...
This was SVN commit r13241.
2013-03-07 21:05:33 +00:00
d892e1887a
My modifications to the jsdebugger's web GUI. Adds a few features and makes it compatible with the current server-side code. Closes #410
...
This was SVN commit r13240.
2013-03-07 14:41:03 +00:00
28200e6a04
The original web GUI for the jsdebugger from contributor mmayfield45. I only removed the jquery demo directory and added some licensing information. This is for an older version of the debuggers server-side part, so it doesn't work anymore. The required modifications will be committed soon. Refs #410
...
This was SVN commit r13239.
2013-03-07 14:27:34 +00:00
73951b75fc
Adds the server-side part of the javascript debugger. Refs #410
...
This was SVN commit r13238.
2013-03-07 13:49:49 +00:00
f5be596ee8
Fixes use of invalid pointer from temporary string (caused some invalid read warnings in Valgrind)
...
This was SVN commit r13237.
2013-03-07 03:54:41 +00:00
ff97d550b8
Added Omri's 2 other new tracks to the relevant civs
...
This was SVN commit r13236.
2013-03-06 22:09:10 +00:00
ee85e942e1
Mauryan civ json changed to use new Mauryan music track.
...
This was SVN commit r13235.
2013-03-06 19:27:24 +00:00
59be67d27e
Portrait for Wonders.
...
This was SVN commit r13234.
2013-03-06 18:16:41 +00:00
dfd1abeab9
A13 - first Mauryan Indian peace track
...
This was SVN commit r13232.
2013-03-06 15:27:05 +00:00
081721c679
Fix the build and stops the AI from creating tons of AI dump images for no good reason.
...
This was SVN commit r13231.
2013-03-06 14:33:15 +00:00
a45a926aeb
Fix an issue that caused a crash on serialization. Prepare the AI manager a little more for serialization.
...
Fix bugs with tests. Fix some other issues in the AI (attack plans deal
with walls better, choose better paths, target selection is better. Dock
building won't be tried hundreds of times if it fails.)
Changes the Oasis random map to only put a path in the middle 50% of the
time.
This was SVN commit r13230.
2013-03-06 11:52:41 +00:00
f0db42e34e
A13 track - Gaulic early peace.
...
This was SVN commit r13228.
2013-03-06 10:54:03 +00:00
c3944097a7
Small nerf to bolt shooters
...
This was SVN commit r13227.
2013-03-06 00:21:38 +00:00
e33d4a52e9
AI API V3 along with a new version of Aegis. Support for a JS shared component that can be used or not for each AI.
...
This was SVN commit r13225.
2013-03-05 22:52:48 +00:00
c29a8d8ac0
Tech icons
...
This was SVN commit r13224.
2013-03-05 21:27:29 +00:00
21f13f9683
Only use interpolation for moving objects in VisualActor. Patch by sbte. Fixes #1846 .
...
This was SVN commit r13223.
2013-03-05 20:02:16 +00:00
121fb35f72
Bolt shooter accuracy tech
...
This was SVN commit r13222.
2013-03-04 23:30:50 +00:00
7461e4a3c1
Add technology support for ranged unit spread
...
This was SVN commit r13221.
2013-03-04 21:52:44 +00:00
7df4fd6919
helmet variations and tweak to ballista template
...
This was SVN commit r13220.
2013-03-04 21:27:45 +00:00
b8322fa6bb
Zebu model
...
This was SVN commit r13219.
2013-03-04 14:16:08 +00:00
efd42ef490
fixes windows compile error and some nuused param warnings
...
This was SVN commit r13217.
2013-03-03 22:28:26 +00:00
3bce7cafba
Updated Mauryan corral and some sound tweaks
...
This was SVN commit r13216.
2013-03-03 22:09:26 +00:00
e4e4ae9ede
Mauryan maceman helmet
...
This was SVN commit r13215.
2013-03-03 18:19:10 +00:00
7e2d54d2ef
Gaia portraits
...
This was SVN commit r13214.
2013-03-03 14:31:49 +00:00
99c0497f23
Model and texture changes to some Mauryan units
...
This was SVN commit r13213.
2013-03-03 11:58:55 +00:00
9b03e0d572
Darkens icons that are unavailable to train/build/research to make it more obvious than only the grayscaling in some cases.
...
Improves the red overlay showing a lack of resource for technologies.
Makes tech pair show a red cross instead of a red overlay when hovering
over a pair to make it less confusing.
This was SVN commit r13212.
2013-03-03 10:27:37 +00:00
2c1a3ee892
Adjusting starting units for all civs.
...
Added "Wonder" structural template.
This was SVN commit r13211.
2013-03-03 00:57:30 +00:00
ed8746e798
remove log message
...
This was SVN commit r13210.
2013-03-01 14:23:28 +00:00
e4a9312c46
newest soundmanager patch, should give better battle sequences, and handle low resource situations correctly.
...
This was SVN commit r13209.
2013-03-01 14:22:28 +00:00
c16b93794a
Support decrementing training batches, show batch size on icons.
...
This was SVN commit r13208.
2013-02-28 00:20:16 +00:00
3c50352134
Use attack move icon as a cursor. Refs #1847 .
...
This was SVN commit r13207.
2013-02-27 18:18:59 +00:00
7ff4538414
Attack move icon
...
This was SVN commit r13206.
2013-02-27 00:39:29 +00:00
1bcb07af64
Improved animal attack sounds
...
This was SVN commit r13205.
2013-02-26 22:33:14 +00:00
284e9cd230
Improves frame rate counter to give smoother results, patch by sbte. Fixes #1016
...
This was SVN commit r13204.
2013-02-26 21:50:38 +00:00
e283e75d84
Updates example component documentation
...
This was SVN commit r13203.
2013-02-26 19:58:51 +00:00
6c7543c044
Added Mauryan birreme from contributor Ndragu.
...
Added details to Mauryan Great Stupa fence.
This was SVN commit r13202.
2013-02-26 15:32:03 +00:00
cb890ad876
Add shift-clicking to tribute multiples of 500. Patch by alpha123. Refs #1839 .
...
This was SVN commit r13201.
2013-02-25 22:59:04 +00:00
18ee932a01
Adds attack move bound to the Ctrl hotkey. Patch from mimo. Refs #1001 .
...
This was SVN commit r13200.
2013-02-25 21:56:24 +00:00
ac32c7266e
Mauryan farmstead
...
This was SVN commit r13199.
2013-02-25 21:56:09 +00:00
94f2c2d912
Add insufficient population count to production queue tooltip. Patch by zoot. Fixes #1659 .
...
This was SVN commit r13198.
2013-02-25 20:30:02 +00:00
a66ac54bbb
Fix slinger tooltip.
...
This was SVN commit r13197.
2013-02-25 02:35:52 +00:00
aa36718217
Balancing for slingers and elephants: Slinger attack and cost small nerf. Elephant speed slightly reduced.
...
Fixed range bug for Celtic faction slingers.
This was SVN commit r13196.
2013-02-25 02:33:44 +00:00
10373892be
Adds support for Apple command/meta hotkeys by grouping them with unified "Super" hotkey (not bothering to handle the distinction which is only relevant to Apple keyboards and SDL 1.2).
...
Adds Super+Q hotkey to close the game on OS X.
This was SVN commit r13195.
2013-02-24 21:42:21 +00:00
ee7e135900
Added bigger Ashoka pillar variation with 4 lions. Textures modified.
...
This was SVN commit r13194.
2013-02-24 15:17:38 +00:00
9e163500c5
Don't use Number, parseInt, etc. per coding conventions (use the +operator instead)
...
This was SVN commit r13192.
2013-02-24 00:25:13 +00:00
ca92e50048
Adds notification tooltips for building placement, fixes #921 .
...
Tweaks info tooltip borders and padding to improve readability.
This was SVN commit r13191.
2013-02-24 00:12:41 +00:00
6e6a25dbce
Updated Mauryan Ndragu mauryan trireme with his fix. Modified Mauryans sandbox map.
...
This was SVN commit r13189.
2013-02-23 16:04:43 +00:00
e5291d267d
Horse sound effects by Evan Bogunia
...
This was SVN commit r13186.
2013-02-23 15:12:37 +00:00
344645dbae
Added mauryan wonder "Great Stupa" with AO. Mauryan market AO texture scaled down.
...
This was SVN commit r13185.
2013-02-23 13:19:42 +00:00
92fdbb49b6
Moves particle interpolation to its own simulation component.
...
Fixes inconsistency between Atlas and in-game particle rendering during
pauses.
Fixes some issues related to Atlas simulation test and map loading.
This was SVN commit r13184.
2013-02-22 23:20:59 +00:00
9e1b4a4370
Some animal sound effects
...
This was SVN commit r13183.
2013-02-22 23:10:16 +00:00
a87019ea5a
Render initial game view during loading screen, to begin loading assets and eliminate ugly terrain blending artifacts. Refs #1663
...
This was SVN commit r13181.
2013-02-22 07:32:22 +00:00
1e3bdc439b
Fix MSVC warning. Refs #1838 .
...
Remove special support for removed internal mod.
This was SVN commit r13180.
2013-02-21 19:59:39 +00:00
5e9c408c01
Added mauryan market with ao
...
This was SVN commit r13179.
2013-02-21 16:08:33 +00:00
3d7bf1dc54
This was SVN commit r13177.
2013-02-21 11:35:29 +00:00
c09d390656
Notify the player on receiving a tribute. Patch by alpha123. Refs #1839 .
...
This was SVN commit r13176.
2013-02-20 15:56:55 +00:00
67202eabc8
Only focus on idle units instead of following them. Patch by zoot. Fixes #1835 .
...
This was SVN commit r13175.
2013-02-20 15:56:42 +00:00
3acba819b0
Fixed Parallax mapping for the Mauryan roofs.
...
This was SVN commit r13174.
2013-02-16 17:58:52 +00:00
708cdd9c91
Improved normal/spec maps. Added parallax support for the Mauryans.
...
This was SVN commit r13173.
2013-02-16 16:07:47 +00:00
7cf7ae769c
Suppresses noisy Boost header warnings on OS X by including them as system headers, refs #1076 .
...
Bumps default SDK in build-osx-bundle.sh to 10.7 (newer Xcode doesn't
include 10.6).
Fixes using xml2-config from SDK when needed.
Fixes more linker warnings about symbol visibility by compiling libs
with fvisibility=hidden.
Updates some comments in the build scripts.
This was SVN commit r13172.
2013-02-15 22:43:28 +00:00
ee4b2ccab4
Added normal, parallax and spec maps for all Mauryan buildings - except for those who aren't done yet.
...
Added normal, parallax and spec maps for the Mauryan ships.
~Gen.Kenobi
This was SVN commit r13171.
2013-02-15 01:29:32 +00:00
22a5bff3a0
Adds more dependency options to NVTT CMake scripts.
...
Disables more unneeded NVTT libs in build-osx-libs.sh (avoids link error
with MacPorts' libtiff installed)
This was SVN commit r13170.
2013-02-14 23:37:04 +00:00
6ce1e46138
Deletes internal mod (see SVN history if needed)
...
This was SVN commit r13169.
2013-02-14 22:32:17 +00:00
88c10f5af1
Mauryan Corral model
...
This was SVN commit r13168.
2013-02-14 01:26:19 +00:00
2f19cf86d3
Fix mod priority. Add user mod support. Fixes #1838 .
...
This was SVN commit r13167.
2013-02-14 00:40:02 +00:00
efd6030ec7
Fixes OS X lib script to build SDL without X11 (caused error on Mountain Lion)
...
This was SVN commit r13165.
2013-02-12 21:52:13 +00:00
4817fd5dbb
Fixes #1781 SPQR signs
...
This was SVN commit r13164.
2013-02-12 01:10:30 +00:00
cd5e5882ee
Improvements to battle detection. Patch from zoot. Fixes #1425 .
...
This was SVN commit r13163.
2013-02-11 20:38:13 +00:00
a91bbdd714
Head gear variations for Mauryan archer and swordsman units
...
This was SVN commit r13162.
2013-02-11 19:17:33 +00:00
a281fa5bdc
Reduced placeholder texture size for the onager
...
This was SVN commit r13161.
2013-02-11 01:22:52 +00:00
5748b1d72a
More wild ass. Committed old onager files last time by mistake
...
This was SVN commit r13160.
2013-02-11 01:17:09 +00:00
87c901f140
Update to Britons sandbox map. Added missing buildings
...
This was SVN commit r13159.
2013-02-11 00:07:23 +00:00
ab4db58e82
Fix build restrictions for neutral players.
...
This was SVN commit r13158.
2013-02-10 20:13:37 +00:00
06a3bf9e99
Mauryan Farmstead wip
...
This was SVN commit r13157.
2013-02-10 15:08:12 +00:00
f9bbd97dde
Adds startup warning(s) about removing fixed renderpath, fixes #1795
...
This was SVN commit r13156.
2013-02-09 22:55:42 +00:00
ac11cf30a5
Mauryan head gear and faces
...
This was SVN commit r13155.
2013-02-09 16:28:10 +00:00
9c2e4c93a0
Siege Onager model and animations. Texture is placeholder.
...
This was SVN commit r13154.
2013-02-09 16:22:36 +00:00
d1dd979800
Added contributor Ndragu mauryan trireme
...
This was SVN commit r13153.
2013-02-09 12:10:42 +00:00
cac2d08353
Fixes corpse variation not matching living entity, fixes #1007
...
This was SVN commit r13152.
2013-02-09 07:10:50 +00:00
b1178d30e3
Adds missing native eol-style property
...
This was SVN commit r13151.
2013-02-04 00:42:53 +00:00
5cbd9f0314
Add tribute stats to the summary screen. Patch by alpha123. Fixes #1831 .
...
This was SVN commit r13149.
2013-02-03 23:49:49 +00:00
14f1917a34
NOTE: Requires update-workspaces!
...
Adds build script for OS X dependencies, fixes #1112 . OS X builds no
longer use MacPorts/Homebrew, check BuildInstructions.
Adds build script for OS X bundles. Adds OS X icon and DMG background
image.
Moves bundled libraries to libraries/source.
Moves most headers and precompiled static libs for Windows to
libraries/win32.
Updates Premake and packaging scripts to support this.
This was SVN commit r13148.
2013-02-03 23:49:29 +00:00
b96009dafc
Fixing the weird line bug in gulf variation of unknown maps.
...
This was SVN commit r13147.
2013-02-03 17:40:05 +00:00
abd98ad581
Re: disable foam and coastal waves in Atlas until properly optimized (this time with 100% more it-does-not-bug). Refs #1743
...
(sorry about the last time, should not blindly commit).
This was SVN commit r13146.
2013-02-03 15:49:41 +00:00
1f7e6cb2ba
Adds actor seed support to scenario XML data, optionally used in place of entity ID.
...
Fixes Atlas previews not matching placed entity.
Fixes in-game building previews not matching final entity (except
walls).
This was SVN commit r13144.
2013-02-03 02:16:52 +00:00
31be9cd0de
Adds building previews that rise during construction, fixes #1174 , refs #21 .
...
Adds scaffold support for foundations, includes two examples for 3x3 and
4x4, fixes #1581 .
Extends CmpVisualActor and CUnit to support random variant seeds.
Fixes bug in actor hotloading.
Fixes serialization failure caused by destroying entities in OnDestroy
handlers.
This was SVN commit r13143.
2013-02-03 02:08:20 +00:00
e4fcddaf73
Some template fixes from qwertz/kosmo.
...
This was SVN commit r13142.
2013-02-02 22:44:51 +00:00
3cbb403685
Neareastern Badlands 2 scenario. 2v2.
...
The 'Cappadocia' region of Central-Eastern Anatolia. All players start
on one end of the map, with a vast unclaimed wilderness lying open
before them ripe for conquest and depredation.
This was SVN commit r13141.
2013-02-02 08:12:23 +00:00
03cc1b3a6b
Fixes minor bugs in reference checker script.
...
Fixes missing template in pathfinding terrain demo
This was SVN commit r13140.
2013-02-01 00:26:23 +00:00
1761a6253f
Little fix I forgot to commit for mauryan docks
...
This was SVN commit r13139.
2013-02-01 00:13:30 +00:00
f51e129628
Temporary revert of revert from 38b0c0eb72 to fix water maps in Atlas, refs #1743
...
This was SVN commit r13138.
2013-01-31 23:03:09 +00:00
449eceb7e8
This was SVN commit r13136.
2013-01-31 20:17:59 +00:00
60c328302b
Added Mauryan fishing boat from contributor Ndragu
...
This was SVN commit r13135.
2013-01-31 12:56:26 +00:00
5bea1e7b87
New random map: Kerala
...
This was SVN commit r13134.
2013-01-31 09:00:44 +00:00
305a654ae1
AO textures added to the metal slabs and rock quarries.
...
This was SVN commit r13133.
2013-01-29 06:37:06 +00:00
7e60f07df5
Ensure that animals that aren't visible when the order is executed are killed before being gathered from. Fixes #1826 .
...
This was SVN commit r13132.
2013-01-28 22:19:06 +00:00
f503dd4e3e
Fixed Mauryan dock selection square and obstruction size
...
This was SVN commit r13131.
2013-01-28 13:22:13 +00:00
9438000616
Added UV coords for AO to geo_mineral_01, 02 and geo_stonemine_large.
...
Added AO textures for them.
This was SVN commit r13130.
2013-01-28 12:38:38 +00:00
66bc206a78
Persian Assyrian Ram +50hp.
...
Celt Fanatic uses round shield instead of buckler.
Neareastern Badlands map preview image.
Rubbles added for Roman market and army camp (though, Army Camp could
use its own custom rubble).
Cavalry meat gathering reduced from 10/sec to 5/sec.
War Dog -20hp.
Gathering rates adjusted for women and men.
Another texture variant for the Mauryan woman.
This was SVN commit r13129.
2013-01-28 01:25:05 +00:00
05695aba36
Updated Neareastern Badlands and another Oasis map, this time with Mauryans.
...
This was SVN commit r13128.
2013-01-27 23:36:05 +00:00
b577f07e6c
Added missing .xml for water troughs in mauryan stables
...
This was SVN commit r13127.
2013-01-27 18:19:08 +00:00
4e7c2807b2
Added Mauryan docks with AO map
...
This was SVN commit r13126.
2013-01-27 18:10:59 +00:00
1fdaca5cec
Attempts to fix StringifyJSON by clearing pending exceptions from JS API
...
This was SVN commit r13125.
2013-01-27 01:38:43 +00:00
25928f1a8b
Updates and organizes main LICENSE.txt.
...
Adds new LICENSE.txts for /libraries and /source/tools. Refs #1682
This was SVN commit r13121.
2013-01-26 21:36:18 +00:00
38b0c0eb72
Reverts some changes: Atlas now won't recompute the water foam on terrain change, thus reducing the lag until I properly optimize it. refs #1743
...
This was SVN commit r13120.
2013-01-26 17:10:12 +00:00
c1f2572006
Fauna elephants for sounds now too.
...
This was SVN commit r13119.
2013-01-25 07:13:33 +00:00
66750ad681
New "badlands" cliff textures.
...
This was SVN commit r13118.
2013-01-25 06:58:41 +00:00
2f8fa898df
This was SVN commit r13117.
2013-01-24 22:17:11 +00:00
a0e6283889
Deletes some duplicate textures
...
This was SVN commit r13116.
2013-01-24 22:03:10 +00:00
26f616aba7
Save player name when hosting.
...
This was SVN commit r13115.
2013-01-24 20:12:12 +00:00
2ceeb3231f
Fix distance restrictions.
...
This was SVN commit r13114.
2013-01-24 18:08:35 +00:00
aebecd1204
Make territory build restriction tech modifiable.
...
This was SVN commit r13113.
2013-01-23 22:50:11 +00:00
fc835bdedb
Only call FinishOrder on MoveCompleted if we didn't get an error. Fix #1823 .
...
This was SVN commit r13112.
2013-01-23 16:02:37 +00:00
3e8bdebc6d
Add Clang detection and add BSD to the collected stats.
...
This was SVN commit r13111.
2013-01-23 16:01:17 +00:00
684f117560
Fortresses and Docks build about 25% faster.
...
This was SVN commit r13110.
2013-01-23 08:11:05 +00:00
b146b3666a
Fixed african elephant UVs, added turret to temporary mauryan support elephant.
...
This was SVN commit r13108.
2013-01-22 18:52:18 +00:00
e543da5565
Activate battle music tracks
...
This was SVN commit r13107.
2013-01-21 23:18:53 +00:00
a65db5ca41
Ensures max population is integral by rounding
...
This was SVN commit r13106.
2013-01-21 22:03:35 +00:00
b9faead8eb
This was SVN commit r13103.
2013-01-21 21:28:57 +00:00
c7123140bb
This was SVN commit r13102.
2013-01-21 21:26:11 +00:00
75a23856cf
Fix some static analysis warnings
...
This was SVN commit r13101.
2013-01-21 20:33:25 +00:00
c037e3f78e
Add detection of Win8 in wversion, to help stats collection
...
This was SVN commit r13100.
2013-01-21 20:32:07 +00:00
a9294b0491
added props for mauryan stables
...
This was SVN commit r13099.
2013-01-21 07:29:24 +00:00
484faf3bc0
Balancing.
...
This was SVN commit r13098.
2013-01-21 04:11:59 +00:00
a4e9c7a223
Tweaks.
...
This was SVN commit r13097.
2013-01-21 01:22:45 +00:00
fe3465cf0c
Fixed indentation for Quantumstate. ;)
...
This was SVN commit r13096.
2013-01-21 00:07:27 +00:00
7947f87c97
War Dogs now have their own template.
...
This was SVN commit r13095.
2013-01-21 00:04:07 +00:00
064c687f0e
Balance changes, decrease build times for houses and mills, increase train times and non food gather rates for women. Patch from TheMista.
...
This was SVN commit r13094.
2013-01-20 23:40:41 +00:00
e3bc8d1c87
Actually add the battle detection code. Refs #1425 .
...
This was SVN commit r13093.
2013-01-20 23:36:08 +00:00
786386f9f0
Test Ptolemaic elephant for Enrique.
...
This was SVN commit r13092.
2013-01-20 22:58:24 +00:00
3715985f1a
Add battle detection support to the simulation. Refs #1425 (Patch by Zoot)
...
The audio code does not yet support actually playing battle music.
This was SVN commit r13091.
2013-01-20 22:47:59 +00:00
2d6e3f8ca4
Gather capacity wheelbarrow tech icon
...
This was SVN commit r13090.
2013-01-20 22:34:05 +00:00
679978310f
handcart icon for tech
...
This was SVN commit r13089.
2013-01-20 21:20:59 +00:00
272d6798d2
Military Engineers tech icon
...
This was SVN commit r13088.
2013-01-20 00:04:31 +00:00
1421b21f82
Added spec and normal mapping to Crannog.
...
This was SVN commit r13087.
2013-01-19 08:22:58 +00:00
369050bdcb
Crannog settlement for the Britons
...
This was SVN commit r13086.
2013-01-17 23:47:00 +00:00
062c1aba6c
Added playercolor to mauryan stables, decal changed.
...
This was SVN commit r13085.
2013-01-17 21:11:42 +00:00
c46d964afb
metalworker tech icon
...
This was SVN commit r13084.
2013-01-17 20:50:30 +00:00
24ec6b8040
Added decal to Mauryan stables
...
This was SVN commit r13083.
2013-01-17 19:07:52 +00:00
36eacbfd06
Added Mauryan stables with AO map
...
This was SVN commit r13082.
2013-01-17 18:27:28 +00:00
46841bc963
New shield textures by Lion.
...
This was SVN commit r13081.
2013-01-16 19:07:15 +00:00
defe8f8b98
Military Engineers, Artillery Instructors, and Metalworker techs
...
This was SVN commit r13080.
2013-01-16 01:05:26 +00:00
31fe58db82
Stop formation members from sliding. Fixes #1823 . Thanks to zoot for the test case!
...
This was SVN commit r13079.
2013-01-15 18:53:19 +00:00
96d389dee2
Mauryan mill model
...
This was SVN commit r13078.
2013-01-15 00:39:59 +00:00
25de88a68b
Take distance between attacker and target into account when fleeing. Patch by mimo. Fixes #1723 .
...
This was SVN commit r13077.
2013-01-15 00:21:25 +00:00
21a70c0399
Bloom shader rewrite.
...
This was SVN commit r13076.
2013-01-14 16:57:09 +00:00
9cd647a2a0
Fixed Mauryan temple selection ring size and obstruction
...
This was SVN commit r13075.
2013-01-14 12:41:27 +00:00
63fa3d5ea1
Mauryan temple with AO added. Fixed mauryan fortress garrison flag
...
This was SVN commit r13074.
2013-01-13 23:55:52 +00:00
56db7fa945
Don't use the carrying animation when a unit is ungarrisoned and it dropped of the resources while garrisoning. Patch by zoot. Fixes #1759 .
...
This was SVN commit r13073.
2013-01-13 20:55:55 +00:00
02ac06e293
Allow ungarrisoning units even if they cannot be built due to tech requirements. Patch by mimo. Fixes #1808 , #1672 .
...
Fix batch training tooltip if we have more units than the entity limit
allows for.
This was SVN commit r13072.
2013-01-13 19:39:11 +00:00
aec8d6ff96
Stop foundation health from jumping. Fixes #1809 .
...
This was SVN commit r13071.
2013-01-13 17:37:26 +00:00
637fb6d258
Fixes a bug in player assignment and prevents starting games with no assigned human players, fixes #1054
...
This was SVN commit r13070.
2013-01-12 05:39:04 +00:00
a074eb814a
Adds blinking cursors with configurable rate, based on patch by kingadami. Fixes #876
...
This was SVN commit r13068.
2013-01-12 01:20:01 +00:00
1f8d0cacdc
Adds manual to in-game menu, based on patches by _vincent and grillaz. Fixes #1338
...
This was SVN commit r13067.
2013-01-12 00:09:42 +00:00
5968e3cb63
Adds xcode4 workspace for OS X, from Premake 4.4-beta4
...
This was SVN commit r13066.
2013-01-11 21:31:38 +00:00
de3a28557c
Fixes Boost libs being linked under compiler settings by accident, caused linker errors in Xcode
...
This was SVN commit r13065.
2013-01-11 20:49:33 +00:00
0be4a49c3f
get my name in the contributors file in alphabetical order
...
This was SVN commit r13064.
2013-01-11 18:40:13 +00:00
8aa62da454
get my name in the contributors file
...
This was SVN commit r13063.
2013-01-11 18:38:18 +00:00
17181e5a73
Fixes incorrect working directory for Windows installer shortcuts
...
This was SVN commit r13062.
2013-01-11 01:51:05 +00:00
bec33070ea
Change attack animation naming to allow for multiple attacks. Patch/script by dvagennip. Fixes #1686 .
...
This was SVN commit r13060.
2013-01-09 14:39:25 +00:00
fd274a6e70
Add template helper function. Fix some errors. Refs #1692 .
...
This was SVN commit r13059.
2013-01-09 13:25:11 +00:00
ca41c22b71
New Mauryan house models
...
This was SVN commit r13058.
2013-01-09 00:10:45 +00:00
d4572e555e
Fixes tests
...
This was SVN commit r13057.
2013-01-08 15:45:39 +00:00
5caddcdd20
Make technology code cleaner with helper functions. Refs #1692 .
...
This was SVN commit r13056.
2013-01-08 00:00:21 +00:00
670deaef2a
added variable sleep time depending on load an seperate mutex for deleting old items
...
This was SVN commit r13055.
2013-01-07 21:02:22 +00:00
d29f6c5c49
Fix dicrepancy in the settings dialog when using hotkeys. Patch by kingadami. Fixes #1817 .
...
This was SVN commit r13054.
2013-01-07 15:19:10 +00:00
e89193d66d
Fixes serialization test failure from CmpVisualActor not setting initial animation state with graphics disabled, fixes #1812
...
This was SVN commit r13053.
2013-01-06 07:37:22 +00:00
8a2baec240
Fixes multiline text alignment, fixes #723 . Patch by kingadami.
...
Adds text alignment to tooltips, fixes text alignment for dropdowns.
This was SVN commit r13051.
2013-01-06 01:46:44 +00:00
50fcbc1fc5
Fixes some alignment issues in the match setup UI
...
This was SVN commit r13050.
2013-01-06 00:34:21 +00:00
1549e1c91c
Fixed Mauryan Civ Centre footprint.
...
This was SVN commit r13049.
2013-01-05 22:33:13 +00:00
179df7e173
Elephant archer tweaks.
...
This was SVN commit r13048.
2013-01-05 22:05:28 +00:00
0cd3f74a62
New Mauryan shields by Lion.Kanzen.
...
New Carthage War Elephant texture.
Work in progress Mauryan elephant archer.
This was SVN commit r13047.
2013-01-05 21:38:27 +00:00
0ef172db74
New Mauryan civic centre with ao added
...
This was SVN commit r13046.
2013-01-05 21:15:28 +00:00
a2aa4b77fa
Change watermark hotkey to Alt-K to prevent accidental presses.
...
This was SVN commit r13045.
2013-01-04 20:12:32 +00:00
58fa0c7c58
Fix errors when using autostart to launch a game. Use setters instead of accessing cmpPlayers properties directly.
...
Tidy the formatting in Player.js
This was SVN commit r13044.
2013-01-04 19:50:54 +00:00
dc6c0e483b
Fixes unhandled enumeration warning in some compilers
...
This was SVN commit r13043.
2013-01-04 05:46:35 +00:00
8e382d98a2
Fixes cost spacing in wall construction tooltips, refs #1675
...
This was SVN commit r13042.
2013-01-04 00:52:21 +00:00
be63de5a7c
Add fps counter to game setup. Fixes #1264 . Patch by kingadami.
...
This was SVN commit r13041.
2013-01-03 23:01:54 +00:00
0d204037b6
Added right click selection removal. Fixes #1028 . Thanks to kingadami and GerbilOfDoom for the patch.
...
This was SVN commit r13040.
2013-01-03 22:53:46 +00:00
ba94247744
Added unordered map serialization
...
This was SVN commit r13039.
2013-01-03 22:33:04 +00:00
8ef7e45a0a
Mauryan barracks re-centered and ao maps fixed
...
This was SVN commit r13038.
2013-01-03 22:11:14 +00:00
d65c7751a5
Updates bundled libpng to v1.5.13, built with VC2008 - requires update-workspaces. Refs #864
...
This was SVN commit r13035.
2013-01-03 17:22:14 +00:00
276f0a41a0
New Year's clean-up.
...
Throw a warning if a invalid (not present) AI is specified in a map.
Replace the last occurences of jubot with qbot.
Exclude the common siege templates from the Units Demo map.
Fix an error with flying units.
Replace CFG_GET_SYS_VAL with CFG_GET_USER_VAL and rename it to
CFG_GET_VAL to reflect its behaviour better.
Fix linker error with clang 3.2. Refs 1588.
Remove some useless includes.
This was SVN commit r13031.
2013-01-01 18:33:53 +00:00
4764af695a
Update to Mauryan structure texture b
...
This was SVN commit r13030.
2012-12-30 15:52:41 +00:00
cbfffbe32f
Fireworks!
...
This was SVN commit r13029.
2012-12-29 22:38:56 +00:00
a223b986e4
New corral and sheep icons
...
This was SVN commit r13028.
2012-12-29 15:26:40 +00:00
4c5ff9579b
This was SVN commit r13027.
2012-12-27 23:39:03 +00:00
ab9463e13f
Miscellaneous Mauryan structure based on Eggbird's old Civ Centre.
...
This was SVN commit r13026.
2012-12-27 23:27:41 +00:00
478de5b001
elephant stables icon update
...
This was SVN commit r13025.
2012-12-27 23:02:29 +00:00
02d95b99ff
Adjusting Mauryan barracks footprint and obstruction.
...
This was SVN commit r13024.
2012-12-27 21:38:52 +00:00
eee68581b8
new fortress icon
...
This was SVN commit r13023.
2012-12-26 23:10:23 +00:00
adc4012944
Save last multiplayer server. Based on patch by Aurium. Fixes #1778 .
...
Fix bug in ConfigDB: Creating a value could result in changing a value
in a different namespace.
This was SVN commit r13021.
2012-12-25 22:49:18 +00:00
b1a606eb08
Increased Mauryan barracks size
...
This was SVN commit r13020.
2012-12-24 11:10:27 +00:00
0df7a67ad1
Reordered unit roster for Mauryan barracks.
...
This was SVN commit r13019.
2012-12-24 01:34:46 +00:00
a685541d52
Portraits for some Mauryan unit. Celtic Fanatic is now a spearman (more historically accurate). Fixed some other things.
...
This was SVN commit r13017.
2012-12-24 00:40:49 +00:00
b33ff333dd
Added two Mauryan barracks variations with AO
...
Fixed garrison flag type in mauryan defense tower
This was SVN commit r13016.
2012-12-24 00:23:10 +00:00
f4da84f15a
Some Mauryan unit textures and spec maps.
...
This was SVN commit r13015.
2012-12-23 22:34:33 +00:00
18b532a195
Remove current targets when changing ownership. Fixes #1794 .
...
This was SVN commit r13014.
2012-12-23 20:03:00 +00:00
61734c48d4
Fix a logic error that lead to reflections always being rendered. Might ref #1744
...
This was SVN commit r13013.
2012-12-23 10:50:30 +00:00
9fa7273c2c
Backport from API v3 to API v2 that should fix a bug happening with sheeps. fixes #1754
...
This was SVN commit r13012.
2012-12-23 10:31:39 +00:00
74cce87692
Nerfed heroes and Champion Archer.
...
This was SVN commit r13011.
2012-12-22 23:39:18 +00:00
00c1766907
Adds and updates some hotkeys in the game manual
...
This was SVN commit r13009.
2012-12-22 22:00:27 +00:00
0322f2ea59
Hannibal is a bit slower.
...
This was SVN commit r13008.
2012-12-22 21:10:37 +00:00
ebb2dc3a15
A quick fix for the assertion failure that happens when trying to access profiling data using profiler2.html.
...
This was SVN commit r13007.
2012-12-22 16:36:20 +00:00
f19dbcdc7b
Increase cavalry health (70 for melee, 30 for ranged) and pierce armour (3 for melee, 1 for ranged). Also increase melee cavalry speed by 1. Thanks to alpha123 for his stats changing script.
...
Fix some minor validation errors in some other templates
This was SVN commit r13006.
2012-12-22 01:28:10 +00:00
b27d4c26b0
Work around the sheep bug on Acropolis 7. Refs #1754 , #1793 .
...
This was SVN commit r13005.
2012-12-21 19:11:31 +00:00
9c34b1ffed
Major random map bugfixes:
...
Fixes the chicken problem
There are no more unreachable trees around the map (hopefully)
Fixed the bug that caused edges of the map ruin the layout of painters
(One of the best examples to look is archipelago, before and after this
revision).
Fixed those out of memory errors caused by pathplacer (Mostly noticeable
in alpine valley and corinthian isthmus)
And some other minor tweaks.
Fixes #1577
This was SVN commit r13004.
2012-12-21 09:48:36 +00:00
9a2dfa3fc0
Read default multiplayer server name/IP address from config. Patch by Aurium. Refs #1778 .
...
This was SVN commit r13003.
2012-12-20 21:44:56 +00:00
6ab0ab586a
Gates added for Iberian player on Acropolis 7.
...
This was SVN commit r13002.
2012-12-20 19:31:26 +00:00
c5e597d5c4
Fixes some Atlas build warnings about hidden overloaded virtual functions when using wxWidgets 2.9
...
This was SVN commit r13001.
2012-12-20 03:57:17 +00:00
573d47d9a9
Disable diplomacy settings when player is defeated. Fixes #1764 .
...
This was SVN commit r13000.
2012-12-19 20:19:54 +00:00
4d6d514029
New icons for dock, mill, stoa, theatron, and monument structures.
...
This was SVN commit r12999.
2012-12-19 19:28:51 +00:00
e7ef6a57ad
Fixes some build errors from the OS X 10.5 SDK, refs #1768
...
This was SVN commit r12998.
2012-12-18 22:58:34 +00:00
5c94761c3e
Fixes use of NULL for non-pointer type, fixes #1765
...
This was SVN commit r12997.
2012-12-18 22:52:55 +00:00
9665a17f7a
Removes "root" attribute from the Mauryan elephant stables.
...
This was SVN commit r12996.
2012-12-18 18:43:51 +00:00
188a60315b
Update release name.
...
This was SVN commit r12995.
2012-12-14 19:56:58 +00:00
1c97d819d8
Updated some tips images.
...
This was SVN commit r12994.
2012-12-14 19:38:20 +00:00
0da37326d6
Fixes bug that caused training icons for unavailable units to not be greyed out
...
This was SVN commit r12993.
2012-12-14 19:22:08 +00:00
9ca9a88bfa
Beefed up hero health since you can only have one alive at a time.
...
This was SVN commit r12992.
2012-12-14 19:02:45 +00:00
29ac57409e
Adds warning about incorrect use of time warp mode, refs #1409
...
This was SVN commit r12990.
2012-12-14 13:41:25 +00:00
012e1585b1
fix for ticket 1758, not fixing the underlying problem but will limit the error messages to 1 per failed allocation and shouldn't crash anymore
...
This was SVN commit r12989.
2012-12-14 03:10:03 +00:00
60987d46cf
Fixes memory leak in sound manager, refs #1736
...
This was SVN commit r12987.
2012-12-12 22:43:57 +00:00
dd69fac774
Added generic stone rubbles for sizes 4x2, 4x4, 4x6, 5x5 and 6x4 with AO and their respective destruct decals.
...
Modified several templates to spawn its correct rubble on death.
This was SVN commit r12985.
2012-12-12 19:06:58 +00:00
683ce0a176
Fixing sheep on this map.
...
This was SVN commit r12984.
2012-12-12 19:06:26 +00:00
8eb7ac7094
Adjusting sheep.
...
This was SVN commit r12983.
2012-12-12 18:56:16 +00:00
cdaab29d2b
make sure file was opened successfully before processing
...
This was SVN commit r12982.
2012-12-12 13:59:36 +00:00
39910affd0
Changes various urls to point to the new website and fixes some broken forum urls.
...
This was SVN commit r12980.
2012-12-11 23:04:03 +00:00
095566c126
Serialize the armour component so that the temporary invulnerability from promotion is synchronised.
...
This was SVN commit r12978.
2012-12-11 22:01:10 +00:00
ea36dc5b3d
Elephant sounds created by EvanBogunia
...
This was SVN commit r12977.
2012-12-11 00:44:41 +00:00
a3ca29138e
Check for all cases. Really fix #1753 .
...
This was SVN commit r12976.
2012-12-10 23:55:16 +00:00
6fd6295644
Check whether the attack/gather target is visible and if not abort. Fixes #1662 and #1753 .
...
This was SVN commit r12975.
2012-12-10 23:35:09 +00:00
03e10011ad
Balance tweaks to Ram WalkSpeed, House cost, Herd Buildtime, Melee Cavalry, Hannibal
...
This was SVN commit r12974.
2012-12-10 23:17:29 +00:00
d616a86c7a
Fixes unit promotions triggering a selection sound, based on patch by zoot. Fixes #1713
...
This was SVN commit r12973.
2012-12-10 21:35:52 +00:00
47275d9416
Updated some terrains. Adds a 2v2 Median Oasis 5.
...
This was SVN commit r12972.
2012-12-10 02:30:44 +00:00
2779512c6e
Removes user feedback message from main menu. Adds "Report a Bug" button instead, with link to ReportingErrors.
...
Updates URLs to new website play0ad.com
This was SVN commit r12971.
2012-12-10 01:29:02 +00:00
1ed2d70e2d
Added normal and spec maps for these 3 terrains.
...
This was SVN commit r12970.
2012-12-09 23:36:05 +00:00
1cd2c48e0b
Fix entity limits error on ownership change/destruction.
...
This was SVN commit r12969.
2012-12-09 21:40:51 +00:00
d7f418c82c
Updated pers stables portrait.
...
This was SVN commit r12968.
2012-12-09 21:20:06 +00:00
e43d1f35e4
Some map updates.
...
This was SVN commit r12967.
2012-12-09 21:16:41 +00:00
2a3f221d11
Check if cmpFormation is set (which should be as we're a formation member)
...
This was SVN commit r12966.
2012-12-09 17:52:44 +00:00
53397d1b9d
Show hidden AIs when they are used by a map. Fixes #1748 .
...
This was SVN commit r12965.
2012-12-09 14:40:43 +00:00
b3d3d3f5b9
Some texture work on Mediterranean Cove map
...
This was SVN commit r12964.
2012-12-08 23:43:56 +00:00
3d72291d19
Update to user interface background textures
...
This was SVN commit r12963.
2012-12-08 20:32:57 +00:00
032692e14e
Tweaked chariot texture.
...
This was SVN commit r12962.
2012-12-08 20:21:32 +00:00
b2bc5268a7
Mauryan chariot tweaks.
...
This was SVN commit r12961.
2012-12-08 20:04:57 +00:00
2e37bf10bc
Fixes #1700 (Increasing max-health by tech)
...
This was SVN commit r12960.
2012-12-08 19:17:48 +00:00
8cbb7bb674
Maur_champion chariot and hero chariot with animations added
...
This was SVN commit r12959.
2012-12-08 18:26:08 +00:00
de4adca0f0
Heroes only trainable in City Phase.
...
This was SVN commit r12958.
2012-12-08 18:21:11 +00:00
24b6e690b2
Adds "Long Walls" tech for Athenians.
...
Adds "Village Phase" requirement to Palisades templates.
This was SVN commit r12957.
2012-12-08 08:53:34 +00:00
abdfcadbbf
This was SVN commit r12956.
2012-12-07 19:30:31 +00:00
b20e727ca5
This was SVN commit r12955.
2012-12-07 19:05:30 +00:00
d1e22a09d1
Theatron description isn't so chauvinistic in the Hellenic civ descriptions.
...
Changed Athenian her Xenophon (a Laconophile) to Iphicrates (a patriot)
after discussion on the forums.
This was SVN commit r12954.
2012-12-07 19:00:34 +00:00
95f7858a24
Delian League bonus given to the Athenians.
...
This was SVN commit r12953.
2012-12-07 18:39:23 +00:00
875aa1235b
Civ history changes by Jeru.
...
This was SVN commit r12952.
2012-12-07 17:26:36 +00:00
f08eaea533
This was SVN commit r12950.
2012-12-06 22:35:04 +00:00
8c931bfa52
Add animation override to VisualActor to fix carrying resource animations. Patch by Deiz. Fixes #1260 , #1741 .
...
This was SVN commit r12949.
2012-12-06 19:46:13 +00:00
d18b9dd2dc
Check if the renderer is initialised. Fixes crash in replay mode.
...
This was SVN commit r12948.
2012-12-06 19:23:31 +00:00
11d0b5ffdb
New portrait for anusyia.
...
This was SVN commit r12947.
2012-12-06 10:10:29 +00:00
186224612c
Fixes tests by checking CConfigDB is initialized before using CFG_GET_USER_VAL
...
This was SVN commit r12946.
2012-12-05 18:27:42 +00:00
f528e58983
Macedonian library scroll icon
...
This was SVN commit r12944.
2012-12-04 23:10:36 +00:00
555e54f088
Workaround for game settings window being hidden behind session UI
...
This was SVN commit r12943.
2012-12-04 21:41:30 +00:00
35c8df02c6
Adds support for Pack/Time tech modification
...
This was SVN commit r12942.
2012-12-04 21:13:27 +00:00
a923cdd139
Fix serialization failure.
...
This was SVN commit r12941.
2012-12-04 16:59:08 +00:00
5e6c845f4d
Fix a test failure caused by eb4805d73d.
...
This was SVN commit r12940.
2012-12-04 13:21:52 +00:00
f705a2910d
Fixing a bug in wall_builder by FeXoR:
...
This was SVN commit r12939.
2012-12-04 13:07:49 +00:00
610623f010
Fixes small bug introduced by aa68198747.
...
Clarifies new serialization test options in readme.txt.
This was SVN commit r12938.
2012-12-04 01:48:05 +00:00
aa68198747
Factors out common properties from siege templates, refs #1718 . Simplifies pack-related tooltips.
...
This was SVN commit r12937.
2012-12-04 00:28:28 +00:00
b4b1f521b5
Fixes incorrect siege templates
...
This was SVN commit r12936.
2012-12-03 22:47:10 +00:00
c02fca79c6
Adds garrison auto-packing for siege units, refs #1718
...
This was SVN commit r12935.
2012-12-03 22:00:19 +00:00
6562cbea7e
... Refs #1746 .
...
This was SVN commit r12934.
2012-12-03 21:57:28 +00:00
b06452bf0f
Try to fix some warnings. Refs 1746.
...
This was SVN commit r12933.
2012-12-03 21:53:37 +00:00
53ae87de93
Mauryan elephant stables ui icon
...
This was SVN commit r12932.
2012-12-03 20:56:06 +00:00
ef5cde9f97
Add unit training hotkeys to in game manual.
...
This was SVN commit r12931.
2012-12-03 20:16:47 +00:00
eb4805d73d
Adds command-line and config options for OOS log and serialization test modes: -ooslog and -serializationtest
...
This was SVN commit r12930.
2012-12-03 20:06:58 +00:00
6f4b1ec5a1
eihrul's shadow filter patch, fixes ticket #1738 .
...
This was SVN commit r12929.
2012-12-03 19:34:43 +00:00
17a50c8d93
Fixes crash when using serialization test mode
...
This was SVN commit r12928.
2012-12-03 19:00:20 +00:00
e91a918164
Fixes race condition in EnsureMonotonic on 32-bit builds, which was causing unreliable timer behavior, fixes #1729
...
This was SVN commit r12927.
2012-12-03 13:24:12 +00:00
ad3fbc543d
Increases garrison loading range for fortresses and army camp, as workaround for siege engines being larger
...
This was SVN commit r12926.
2012-12-03 05:01:52 +00:00
e91d8a0c47
Toona tree sways now.
...
This was SVN commit r12925.
2012-12-03 00:38:44 +00:00
9bff9b3b6d
Spartan woman defends herself. This is still a work in progress. Not quite right yet.
...
This was SVN commit r12924.
2012-12-03 00:37:58 +00:00
feca7e0be7
Updates Polynesia map as a demo with appropriate description
...
This was SVN commit r12923.
2012-12-03 00:23:43 +00:00
c3c655aaa5
Display time cost for walls. Fixes #1740 .
...
This was SVN commit r12922.
2012-12-02 23:45:34 +00:00
26a22a7bcb
Make hunting units disband earlier.
...
Fix formation disbanding.
This was SVN commit r12921.
2012-12-02 23:11:55 +00:00
37109f5c70
Packed siege unit icons
...
This was SVN commit r12920.
2012-12-02 22:33:40 +00:00
2004fb5e62
Fix error caused by unit dying while attacking.
...
This was SVN commit r12919.
2012-12-02 22:02:36 +00:00
94c7a0dcf6
Tweaking map settings.
...
This was SVN commit r12918.
2012-12-02 21:29:39 +00:00
116c4674b3
Handle undefined team setting properly.
...
This was SVN commit r12916.
2012-12-02 17:29:32 +00:00
5806ed94e1
Fix bug with gather-near-position.
...
Use the max range for attacking.
This was SVN commit r12915.
2012-12-02 17:25:23 +00:00
a4f27dc3e0
Add "score" tab in post-game summary. Patch from EMontana. FIxes #1721 .
...
This was SVN commit r12914.
2012-12-02 15:55:06 +00:00
232dee5a9c
Don't show slaughter attack in tooltips and hide the tutorial AI. Patch from zoot. Fixes #1732
...
This was SVN commit r12913.
2012-12-02 15:22:15 +00:00
5e8993fd8f
Rome rock packed model fix
...
This was SVN commit r12912.
2012-12-02 13:50:05 +00:00
5800be1334
Formation order queueing. Fixes #592 , #593 and #1716 .
...
Allow changing the formation, while under attack. Fixes #1624 . Patch by
Simikolon.
This was SVN commit r12911.
2012-12-02 01:52:27 +00:00
ddd8c36d6f
Fix tests.
...
This was SVN commit r12910.
2012-12-01 23:04:49 +00:00
9d0da11eab
Fixes compile error introduced in 3787f17e4d
...
This was SVN commit r12909.
2012-12-01 20:34:35 +00:00
308db6627a
fix synchronization of TimerState (refs #1729 )
...
This was SVN commit r12908.
2012-12-01 06:33:30 +00:00
3787f17e4d
merge with local codebase: fix PopulationCount
...
This was SVN commit r12907.
2012-12-01 03:06:24 +00:00
9001cba02c
fix: remove unnecessary failure check concerning window class atom. fixes #1729
...
This was SVN commit r12906.
2012-12-01 02:34:19 +00:00
e7ef4796ee
Group civs in info screen by culture. Fixes #1734 .
...
This was SVN commit r12905.
2012-12-01 00:39:26 +00:00
6fd99e34ce
Implements siege packing. Closes #1718 .
...
Adds templates for packed and unpacked siege units - needs stat
tweaking.
This was SVN commit r12904.
2012-12-01 00:34:03 +00:00
090e2a74cf
Sync with upstream. Refs #1518 .
...
This was SVN commit r12903.
2012-11-30 21:35:48 +00:00
f7608bf270
Attempted fix to prevent strange timer-related bug in Atlas (fails to start when opened from the game's main menu), refs #1729
...
This was SVN commit r12902.
2012-11-30 21:34:33 +00:00
0e7e6e88e0
Added mauryan scout tower with ao
...
This was SVN commit r12901.
2012-11-29 23:49:07 +00:00
3e7e8d1528
Icons for siege packing/unpacking/cancelling
...
This was SVN commit r12900.
2012-11-28 20:46:50 +00:00
3e531b7571
removed improper comparison warning
...
This was SVN commit r12899.
2012-11-28 04:31:52 +00:00
ad13ded9a5
Some normal and spec maps for these terrains.
...
This was SVN commit r12898.
2012-11-27 18:59:10 +00:00
fdd2b92723
Simplify formatBatchTrainingString function a bit: remove always true condition/unreachable code. Refs #1432
...
This was SVN commit r12897.
2012-11-27 15:57:45 +00:00
a4a060cd86
Fixes build warning and cleans up a few things
...
This was SVN commit r12895.
2012-11-26 02:28:35 +00:00
b2efabdf66
This map -> Demo.
...
This was SVN commit r12894.
2012-11-26 01:43:43 +00:00
5142c2e9bd
Added operator infantry unit to the siege scorpio
...
This was SVN commit r12893.
2012-11-25 22:39:12 +00:00
9654715773
Swaying grass. Most noticeable with the tall grass sprites on maps like Punjab.
...
Environmental settings edited on a bunch of maps.
Belgian Bog Night added.
This was SVN commit r12892.
2012-11-25 21:52:39 +00:00
91fbcf7eb6
This was SVN commit r12891.
2012-11-25 21:26:39 +00:00
dc70751fc8
Made this map a "demo" map.
...
This was SVN commit r12890.
2012-11-25 21:13:28 +00:00
1f2047f04e
Consider the unit's build time in the calculation.
...
This was SVN commit r12889.
2012-11-25 21:01:03 +00:00
f6e1e15a5d
Fixed an icon error.
...
This was SVN commit r12888.
2012-11-25 20:36:20 +00:00
f9fce9d43a
This was SVN commit r12887.
2012-11-25 20:33:59 +00:00
0a622c0454
Mausoleum has normal and spec maps.
...
This was SVN commit r12886.
2012-11-25 20:30:12 +00:00
6de4300c01
Packed Roman ballista and Packed Carthaginian rock thrower
...
This was SVN commit r12885.
2012-11-25 19:28:18 +00:00
f456112492
Shadowmapping bugfixes and tweaks.
...
This was SVN commit r12884.
2012-11-25 18:35:59 +00:00
1052cb9ee0
Rename property. Refs #1717 .
...
This was SVN commit r12883.
2012-11-25 16:23:59 +00:00
a6f1620621
Add nop rendering technique to water and waterfall to stop crashes in fixed and arb mode when those are used.
...
This was SVN commit r12882.
2012-11-25 15:26:09 +00:00
cdcd3e504b
Hele siege rock thrower packed and four wheel wagon
...
This was SVN commit r12881.
2012-11-25 14:40:23 +00:00
86293398eb
Roman siege scorpio packed donkey
...
This was SVN commit r12880.
2012-11-25 13:58:42 +00:00
2ab8c8b874
Fix technology pair affordable mask.
...
This was SVN commit r12879.
2012-11-25 13:18:01 +00:00
3674524c6c
Carthaginian mausoleum icon
...
This was SVN commit r12878.
2012-11-25 12:36:45 +00:00
5f2d30c7f7
Make batch time factor tech modifiable and a template property.
...
Fix unit test map.
This was SVN commit r12877.
2012-11-25 02:52:13 +00:00
27ae648d9c
Show cost in tooltips for batches. Closes #1717 , patch by zoot.
...
This was SVN commit r12876.
2012-11-24 22:04:29 +00:00
a326aa63a9
Add check to the hotkeys. Fix #1726 .
...
This was SVN commit r12875.
2012-11-24 20:19:13 +00:00
f0493e7060
Spelling fixes. Fixes #1727 , patch by zoot.
...
This was SVN commit r12874.
2012-11-24 19:47:36 +00:00
f96aeb1bd8
2 wheeled wagon and hele spear packed. Wooden wagon texture
...
This was SVN commit r12873.
2012-11-24 17:42:42 +00:00
ed98320acc
Fix non-pch build.
...
This was SVN commit r12872.
2012-11-24 17:15:07 +00:00
b1720ebdbc
This was SVN commit r12871.
2012-11-24 00:51:57 +00:00
250ba9a3ed
Fireflies particle.
...
This was SVN commit r12870.
2012-11-24 00:32:09 +00:00
ea2626106e
This was SVN commit r12869.
2012-11-24 00:29:46 +00:00
21b4f33184
Animated Roman bireme
...
This was SVN commit r12868.
2012-11-24 00:12:29 +00:00
39eba0928b
Carthaginian mausoleum building
...
This was SVN commit r12867.
2012-11-23 22:24:00 +00:00
909956f8c3
fixed possible null access crash
...
This was SVN commit r12866.
2012-11-22 03:20:51 +00:00
081c846ff1
Network synchronise the projectile id to prevent out of sync errors. Fixes #1681
...
This was SVN commit r12865.
2012-11-20 23:46:23 +00:00
a23d245405
volume roilloff returned to standard with bug fixed. Added hints to help stereo playback
...
This was SVN commit r12864.
2012-11-18 22:39:20 +00:00
355bdfb748
Updates the water settings of many scenarios. Most should have been updated now. Refs #1706
...
This was SVN commit r12863.
2012-11-18 15:23:19 +00:00
8c86beb0fa
Made silhouettes display correctly in the fog.
...
This was SVN commit r12862.
2012-11-18 12:34:42 +00:00
89217603a1
Unit training hotkeys from mammadori. Fixes #1226 .
...
This was SVN commit r12861.
2012-11-17 18:27:31 +00:00
bd6a39961a
More updates to contributors.txt, adds forum usernames for WFG programmers
...
This was SVN commit r12860.
2012-11-15 00:18:00 +00:00
9df9d24a26
Fixing the rubble.
...
This was SVN commit r12859.
2012-11-14 18:28:35 +00:00
1cb2a0ba69
Partial update of contributors.txt, based on WFG programmers who contributed to source/ and whose names are publicly visible in their profile (if you contributed and don't see your name on the list, please add it)
...
This was SVN commit r12858.
2012-11-14 17:52:52 +00:00
51f5025b96
Added custom docks rubbles with ao for each civ except Mauryans.
...
Fixed Hellenic dock origin
Added custom decal for celt docks
This was SVN commit r12857.
2012-11-14 04:24:59 +00:00
7ea7b7cd44
Added peacock two death animations, one for when it's showing off, one for when it's not.
...
This was SVN commit r12856.
2012-11-13 17:08:07 +00:00
89ced839f2
Added "Starting Economy Walkthrough" as a demo map.
...
This was SVN commit r12855.
2012-11-12 22:21:20 +00:00
742b265209
Added a couple moremediterranean dirt textures
...
This was SVN commit r12854.
2012-11-12 20:33:07 +00:00
4006a00012
Added Introductory Tutorial
...
Removed some buggy optimisation from common-api-v2
This was SVN commit r12853.
2012-11-12 19:55:11 +00:00
b3f08869ff
This was SVN commit r12852.
2012-11-12 18:53:08 +00:00
180a66f9f4
This was SVN commit r12850.
2012-11-12 12:43:19 +00:00
c00cfa2e5d
Roman Bireme fixed.
...
This was SVN commit r12849.
2012-11-12 04:36:37 +00:00
7125e72e52
Add build/research/train time to tooltips.
...
This was SVN commit r12848.
2012-11-11 23:08:44 +00:00
fe45a2b046
Small "time" icon for tooltips. (build time/research time/train time)
...
This was SVN commit r12847.
2012-11-11 21:25:22 +00:00
55be4f8d0e
Made houses construct 20% faster.
...
Made the Mauryan "Warrior" into a siege dude.
Started switching over the Mauryan cav jav to Mauryan textures and
actors.
This was SVN commit r12846.
2012-11-11 21:16:50 +00:00
93b0048576
Replace resource names with icons in tooltips. Based on patch by zoot. Fixes #1675 .
...
This was SVN commit r12845.
2012-11-11 15:35:01 +00:00
beff7a187d
Fixed mauryan civic centre projectile attach point and AO added
...
This was SVN commit r12844.
2012-11-11 04:34:21 +00:00
cd153ad0c8
Mauryan fortress size increased. Added custom iber_civil_centre rubble
...
This was SVN commit r12843.
2012-11-11 03:38:57 +00:00
ca5a09ff65
Made round roof normal maps more strawish.
...
This was SVN commit r12842.
2012-11-10 20:31:23 +00:00
be0beacd1a
Brit War Dog nerf.
...
This was SVN commit r12841.
2012-11-10 19:14:16 +00:00
3f334bbdb3
This was SVN commit r12840.
2012-11-10 16:44:12 +00:00
33cb23afa5
New random map: "Corinthian Isthmus"
...
This was SVN commit r12839.
2012-11-10 16:35:36 +00:00
d4ea031334
Fix a warning, a bug, and modifies the setting for the Cycladic Archipelagos maps.
...
This was SVN commit r12838.
2012-11-10 07:48:43 +00:00
cd3a727cd4
Added custom civic centre rubbles for each faction except Iberians.
...
This was SVN commit r12837.
2012-11-10 03:50:00 +00:00
4cf5703125
Return back the focus on rally point button mistakenly replaced with an additional delete button in a21e01150a
...
This was SVN commit r12836.
2012-11-09 09:16:20 +00:00
3a02bc296c
Fix setupUnitPanel usage broken in 7e21db08d5. Refs #1432
...
This was SVN commit r12835.
2012-11-08 03:54:00 +00:00
116281f830
Fixes Atlas and Collada dylib loading on OS X, for non-bundled binaries. Thanks to wraitii for the suggestion.
...
This was SVN commit r12834.
2012-11-08 01:57:50 +00:00
fa56c11820
Removes JuBot AI which is no longer maintained and has been superseded by qBot. The latest code will remain on Trac for reference.
...
This was SVN commit r12833.
2012-11-07 21:11:50 +00:00
7e21db08d5
Training limits. Limit heroes to one living per player. Allow heroes to be trained again. Closes #1432
...
This was SVN commit r12832.
2012-11-07 17:56:14 +00:00
669b7e6e2c
Fixes #1714 . Also updates the Mediterranean Cove map water settings.
...
This was SVN commit r12831.
2012-11-07 15:40:34 +00:00
c722fbd93f
Change hwdetect to handle slightly more cases with the water detection.
...
Updates a few more maps with new settings.
This was SVN commit r12830.
2012-11-07 10:53:37 +00:00
10752c798d
Prevent attacking yourself (caused by splash damage).
...
This was SVN commit r12829.
2012-11-06 14:58:34 +00:00
d57926fa5b
Adjust diplomacy according to irc discussion. Refs #7 .
...
This was SVN commit r12828.
2012-11-05 20:16:35 +00:00
e969340b6c
Fix diplomacy for atlas.
...
This was SVN commit r12827.
2012-11-05 19:34:21 +00:00
c1da925786
Change some scenario water settings. Refs #1711 .
...
This was SVN commit r12825.
2012-11-05 17:31:28 +00:00
9ebdeff90e
mauryan fortress small fix
...
This was SVN commit r12824.
2012-11-05 16:30:57 +00:00
d52cac9c1a
Mauryan fortress commited, second mauryan texture (maur_struct_b.png) commited.
...
This was SVN commit r12823.
2012-11-05 16:15:15 +00:00
76676b1e38
Fix a non-fatal GL error, fix me forgetting to commit a file, remove the "3D" waviness setting as it was mostly redundant with HQ.
...
This was SVN commit r12822.
2012-11-05 12:14:04 +00:00
1e3c885f45
Allow trading with neutral players.
...
This was SVN commit r12821.
2012-11-04 23:01:12 +00:00
d8f22c860d
Fix when not using shadows.
...
This was SVN commit r12820.
2012-11-04 20:39:01 +00:00
e633196698
Updates the Belgian Bog settings. Changes the water shader to have refraction look more similar between different quality levels.
...
This was SVN commit r12818.
2012-11-04 18:07:41 +00:00
ed7c66eb82
Updates the water settings: features can now be enabled individually for more modularity. Fixes a few bugs. Allows it to be run at an acceptable speed in Atlas.
...
This was SVN commit r12817.
2012-11-04 15:54:36 +00:00
7848f4edef
Fixes Roman Mars temple by dvangennip, adds garrison prop point and fixes collada warning (unknown polygons set input). Fixes #1708
...
This was SVN commit r12816.
2012-11-03 21:08:17 +00:00
1048ab4a1d
Fixed water color in Belgian_Bog_night.xml, fixed normals in maur_long_sword.dae
...
This was SVN commit r12815.
2012-11-03 14:00:06 +00:00
b90a4ef776
Fixes some typos in civ json files, patch by grillaz. Fixes #1168
...
This was SVN commit r12814.
2012-11-02 23:07:42 +00:00
21e284f8eb
Adds the Belgian Uplands random map, and the Polynesia (Water Demo) demo scenario.
...
This was SVN commit r12813.
2012-11-02 21:18:46 +00:00
a0e13d9625
Fix tests. BuildingAI now handles DiplomacyChanged messages.
...
This was SVN commit r12812.
2012-11-02 17:20:32 +00:00
d75ae52f56
Particles now correctly update with the fog. Refs #276 .
...
This was SVN commit r12811.
2012-11-02 16:31:27 +00:00
9930500661
Diplomacy is now mutual. Refs #7 .
...
This was SVN commit r12810.
2012-11-02 13:44:35 +00:00
a3ddd7b1b3
Fix for some problems when using shadows with the superfancywater.
...
This was SVN commit r12809.
2012-11-02 13:08:58 +00:00
114593b9ad
Fix the "Advanced water" box from being ticked when then it shouldn't be on loading.
...
This was SVN commit r12808.
2012-11-02 09:59:15 +00:00
f63b795906
Fixed Mauryan shields origin and thickness, fixed mauryan club and spiked mace
...
This was SVN commit r12807.
2012-11-01 15:31:01 +00:00
cf23990192
Updates random maps with new settings for the new water shader. Type ambiguity tweaks in WaterManager.
...
This was SVN commit r12806.
2012-11-01 10:17:54 +00:00
79f2fc1ac1
Fixes build error on MSVC, use of sqrt was ambiguous. Refs #1572
...
This was SVN commit r12804.
2012-10-31 20:59:43 +00:00
f3984a6c0e
Forgot the waves shader.
...
This was SVN commit r12803.
2012-10-31 18:54:10 +00:00
fb035d08e3
fixes #1572 and fixes #932
...
Changes the water rendering in game to support higher quality effects
and to look nicer.
This was SVN commit r12802.
2012-10-31 18:42:17 +00:00
97b46d402c
Removing GL3 dependency from GPU skinning code.
...
This was SVN commit r12801.
2012-10-30 21:57:00 +00:00
608e01a5b2
Iberian walls and Roman gate use normal/parallax mapping now.
...
This was SVN commit r12800.
2012-10-30 18:31:05 +00:00
c5fae74ac7
Normal mapping for Craterus.
...
This was SVN commit r12799.
2012-10-30 17:34:40 +00:00
7c1b03d031
Fixes MSVC warnings of truncation from double to float
...
This was SVN commit r12797.
2012-10-30 02:03:40 +00:00
5b7564da37
Adds moved mikktspace source files to premake4.lua.
...
Mentions mikktspace licensing in LICENSE.txt
This was SVN commit r12796.
2012-10-30 00:56:24 +00:00
367c67d6ad
GPU-skinned tangent-space effects for non-instanced units, plus a bit of cleanup.
...
This was SVN commit r12795.
2012-10-29 13:20:21 +00:00
ae4b3cc9b6
Fixed player color for Mauryan shields.
...
Made a "Boudicca swordswoman" for fun.
This was SVN commit r12794.
2012-10-29 00:46:33 +00:00
0353177a94
This was SVN commit r12793.
2012-10-28 23:19:19 +00:00
37d3adcf23
Females now have an attack animation.
...
"Short hair" female head texture, ready for a turban prop.
This was SVN commit r12792.
2012-10-28 22:08:45 +00:00
8f573c9aae
New Mauryan shields.
...
New Mauryan weapons.
Mauryan champion infantry is now a mace man.
Resized Mauryan swordsman textures.
This was SVN commit r12791.
2012-10-28 00:34:03 +00:00
22b2343192
Fix name/color in diplomacy messages.
...
This was SVN commit r12790.
2012-10-27 23:31:16 +00:00
cb8123ffc9
Maiden Guard Archer, until we can combine them into one unit.
...
This was SVN commit r12789.
2012-10-27 22:52:08 +00:00
5d960a136a
Bactrian archer cav.
...
Tweaked HQDOF settings.
This was SVN commit r12788.
2012-10-27 22:18:29 +00:00
cd79b8e57b
Changed DOF size and position.
...
This was SVN commit r12787.
2012-10-27 21:26:33 +00:00
5ef6d1f92b
Adds "English Channel" random map.
...
This was SVN commit r12786.
2012-10-27 13:03:34 +00:00
97554bd726
Made sampling code remove blurring from around fully-focused foreground objects and cleaned up some of the code a bit.
...
This was SVN commit r12785.
2012-10-26 05:25:50 +00:00
7bd5872dd7
Fixed info in Rome civ json
...
This was SVN commit r12784.
2012-10-25 16:28:13 +00:00
749b685c64
Mauryans selectable in random map.
...
Fixed animations for Mauryan sword dudes.
Added placeholder Mauryan heroes.
This was SVN commit r12783.
2012-10-25 07:42:31 +00:00
9dc1724e57
Mauryan Maiden Guard.
...
This was SVN commit r12782.
2012-10-24 18:32:50 +00:00
402ea61581
don't set location info by default, music and sounds should not have it set
...
This was SVN commit r12781.
2012-10-24 13:12:55 +00:00
ca4dedbc3e
Improve neutral and ally combat handling. Refs #7 .
...
This was SVN commit r12780.
2012-10-23 23:13:39 +00:00
c98a97924d
Fix some inconsistent newline characters from 902fc4a541 in unit_commands.js via unix2dos. Refs #1432
...
This was SVN commit r12779.
2012-10-23 20:42:03 +00:00
a21e01150a
Basic diplomacy. Refs #7 .
...
This was SVN commit r12778.
2012-10-23 16:31:07 +00:00
8208b52faf
Testing new hero selection ring.
...
This was SVN commit r12777.
2012-10-21 22:30:04 +00:00
932bb87046
New spec and normal maps for some Mediterranean terrains.
...
This was SVN commit r12776.
2012-10-21 22:28:04 +00:00
4a8e14004c
Make markets and traders non conquest critical (from alkazar).
...
This was SVN commit r12775.
2012-10-21 20:59:54 +00:00
9698b67400
Made manual DOF scale with focus.
...
This was SVN commit r12774.
2012-10-20 23:39:56 +00:00
347b5e18cf
Aviv's adjustment to the tooltips for trading.
...
This was SVN commit r12773.
2012-10-20 21:36:36 +00:00
753d151959
Added comments listing the changes from the original shader by Martinsh.
...
This was SVN commit r12772.
2012-10-18 20:06:25 +00:00
e963b43dcc
Made bokeh DOF blur stronger, made it use the postproc manager's zNear and zFar values, and moved its settings into its effect XML file.
...
This was SVN commit r12771.
2012-10-18 18:52:52 +00:00
0981911542
Test strat map city.
...
This was SVN commit r12770.
2012-10-18 18:18:10 +00:00
cc88d057ee
This was SVN commit r12769.
2012-10-18 18:17:56 +00:00
ec8b49e822
Fixing a small bug suggested by FeXoR.
...
This was SVN commit r12768.
2012-10-18 18:03:01 +00:00
2cb81bc87a
Adding a new cheat
...
This was SVN commit r12766.
2012-10-18 13:13:41 +00:00
742a68d055
Adding Syria random map. Updating the preview of Unknown random maps.
...
This was SVN commit r12765.
2012-10-18 06:34:14 +00:00
2c292798bc
Changed sample count on high-quality DOF to increase performance.
...
This was SVN commit r12764.
2012-10-18 01:31:13 +00:00
43ad3569e1
Added higher-quality DOF postproc filter.
...
This was SVN commit r12763.
2012-10-18 01:21:24 +00:00
7fafeec767
Fixes splash screen to display only once at startup. Fixes #1701 .
...
Adds some spacing between splash screen icons and text.
This was SVN commit r12762.
2012-10-17 20:33:50 +00:00
8e48beeeef
Added Belgian_Bog_night map
...
This was SVN commit r12761.
2012-10-17 16:32:34 +00:00
71b27dd281
Post processing updates to these maps.
...
This was SVN commit r12760.
2012-10-16 18:10:20 +00:00
bc1efba1dc
Moves water rendering update to CCmpWaterManager and uses sim time instead of real time. Fixes water not animating in Atlas and incorrectly animating while the game is paused.
...
This was SVN commit r12758.
2012-10-15 19:36:04 +00:00
092498f961
(hopefully) fixed errors with the boar skeleton.
...
This was SVN commit r12757.
2012-10-15 19:30:29 +00:00
9177683653
Match setup GUI revamp. Adds pop-cap and starting resource options. Refs #802
...
This was SVN commit r12756.
2012-10-15 15:19:24 +00:00
1fb7889539
Postproc manager
...
This was SVN commit r12755.
2012-10-15 10:34:23 +00:00
538286054a
Just some floating barrels.
...
This was SVN commit r12754.
2012-10-15 03:38:47 +00:00
cb3e94a746
New wood gathering tech (iron axes) at the Mill, paired with a capacity tech (wheelbarrows).
...
New special technologies for the Carthaginian faction: Colonisation
(research at the Civ Centre) and Exploration (research at the Super
Dock).
New special technology for the Macedonians: Hellenistic Metropolis
(research at the Library).
Athenian special tech Iphicratean Reforms now unlocks Cretan archers for
the Athenian Triremes.
Sandbox scenario for Macedonians.
This was SVN commit r12753.
2012-10-15 03:11:17 +00:00
93c21d8965
Reordering these sandbox maps by renaming them.
...
This was SVN commit r12752.
2012-10-15 01:54:15 +00:00
b581e54185
This was SVN commit r12751.
2012-10-15 00:59:05 +00:00
51496f1d40
Restructured phase_city techs so that phase_city is auto researched.
...
This means that there can be civ specific techs for phase_city, but
phase_city is always researched so can be used as a requirement.
Added phase_city_generic which is the tech which will actually be
researched from the building.
This was SVN commit r12750.
2012-10-14 16:12:22 +00:00
dd462c5b8f
Moved these civ bonus techs to their civ folders.
...
This was SVN commit r12749.
2012-10-13 20:51:12 +00:00
57a8fcc724
-Mauryan population cap bonus (+10%)
...
-Persian population cap bonus (+10%)
-"Immortals" technology for Persians. Reduces training time for Anusiya
by half. This is their "special" for now, since they are otherwise
unchanged from the default Champion Spearman.
-"Persian Architecture" technology for Persians (removes the inherent
health bonus and makes it a "special tech" instead).
-Added the Spartan City Phase civ bonus. Spartan citizen-soldiers now
promote directly from Basic to Elite after one kill. Pop cap is reduced
by -10% at the City Phase to balance.
-Updated civ JSON files (and their civ profiles on Trac).
-Adds map preview image for Acropolis 7.
This was SVN commit r12748.
2012-10-13 20:38:40 +00:00
7f8adcf8cb
Adding the demo Unknown-Nomad map.
...
This was SVN commit r12747.
2012-10-11 15:32:10 +00:00
6fd4a75312
This was SVN commit r12745.
2012-10-08 18:10:29 +00:00
fa6ce56fde
This was SVN commit r12744.
2012-10-08 17:42:47 +00:00
a27ef1c4b4
Adjusted some destruction dust to better hide the building->rubble transition.
...
This was SVN commit r12743.
2012-10-08 17:36:57 +00:00
a9417be899
Set some buildings to spawn stone_rubble 2x2, and added custom decals sizes for wall segments rubbles.
...
This was SVN commit r12742.
2012-10-08 00:51:24 +00:00
6f4b3b6e5c
This was SVN commit r12741.
2012-10-07 23:10:18 +00:00
3a816f0616
This was SVN commit r12740.
2012-10-07 22:21:20 +00:00
7d0e660fbb
Added Player/MaxPopulation for technologies.
...
This was SVN commit r12739.
2012-10-07 22:19:03 +00:00
cc34cf169c
Nerfed stone throwers based on gameplay and discussion with quantumstate. More game testing will be needed.
...
Tweaked some rubble stuff.
This was SVN commit r12738.
2012-10-07 21:19:01 +00:00
6a100996bf
Added civ requirement for technologies.
...
This was SVN commit r12737.
2012-10-07 20:34:37 +00:00
14d74055ef
Lowered the cost of 5 pop houses after discussion with quantumstate.
...
This was SVN commit r12736.
2012-10-07 18:05:36 +00:00
5ce5ef9286
Adds a splashscreen that appears on startup and informs the player about the status of the game (bugs, missing features). The splashscreen can be disabled for future startups by unckecking a checkbox on the splashscreen.
...
This was SVN commit r12735.
2012-10-07 12:43:08 +00:00
fc294e5ff9
Added rubble_stone_6x6 and set to CC deaths
...
This was SVN commit r12734.
2012-10-06 14:04:18 +00:00
45de2907ea
Added prop points for falmes to rubble_stone_3x3.dae
...
This was SVN commit r12733.
2012-10-06 11:21:13 +00:00
06d0c05a31
Spec and Normal maps for Mediterranean grass terrains.
...
This was SVN commit r12732.
2012-10-06 06:49:11 +00:00
868c5488b1
Added mountains and mountain passes to Oasis 11.
...
This was SVN commit r12731.
2012-10-05 18:09:17 +00:00
35b1a5305d
Enrique's stone rubble mesh and actor for 3x3 footprints (large houses).
...
This was SVN commit r12730.
2012-10-05 18:07:30 +00:00
65c0f3efc5
removed extra whitespace
...
This was SVN commit r12728.
2012-10-03 15:14:20 +00:00
9e328e6b9f
Changing sky manager to render sky using cubemaps, to avoid duplication of sky textures in memory.
...
This was SVN commit r12727.
2012-10-03 12:40:01 +00:00
5cff74f4e7
Replaces FAM file monitoring with inotify on Linux, based on patch by noKid. Fixes #1316 , refs #1687 .
...
Removes FAM dependency.
This was SVN commit r12726.
2012-10-02 00:03:14 +00:00
222256bd59
This was SVN commit r12725.
2012-10-01 01:47:01 +00:00
85c8fa9aec
A test normal map for units. Causes error though.
...
This was SVN commit r12724.
2012-10-01 00:01:46 +00:00
7c7ab773a7
Normal map for destroyed farm field rubble actor.
...
Defense Towers added to Oasis 1 for a little variation.
This was SVN commit r12723.
2012-09-30 02:34:06 +00:00
01e36d1756
Added heroes to Persians Sandbox.xml
...
New farm field "rubble" actor. Looks pretty good. May need a normal map
to look excellent.
This was SVN commit r12722.
2012-09-30 00:55:52 +00:00
6820ee1fc3
Spec and normal maps for farm fields.
...
This was SVN commit r12721.
2012-09-30 00:05:42 +00:00
c4267fb3f8
This was SVN commit r12720.
2012-09-29 21:45:04 +00:00
439f67b5d8
3x3 Destruction mesh for example purposes. Others will need to make other rubble meshes based on this example.
...
Place and "delete/destroy" a Greek house to see in action.
This was SVN commit r12719.
2012-09-29 21:43:55 +00:00
03261b8ade
Adds rubble entities to most structures. This and bf55acadaa based on patch by quonter. Refs #1166
...
This was SVN commit r12718.
2012-09-28 22:06:07 +00:00
bf55acadaa
Implements SpawnEntityOnDeath property for entities (i.e. rubble). Fixes #1166 .
...
Adds some placeholder rubble entities. They currently reuse foundation
actors until proper rubble models are created.
This was SVN commit r12717.
2012-09-28 22:02:13 +00:00
772c10801c
Fixes missing Atlas selection rings for decorative actors
...
This was SVN commit r12716.
2012-09-28 19:16:32 +00:00
7d8dc05c68
Fixes actor viewer bug where view was obstructed by map's water level. Fixes #1562 .
...
Adds water plane option to actor viewer.
This was SVN commit r12715.
2012-09-28 18:20:36 +00:00
9fadd9017f
Fixing the name of tamarix tree.
...
This was SVN commit r12714.
2012-09-27 08:15:53 +00:00
59f3f1830c
This was SVN commit r12713.
2012-09-27 06:23:53 +00:00
fb6493d33c
This was SVN commit r12712.
2012-09-27 06:23:19 +00:00
a9ae4e2c80
This was SVN commit r12711.
2012-09-27 06:15:28 +00:00
4c8159d47f
Adding cultures to the civs. Fixing the recent problem with random maps.
...
This was SVN commit r12710.
2012-09-27 06:12:25 +00:00
44821da620
new threaded soundmanager and proper distance roll off
...
This was SVN commit r12709.
2012-09-27 02:42:03 +00:00
e72b603cce
Implements Vision/Range tech modification
...
This was SVN commit r12707.
2012-09-24 22:27:32 +00:00
ef81521dc9
Stop a technology from being queued multiple times.
...
Also fixed formatting in Attack.js
This was SVN commit r12706.
2012-09-24 20:20:14 +00:00
94f469e705
Added a Slaughter attack type which instantly kills all herdable animals with a melee attack. Fixes #1652 .
...
This was SVN commit r12705.
2012-09-24 19:31:31 +00:00
e464332c74
Fixing a bug in "random" map selection.
...
This was SVN commit r12704.
2012-09-24 11:13:37 +00:00
4c37e8de95
Adds hotkey for forcing unit attack (useful for destroying enemy farms), based on patch by quonter. Fixes #1489
...
This was SVN commit r12703.
2012-09-24 01:14:21 +00:00
60f9fece29
Fixes build on GNU/kFreeBSD, patch by vincent. Fixes #1322
...
This was SVN commit r12702.
2012-09-24 00:41:35 +00:00
de6653e255
Adds max attack range to training tooltip and unit details panel for ranged units.
...
Adds attack type to unit details panel. Refs #1657
This was SVN commit r12700.
2012-09-23 20:50:23 +00:00
b8baa54722
Implements Health/Max tech modification
...
This was SVN commit r12699.
2012-09-23 19:24:43 +00:00
7064e0673c
Adds TechnologyModification message for newly created entities, so they are notified of previously researched techs (this will streamline implementation of certain techs). Fixes #1410
...
This was SVN commit r12698.
2012-09-23 19:19:57 +00:00
db4b08d1ad
Slight changes to the cubemap stuff in the sky manager, to make it behave better after archivebuild.
...
This was SVN commit r12697.
2012-09-21 20:22:23 +00:00
8a57ed2e7b
Updated Persian stables portrait.
...
This was SVN commit r12696.
2012-09-20 17:43:39 +00:00
4b7ff6f375
Higher health for the Persian gardens.
...
This was SVN commit r12695.
2012-09-20 17:19:51 +00:00
d6ffba5e43
Updated Persian sandbox demo map.
...
This was SVN commit r12693.
2012-09-20 17:10:42 +00:00
9340e0bf8a
Fixed texture typo.
...
This was SVN commit r12692.
2012-09-20 17:04:31 +00:00
7cab4f2bce
Persian gardens template. Some normal and spec maps for Persian structures. Someone else please redo them, as they suck.
...
This was SVN commit r12691.
2012-09-19 18:13:11 +00:00
bead0319ab
Fixed gardens_water to no longer cast shadows. Updated gardens_struct and waterfall
...
This was SVN commit r12690.
2012-09-18 23:28:58 +00:00
94c15987d6
added prop points to gardens_struct
...
This was SVN commit r12689.
2012-09-17 23:49:55 +00:00
811a0aa5a2
Fixed pers_gardens_waterfall.dae
...
This was SVN commit r12688.
2012-09-17 22:37:25 +00:00
4b1df39d55
Macedonian Library template.
...
This was SVN commit r12687.
2012-09-17 17:51:22 +00:00
bf5b7938f4
First attempt at adding waterfall splashes...
...
This was SVN commit r12686.
2012-09-17 12:22:21 +00:00
bdab01b381
Making the "random" option in the map selection dropdown orange. Refs #1668
...
This was SVN commit r12685.
2012-09-17 08:24:04 +00:00
91f3463bd3
Adding the "Random" option in map selection. Fixes #1668
...
This was SVN commit r12684.
2012-09-17 02:58:47 +00:00
a03ce4d904
Removes skeletal animated pine tree
...
This was SVN commit r12683.
2012-09-17 01:05:54 +00:00
b8e0f02b31
Updates remaining actors to new format
...
This was SVN commit r12682.
2012-09-17 00:55:45 +00:00
987d677072
Cleaning up some unused/duplicate files
...
This was SVN commit r12681.
2012-09-17 00:54:21 +00:00
7153c50d10
Mace_library, spart_sissyton and pers_gardens commited. New waterfall and gardens_turf textures added.
...
This was SVN commit r12679.
2012-09-16 18:05:28 +00:00
3dd887a193
Roman army camp icon
...
This was SVN commit r12678.
2012-09-16 16:53:52 +00:00
11b1c59397
A minor change to water rendering on models.
...
This was SVN commit r12677.
2012-09-16 11:39:04 +00:00
bdde574ade
Wall build orders shouldn't always be queued. Fixes #1673 .
...
This was SVN commit r12676.
2012-09-15 05:45:49 +00:00
c4c65c02ac
Need to explicitly return values to silence warnings.
...
This was SVN commit r12675.
2012-09-14 20:55:49 +00:00
27c390cdf2
Always abort the FSM transition when failing to enter a state. Fixes #1669 .
...
This was SVN commit r12674.
2012-09-14 20:00:03 +00:00
f91111aec8
Load default MP player name from the config.
...
This was SVN commit r12673.
2012-09-14 05:38:29 +00:00
8bd54eef71
Handle nested garrison holder death properly.
...
This was SVN commit r12672.
2012-09-13 22:47:47 +00:00
71cfdec62b
Removes obsolete reference to wxjs and adds Mongoose to LICENSE.txt
...
This was SVN commit r12671.
2012-09-13 19:03:48 +00:00
f732fd801e
A bunch of stuff.
...
This was SVN commit r12670.
2012-09-13 18:22:09 +00:00
710ed7adb6
Some AI name stuffs.
...
This was SVN commit r12669.
2012-09-13 17:24:47 +00:00
c78ab91740
This was SVN commit r12668.
2012-09-13 17:13:17 +00:00
064c28408d
Fixing some tooltips from changeset 513876ffd6
...
This was SVN commit r12667.
2012-09-13 06:21:01 +00:00
4365cc639d
Default ai player names patch: Codes. Fixes #1582 .
...
This was SVN commit r12666.
2012-09-13 06:18:01 +00:00
513876ffd6
Default ai player names patch: Names
...
This was SVN commit r12665.
2012-09-13 06:17:03 +00:00
41e5f88aae
Support appending and global selection via the 'find idle' keys.
...
This was SVN commit r12664.
2012-09-12 21:37:04 +00:00
958fce0438
Prevent naval gatherers from trying to reach land drop sites.
...
This was SVN commit r12663.
2012-09-11 21:03:08 +00:00
7ff34fedc4
Turn formation Gather orders into GatherNearPosition if necessary.
...
This was SVN commit r12662.
2012-09-11 00:56:23 +00:00
820d6856ee
Map updates. Made "Reservoir" a demo map.
...
This was SVN commit r12661.
2012-09-10 17:21:09 +00:00
34b9bd4bca
Reservoir test map.
...
This was SVN commit r12660.
2012-09-09 21:15:54 +00:00
fdc3322eec
New treasure icon
...
This was SVN commit r12659.
2012-09-09 20:46:54 +00:00
fef2bdf39b
Removed unused file
...
This was SVN commit r12658.
2012-09-09 19:41:32 +00:00
0784d75dfe
Removed out-of-date, often-forgotten civilization count.
...
This was SVN commit r12657.
2012-09-09 18:52:47 +00:00
37cdcdc6fa
Removing use of textureGrad function in shaders, as it requires too new a version of OpenGL.
...
This was SVN commit r12656.
2012-09-09 14:53:34 +00:00
6528751875
Fix non-pch build. Fixes #1664 .
...
This was SVN commit r12655.
2012-09-09 13:51:04 +00:00
25682da568
Improving the layout of "Unknown" random map. Improving the random biome system. Adding "Unknown Land" random map.
...
This was SVN commit r12654.
2012-09-09 08:38:36 +00:00
7618625884
Tweaking Persian Highlands random map.
...
This was SVN commit r12653.
2012-09-09 07:19:11 +00:00
8e71ae35e7
Fixing the texture parameter of iceberg.
...
This was SVN commit r12652.
2012-09-09 04:28:35 +00:00
7d8ef7a2ef
Add support for non-integer GarrisonHolder regen rates; round health up in the GUI. Refs #1633 .
...
This was SVN commit r12651.
2012-09-09 00:52:10 +00:00
502311fe5c
Normal and spec maps for Tropic Cliff B.
...
This was SVN commit r12650.
2012-09-08 23:39:47 +00:00
2797cacd21
Ship tech and temple tech tweaks
...
This was SVN commit r12648.
2012-09-08 21:50:07 +00:00
5456e75761
New background textures
...
This was SVN commit r12647.
2012-09-08 21:44:29 +00:00
8c1b51bdda
Garrison healing tech for temples
...
This was SVN commit r12646.
2012-09-08 20:22:31 +00:00
411884f607
Small nerf to all warships. Less attack and range
...
This was SVN commit r12645.
2012-09-08 19:48:35 +00:00
ae3c9fb318
Three new technologies for ships
...
This was SVN commit r12644.
2012-09-08 19:20:26 +00:00
779a33ee30
Water and waterfall shaders, materials and examples.
...
This was SVN commit r12643.
2012-09-08 18:56:13 +00:00
1fec7c382b
Respect the queued flag for garrison orders.
...
This was SVN commit r12642.
2012-09-08 16:17:25 +00:00
3c6bce057e
Fixing the buggy passageMaker function. Smoothing the edges of the passes.
...
This was SVN commit r12641.
2012-09-08 10:04:20 +00:00
326e4a75d6
Committing FeXoR's new fortress arrangement for Fortress random map. Fixes #1654 .
...
This was SVN commit r12640.
2012-09-08 08:20:27 +00:00
1fce30839f
zero out buffers before loading sounds
...
This was SVN commit r12639.
2012-09-08 02:54:49 +00:00
df0c4559ad
silence repeated errors when buffers don't allocate, fix up reference counting
...
This was SVN commit r12638.
2012-09-07 12:05:29 +00:00
d04f737c5e
Putting a check for bad texture references, in case anyone tries to use old-style texture tags in actors.
...
This was SVN commit r12637.
2012-09-06 21:05:34 +00:00
ef2c9e338d
LeaveFoundation should put formation members into a discrete state to avoid prematurely disbanding.
...
This was SVN commit r12636.
2012-09-04 23:27:06 +00:00
b3d85df2fd
Adds notes about a few currently useless special buildings
...
This was SVN commit r12634.
2012-09-04 19:56:27 +00:00
323d7b207e
Completely hide deprecated AIs for now.
...
This was SVN commit r12633.
2012-09-04 17:41:46 +00:00
3efb235725
And re-enabling the stuff disabled for debugging 2
...
This was SVN commit r12632.
2012-09-04 17:30:01 +00:00
10101b138d
And re-enabling the stuff disabled for debugging
...
This was SVN commit r12631.
2012-09-04 16:59:03 +00:00
3cdf49c75f
Changing texture for this tree top.
...
This was SVN commit r12630.
2012-09-04 16:57:17 +00:00
8b10290f78
Disabling some LOD stuff to track down Deiz's bug (as a result, parallax also temporarily disabled)
...
This was SVN commit r12629.
2012-09-04 15:55:36 +00:00
1ba858bf6e
More on that bug (warning: renderer temporarily slower)
...
This was SVN commit r12628.
2012-09-04 12:34:02 +00:00
f92cda7a91
Testing something different in the hope it helps with a bug reported on the forums
...
This was SVN commit r12627.
2012-09-04 11:09:36 +00:00
6adccf3660
Hide unusable AIs from the default match setup drop-down list.
...
This was SVN commit r12626.
2012-09-04 07:09:36 +00:00
25f7012f0c
Squished the match setup player display a bit, to better show longer names at low resolutions.
...
This was SVN commit r12625.
2012-09-04 07:01:11 +00:00
0a0a49eb09
Explicitly store whether whether a unit is moving, as formation members don't finish moving as normal.
...
This was SVN commit r12624.
2012-09-04 03:57:22 +00:00
0eeb187609
Mauryan units can build elephant stables now.
...
This was SVN commit r12623.
2012-09-04 00:57:05 +00:00
3efc51b9f2
Clarified Worker Elephant tooltip.
...
Increased Worker Elephant builder speed.
This was SVN commit r12622.
2012-09-04 00:37:16 +00:00
88f1145368
Acropolis 1 now uses Aegis Bot.
...
This was SVN commit r12621.
2012-09-03 23:56:52 +00:00
bf825ed41f
This was SVN commit r12620.
2012-09-03 23:56:11 +00:00
ca4a5238af
Updated Punjab 1 map.
...
This was SVN commit r12619.
2012-09-03 23:54:51 +00:00
becc13cf44
Tweaked color of building decals.
...
This was SVN commit r12618.
2012-09-03 23:29:31 +00:00
80e3efda02
Destruction smoke for Rotary Mill.
...
This was SVN commit r12617.
2012-09-03 22:37:31 +00:00
541c77168c
Updated Roman market AO.
...
This was SVN commit r12616.
2012-09-03 21:08:08 +00:00
681713fe98
Re-committed celt_house_b.dae with the correct model.
...
This was SVN commit r12615.
2012-09-03 17:11:59 +00:00
89c87f2af2
This was SVN commit r12614.
2012-09-03 16:43:57 +00:00
d805c87249
Send messages when formation members hit fail to find a path or are obstructed.
...
This was SVN commit r12613.
2012-09-03 02:59:15 +00:00
66318d7011
Added/fixed dust prop points on one of the Celtic house variants and one of the defense tower variants.
...
This was SVN commit r12612.
2012-09-03 01:51:02 +00:00
7d2e201332
Fixes some unreferenced formal parameter warnings
...
This was SVN commit r12611.
2012-09-02 23:07:16 +00:00
a972ba900d
Renamed qBot-experimental to something nicer. Can easily be changed to something else.
...
This was SVN commit r12610.
2012-09-02 22:16:41 +00:00
c518ad6834
Commented out "USE_SELF_LIGHT" because the lack of an alpha channel in many specular textures may cause problems on some systems. Per discussion with historicbruno.
...
This was SVN commit r12609.
2012-09-02 21:36:28 +00:00
b9efc49c88
These helmets now use the new specular helmet material. More to come.
...
This was SVN commit r12608.
2012-09-02 21:08:43 +00:00
0c2b69cb89
A spec map material for helmets. This makes the specular shinier for helmets that use this material for a more noticeable effect.
...
This was SVN commit r12607.
2012-09-02 20:46:17 +00:00
545db71a8c
Adding missing material.
...
This was SVN commit r12606.
2012-09-02 20:32:33 +00:00
eedb25fedc
Fixes invalid light model and overbrightness on some demo maps
...
This was SVN commit r12605.
2012-09-02 20:23:27 +00:00
8e1a9bf89b
Fixing celt defence tower prop points and adding foundation
...
This was SVN commit r12604.
2012-09-02 18:06:49 +00:00
cb83f6955c
Fixing dust prop point errors. Celt house and tower
...
This was SVN commit r12602.
2012-09-02 14:55:53 +00:00
fd400f111c
Bugfix: a problematic decal in Hellenic Sandbox, ticket #1632
...
This was SVN commit r12601.
2012-09-02 12:11:27 +00:00
6548827ca2
Changed a few more decals
...
This was SVN commit r12600.
2012-09-02 09:10:59 +00:00
8a61f207f2
Changed a couple of misnamed materials, which were breaking some decals
...
This was SVN commit r12599.
2012-09-02 09:00:27 +00:00
766823f293
Made theatron available to all hellenic factions.
...
This was SVN commit r12598.
2012-09-02 05:12:06 +00:00
f48883187d
Spec and Normal maps for Tropical stone quarries and one of the tropical cliff terrains.
...
This was SVN commit r12597.
2012-09-02 03:30:14 +00:00
1a3a6a73ac
Made the "default" maps Acropolis 1 (first map alphabetically in the list).
...
This was SVN commit r12596.
2012-09-02 03:03:53 +00:00
6e3127cb74
Album image for the game's music.
...
This was SVN commit r12595.
2012-09-02 02:55:25 +00:00
38ea080d25
Increase the AI's js runtime size to 32 MB for the time being.
...
This was SVN commit r12594.
2012-09-02 01:50:16 +00:00
ba3b6b9bb7
Attempting to rewrite fixed renderpath model rendering code to apply LOS to models.
...
This was SVN commit r12593.
2012-09-02 01:33:56 +00:00
18aa6e3320
Tweaked
...
This was SVN commit r12592.
2012-09-01 23:42:08 +00:00
a6e1e6cec7
report errors opening sound files and hopefully revcover from them gracefully
...
This was SVN commit r12591.
2012-09-01 23:24:32 +00:00
453f4a8aa6
Deleted broken and unused fancy Mars temple.
...
This was SVN commit r12590.
2012-09-01 23:23:29 +00:00
0be2384297
Added shader maps to (hopefully) all the Celtic buildings.
...
This was SVN commit r12589.
2012-09-01 22:53:28 +00:00
affe91b52c
Fixed fixed renderpath: green water, broken minimap
...
This was SVN commit r12588.
2012-09-01 22:34:36 +00:00
d45a044445
Cleans up rogue printf
...
This was SVN commit r12587.
2012-09-01 22:16:53 +00:00
ccdb67c8f2
Fix non-pch build.
...
This was SVN commit r12586.
2012-09-01 22:12:28 +00:00
535065eb5c
Fixed Spartan cc
...
This was SVN commit r12585.
2012-09-01 22:02:05 +00:00
a1e21449fb
Fixed Athenian CC, added spartan and macedonian CC
...
This was SVN commit r12584.
2012-09-01 21:53:39 +00:00
c185ac89bc
Added teams to this map.
...
This was SVN commit r12583.
2012-09-01 20:59:28 +00:00
c5713719a8
Adjusted the Maur CC footprint a bit.
...
This was SVN commit r12582.
2012-09-01 20:39:52 +00:00
4a06158fa5
This was SVN commit r12581.
2012-09-01 18:59:19 +00:00
9b453f086e
This was SVN commit r12580.
2012-09-01 18:57:30 +00:00
ecff938a6f
This was SVN commit r12579.
2012-09-01 18:56:13 +00:00
f59024b491
This was SVN commit r12578.
2012-09-01 18:55:06 +00:00
a29acce208
Adds some missing includes, refs #1614
...
This was SVN commit r12577.
2012-09-01 18:23:13 +00:00
0cd7da8d0d
A C-style for loop is needed for this to iterate as expected.
...
This was SVN commit r12576.
2012-09-01 10:43:05 +00:00
74364a3130
Changing the release name to "Alpha XI Kronos" before someone makes a package.
...
This was SVN commit r12575.
2012-09-01 05:45:14 +00:00
0133197dcd
proper disposal of single buffer sounds
...
This was SVN commit r12574.
2012-09-01 02:41:48 +00:00
9cc8a0a40b
Enable rally points for corrals.
...
This was SVN commit r12573.
2012-08-31 19:52:58 +00:00
166afff098
Fixed zoot's shimmering rock problem
...
This was SVN commit r12571.
2012-08-31 19:46:40 +00:00
df96445284
missing files from 89c8bccbde
...
This was SVN commit r12570.
2012-08-31 19:26:29 +00:00
0340cc2baa
Shade and show an insufficient resources tooltip for unaffordable walls. Fixes #1641 .
...
This was SVN commit r12569.
2012-08-31 19:20:16 +00:00
2ed11f6a84
Trying to clean up the old specularity code
...
This was SVN commit r12568.
2012-08-31 19:12:42 +00:00
7ce09c315b
Athenian cc by Enrique (still needs projectile prop point).
...
Spec and Normal maps for Roman siege wall. Siege wall gate still needs
it, but currently there is a bug with using the new materials on
animated structures.
This was SVN commit r12567.
2012-08-31 19:10:35 +00:00
89c8bccbde
Sound system patch by stwf:
...
Fixes sound system to work with archives (use VFS files instead of
POSIX), fixes #1604 .
Improves error handling and logging, refs #1594 .
Allows sound to be disabled with -nosound/-quickstart runtime options or
--without-audio build option, fixes #1609 , #1614 .
Experimentally increases default buffer size to help prevent sound
stoppages.
This was SVN commit r12566.
2012-08-31 19:08:41 +00:00
e8758b8bf1
Making sure LOS really is black after Reveal Map option is used...
...
This was SVN commit r12565.
2012-08-31 18:33:03 +00:00
ff2ffa384b
Domestic animals should be unable to gather treasure.
...
This was SVN commit r12564.
2012-08-31 08:25:27 +00:00
9fcb7cc738
Fixed formations so switching formation in-place doesn't leave entities in FORMATIONMEMBER.WALKING and short walk orders bring units into proper formation.
...
This was SVN commit r12563.
2012-08-31 08:20:36 +00:00
d98c62f00a
Show the resource tooltips over the resource counter icons. Fixes #1636 .
...
This was SVN commit r12562.
2012-08-30 20:36:40 +00:00
ea11dee4fa
Bugfix: made sure LOS is always thresholded to black
...
This was SVN commit r12561.
2012-08-30 20:29:39 +00:00
5f88bf8a79
Displays error when converting a grayscale texture instead of possibly crashing, refs #1640
...
This was SVN commit r12560.
2012-08-30 19:24:24 +00:00
0b832176d5
Replaces grayscale decal texture with RGB, refs #1640
...
This was SVN commit r12559.
2012-08-30 19:21:25 +00:00
df531c90d7
Map previews for the height map import maps.
...
This was SVN commit r12558.
2012-08-30 18:24:11 +00:00
5fcbf01fcb
Using even stricter GLSL typing to please even more compilers...
...
This was SVN commit r12557.
2012-08-30 14:13:28 +00:00
afe65d7b76
Adjusting the scale of Northern Lights preview.
...
This was SVN commit r12556.
2012-08-30 11:21:42 +00:00
221c7dacde
Also try to strip the 'resource|' prefix when handling a GatherNearPosition order.
...
This was SVN commit r12555.
2012-08-30 08:18:43 +00:00
8968df0554
Only have builders auto-gather if they received a forced order. Patch by picobyte, fixes #1511 .
...
This was SVN commit r12554.
2012-08-30 02:23:36 +00:00
a563786b86
Only play selection sounds for Gaia entities or entities that the player can control.
...
This was SVN commit r12553.
2012-08-30 02:02:59 +00:00
2850476389
Using stricter GLSL typing to please some compilers
...
This was SVN commit r12552.
2012-08-30 00:29:10 +00:00
38c1a4c4a1
Modified sky, minimap and healthbar renderers to use shaders, to fix a bug reported by historic_bruno
...
This was SVN commit r12551.
2012-08-29 23:07:53 +00:00
fcf09598d9
Temporarily disabling FAM for Alpha 11 because it can cause problems on Ubuntu and hotloading doesn't seem to work anyway at the moment.
...
Known problems with FAM:
- System hangs at shutdown
- Assertion failure at startup in debug mode
This was SVN commit r12550.
2012-08-29 21:22:57 +00:00
833d79445e
Allow immediate re-targeting if an attack target becomes invalid.
...
This was SVN commit r12549.
2012-08-29 21:13:50 +00:00
781ad7d520
Don't always call FinishOrder when leaving a formation, as they may be in the idle state.
...
This was SVN commit r12548.
2012-08-29 19:54:29 +00:00
eea0a62b64
This was SVN commit r12547.
2012-08-29 17:01:41 +00:00
776282b59d
Updating random biome system to include autumn textures. adding another theme to "unknown".
...
This was SVN commit r12546.
2012-08-29 16:43:39 +00:00
0d0bc32736
Adding "Unknown" random map. Updating "Gulf of Bothnia".
...
This was SVN commit r12545.
2012-08-29 13:00:01 +00:00
95ccd432c8
Adding "Unknown" random map
...
This was SVN commit r12544.
2012-08-29 12:59:12 +00:00
08a4b12f01
Added resource used counters that track all non-barter spending. Fixes #1605 .
...
This was SVN commit r12543.
2012-08-29 05:13:45 +00:00
96ee70b75b
Enforce attack/heal repeat delay to prevent units from performing actions too often.
...
This was SVN commit r12542.
2012-08-28 20:02:03 +00:00
dd40cc023e
Resource supply corpses won't have UnitAI and should never be in formations.
...
This was SVN commit r12541.
2012-08-27 23:14:10 +00:00
205792ddd3
Fix path to user.cfg on unix
...
This was SVN commit r12540.
2012-08-27 20:36:05 +00:00
05525a9c2a
Fixed.
...
This was SVN commit r12539.
2012-08-27 17:46:21 +00:00
e15ba08510
Added teams to this map.
...
This was SVN commit r12538.
2012-08-27 17:09:09 +00:00
b4ba09c8b3
Reduce maximum garrison icons to 12 so stances can be shown for siege rams, etc.
...
This was SVN commit r12537.
2012-08-27 16:56:58 +00:00
9db71f5417
Only count civ centres as destroyed if they aren't foundations.
...
This was SVN commit r12536.
2012-08-27 07:16:21 +00:00
6a7e6ca343
Clean up entity name formatting; always show generic names in tooltips.
...
This was SVN commit r12535.
2012-08-27 07:07:33 +00:00
126db0097a
Generic names should have parens only if a specific name is also present.
...
This was SVN commit r12534.
2012-08-27 06:17:52 +00:00
2de4786240
UnitAI's CanGather should always return false if the target isn't a resource.
...
This was SVN commit r12533.
2012-08-27 01:35:53 +00:00
b462f2acfe
Show generic names in unit garrison tooltips.
...
This was SVN commit r12532.
2012-08-26 19:58:25 +00:00
2bdb8f75ff
Check the length of the unit collection in started attack plans to avoid errors. Fixes #1620
...
This was SVN commit r12531.
2012-08-26 11:25:39 +00:00
576761c05e
Never allow entities to set a rally point on themselves.
...
This was SVN commit r12530.
2012-08-26 06:38:29 +00:00
3e40453bd2
This was SVN commit r12529.
2012-08-26 06:30:44 +00:00
dd2d1eb6ec
Added name tooltips to the summary screen civ emblems.
...
This was SVN commit r12528.
2012-08-25 22:05:15 +00:00
c688f64699
Increased the verbosity of the FinishOrder error and made it generate a stack trace.
...
This was SVN commit r12527.
2012-08-25 21:55:53 +00:00
89cf2b26e3
Second attempt to fix a graphical glitch in ARB mode
...
This was SVN commit r12526.
2012-08-25 21:41:31 +00:00
cd0802294a
Forced chase orders should override stance.
...
This was SVN commit r12524.
2012-08-24 23:32:26 +00:00
1c06a17e87
EntityRenamed should be ignored if the old entity doesn't match.
...
This was SVN commit r12523.
2012-08-24 08:22:29 +00:00
d89e64cf49
Regular champions take 13 seconds to build, Persian Immortals shouldn't build 2.6x as fast.
...
This was SVN commit r12522.
2012-08-24 07:24:33 +00:00
a4ff4b92b7
Include the generic name in the tooltips when selecting multiple units.
...
This was SVN commit r12521.
2012-08-24 07:14:50 +00:00
870fe14391
Updated Roman structure normal and specular maps.
...
This was SVN commit r12520.
2012-08-24 07:08:23 +00:00
9c9cab1f89
Add a Foundation element to the Armour templates for structures.
...
This was SVN commit r12519.
2012-08-23 21:22:49 +00:00
9defa4150e
Height map test maps.
...
This was SVN commit r12518.
2012-08-23 17:54:08 +00:00
c8d509e574
Fixed some templates.
...
This was SVN commit r12517.
2012-08-23 17:38:19 +00:00
8facd45803
s/IRC/Chat/, clarified tooltip.
...
This was SVN commit r12516.
2012-08-23 06:59:16 +00:00
5b218ca4b0
An extra heightmap and demo map
...
This was SVN commit r12515.
2012-08-23 06:04:23 +00:00
6de082abca
Forgot a semicolon :P
...
This was SVN commit r12514.
2012-08-22 08:04:55 +00:00
e50bf9e539
Sky toggling through config and with Alt+Z
...
This was SVN commit r12513.
2012-08-22 07:32:26 +00:00
95585d1e15
Tweaked a few fishing-related templates, removed ugly workaround.
...
This was SVN commit r12512.
2012-08-22 06:53:22 +00:00
7e382fc26f
CCmpUnitMotion::MoveToPointRange should ignore unit radius, so it correctly returns false when called repeatedly for large units.
...
This was SVN commit r12511.
2012-08-22 06:13:23 +00:00
58b3a88daa
Fixes more overloaded-virtual warnings in clang.
...
This was SVN commit r12510.
2012-08-21 21:47:36 +00:00
619dd95d5b
Fixes an overloaded-virtual warning in clang.
...
This was SVN commit r12509.
2012-08-21 20:13:42 +00:00
d73c589a04
Normal maps for decals.
...
This was SVN commit r12508.
2012-08-21 18:13:37 +00:00
7ba2b8947c
Attempting to fix a graphical bug affecting ARB mode
...
This was SVN commit r12507.
2012-08-21 18:04:05 +00:00
43eac32795
Fixes GCC warning about passing NULL to non-pointer argument
...
This was SVN commit r12506.
2012-08-21 16:44:54 +00:00
ddbc9e7d86
Disables useless MSVC warning in MikktspaceWrap. Cleans up a few inconsistencies
...
This was SVN commit r12505.
2012-08-21 16:40:07 +00:00
952385b21d
Ticket 1612: Fixed overlay z-fighting in GLSL mode
...
This was SVN commit r12504.
2012-08-21 16:28:06 +00:00
6cf4efbd01
Handle exit and return hotkeys in message boxes. Fixes #1319 .
...
This was SVN commit r12503.
2012-08-21 06:30:30 +00:00
19fd2f8b9f
Fixed streched UV on Badland's rock.
...
This was SVN commit r12502.
2012-08-21 01:03:41 +00:00
0af34b1fcb
Removes some unread variables reported by LLVM. Refs #1114
...
This was SVN commit r12501.
2012-08-20 23:59:50 +00:00
70c317b1b0
Hunt all domestic animals, not just very weak animals (<= 10 health).
...
This was SVN commit r12500.
2012-08-20 23:37:19 +00:00
4a2ff9521f
Added rounding to armour changes (thanks Deiz)
...
This was SVN commit r12498.
2012-08-20 20:22:48 +00:00
89eef72f20
cmpFoundation won't exist when repairing finished buildings.
...
This was SVN commit r12497.
2012-08-20 19:53:08 +00:00
e5df8d17e1
Weaken foundation armour to 1/5th of standard.
...
This was SVN commit r12496.
2012-08-20 19:52:26 +00:00
af005b00b2
Added AI handling for 'resource|' pseudo-templates.
...
This was SVN commit r12495.
2012-08-20 18:02:56 +00:00
ad63a1e60e
Don't sed templates at 5 AM without testing.
...
This was SVN commit r12494.
2012-08-20 16:07:50 +00:00
3cf726ffa8
Adjusted wall sets so that all wall segments have the same health. Gave gates 2/3 of wall segment health.
...
This was SVN commit r12493.
2012-08-20 08:48:03 +00:00
b624328a89
Reverted k776's not-suggestion from ca3886be20, per k776's suggestion.
...
This was SVN commit r12492.
2012-08-20 08:23:21 +00:00
ca3886be20
Made citizen-soldiers build 25% faster than female citizens, per k776's suggestion.
...
This was SVN commit r12491.
2012-08-20 07:48:48 +00:00
4136512a90
Scale the build rate as 'builders^0.7' rather than 'builders' (linear).
...
This was SVN commit r12490.
2012-08-20 07:30:50 +00:00
a1d16c2fbd
Made ALL cliff terrains triplanar.
...
This was SVN commit r12489.
2012-08-20 03:32:11 +00:00
951e682f27
normal and spec mapping for Celtic "henge"
...
This was SVN commit r12488.
2012-08-20 02:39:03 +00:00
cebe8bed64
Removed unused 'remain' corpse logic from UnitAI.
...
This was SVN commit r12487.
2012-08-20 01:41:56 +00:00
66012e2e2c
Destroy dying 'remain' entities and replace them with visually-identical resources. Fixes #1600 .
...
This was SVN commit r12486.
2012-08-20 01:38:39 +00:00
034212a554
Made Mace fortress use the new actor and meshes.
...
This was SVN commit r12485.
2012-08-20 01:30:09 +00:00
36f2781a38
A better Spartan hoplites tip pic.
...
This was SVN commit r12484.
2012-08-20 00:51:54 +00:00
141dfabf5b
Removed stray cd from a template file.
...
This was SVN commit r12483.
2012-08-19 22:05:28 +00:00
d71f883d3e
Adds warning when OS X users try to toggle fullscreen since it's disabled
...
This was SVN commit r12482.
2012-08-19 20:45:43 +00:00
875ea8f440
Fixes some warnings in mikktspace and weldmesh
...
This was SVN commit r12481.
2012-08-19 20:28:00 +00:00
edd882492b
Fixed syntax error in new technology.
...
This was SVN commit r12480.
2012-08-19 20:20:37 +00:00
1c1486d74a
Don't allow people to train heroes because they are not balanced.
...
This was SVN commit r12479.
2012-08-19 20:16:18 +00:00
a17ffaa0f2
Fixes weldmesh build on *BSD
...
This was SVN commit r12478.
2012-08-19 19:57:23 +00:00
a3f9da72a5
Removes yucky sed commands from update-workspaces.sh to avoid modifying the Premake makefiles. Adds new BSD and OS X-specific Makefiles instead (can be autogenerated by Premake). Fixes a few bugs and omissions in the Premake4 build configuration script.
...
This was SVN commit r12477.
2012-08-19 18:49:02 +00:00
af59e1d9ca
Fixed rotation of hele tower models
...
This was SVN commit r12476.
2012-08-19 15:34:27 +00:00
ca0b3efc3d
Carthaginian buildings now showcase AO, spec and normal maps. Room for improvement, but usable.
...
This was SVN commit r12475.
2012-08-19 12:08:27 +00:00
142d6619a8
Fixed farmstead AO map and added specularity to the roof tiles.
...
This was SVN commit r12474.
2012-08-19 09:49:10 +00:00
8300113a3a
Fixed some artifacts on the Broch wall.
...
This was SVN commit r12473.
2012-08-19 07:36:48 +00:00
6e326e2d2e
Ticket 1603: Using GL extension defines to avoid compiler errors on older systems
...
This was SVN commit r12472.
2012-08-19 07:05:11 +00:00
1b9b7dc390
Added normal mapping to the Broch.
...
This was SVN commit r12471.
2012-08-19 04:13:43 +00:00
7a32e9d868
Small Badland rocks committed.
...
This was SVN commit r12470.
2012-08-19 02:12:46 +00:00
689a15d784
Committed Temperate_Small_stonemine.
...
This was SVN commit r12469.
2012-08-19 01:47:57 +00:00
9216dc3924
Have toggleChat (enter by default) send a chat message if the input isn't empty.
...
This was SVN commit r12468.
2012-08-19 00:28:46 +00:00
c32d3ece44
Remove focus when closing the chat window via the escape key.
...
This was SVN commit r12467.
2012-08-18 21:35:52 +00:00
0f94813aa9
Export stop.png in GIMP to fix strange crash
...
This was SVN commit r12466.
2012-08-18 21:07:21 +00:00
0dfdf868b2
Set ownership to Gaia when units that remain on death are killed. Refs #1600 .
...
This was SVN commit r12465.
2012-08-18 20:33:44 +00:00
e485fb9e2c
Implements copy/paste for OS X using NSPasteboard including pre-10.6 API support. Fixes #1326
...
This was SVN commit r12464.
2012-08-18 19:47:55 +00:00
9519635869
0-population units (e.g. sheep) should never have production blocked.
...
This was SVN commit r12463.
2012-08-18 18:44:20 +00:00
77f26c454a
Have UnitAI respect the LeaveFoundation order unless in combat. Fixes #1406 .
...
This was SVN commit r12462.
2012-08-18 08:13:47 +00:00
a08d55e603
Added AO, norm and spec maps for all Iberian buildings except the walls and the dock(couldn't find the AO texture from myconid's git trunk) and to a couple of Carthaginian buildings too.
...
This was SVN commit r12461.
2012-08-18 05:40:23 +00:00
8e996cedab
Adds sensible default sound gains, when the config file(s) omit them
...
This was SVN commit r12458.
2012-08-17 23:00:41 +00:00
bbed3ca69a
Made player slot reassignment in the game setup screen swap slot contents instead of leaving the old slot empty.
...
This was SVN commit r12457.
2012-08-17 21:22:07 +00:00
fdb3995141
Adds UTF-8 BOM stripping to checkrefs.pl when using JSON files, patch by retrosnub. Refs #1556
...
This was SVN commit r12456.
2012-08-17 19:24:23 +00:00
37964d048e
Added camera movement speed modifier keys.
...
This was SVN commit r12455.
2012-08-17 18:33:41 +00:00
592478eb67
Another height map demo map and image.
...
This was SVN commit r12454.
2012-08-17 18:26:03 +00:00
a6230497ba
Committed updated theatron and updated gymnasion for athenians
...
This was SVN commit r12453.
2012-08-17 02:17:38 +00:00
55dc7cc553
This was SVN commit r12452.
2012-08-17 01:28:26 +00:00
a18dd1a36d
Fixed Spec for the Temperate Rock Formation. Added parallax mapping for terrain's decals. Added missing AO for scandiv rock.
...
This was SVN commit r12451.
2012-08-16 23:18:21 +00:00
d7532a1c77
This was SVN commit r12450.
2012-08-16 18:52:39 +00:00
3d67aeeb71
Adds some debug output to OpenAL init
...
This was SVN commit r12448.
2012-08-16 17:01:15 +00:00
791b6fa741
Partially fixed artifacts on the wood pile on the Roman mill.
...
This was SVN commit r12447.
2012-08-16 03:58:27 +00:00
065a3e093b
Fixes incorrect test for command debugging
...
This was SVN commit r12446.
2012-08-16 02:29:08 +00:00
de38f9ef9a
Prevent domestic animals from being manually deleted (killed). Patch by yakca. Fixes #1525 .
...
This was SVN commit r12445.
2012-08-16 02:08:56 +00:00
714426f761
Fixes unnecessary use of VfsPath pointers in sound system. Refs #1223
...
This was SVN commit r12444.
2012-08-16 01:41:45 +00:00
78e9fecf92
Added support for ungarrisoning units by template name and for ungarrisoning from multiple entities at once. Fixes #910 .
...
This was SVN commit r12443.
2012-08-16 01:15:04 +00:00
b03df364ea
Fixed VHQ Parallax for the new rocks.
...
This was SVN commit r12442.
2012-08-16 00:46:43 +00:00
b54a7486da
Added Parallax VHQ for the new rocks
...
This was SVN commit r12441.
2012-08-16 00:31:42 +00:00
3653fe5d3a
Added support for putting technologies in folders. Fixes #1462 .
...
This was SVN commit r12440.
2012-08-15 22:25:25 +00:00
765d02716a
Updated Mauryan isw textures.
...
This was SVN commit r12439.
2012-08-15 18:22:28 +00:00
ee83c07184
This was SVN commit r12437.
2012-08-15 13:14:37 +00:00
8256f691f4
Optimizations, and made qBot-xp destroy walls when Iberians (but not towers).
...
This was SVN commit r12436.
2012-08-15 09:06:45 +00:00
3e29520326
Mauryan Swordsman body textures
...
This was SVN commit r12435.
2012-08-15 06:44:58 +00:00
56c15ae427
Updated Roman normal maps.
...
This was SVN commit r12434.
2012-08-15 03:22:01 +00:00
851786b01a
Band-aid fix for corpses responding to the stop order.
...
This was SVN commit r12433.
2012-08-15 02:51:48 +00:00
aa86664d8f
Make sure to initialize the entity collection's cached length before modifying the actual object. Fixes #1535 .
...
This was SVN commit r12432.
2012-08-15 01:31:53 +00:00
af62b5ad8a
Adds <Distanceless> flag to a bunch of voice sound groups
...
This was SVN commit r12430.
2012-08-15 01:04:54 +00:00
e3b8d9c38c
Deleted AO textures that didn't get deleted by Gen.Kenobi.
...
This was SVN commit r12429.
2012-08-15 00:49:17 +00:00
011ba8255e
New sound system implementation by stwf, refs #1223 , #961 .
...
Enables audio on OS X, refs #685 , #931 .
Fixes music not playing after a game, refs #946 .
This was SVN commit r12428.
2012-08-15 00:10:44 +00:00
2c260660e6
Created AO folder for
...
This was SVN commit r12427.
2012-08-15 00:02:58 +00:00
a6945413c3
Added AO to rome_temple and rome_temple_mars.
...
This was SVN commit r12426.
2012-08-14 21:11:06 +00:00
ba253d34d4
Normals and Specs for Persian city tile terrain.
...
This was SVN commit r12425.
2012-08-14 18:01:40 +00:00
927592aca9
This was SVN commit r12424.
2012-08-14 17:47:13 +00:00
0c56dfe272
Forgot to add the new short, medium wall templates.
...
This was SVN commit r12423.
2012-08-14 17:10:55 +00:00
e83bebe02e
Remove entities from selection groups when they become hidden. Fixes #1373 .
...
This was SVN commit r12422.
2012-08-14 14:02:52 +00:00
d90e53d0a5
Show cost ranges in the wall construction tooltip, if possible.
...
This was SVN commit r12421.
2012-08-14 07:51:50 +00:00
981db4c005
Stone wall segments now have costs dependent on length. Rebalanced gate/tower costs per IRC discussion.
...
This was SVN commit r12420.
2012-08-14 07:46:47 +00:00
97de77c6b6
Adds alternative materials to reference checker
...
This was SVN commit r12419.
2012-08-14 02:31:54 +00:00
6031b0785f
Organized materials XML a bit.
...
This was SVN commit r12418.
2012-08-14 02:31:11 +00:00
2d505a5015
Added new Pointy_StoneMines_Badlands by Gen.Kenobi. It has AO, normal and SpecMaps. Need to fix AO and Spec and add new shaders to desert_decals.
...
This was SVN commit r12417.
2012-08-14 02:22:37 +00:00
5366dd8388
Added VHQ (very high-quality) parallax to materials that were missing it.
...
This was SVN commit r12416.
2012-08-14 02:04:59 +00:00
4138a78c7f
Fixes infinite recursion error in UnitAI when hunting an animal with a unit that's standing ground
...
This was SVN commit r12415.
2012-08-14 00:44:36 +00:00
a71d77b03e
Fixed material levels of quality more.
...
Added AO to dock prop.
This was SVN commit r12414.
2012-08-13 21:39:45 +00:00
7d86fc4c31
Gate conversion now maintains wall HP percentage instead of magically restoring to full health
...
This was SVN commit r12413.
2012-08-13 21:37:40 +00:00
93a3f77aaa
Fixed basic_trans levels of quality.
...
This was SVN commit r12412.
2012-08-13 20:17:29 +00:00
9f358abaed
Adds particle and material files to reference checker
...
This was SVN commit r12411.
2012-08-13 19:39:09 +00:00
9cb5d48ccf
Reverts mistaken default config changes. Please DO NOT use default.cfg for personal settings and check before committing modifications to that file.
...
This was SVN commit r12410.
2012-08-13 19:09:11 +00:00
02f2c082cb
This was SVN commit r12409.
2012-08-13 18:00:15 +00:00
d6792c4e1b
This was SVN commit r12408.
2012-08-13 17:54:39 +00:00
f000fc6bbd
This was SVN commit r12407.
2012-08-13 17:50:54 +00:00
b42708a3f1
This was SVN commit r12406.
2012-08-13 17:45:48 +00:00
1129c2be0e
This was SVN commit r12405.
2012-08-13 17:41:48 +00:00
902fc4a541
Show a red overlay over training/construction... icons that cannot be afforded.
...
This was SVN commit r12404.
2012-08-13 16:47:10 +00:00
9e35243976
This was SVN commit r12402.
2012-08-13 14:25:37 +00:00
9e9e1e3b78
Optimize enemy watchers usage. This should avoid massive lag later in the game.
...
This was SVN commit r12401.
2012-08-13 08:06:20 +00:00
1f17407161
This was SVN commit r12400.
2012-08-13 05:11:12 +00:00
dac4ae2716
More AO! ...and an updating rome_struct_2_norm.png.
...
This was SVN commit r12399.
2012-08-13 03:09:20 +00:00
8c97458de7
Prevent healers from healing themselves.
...
This was SVN commit r12398.
2012-08-13 02:56:51 +00:00
61cf6a6040
This was SVN commit r12397.
2012-08-13 00:03:18 +00:00
cbddd53e47
Avoid an edge case when buildings are destroyed while researching, leaving techs stuck. Refs #1521 .
...
This was SVN commit r12396.
2012-08-12 23:40:04 +00:00
13d7867a58
Fixes checkrefs.pl for latest actor format.
...
Adds checking for map preview textures.
Adds checking for random map scripts.
This was SVN commit r12395.
2012-08-12 21:00:58 +00:00
b1090d1a12
Use a linear interpolation to find the point where the parallax ray intersects the surface more accurately.
...
This was SVN commit r12394.
2012-08-12 14:50:56 +00:00
3b704b12a9
Summary screen: separate barter info for each resource
...
This was SVN commit r12393.
2012-08-12 09:12:06 +00:00
3acc855a2d
Renamed /restrictteam to /team, added /enemy, /msg, /all. Fixes #1583 .
...
This was SVN commit r12392.
2012-08-12 06:48:49 +00:00
6f9a44d220
Removed shaders from Roman wall gate so it won't give errors.
...
This was SVN commit r12391.
2012-08-12 05:36:59 +00:00
a6909b677a
Deleted unused material file.
...
This was SVN commit r12390.
2012-08-12 05:29:41 +00:00
2534b26b16
Added AO to Roman market.
...
This was SVN commit r12389.
2012-08-12 05:00:59 +00:00
40886d1b24
This was SVN commit r12388.
2012-08-12 04:51:50 +00:00
d9531b78f9
This was SVN commit r12387.
2012-08-12 04:49:00 +00:00
740322c88d
Renamed the Roman structure texture normal map.
...
This was SVN commit r12386.
2012-08-12 04:42:59 +00:00
a02d32a7d1
More AO.
...
This was SVN commit r12385.
2012-08-12 03:49:27 +00:00
913770347b
Resized decals for the new Stonemine
...
This was SVN commit r12384.
2012-08-12 03:04:46 +00:00
90521c49ff
Extended Rock_Scandiv.
...
This was SVN commit r12383.
2012-08-12 02:56:17 +00:00
6f80824c48
This was SVN commit r12382.
2012-08-12 02:55:50 +00:00
ab19bc233a
Height Map import demo.
...
This was SVN commit r12381.
2012-08-12 02:55:28 +00:00
b89d23d325
Added Smoothed stone mine :)
...
This was SVN commit r12380.
2012-08-12 02:33:40 +00:00
2a7f037e69
Reverting some mistaken changes.
...
This was SVN commit r12379.
2012-08-12 02:24:20 +00:00
e735df4a7f
New geo entity.
...
This was SVN commit r12378.
2012-08-12 02:16:50 +00:00
e4eb394ca8
Fixed GreekFortress.
...
This was SVN commit r12377.
2012-08-12 02:13:22 +00:00
c4c215d5e1
Added a new StoneMine for Temperate terrains and new terrain decals.
...
This was SVN commit r12376.
2012-08-12 01:56:53 +00:00
49b734336a
Some "tips" text fixes.
...
Spec maps for more helmets.
This was SVN commit r12375.
2012-08-12 01:54:23 +00:00
ed806b6a9a
Added messed up normal maps for the Roman camp so a graphics programmer can look at them.
...
This was SVN commit r12374.
2012-08-12 01:17:32 +00:00
e403c748f2
More cliff terrain spec and normal mapping.
...
More metal mine spec mapping.
This was SVN commit r12373.
2012-08-12 00:11:46 +00:00
277b637578
Updated Greek_Fortrees_Up entities and added foundation to the model.
...
This was SVN commit r12372.
2012-08-12 00:08:49 +00:00
2eed26df09
Implemented two chat commands, /restrictteam and /me. Refs #1583 .
...
This was SVN commit r12371.
2012-08-11 23:59:28 +00:00
b1657b63b3
This was SVN commit r12370.
2012-08-11 21:10:36 +00:00
dedd0ca792
Some spec and normal tests for terrain.
...
This was SVN commit r12369.
2012-08-11 19:29:28 +00:00
dde8f5f57b
This was SVN commit r12368.
2012-08-11 17:10:27 +00:00
7adecfebb3
Updated AO again.
...
This was SVN commit r12367.
2012-08-11 17:08:00 +00:00
483707f3c8
Darkened AO on three Roman buildings.
...
This was SVN commit r12366.
2012-08-11 16:57:48 +00:00
7a7d7e5d0a
Add trade/barter stats to the summary screen.
...
This was SVN commit r12365.
2012-08-11 16:38:01 +00:00
9bbfc3f808
Spec map for Savanna metal mine.
...
Adjusted spec/ao/norm for Scandinavian rock.
This was SVN commit r12364.
2012-08-11 16:35:46 +00:00
abca51c1ae
Fixed typo in config file
...
This was SVN commit r12363.
2012-08-11 16:20:32 +00:00
06d22af3dc
Making all cliffs triplanar.
...
Adding spec maps to helmets.
Adjusted the rome_struct_2 spec map a little.
This was SVN commit r12362.
2012-08-11 16:11:23 +00:00
9c56092999
Added very high quality parallax; GPU-intensive, defaults to off; enabled through config
...
This was SVN commit r12361.
2012-08-11 15:25:00 +00:00
4890789d58
Added support for team chat in multiplayer. Team chat is default if you are on a team of size >1. Using the prefix g will make the message global. Fixes #1583 .
...
This was SVN commit r12360.
2012-08-11 15:12:48 +00:00
96534fc5ed
Fix a problem with civilizations who didn't have advanced building defined.
...
This was SVN commit r12359.
2012-08-11 12:41:29 +00:00
226738d447
Last batch of fix for qBot-xp for the day if all goes well.
...
This was SVN commit r12358.
2012-08-11 10:36:39 +00:00
508994e4c8
Fix a typo.
...
This was SVN commit r12357.
2012-08-11 07:59:05 +00:00
dc916e7295
Fix bugs related to garrisoning, should fix the pathfinder sometimes choosing a path over water when unneeded.
...
This was SVN commit r12356.
2012-08-11 07:41:23 +00:00
c5658edfca
Improved AO on the Roman farmstead and fortress, and added it to the barracks.
...
This was SVN commit r12355.
2012-08-11 07:20:36 +00:00
c573f4905c
Fixed warning on farmstead model.
...
This was SVN commit r12354.
2012-08-11 06:32:38 +00:00
9d54763401
Added improved normal mapping, parallax mapping, specular mapping, and AO on the Roman buildings.
...
Created folder for AO textures.
This was SVN commit r12353.
2012-08-11 06:10:29 +00:00
b926a5ee54
Added Spec and Normal Maps for the Roman Structures by Gen.Kenobi. (rome_struc_2 texture files) - What applies to the Barracks, Corral, Dock, Farmstead, Fortress, Houses, Mill, ScoutTower and Walls. Feature Warning: Alphas not working properly + Gate fails to render material.
...
This was SVN commit r12352.
2012-08-11 02:21:04 +00:00
8cb340ade0
Make roof tile shadowing consistent by flipping UV's
...
This was SVN commit r12351.
2012-08-10 23:58:59 +00:00
eee04db56b
Bugfix- changed GLSL particle shader to use modelview matrix instead of modelviewprojection
...
This was SVN commit r12350.
2012-08-10 21:40:50 +00:00
d45379cc62
Bugfix- changed GLSL particle shader to look the same as ARB
...
This was SVN commit r12349.
2012-08-10 21:02:22 +00:00
9dc838bed5
Add support for cropped images in the GUI code and update game setup to use cropped map previews. Refs #1343 .
...
This was SVN commit r12348.
2012-08-10 19:59:20 +00:00
5d2c0b466f
Resize all map previews to be 512x512 by adding a black area of padding.
...
This was SVN commit r12347.
2012-08-10 19:56:58 +00:00
0f4acf7167
Bigger foundation for Brit fortress.
...
This was SVN commit r12346.
2012-08-10 18:18:14 +00:00
d7140c4edf
Helmet specular stuff.
...
This was SVN commit r12345.
2012-08-10 18:18:04 +00:00
eb422bc4b3
Bugfix- changed GLSL particle shader to look the same as ARB
...
This was SVN commit r12344.
2012-08-10 18:14:42 +00:00
07ea313ad6
Major update for qBot-xp, with slight changes to unitAI (that broke qBot, and fix for that).
...
This was SVN commit r12343.
2012-08-10 16:33:58 +00:00
2b503e68f7
Fixed broken chat; improved cheat message handling.
...
This was SVN commit r12342.
2012-08-10 03:35:20 +00:00
8009c88a81
This was SVN commit r12340.
2012-08-09 21:42:32 +00:00
8b365ca96d
New Celtic Broch fortress
...
This was SVN commit r12339.
2012-08-09 21:13:21 +00:00
613f845095
Improve gate closing behaviour when locked or with no allies nearby. Fixes #1551 .
...
This was SVN commit r12337.
2012-08-09 19:06:01 +00:00
a89d131f2d
Added specular mapping for units
...
This was SVN commit r12336.
2012-08-09 18:49:35 +00:00
8d59192410
A couple more materials.
...
Testing spec mapping with Iberian bull statue and Craterus unit.
This was SVN commit r12335.
2012-08-09 18:30:05 +00:00
97c97dc7e0
Bugfix- changed decal/terrain blending mode for the fixed renderpath
...
This was SVN commit r12334.
2012-08-09 16:22:49 +00:00
ef55e60d9b
Prevent chickens from spawning in the obstruction area of the civil centre.
...
This was SVN commit r12333.
2012-08-09 15:24:11 +00:00
3ef639c4bc
Adds new texture names to actor editor choices
...
This was SVN commit r12332.
2012-08-09 04:02:49 +00:00
c5ce1b23ae
Remove a bit of indirection in UnitAI.
...
This was SVN commit r12331.
2012-08-09 02:32:56 +00:00
388544abdb
Committed AO Scandiv_formation textures & material.
...
This was SVN commit r12330.
2012-08-09 00:55:40 +00:00
66d026a498
This was SVN commit r12329.
2012-08-09 00:14:58 +00:00
87b2346154
Condensed the sanity checks for the Gaia range query, per leper's suggestion.
...
This was SVN commit r12328.
2012-08-08 23:29:30 +00:00
14df6cf1a2
Removed triple and trailing newlines from random map descriptions.
...
This was SVN commit r12327.
2012-08-08 23:11:09 +00:00
f210008b07
Put a warning about the AI into the description of naval maps.
...
This was SVN commit r12326.
2012-08-08 23:10:21 +00:00
e046fc0a01
Bugfix- changed some decal materials and fixed decal blending mode
...
This was SVN commit r12325.
2012-08-08 19:08:56 +00:00
6afe17dbf1
This was SVN commit r12324.
2012-08-08 18:50:20 +00:00
dcbe7d2e96
This was SVN commit r12323.
2012-08-08 18:30:20 +00:00
d5f93396b6
Deccan Plateau map.
...
This was SVN commit r12322.
2012-08-08 18:27:47 +00:00
af9da8e01e
Fixed decals on Celt Tavern and Mill.
...
This was SVN commit r12321.
2012-08-08 18:16:50 +00:00
fb012f14b9
Fixed some corral decals.
...
This was SVN commit r12320.
2012-08-08 17:40:25 +00:00
166255b744
Remember scroll position when re-opening dropdown lists.
...
This was SVN commit r12319.
2012-08-08 17:22:52 +00:00
eadd24b64b
Added a 'Stop' button to the GUI for immediately halting units.
...
This was SVN commit r12318.
2012-08-08 05:36:42 +00:00
1120701351
Substantially rework how Gaia is handled by UnitAI, BuildingAI. Dangerous animals and combat units will be attacked like regular enemies.
...
This was SVN commit r12317.
2012-08-08 05:32:53 +00:00
84305155de
Seamlessly change a player's entities to be Gaia-owned when resigning.
...
This was SVN commit r12316.
2012-08-08 05:27:59 +00:00
791752c7a4
Added a 'quiet' version of SetOwner() that doesn't send a message, to allow faux-atomic batch ownership changes.
...
This was SVN commit r12315.
2012-08-08 05:18:20 +00:00
28333ba92e
Committed fixed Normal Maps and materials for the Rock ScandivFormation. Now the bump is much more noticeable, yet realistic.
...
This was SVN commit r12314.
2012-08-08 00:26:08 +00:00
7666bfcbda
This was SVN commit r12312.
2012-08-07 21:32:45 +00:00
18930375e6
This was SVN commit r12310.
2012-08-07 21:16:25 +00:00
c9abf6f68c
Heightmap importing in Atlas
...
This was SVN commit r12308.
2012-08-07 18:49:46 +00:00
e488eb4d6f
Bugfix for smoothlos, a test routine was complaining because g_Renderer wasn't available in test mode.
...
This was SVN commit r12307.
2012-08-07 18:28:23 +00:00
88ab3f0f5b
Terrain/decal materials (includes triplanar/normal/specular/emissive mapping); custom alphamaps
...
This was SVN commit r12306.
2012-08-07 18:21:16 +00:00
780970d16a
Avoid a rare error when a group has both renamed and deleted entities.
...
This was SVN commit r12305.
2012-08-07 00:41:57 +00:00
648e68e49c
smooth LOS
...
This was SVN commit r12304.
2012-08-06 22:38:42 +00:00
4b119b9bd1
*Small Greek Fortress Fixes
...
*Added Scandinav-Rock formation by Gen.Kenobi (with spec&normal included
as a test)
This was SVN commit r12303.
2012-08-06 22:34:37 +00:00
77346e6914
Adding some missing random map previews
...
This was SVN commit r12302.
2012-08-06 22:08:07 +00:00
47c2907f10
added licensing headers to some of the new files
...
This was SVN commit r12301.
2012-08-06 21:34:41 +00:00
da8c673a0a
ao/parallax/normal/specular/emissive mapping; windy trees; time manager; render queries; conditional defines
...
This was SVN commit r12300.
2012-08-06 19:10:47 +00:00
8fc1fd2478
Fixes default map names, closes #1578
...
This was SVN commit r12299.
2012-08-06 18:09:22 +00:00
c0f522fd20
Use upper camel case for member variables
...
This was SVN commit r12298.
2012-08-06 16:46:54 +00:00
00aa354f8f
Updated Greek Fortress by Gen.Kenobi. Finally fixed it. Enjoy!
...
This was SVN commit r12297.
2012-08-06 15:51:16 +00:00
0f44c5b3fe
Fix some mistakes with class definition for stone/palisade gates and wallsets.
...
This was SVN commit r12296.
2012-08-06 11:43:02 +00:00
bfdd23997d
Added new Rock-set-desert by Gen.Kenobi
...
They might need re-scaling.
This was SVN commit r12295.
2012-08-06 03:07:58 +00:00
11eb862bdb
Map preview for Acropolis 7.
...
Made the status bar for trees a little easier to see.
This was SVN commit r12294.
2012-08-05 19:07:41 +00:00
78cc29b591
Added a resign option (deletes all of a player's entities).
...
This was SVN commit r12293.
2012-08-05 18:07:56 +00:00
0037bb8230
Slightly ugly fix for 'You has been defeated.' message in singleplayer.
...
This was SVN commit r12292.
2012-08-05 18:05:25 +00:00
0a2449bf5f
Added small_scaffold actor
...
This was SVN commit r12291.
2012-08-05 16:31:36 +00:00
8291019fa1
Added scaffold_small.dae prop
...
This was SVN commit r12290.
2012-08-05 16:27:38 +00:00
88aff0c501
Added new theatron version to athenians civ.
...
-Modified entity athen_theatron.xml to reference visual actor
"hellenes/theatre_new.xml"
This was SVN commit r12289.
2012-08-05 16:00:25 +00:00
959a897ec1
This was SVN commit r12288.
2012-08-05 15:24:26 +00:00
8f635b7e01
Fixing an issue.
...
This was SVN commit r12287.
2012-08-05 15:04:35 +00:00
6d633c9b18
Fixing a bug
...
This was SVN commit r12286.
2012-08-05 14:24:39 +00:00
7d62da8d2c
This was SVN commit r12285.
2012-08-05 14:20:51 +00:00
202a02568b
Cheats ... fixes #1555 .
...
This was SVN commit r12284.
2012-08-05 14:01:05 +00:00
36cc1766a4
General improvements to the attack plans and the defense manager. Slight econ improvements (better early game priorities, faster play, better farming, tentative to get qBot to crowd resources less, tweaking of dropsites variable). Many bugfixes, should be stable enough for alpha 11.
...
This was SVN commit r12283.
2012-08-05 11:19:31 +00:00
4a1b085df0
Send chat notifications upon player defeat.
...
This was SVN commit r12282.
2012-08-05 05:41:19 +00:00
b86d39681f
Reveal the map for defeated players.
...
This was SVN commit r12281.
2012-08-05 05:34:17 +00:00
86db7b8a59
Show multiplayer names in the summary screen, rather than the map's defaults.
...
This was SVN commit r12280.
2012-08-05 02:18:44 +00:00
d04eb12b83
Made cart walls considerably longer to build time.
...
This was SVN commit r12279.
2012-08-04 20:53:01 +00:00
347c7d45cc
Updates random map wall_builder with correct gate sizes, patch by FeXoR. Fixes #1576
...
This was SVN commit r12278.
2012-08-04 19:29:45 +00:00
2eb49be1a3
Show shallows (walkable water) on the minimap in a lighter color.
...
This was SVN commit r12277.
2012-08-04 18:52:02 +00:00
2c642fc68e
Uninitialized variable was causing nondeterministic weirdness in Atlas.
...
This was SVN commit r12275.
2012-08-04 16:56:09 +00:00
1b78b3cc20
Projectile actors for Mauryan defence structures
...
This was SVN commit r12274.
2012-08-04 08:41:02 +00:00
1e0ea4b963
This was SVN commit r12272.
2012-08-04 00:02:11 +00:00
20d75a3880
Free cursors before shutting down SDL. Fixes #1355 .
...
This was SVN commit r12271.
2012-08-03 16:48:02 +00:00
c5a0dabe8d
Do a second check when trying to place wall pieces with two control groups. Fixes #1529 .
...
This was SVN commit r12270.
2012-08-03 16:38:31 +00:00
be31d3a9e7
Added a function for finding colliding entities with identical control groups. Refs #1529 .
...
This was SVN commit r12269.
2012-08-03 16:36:40 +00:00
2ee61750b4
Forgot to fix a few things before committing.
...
This was SVN commit r12268.
2012-08-03 16:12:45 +00:00
45ee419171
Adding an experimental version of qBot. This is half a crossover with my former Marilyn bot (defense manager, attack plans) and some improvements here and there that I believe could help improve the bot.
...
This was SVN commit r12267.
2012-08-03 15:52:18 +00:00
0d5366fd7b
This was SVN commit r12264.
2012-08-03 11:30:28 +00:00
09d0def213
This was SVN commit r12263.
2012-08-03 10:55:45 +00:00
ddcdd5d2e8
Updates logs readme with link to Trac, to replace confusing outdated info
...
This was SVN commit r12261.
2012-08-02 19:41:50 +00:00
4bb0ad46a5
Re-saved all maps with walls, sanitizing their obstruction groups.
...
This was SVN commit r12260.
2012-08-01 21:39:54 +00:00
4c8907e30c
Added the new ControlPersist XML element to wall tower templates.
...
This was SVN commit r12259.
2012-08-01 21:39:08 +00:00
692795e56e
Added engine-side obstruction group sanitizing, saving, and loading. Refs #1566
...
This was SVN commit r12258.
2012-08-01 21:38:13 +00:00
c22476eee2
Check for builders that can't place foundations (e.g. Mauryan worker elephants)
...
This was SVN commit r12257.
2012-08-01 19:22:45 +00:00
d1d17b7222
Acropolis map updates.
...
This was SVN commit r12256.
2012-08-01 18:14:14 +00:00
1e38b39021
Remove deleted props.
...
This was SVN commit r12255.
2012-08-01 17:09:52 +00:00
d9c36f1fcc
Remove empty texture that was causing asserts.
...
This was SVN commit r12254.
2012-08-01 15:50:50 +00:00
aa00a845d1
Fixed helle_docks_pentekonter.dae normals problem. Added playercolor details on helle_docks_props.dae.
...
This was SVN commit r12253.
2012-08-01 13:33:41 +00:00
8c5558895e
Disable rally points for Celtic wall towers (which can't be garrisoned).
...
This was SVN commit r12252.
2012-08-01 04:53:17 +00:00
0f7f73be2c
Balanced some Dock costs.
...
This was SVN commit r12251.
2012-07-31 17:43:12 +00:00
05d4b1eccf
Scaffold test object by Enrique. Looks nice. No errors. Possible prototype for some kind of construction scaffolding for buildings.
...
This was SVN commit r12250.
2012-07-31 17:35:50 +00:00
a012a8c231
New Hellenic dock by Enrique. Needs some fixes though.
...
This was SVN commit r12249.
2012-07-31 17:26:04 +00:00
a796800bb1
Add the
...
This was SVN commit r12248.
2012-07-31 15:59:36 +00:00
8074f18d6d
Slight updates to the Corsica map. Also trying my hands at this whole "commit" stuff.
...
This was SVN commit r12247.
2012-07-31 14:41:09 +00:00
83ca7142b6
Fixed a minor bug in the research display; removed an unnecessary comma.
...
This was SVN commit r12246.
2012-07-31 03:39:35 +00:00
be3ca61d43
Updated the production queue buttons, putting the progress sliders inside the button border.
...
This was SVN commit r12245.
2012-07-31 03:37:04 +00:00
b8b6ebb6ec
Properly re-initialize drop-down lists when the list items changes. Fixes #1558 .
...
This was SVN commit r12244.
2012-07-31 03:34:09 +00:00
c708de489e
Display in-progress technologies in the upper right of the screen. Fixes #1431 .
...
This was SVN commit r12243.
2012-07-31 02:03:25 +00:00
08505d9353
Include a note about the UDP port in the 'host game' tooltip.
...
This was SVN commit r12242.
2012-07-30 21:08:29 +00:00
3c0bd23108
Slightly speed up actor rendering; have selectables properly handle fog of war, etc. Refs #1365 .
...
This was SVN commit r12241.
2012-07-30 21:06:54 +00:00
10e8847b6f
Some template changes. Moves Dock and Fishing Boat to Village Phase. Warships to later phases. Increases accuracy of basic ranged units slightly. Based on patch by gudo.
...
This was SVN commit r12240.
2012-07-30 06:11:26 +00:00
4264166acf
Detect when units aren't in the world and hide their selection rings. Based on patch by dvangennip. Refs #1365 .
...
This was SVN commit r12239.
2012-07-30 04:45:33 +00:00
9e59f496f3
Tweaked NA elephant walk speed.
...
Map preview for Acropolis 1 map.
This was SVN commit r12238.
2012-07-30 04:37:47 +00:00
f9a8280b81
More map renaming.
...
This was SVN commit r12237.
2012-07-30 04:22:11 +00:00
a82e6ecdd9
Renamed a bunch of numbered maps for better sorting. :)
...
This was SVN commit r12236.
2012-07-30 04:17:24 +00:00
bb8783d6eb
New Acropolis 1 map.
...
Edited Acropolis 2's description.
This was SVN commit r12235.
2012-07-30 04:09:02 +00:00
008d361a5e
This was SVN commit r12234.
2012-07-30 02:29:20 +00:00
39784d47b5
Some updated textures.
...
This was SVN commit r12233.
2012-07-30 02:15:56 +00:00
e17b9c84eb
More map preview pics. All default maps complete.
...
This was SVN commit r12231.
2012-07-29 23:22:00 +00:00
48d871d870
Allow gate lock/unlock buttons and wall conversion icons to show simultaneously.
...
This was SVN commit r12230.
2012-07-29 23:08:15 +00:00
2c8adb1aea
Adds support for Boost.Filesystem v3, the only option in Boost 1.50. Fixes #1527 . Refs #1360
...
This was SVN commit r12229.
2012-07-29 23:04:22 +00:00
0f5756f5fb
Renamed the sandbox maps for better drop menu sorting.
...
Added map previews for the Oasis maps.
This was SVN commit r12228.
2012-07-29 22:23:30 +00:00
b172a89965
Give the Brythonic and Gallic gates the new Celtic gate footprint and obstruction.
...
This was SVN commit r12227.
2012-07-29 20:07:36 +00:00
b1ccaa020f
Preview image for fortress RMS
...
This was SVN commit r12226.
2012-07-29 18:22:27 +00:00
01e7895521
Adding Northern Lights random map...
...
This was SVN commit r12225.
2012-07-29 17:59:46 +00:00
8946e2782f
This was SVN commit r12224.
2012-07-29 17:58:53 +00:00
815178fa3d
This was SVN commit r12223.
2012-07-29 17:54:49 +00:00
06f0212597
This was SVN commit r12222.
2012-07-29 17:53:06 +00:00
16ef74d9fe
Clicking on empty space only clears the selection if modifiers aren't held. Fixes #1561 .
...
This was SVN commit r12221.
2012-07-29 17:42:35 +00:00
467195e712
Making the lake map circular
...
This was SVN commit r12220.
2012-07-29 03:00:33 +00:00
d1b2922f02
Fixes unnecessary linking of X11 on OS X.
...
This was SVN commit r12219.
2012-07-28 23:48:57 +00:00
7eb751fa83
Moar scenario map previews. Still a work in progress.
...
This was SVN commit r12218.
2012-07-28 22:32:09 +00:00
42b12f6567
Missing actors, textures, meshes fixes
...
This was SVN commit r12217.
2012-07-28 18:08:48 +00:00
5fef0394cc
Fixed music. :)
...
This was SVN commit r12216.
2012-07-28 17:44:39 +00:00
d5936938d0
Celt slope wall prop actor references
...
This was SVN commit r12215.
2012-07-28 17:42:09 +00:00
2c56ad61bd
Cleanup of audio xml files
...
This was SVN commit r12214.
2012-07-28 17:36:59 +00:00
5383d7e40b
A few fixes to the Hele scout tower model
...
This was SVN commit r12213.
2012-07-28 15:17:51 +00:00
f5d2924b66
This was SVN commit r12212.
2012-07-27 11:49:43 +00:00
187d6fa12e
This was SVN commit r12211.
2012-07-27 11:35:17 +00:00
50711f7369
This was SVN commit r12210.
2012-07-27 11:32:51 +00:00
5678c7f9cd
This was SVN commit r12209.
2012-07-27 11:05:32 +00:00
b564f57990
This was SVN commit r12208.
2012-07-27 10:17:12 +00:00
abe1578d14
This was SVN commit r12207.
2012-07-27 07:15:51 +00:00
afeda27de0
This was SVN commit r12206.
2012-07-27 07:11:55 +00:00
c6a0d0b6f3
Fixes build error left out of c1a3b8f171. Refs #1497
...
This was SVN commit r12205.
2012-07-27 05:26:37 +00:00
4a1483231f
This was SVN commit r12204.
2012-07-27 05:05:21 +00:00
f49de6fb8b
This was SVN commit r12203.
2012-07-27 01:54:56 +00:00
34f0cc2449
This was SVN commit r12202.
2012-07-26 22:50:54 +00:00
3f933e2944
Fix to Cart stone gate closing animation speed
...
This was SVN commit r12201.
2012-07-26 19:50:49 +00:00
19bc3ea9ec
Hele stone gate closing animation update
...
This was SVN commit r12200.
2012-07-26 19:44:40 +00:00
40c1f32eef
Carth war ele uses Zaggy's new elephant.
...
This was SVN commit r12199.
2012-07-26 17:28:54 +00:00
9b79ca5179
Fixes incorrect exclusion of rpath that broke shared lib loading. Refs #1421 , #1516
...
This was SVN commit r12198.
2012-07-26 13:33:04 +00:00
3050cdc8c6
This was SVN commit r12197.
2012-07-26 09:25:31 +00:00
37b8bef3a8
Added prop points to the elephant.
...
This was SVN commit r12196.
2012-07-26 09:02:29 +00:00
9564de4f17
Added elephant death animation.
...
This was SVN commit r12195.
2012-07-26 02:17:44 +00:00
189eaefe7d
This was SVN commit r12194.
2012-07-25 23:55:33 +00:00
a3cb804ccb
This was SVN commit r12193.
2012-07-25 23:38:01 +00:00
bfcbcc7ba8
Preserve selection order when entities are 'renamed'. Patch by Deiz/F00. Fixes #1544 .
...
e.g. If you have a long wall as primary selection and CC as secondary,
after the gate upgrade the wall (now gate) remains the primary
selection.
This was SVN commit r12192.
2012-07-25 22:20:57 +00:00
0dc1d2139e
Make rally points work for trade. Patch from Deiz/F00. Fixes #1173 .
...
This was SVN commit r12191.
2012-07-25 21:38:56 +00:00
006aa8ee21
Added elephant animations except the death animation. Contains no prop points currently.
...
This was SVN commit r12190.
2012-07-25 05:10:13 +00:00
56b83a3926
Fixed the grapes.
...
Gave Persian healer a run.
This was SVN commit r12189.
2012-07-24 17:45:30 +00:00
a4cc749eca
Committing the left out grapes.
...
This was SVN commit r12188.
2012-07-24 14:51:24 +00:00
3d973b3554
Adds hotkey (Tab) for showing all player's entities' status bars at once, based on patch by Deiz/F00. Fixes #1187
...
This was SVN commit r12187.
2012-07-24 04:14:09 +00:00
c1a3b8f171
Updates to myconid's most recent multiple UV set patch. Refs #1497
...
This was SVN commit r12185.
2012-07-24 02:57:25 +00:00
1f15257987
Update actor editor for data driven textures. From zoot. Refs #1493 .
...
This was SVN commit r12184.
2012-07-23 22:51:20 +00:00
f598101c34
Add support for multiple UVs and data driven texture loading. From myconid's patches. Fixes #1493 and fixes #1497 .
...
This was SVN commit r12183.
2012-07-23 22:49:46 +00:00
068fe0cbbb
Added Omnri's new tracks to Macedonian and Athenian civ jsons.
...
Added "breath" creation sound for female citizen.
This was SVN commit r12182.
2012-07-23 16:38:50 +00:00
13759f3572
Helen of Troy, not Hellen of Troy. ;)
...
This was SVN commit r12181.
2012-07-23 16:34:34 +00:00
4cbbbe6b04
This was SVN commit r12180.
2012-07-23 16:33:53 +00:00
8cf822c6c3
This was SVN commit r12177.
2012-07-23 10:44:03 +00:00
e8fae14a3f
This was SVN commit r12176.
2012-07-23 10:36:16 +00:00
31f4b17d54
This was SVN commit r12174.
2012-07-22 21:44:15 +00:00
2f90e1eee7
Adds --minimal-flags option to Premake, for building only with essential flags (currently only a *nix option). Based on patch by leper. Refs #1516 .
...
Updates Premake4.make to not include CFLAGS in CXXFLAGS (see
aab1cdf9d6
2012-07-22 02:52:37 +00:00
6bcb4455ef
Animations for Celt stone wall gate
...
This was SVN commit r12172.
2012-07-21 22:56:56 +00:00
d8b89936b3
New palisade gate animations
...
This was SVN commit r12171.
2012-07-21 00:58:40 +00:00
666c12a309
Animations for Athenian wall gate
...
This was SVN commit r12170.
2012-07-20 23:16:03 +00:00
04a7b2becd
Hele animated stone wall gates
...
This was SVN commit r12169.
2012-07-20 22:56:26 +00:00
bccafceb09
Some map updates and map previews.
...
This was SVN commit r12168.
2012-07-20 18:37:54 +00:00
a5f737b441
Fixed map description.
...
This was SVN commit r12167.
2012-07-20 05:02:51 +00:00
b8ec515234
Construction cost should be checked after everything else to avoid messy refunds.
...
This was SVN commit r12166.
2012-07-20 02:50:43 +00:00
a41432f73b
Adds support for Cost/Resources and Cost/BuildTime tech modifications.
...
This was SVN commit r12165.
2012-07-20 01:54:24 +00:00
1bf086fefb
Animations for Carthaginian stone gate
...
This was SVN commit r12164.
2012-07-19 23:45:07 +00:00
574e079d64
Wall and gate selection usability improvements by Deiz/F00. Refs #619 .
...
Fixes bug where selecting multiple wall types could convert to
mismatching gates.
This was SVN commit r12163.
2012-07-19 21:46:35 +00:00
512e3a01b6
Celt gate resized to the size of long wall
...
This was SVN commit r12162.
2012-07-19 20:47:30 +00:00
c1c0fcc67a
This was SVN commit r12161.
2012-07-19 18:28:02 +00:00
4c1ddd33c5
This was SVN commit r12160.
2012-07-19 05:53:36 +00:00
718e1dfad4
Updating fortress random map to use the new autumn textures.
...
This was SVN commit r12159.
2012-07-19 05:41:08 +00:00
b6faac80ae
Templates of the new trees.
...
This was SVN commit r12158.
2012-07-19 05:36:58 +00:00
bdd04befd2
Actors of the new art assets.
...
This was SVN commit r12157.
2012-07-19 05:35:56 +00:00
563197a409
Meshes for the new art assets.
...
This was SVN commit r12156.
2012-07-19 05:31:14 +00:00
c4d248c53c
This was SVN commit r12155.
2012-07-19 05:29:58 +00:00
08022d87ca
This was SVN commit r12154.
2012-07-19 05:29:19 +00:00
c4a3c9045a
This was SVN commit r12153.
2012-07-19 05:28:30 +00:00
47130edc74
This was SVN commit r12152.
2012-07-19 05:25:56 +00:00
940beaebfe
Textures for new graphical assets.
...
This was SVN commit r12151.
2012-07-19 05:23:49 +00:00
575f0371e6
Specific names for elephant stables and worker elephant.
...
This was SVN commit r12150.
2012-07-19 05:21:28 +00:00
1c4302cf5d
Autumn terrain textures
...
This was SVN commit r12149.
2012-07-19 04:53:34 +00:00
89399e08e6
Implements always visible hero selection rings, based on patch by Deiz/F00. Fixes #1365
...
This was SVN commit r12148.
2012-07-19 04:45:01 +00:00
380d15d6c0
Resized model of the Carthaginian gate. Same size as long wall.
...
This was SVN commit r12147.
2012-07-18 23:29:56 +00:00
3a5b2159b7
Fixes broken test
...
This was SVN commit r12146.
2012-07-18 21:39:45 +00:00
3c8c5757de
Adding icons to wooden gates
...
This was SVN commit r12145.
2012-07-18 21:17:14 +00:00
f0d9b496bf
Wooden gate icon for palisades and siege walls
...
This was SVN commit r12144.
2012-07-18 19:40:14 +00:00
0374570ac6
Fixed error.
...
This was SVN commit r12143.
2012-07-18 06:01:26 +00:00
5546fb4283
Fix dog errors.
...
This was SVN commit r12142.
2012-07-18 05:52:31 +00:00
9761ded603
Specific names for the Briton/Gaul gates based on Bruno's research.
...
This was SVN commit r12141.
2012-07-18 05:08:45 +00:00
181b461e7b
This was SVN commit r12140.
2012-07-18 03:57:45 +00:00
9b6839ace4
Adds gate conversion to palisades and siege walls. Fixes bug that all player entities in a selection could be converted to gates. Cleans up templates slightly. Refs #619
...
This was SVN commit r12139.
2012-07-18 03:56:18 +00:00
95dea8e097
Gate-related template cleanup and tweaking
...
This was SVN commit r12138.
2012-07-18 01:10:47 +00:00
b186fc4e7e
A small tweak.
...
This was SVN commit r12137.
2012-07-17 03:55:00 +00:00
65ac54c4dd
This was SVN commit r12136.
2012-07-17 03:53:52 +00:00
a1cc4e623e
New map previews by luziferius.
...
This was SVN commit r12135.
2012-07-17 03:49:15 +00:00
c495b0bca1
Adds gate cost to tooltip and shows both gate lock actions, based on patch by Deiz/F00. Changes and renames lock icons. Fixes #1539
...
This was SVN commit r12134.
2012-07-16 23:49:19 +00:00
a26f230867
Roman siege wall gate animations
...
This was SVN commit r12133.
2012-07-16 21:10:43 +00:00
a700486cd3
Lock icons for gates
...
This was SVN commit r12132.
2012-07-16 18:04:23 +00:00
1202c2b2a3
Some preview images for these scenarios.
...
This was SVN commit r12131.
2012-07-16 17:18:16 +00:00
db2bbc10ca
Made model able to be imported into Blender.
...
This was SVN commit r12130.
2012-07-16 15:32:59 +00:00
b444e3c435
Cleanup...
...
This was SVN commit r12129.
2012-07-16 05:52:43 +00:00
f3d0aaeeb4
Waypoint and garrison flags for Mauryans.
...
This was SVN commit r12128.
2012-07-16 05:05:41 +00:00
7726448a7d
Adds --without-nvtt option to update-workspaces.sh so we don't attempt to build NVTT in that case, based on patch by pcpa. Refs #1427
...
This was SVN commit r12127.
2012-07-16 04:57:07 +00:00
39e0878b6e
This was SVN commit r12126.
2012-07-16 04:43:12 +00:00
6d93492e54
Added Mauryans to Punjab 1.
...
This was SVN commit r12125.
2012-07-16 04:37:35 +00:00
3153829d45
Made the dust a little more transparent.
...
This was SVN commit r12124.
2012-07-16 04:28:00 +00:00
9f5c7a5607
Fixes possible conflicts in unit command panel when selecting multiple entities, patch by Deiz/F00. Fixes #1524
...
This was SVN commit r12123.
2012-07-16 04:12:48 +00:00
3a85fb7c48
Displays save game timestamps in local time rather than UTC, patch by Deiz/F00. Fixes #1530
...
This was SVN commit r12122.
2012-07-16 03:55:40 +00:00
743f60b920
Handles gate upgrade case left out of previous commit.
...
This was SVN commit r12121.
2012-07-16 01:52:18 +00:00
b59c2d9e36
Adds lock/unlock gate icons, based on patch by F00.
...
This was SVN commit r12120.
2012-07-16 01:40:09 +00:00
27a0bd6331
Gate lock and unlock icons
...
This was SVN commit r12119.
2012-07-15 23:40:49 +00:00
8f0eb7318e
Iberian gate animations
...
This was SVN commit r12118.
2012-07-15 22:34:49 +00:00
8d64c26db9
Decrease trader income to 20% of the previous and increase the cost of traders to 100f 80m.
...
This was SVN commit r12117.
2012-07-15 18:55:35 +00:00
937670a916
Lots of Mauryan unit stuff.
...
This was SVN commit r12116.
2012-07-15 07:09:26 +00:00
900affb9bf
This was SVN commit r12115.
2012-07-15 06:41:41 +00:00
694619a984
Adds gates to Fortress random map by FeXoR. Fixes #1533
...
This was SVN commit r12114.
2012-07-15 04:28:57 +00:00
3eafdcf6db
Roman gate animations
...
This was SVN commit r12113.
2012-07-15 00:17:38 +00:00
4ca8e679d6
Persian gate animations again
...
This was SVN commit r12112.
2012-07-15 00:06:25 +00:00
e0f3add90e
Mauryan basic spearman.
...
This was SVN commit r12111.
2012-07-14 23:13:53 +00:00
1fd00b5e3f
Added Lorraine Plain random map.
...
This was SVN commit r12110.
2012-07-14 17:17:06 +00:00
62f7c6e27a
Trying to fix gate animation locking animations
...
This was SVN commit r12109.
2012-07-14 09:04:20 +00:00
2cdc6c7dbf
Persian gate opening and closing animations
...
This was SVN commit r12108.
2012-07-14 08:04:00 +00:00
5e92aabe72
Increases maximum dropdown list size slightly, allowing up to 10 lines at a time (must be careful that it fits on 1024x768!). Refs #1532
...
This was SVN commit r12107.
2012-07-14 04:29:16 +00:00
8c9ef1139a
This was SVN commit r12106.
2012-07-14 04:15:20 +00:00
1b7519be91
Fixing the random player selection
...
This was SVN commit r12104.
2012-07-14 03:10:35 +00:00
1d677156fd
Adds animation and sound support to wall gates. Uses temporary sounds for now. Adds new animation choices to actor viewer/editor. Refs #619
...
This was SVN commit r12103.
2012-07-14 03:08:21 +00:00
fd22b91138
Do not close a gate if some units are in the passRange.
...
This was SVN commit r12102.
2012-07-13 22:34:49 +00:00
c908970c02
This was SVN commit r12101.
2012-07-13 04:37:04 +00:00
8cd2751131
This was SVN commit r12100.
2012-07-13 04:15:23 +00:00
1233323e79
A minor change.
...
This was SVN commit r12099.
2012-07-13 04:05:13 +00:00
d0a1a3bd50
Fixed a bug.
...
This was SVN commit r12098.
2012-07-13 03:41:07 +00:00
2717e6d34f
Adding previews for some random maps.
...
This was SVN commit r12097.
2012-07-13 03:10:15 +00:00
c63074cabb
New GUI changes.
...
This was SVN commit r12096.
2012-07-13 03:00:18 +00:00
6eb71380aa
Get the gate template name from the wall name and fixes two templates which caused errors.
...
This was SVN commit r12095.
2012-07-12 22:49:40 +00:00
953606cfcf
Roman wall gate animations
...
This was SVN commit r12094.
2012-07-12 22:27:59 +00:00
51b9fa6186
Uses xml attributes instead of elements for obstructions shapes.
...
This was SVN commit r12093.
2012-07-12 20:00:38 +00:00
8f2ed2586f
Fixed "specific name" for palisades, since they were taking "stone wall" from the defense_wall template.
...
This was SVN commit r12091.
2012-07-11 16:44:03 +00:00
3edbe6490e
Palisade gate opening and closing animations
...
This was SVN commit r12090.
2012-07-11 16:40:56 +00:00
f340c8be63
Skeletal setup for animated opening and closing gates
...
This was SVN commit r12089.
2012-07-11 15:36:00 +00:00
c8b024ec5f
Updates to a few sounds
...
This was SVN commit r12087.
2012-07-10 20:16:29 +00:00
0ef77d550c
Britons get the Kennl.
...
Gauls get the Rotary Mill.
This was SVN commit r12086.
2012-07-09 03:24:50 +00:00
1926a18354
Britons emblem.
...
This was SVN commit r12085.
2012-07-08 21:22:27 +00:00
b7e6bbdf3f
Fixes waypoint flags for Britons and Gauls.
...
This was SVN commit r12084.
2012-07-08 20:15:16 +00:00
e416b38811
Fix phases.
...
This was SVN commit r12083.
2012-07-08 20:12:36 +00:00
2c5933912c
Gates. Adds UI buttons, replaces wall section with a gate, defines and create obstruction shapes, detects friendly units and eventually disable door's "block movement" flag, allows us to lock / unlock the door by disabling "block pathfinding" flag. Needs icons, play sound, animations. Fixes #1385 , refs #619 .
...
This was SVN commit r12081.
2012-07-08 16:25:33 +00:00
9a3a6b9c2f
Tweaked Mauryan sandbox.
...
This was SVN commit r12080.
2012-07-07 21:54:43 +00:00
68f44a74bd
- Fig Tree: Gave it the "berry bush" selection sound to help drive home that it is a fruit-bearing tree.
...
- All Mauryan buildings: Removed the Persian structural health bonus, a
legacy from copying over from Persian templates.
- Mauryan Barracks: Added the Indian Light Cavalry to the training
roster. Removed the Persian Barracks portrait icon.
This was SVN commit r12079.
2012-07-07 21:38:48 +00:00
4cd3a93ca4
Fixes inconsistent bow props on some Persian units, based on patch by dvangennip. Fixes #1523
...
This was SVN commit r12078.
2012-07-06 23:52:17 +00:00
54e24d9a43
Fixed costs for Carthaginian embassies.
...
This was SVN commit r12076.
2012-07-06 00:57:59 +00:00
80d6d8930e
Alters tooltips for Town and City Phase upgrades for clarity. Closes #1447
...
This was SVN commit r12075.
2012-07-06 00:23:31 +00:00
463e62a514
Added checks to see if a resource is in another players territory and to mark a resource as inaccessible if a unit has spent too long trying to reach it.
...
This was SVN commit r12074.
2012-07-05 21:14:48 +00:00
574f4db8ab
Fixes font texture handling to use format auto-detection when possible, based on patch by Deiz/F00. Fixes #1508
...
This was SVN commit r12073.
2012-07-05 01:05:09 +00:00
fba0730db9
Add a comment about maxDensity based on FeXoR's description. Refs #1522 .
...
This was SVN commit r12071.
2012-07-04 18:59:11 +00:00
585a30e1f3
Added FeXoR's changes for deep forest. Fixes #1522 .
...
This was SVN commit r12070.
2012-07-04 17:25:18 +00:00
5abedde99a
Don't enable -fpch-preprocess (which may interfere with ccache) unless we're actually building with PCH
...
This was SVN commit r12069.
2012-07-04 15:20:42 +00:00
512854e30c
Fixes log folder script on WinXP/2000. Moves script inside source/tools. Adds start menu shortcut to the installer. Updates README. Fixes #1438
...
This was SVN commit r12068.
2012-07-04 03:50:01 +00:00
f845878039
Renamed.
...
This was SVN commit r12067.
2012-07-04 01:48:57 +00:00
2bf4cde60a
This was SVN commit r12066.
2012-07-04 01:46:44 +00:00
b26e6a442a
- Updated Persian Stable and Barracks portraits.
...
- Updated Carth and Pers civ files.
- Updated some Carth structure templates.
This was SVN commit r12065.
2012-07-04 01:08:51 +00:00
56571f4934
Theban stuff.
...
This was SVN commit r12063.
2012-07-04 00:05:43 +00:00
835af18630
Civ jsons.
...
This was SVN commit r12062.
2012-07-03 23:04:58 +00:00
7cfbf43f5e
This was SVN commit r12061.
2012-07-03 07:07:50 +00:00
31a58e07c1
Fixes Builder component to allow repairers who can't place new foundations.
...
This was SVN commit r12060.
2012-07-03 03:15:39 +00:00
e8f5f74f71
Trying to make Worker Elephant construct buildings, without listing a list of buildings in its UI.
...
This was SVN commit r12058.
2012-07-03 02:52:11 +00:00
292cb1d26a
Adjusted splash damage for onagers. Adjusted stats for Mauryan houses. Added builder support for Mauryan Worker Elephant.
...
This was SVN commit r12057.
2012-07-03 02:38:24 +00:00
99d04e93bb
Implements global tech modification function. Fixes #1358 , refs #1520 .
...
Applies tech modifications to template data returned by GuiInterface.
Extends engine to load arbitrary global scripts, separates this from RNG
replacement. Refs #1193 .
Loads global scripts for most script contexts for consistency.
Adds simulation tests for global scripts.
This was SVN commit r12056.
2012-07-03 02:16:45 +00:00
db943341a8
Secretly adding Gear random map.
...
This was SVN commit r12055.
2012-07-02 13:11:02 +00:00
11ec25726a
Bug fixes. Some suggested by wraitii.
...
This was SVN commit r12054.
2012-07-02 08:07:59 +00:00
e4f9816166
This was SVN commit r12053.
2012-07-02 07:43:44 +00:00
45c5e991d7
Fixing the bug on Deep Forest random map by FeXoR. Fixes #1513 .
...
This was SVN commit r12052.
2012-07-02 03:28:27 +00:00
130caac4f5
Smoke, less thick.
...
This was SVN commit r12051.
2012-07-01 19:19:31 +00:00
f38ba1d91b
Updated the Sahel Watering Holes map.
...
This was SVN commit r12050.
2012-07-01 04:15:02 +00:00
0e4efdf100
Small correction -- building with both xelatex and pdflatex doesn't make sense :o)
...
This was SVN commit r12049.
2012-07-01 01:05:06 +00:00
75b436e010
A more detailed explanation of how the slab method for OBB/ray intersection from Real-Time Rendering, Third Edition works.
...
This was SVN commit r12048.
2012-07-01 01:02:26 +00:00
2921694346
Long skirt for Mauryan female.
...
This was SVN commit r12047.
2012-06-30 21:40:42 +00:00
28fbc77c45
Updated Mauryan civ json.
...
This was SVN commit r12046.
2012-06-30 03:52:30 +00:00
4899144d8a
This was SVN commit r12045.
2012-06-30 02:13:40 +00:00
9e1310fed5
This was SVN commit r12044.
2012-06-30 00:31:03 +00:00
730263fa5e
Mauryan female citizen.
...
This was SVN commit r12043.
2012-06-30 00:25:30 +00:00
1dc74dc2d7
Fixed up some Mauryan entities.
...
This was SVN commit r12042.
2012-06-29 23:39:05 +00:00
67e7953e3a
Mauryan Elephant stables added
...
This was SVN commit r12041.
2012-06-29 19:16:13 +00:00
fe809e1deb
Mauryan infantry archer template tweak
...
This was SVN commit r12040.
2012-06-29 18:32:12 +00:00
347eb964bd
Fixed an error in description.
...
This was SVN commit r12039.
2012-06-29 04:14:06 +00:00
c3082fab9a
Added Sahel Watering Holes random map.
...
This was SVN commit r12038.
2012-06-29 03:52:14 +00:00
4f60ef63c2
Fixed the starting angle on Oasis.
...
This was SVN commit r12037.
2012-06-29 03:20:40 +00:00
aa11c5bd90
Territory decay rate tech for Outposts
...
This was SVN commit r12036.
2012-06-29 00:02:04 +00:00
9536dbb898
Roman quinquereme ship animations
...
This was SVN commit r12035.
2012-06-28 21:10:59 +00:00
78d90087a2
In RMS: Fix misaligned iberian bonus starting walls. Fix celt split civs errors. Add roads. Closes #1449 .
...
This was SVN commit r12034.
2012-06-28 21:02:47 +00:00
c00abd4ab6
Update to Mauryan civ template and some new tech icons
...
This was SVN commit r12033.
2012-06-27 21:49:31 +00:00
0b55844452
Mauryan support elephant
...
This was SVN commit r12032.
2012-06-27 19:53:16 +00:00
d4a44a6128
Removes "demo" keyword from volcanic lands.
...
This was SVN commit r12031.
2012-06-27 10:45:09 +00:00
0c7a9d43d7
Prevents trees to block the view of players. Refs #1408 .
...
This was SVN commit r12030.
2012-06-27 10:44:25 +00:00
4a1f417d40
Fixed a bug.
...
This was SVN commit r12029.
2012-06-27 10:22:05 +00:00
e8a4f9ce4a
This was SVN commit r12028.
2012-06-27 08:17:04 +00:00
c2ecc0eae0
Templates for new tropical flora.
...
This was SVN commit r12027.
2012-06-27 08:16:25 +00:00
3cb07b95d1
Models and actors for new Tropical flora.
...
This was SVN commit r12026.
2012-06-27 08:15:55 +00:00
aab1cdf9d6
Don't add system CFLAGS to the CXXFLAGS. Refs #1516 .
...
This was SVN commit r12025.
2012-06-26 20:48:06 +00:00
98dea7eb03
Fix issues with civ specific victory/defeat music. Fixes #1370 .
...
This was SVN commit r12024.
2012-06-26 18:44:52 +00:00
a8dce674ce
Some minor changes. Added the possibility of a frozen sea in gulf of bothnia.
...
This was SVN commit r12023.
2012-06-26 12:29:41 +00:00
2cd95cfe1b
Added more wood to archipelago, islands and migration so that players can reach phase 2 to build a dock. Updated oasis to the current standard including ally placement and iberian wall. Replaced the polar cliff texture in random biome system.
...
This was SVN commit r12022.
2012-06-26 08:54:00 +00:00
ad3f543d2c
Revert useless part of previous commit.
...
This was SVN commit r12021.
2012-06-25 22:27:00 +00:00
a60d01ee2e
Display map name and size on summary screen. Based on patch by hapsky. Fixes #1333 .
...
Play victory and defeat music.
Replace celts with gauls.
This was SVN commit r12020.
2012-06-25 22:11:47 +00:00
622d6b9162
Crenelations tech new icon
...
This was SVN commit r12019.
2012-06-25 20:45:57 +00:00
ace4793086
Make menu disappear when interacting with the game world. Based on patch by Deiz. Fixes #1291 .
...
This was SVN commit r12018.
2012-06-25 17:27:22 +00:00
272efcc364
K776's minor GUI changes
...
This was SVN commit r12017.
2012-06-25 03:43:34 +00:00
7476ce438d
Sandbox map update
...
This was SVN commit r12016.
2012-06-24 21:58:17 +00:00
975fec3af3
Fix incorrect font reference
...
This was SVN commit r12015.
2012-06-24 21:44:20 +00:00
ebe5b66ba3
Fix test failure caused by f660f834bf.
...
This was SVN commit r12014.
2012-06-24 21:03:46 +00:00
03363fe085
Updates to some more Mauryan civ files
...
This was SVN commit r12013.
2012-06-24 20:58:21 +00:00
f814e532ae
Remove player color from queue panel and center civ shield behind name
...
This was SVN commit r12012.
2012-06-24 19:38:58 +00:00
01d9b0d4b9
Mauryan civ. Sandbox map showing placeholder units and buildings
...
This was SVN commit r12011.
2012-06-24 13:55:36 +00:00
c7d90ec644
Mauryan structure actor files
...
This was SVN commit r12010.
2012-06-24 13:16:21 +00:00
ef6f73fb89
Placeholder structure models for Mauryans
...
This was SVN commit r12009.
2012-06-24 12:44:18 +00:00
51a87cc8c3
Unit actors folder for Mauryans
...
This was SVN commit r12008.
2012-06-24 12:40:11 +00:00
d62971ad29
Unit sim templates
...
This was SVN commit r12007.
2012-06-24 10:59:54 +00:00
adae2dd998
Mauryan placeholder struct texture and emblem
...
This was SVN commit r12006.
2012-06-24 10:32:25 +00:00
6822e33c65
Mauryan structure templates
...
This was SVN commit r12005.
2012-06-24 09:54:52 +00:00
23d1879876
Fixed song name. Added it to Spartans civ json.
...
This was SVN commit r12004.
2012-06-24 04:14:46 +00:00
63bdbcc67a
Unbold generic name
...
This was SVN commit r12003.
2012-06-24 03:21:47 +00:00
b19d7268b8
Update settings text to use bold stroke 16
...
This was SVN commit r12002.
2012-06-24 03:17:54 +00:00
941a8c014b
Update fontbuilder with stroked and bold stroked 12, 13, and 16
...
This was SVN commit r12001.
2012-06-23 22:05:05 +00:00
a8e00a4a7f
Add stroked 16 font
...
This was SVN commit r12000.
2012-06-23 22:04:04 +00:00
94bae18389
Use bolded text for unit names
...
This was SVN commit r11999.
2012-06-23 21:58:58 +00:00
859b568e9f
Add new stroked 12 and 13 fonts and update session panels to use them
...
(non-bold used stroked 2 and bold used stroked 3)
This was SVN commit r11998.
2012-06-23 21:37:26 +00:00
f660f834bf
Added default, arbitrary-sized Footprint component to actor entities. Makes their selection outlines show up in Atlas. Fixes #1477 .
...
This was SVN commit r11997.
2012-06-23 21:12:51 +00:00
0b57709d17
Make unit command buttons clickable again.
...
This was SVN commit r11996.
2012-06-23 13:28:19 +00:00
efb6ac808b
Fix premake build on OS X by linking with the CoreServices framework. Fixes #1505 .
...
Remove obsolete and unused parameters. Fixes #1179 .
This was SVN commit r11995.
2012-06-21 22:55:07 +00:00
b35bebbdbf
This was SVN commit r11994.
2012-06-21 22:30:17 +00:00
95a003edb8
Fix premake's os.getversion() to work with glibc. Refs #1322 .
...
This was SVN commit r11993.
2012-06-21 22:01:39 +00:00
76ada61960
This was SVN commit r11991.
2012-06-21 07:05:21 +00:00
de8dc92e49
widen experience bar
...
This was SVN commit r11990.
2012-06-19 02:53:43 +00:00
2268fd3f0e
Fix unit commands alignment
...
This was SVN commit r11989.
2012-06-18 23:59:02 +00:00
3337949721
Fix player name
...
This was SVN commit r11988.
2012-06-18 23:53:16 +00:00
9fb45928a1
Fix unit civ tooltip
...
This was SVN commit r11987.
2012-06-18 23:51:07 +00:00
03d56edb1b
Add more detailed shading to selections details
...
This was SVN commit r11986.
2012-06-18 23:47:36 +00:00
80213bba5f
Fix rank icon hiding
...
This was SVN commit r11985.
2012-06-18 22:45:10 +00:00
033120e8d8
Shrink experience bar, add tooltip to rank icon, rework middle panel shading
...
This was SVN commit r11984.
2012-06-18 22:33:40 +00:00
a34232d71e
Add black border around stats bars
...
This was SVN commit r11983.
2012-06-18 13:40:53 +00:00
0c083f9a45
Fix stats bars on multi-select and shrink all stats bars from 8 to 7 px
...
This was SVN commit r11982.
2012-06-18 13:33:11 +00:00
3ec1b88d2c
Adds missing break statements, thanks to picobyte. Fixes #1503
...
This was SVN commit r11981.
2012-06-18 01:38:30 +00:00
8f2b82fa8a
Basic README.txt for fontbuilder.py to outline installation process of PyCairo on Win32
...
This was SVN commit r11980.
2012-06-17 23:01:37 +00:00
821cfe8862
Removed reverse dependency on SOverlayTexturedLine from CTexturedLineRData; fixes dangling pointer dereference. Fixes #1495 .
...
This was SVN commit r11979.
2012-06-17 03:40:35 +00:00
972f28c6a7
Update unit experience display
...
This was SVN commit r11978.
2012-06-17 00:28:05 +00:00
b269dabe3b
Fix stamina and generic name issues
...
This was SVN commit r11977.
2012-06-16 22:41:48 +00:00
b66d1716e7
Recenter GUI and update unit details section.
...
This was SVN commit r11976.
2012-06-16 20:55:33 +00:00
5752863e6f
Updates premake Windows binary and VS projects for 637c09b204.
...
This was SVN commit r11974.
2012-06-15 23:11:57 +00:00
8dc36bed4e
Fixes error in actor viewer caused by 962da61f12. Fixes #1499
...
This was SVN commit r11973.
2012-06-14 22:47:57 +00:00
744eb1a7d7
This was SVN commit r11972.
2012-06-14 21:44:59 +00:00
20e9d70757
Link with boost_system as that is needed for Boost <= 1.43. Refs #1360 .
...
This was SVN commit r11971.
2012-06-13 22:54:14 +00:00
637c09b204
Add support for OpenBSD. Fixes #1463 .
...
Backport os_getversion from premake4.4-beta4 and extend it to support
POSIX-compilant systems.
Add some missing newlines at the end of file as these cause warnings on
OpenBSD.
Update the config paths.
This was SVN commit r11970.
2012-06-13 20:43:56 +00:00
f056b8f6f0
This was SVN commit r11969.
2012-06-13 00:19:26 +00:00
c4b993075a
Celts -> Britons or Gauls.
...
This was SVN commit r11968.
2012-06-13 00:12:18 +00:00
4ddd2a7fb1
Added IsInWorld check to attack code. Refs #1496
...
This was SVN commit r11967.
2012-06-12 12:13:24 +00:00
f944649153
Fix the attack error due to no footprint. Refs #1496 .
...
This was SVN commit r11966.
2012-06-12 12:04:55 +00:00
d97f8180d5
Removes unused Boost link dependencies with patch by fabio. Fixes #1360
...
This was SVN commit r11965.
2012-06-12 05:38:43 +00:00
306a9759d5
stats bar textures
...
This was SVN commit r11964.
2012-06-11 13:12:39 +00:00
d905e4c63a
Split GUI out to bottom corners based on suggestions, and move barter icons down
...
This was SVN commit r11963.
2012-06-11 01:07:41 +00:00
29a11e24d5
Fix NVTT build on OpenBSD based on patch by anthonyjbentley. Refs #1463 .
...
This was SVN commit r11962.
2012-06-10 22:39:26 +00:00
85f4702531
Hide stamina for now
...
This was SVN commit r11961.
2012-06-10 03:38:25 +00:00
bf81922c62
Fix resource label when type is a treasure and fix civ tooltip
...
This was SVN commit r11960.
2012-06-10 02:56:21 +00:00
aa58b6ccfa
always show generic name for now
...
This was SVN commit r11959.
2012-06-10 02:39:16 +00:00
87d415aca9
Update GUI selection details panel (single selections)
...
This was SVN commit r11958.
2012-06-10 02:05:40 +00:00
4ac52a3c47
Fixes bug in percentage map explored calculation. Refs #1334
...
This was SVN commit r11957.
2012-06-09 23:04:27 +00:00
fba599c847
This was SVN commit r11956.
2012-06-09 05:59:01 +00:00
82ca0243d7
This was SVN commit r11955.
2012-06-09 05:58:09 +00:00
a00b92dcd5
Gauls.
...
This was SVN commit r11954.
2012-06-09 05:57:28 +00:00
67f306724a
Britons json.
...
This was SVN commit r11953.
2012-06-09 01:17:49 +00:00
52af3369ba
Britons.
...
This was SVN commit r11952.
2012-06-09 01:17:27 +00:00
2243f699fc
Fix test failure.
...
Fix entity placement on Phoenician Levant.
This was SVN commit r11951.
2012-06-08 19:17:31 +00:00
962da61f12
Adds shared LOS for allied players, based on patch by Deiz/F00. Fixes #1334 .
...
This was SVN commit r11949.
2012-06-08 04:41:39 +00:00
659049eb1c
Auto-gather all types of treasures. Fixes #1422 . Patch by Deiz.
...
This was SVN commit r11948.
2012-06-07 21:56:29 +00:00
4d0aaa4bdb
This was SVN commit r11947.
2012-06-06 22:59:36 +00:00
231b0cd5f6
Testing branching phases.
...
This was SVN commit r11946.
2012-06-06 21:38:17 +00:00
8aaa6d06e2
Removing some large unused png image files
...
This was SVN commit r11945.
2012-06-06 19:40:16 +00:00
6b50a660b9
Added elapsed real time (as opposed to elapsed simulation time) to MT_Interpolate messages. Fixes leftover TODO from #824 . Refs #824 .
...
This was SVN commit r11944.
2012-06-06 19:37:03 +00:00
f9fa347a7f
Fixed shark animation and skeleton.
...
This was SVN commit r11939.
2012-06-05 04:05:01 +00:00
d020e02644
This was SVN commit r11938.
2012-06-05 02:05:41 +00:00
d271ca89cf
Update GUI style for single object selections (based on quantumstate's mockup)
...
This was SVN commit r11937.
2012-06-05 00:36:35 +00:00
0296323c9d
Make FCollada compile on OpenBSD, based on patch by anthonyjbentley. Refs #1463 .
...
This was SVN commit r11936.
2012-06-04 21:33:15 +00:00
66194deedc
Fixes player setup to set all diplomacy values (including self as ally).
...
Removes unnecessary checks from CmpPlayer diplomacy functions.
Fixes some inconsistent formatting.
This was SVN commit r11935.
2012-06-04 00:24:08 +00:00
4ee4f16793
Stop rearranging formations for orders carried out individually. Fixes #1476 .
...
This was SVN commit r11934.
2012-06-03 23:00:36 +00:00
da719b883c
Split out code specific to textured overlay lines construction from OverlayRenderer into its own files.
...
This was SVN commit r11933.
2012-06-02 21:19:20 +00:00
210f0265b7
Updated Acropolis maps.
...
This was SVN commit r11932.
2012-06-02 06:00:45 +00:00
4c01de2100
Reduced accuracy for Basic-level ranged citizen units.
...
Portraits for Mace and Spart rams.
Lower XP requirements for cavalry promotion.
This was SVN commit r11931.
2012-06-02 05:57:57 +00:00
8c848c2f45
Replaces info icon with higher quality version. Fixes #1469 .
...
Uses add_color effect, so it's easier to change the theme.
Fixes some inconsistent whitespace.
This was SVN commit r11930.
2012-06-02 00:09:57 +00:00
98ee2bdf0a
elongated raindrop.
...
This was SVN commit r11929.
2012-06-01 01:28:51 +00:00
1c005b0c0e
Fixed AABB to OBB transformation resulting in NaN basis vectors when the AABB size in one or more dimensions is zero. Fixes #1121 .
...
This was SVN commit r11928.
2012-05-31 23:17:15 +00:00
9e798addf9
This was SVN commit r11927.
2012-05-31 17:49:26 +00:00
73f9d984fe
Fixes typo in crenellations tech.
...
This was SVN commit r11926.
2012-05-31 03:40:25 +00:00
9d619a673e
A pair of tower technologies.
...
This was SVN commit r11925.
2012-05-30 05:55:55 +00:00
3009d463a6
Updated Savanna terrains.
...
This was SVN commit r11924.
2012-05-29 21:27:39 +00:00
f876f2e747
Traders respond when tasked to trade.
...
This was SVN commit r11923.
2012-05-29 05:07:14 +00:00
d7752438fe
Do not count domestic animals as units in statistics, based on patch by Deiz. Fixes #1439
...
This was SVN commit r11922.
2012-05-29 04:04:41 +00:00
636896dd7f
Pass template to gather-near-position. Fixes #1454 .
...
Add order_trade sound.
This was SVN commit r11921.
2012-05-27 20:23:08 +00:00
f2e6194440
Lighting on some demo maps. No more maps use 'old' LightingModel
...
This was SVN commit r11920.
2012-05-26 13:57:44 +00:00
48fd27a10a
Second female unit voice. All phrases
...
This was SVN commit r11918.
2012-05-26 11:22:45 +00:00
757c873a2e
New death sounds added
...
This was SVN commit r11915.
2012-05-25 21:37:10 +00:00
aec44da406
Bunch of different stuff.
...
This was SVN commit r11914.
2012-05-25 21:36:07 +00:00
20125515f1
Removing changes to skeletons.xml that conflict with other skeletons
...
This was SVN commit r11913.
2012-05-25 21:20:28 +00:00
5f6dea8455
Fix the size of the Units Demo map.
...
This was SVN commit r11912.
2012-05-25 20:42:24 +00:00
1004864733
Siege ram for the Macedonians
...
This was SVN commit r11910.
2012-05-24 21:44:28 +00:00
137b6dd338
Queued orders for rally points. Fixes #1053 and #1211 .
...
This was SVN commit r11909.
2012-05-24 18:25:31 +00:00
4c974a49a4
This was SVN commit r11908.
2012-05-24 00:33:55 +00:00
b0c3533b20
Added shark move animation.
...
This was SVN commit r11907.
2012-05-23 23:48:06 +00:00
a69b2f796c
Ranged infantry promotions now confer accuracy boosts instead of attack boosts. In the end, the accuracy boost ends up being an attack boost (in average damage per second).
...
This was SVN commit r11906.
2012-05-23 21:22:34 +00:00
6d96dd7137
Increased the size of the Units Demo map.
...
Fixed some things about the Celts sandbox map.
This was SVN commit r11905.
2012-05-23 21:17:18 +00:00
c8d404eb25
Fixed errors when Celt walls die.
...
This was SVN commit r11904.
2012-05-23 20:31:11 +00:00
0ce770f227
Disables Roman Quinquereme no sail variation.
...
This was SVN commit r11903.
2012-05-23 20:12:48 +00:00
c6b53e1677
New Athenian emblem.
...
This was SVN commit r11902.
2012-05-22 23:15:33 +00:00
e999289021
Kennel available in town phase.
...
This was SVN commit r11900.
2012-05-22 16:57:09 +00:00
cab27587fd
This was SVN commit r11899.
2012-05-22 15:28:21 +00:00
7b1ab20852
This was SVN commit r11898.
2012-05-22 07:14:26 +00:00
7559764fa6
Fixed some maps that caused errors and removed extra trees from some.
...
This was SVN commit r11897.
2012-05-22 06:38:07 +00:00
dd072112d1
Improved shadow filtering, from eihrul.
...
This was SVN commit r11896.
2012-05-21 19:23:14 +00:00
16883b225b
Gathers all the trees near the player start position near each other to make more room for players. Fixes #1408 .
...
This was SVN commit r11895.
2012-05-21 16:14:51 +00:00
4b4d048967
Found a better name for Persian fishing boat.
...
This was SVN commit r11894.
2012-05-21 10:39:25 +00:00
088caa647f
Fixed the bug in Hyrcanian Shores. Fixes #1388 .
...
This was SVN commit r11893.
2012-05-21 09:35:05 +00:00
8fd3fbc210
Fixes Attack.js error.
...
This was SVN commit r11892.
2012-05-20 22:51:51 +00:00
c4d6019599
Add garrison order sound and remove the old garrison sound.
...
Fix some map errors, tabs in templates and update docs.
This was SVN commit r11891.
2012-05-20 15:44:57 +00:00
4cf3467819
New siege ram for the Spartans
...
This was SVN commit r11890.
2012-05-20 11:32:35 +00:00
d5e3e975c8
This was SVN commit r11888.
2012-05-20 00:26:18 +00:00
f72d820cd4
Added randomized arrow positions with hit detection when the missile lands and splash damage. Fixes #18 .
...
This was SVN commit r11886.
2012-05-19 23:07:41 +00:00
6cc98a6763
Add heal order sound.
...
This was SVN commit r11885.
2012-05-19 18:27:00 +00:00
7be67fe6b7
Added new voice sounds to all female units. Recorded by khegarty
...
This was SVN commit r11884.
2012-05-19 16:02:16 +00:00
7ad6a6012f
Persians: Cav techs to Stables. Infantry techs to Barracks.
...
This was SVN commit r11883.
2012-05-19 06:24:12 +00:00
7f3bd8fb48
Shiny Bactrian lancers.
...
This was SVN commit r11882.
2012-05-19 06:16:55 +00:00
97bf4df2a6
Some Athenian shields for their buildings.
...
This was SVN commit r11881.
2012-05-19 04:46:50 +00:00
5d59175953
Footprint sizes for these things.
...
This was SVN commit r11880.
2012-05-18 22:41:31 +00:00
c2c0469472
Make qBot swap gatherers based on gathering speed and always deposit resources when switching resource.
...
Also added missing var's in for loops.
This was SVN commit r11879.
2012-05-18 22:27:08 +00:00
d7faa813f4
Update territory bitmask and add a returnResource command for entities.
...
This was SVN commit r11878.
2012-05-18 22:10:56 +00:00
0d9dcac82a
Changing the Greek civs on these maps.
...
This was SVN commit r11877.
2012-05-18 21:42:55 +00:00
68d1cf167e
Add repair order queueing to formations. Refs #592 .
...
This was SVN commit r11876.
2012-05-18 21:31:57 +00:00
e7689342f8
Implements TerritoryDecay/HealthDecayRate and Promotion/RequiredXp tech modifications.
...
This was SVN commit r11875.
2012-05-18 03:58:37 +00:00
8fba8097ce
Reverts bfb7526bcf.
...
This was SVN commit r11874.
2012-05-17 23:24:12 +00:00
786896bf8d
Prevents fishing ship from attacking structures (docks).
...
This was SVN commit r11873.
2012-05-17 22:33:46 +00:00
862f6fb3e3
Update to Necropolis.
...
This was SVN commit r11872.
2012-05-17 13:43:15 +00:00
fb44299104
This was SVN commit r11871.
2012-05-17 13:10:12 +00:00
96b2c1e89b
Makes territory_pull selectable in Atlas only.
...
This was SVN commit r11870.
2012-05-17 02:32:16 +00:00
5d72fa689e
Updated spartan emblem.
...
This was SVN commit r11869.
2012-05-17 01:53:41 +00:00
a4e701fcf9
Lightened up the shark textures.
...
This was SVN commit r11867.
2012-05-16 20:56:08 +00:00
a5a7bf3c5d
Spartan females can make palisades.
...
This was SVN commit r11866.
2012-05-16 17:57:56 +00:00
cdafb50278
Selection groups for wall lengths.
...
This was SVN commit r11865.
2012-05-16 17:56:06 +00:00
04fe6d2363
Add reminders to keep alpha names in sync
...
This was SVN commit r11864.
2012-05-15 21:34:28 +00:00
f8c22634de
oops
...
This was SVN commit r11863.
2012-05-15 00:26:24 +00:00
a317d20b39
Romans Sandbox map.
...
This was SVN commit r11862.
2012-05-14 04:19:22 +00:00
f18365830b
Fixed foundation size.
...
This was SVN commit r11861.
2012-05-14 03:47:32 +00:00
3bb1c01ccc
Removed territory effect from Roman siege walls.
...
Removed palisades from Roman infantry prod queue.
This was SVN commit r11860.
2012-05-14 01:39:04 +00:00
f14fc977e3
Moved thebans civ json to Internal.
...
This was SVN commit r11858.
2012-05-13 23:49:23 +00:00
2ee9981d99
Replace boost::uniform_real to avoid OOS caused by changes in behaviour between Boost versions
...
This was SVN commit r11857.
2012-05-13 23:40:06 +00:00
09414078fd
Switched warning to a debug so that only AI devs see it. Fixes #1403 .
...
This was SVN commit r11856.
2012-05-13 15:04:25 +00:00
8bd73e774e
Deleted Granicus River.
...
Fixed Isthmus description.
Renamed and tweaked Battle for Tiber.
This was SVN commit r11855.
2012-05-12 22:05:05 +00:00
26531bcdc7
War dog footprint increased.
...
This was SVN commit r11854.
2012-05-12 21:34:21 +00:00
6f2b90ba70
Default starting resources decreased.
...
This was SVN commit r11853.
2012-05-12 21:31:00 +00:00
3668f691ef
Made the river traversable to help the AI.
...
This was SVN commit r11852.
2012-05-12 20:53:25 +00:00
d35ec1840e
Tweaked these structures.
...
This was SVN commit r11851.
2012-05-12 17:58:25 +00:00
0b1d911675
Added check for existance of ent.resourceSupplyType(). Fixes #1402
...
This was SVN commit r11850.
2012-05-12 14:18:40 +00:00
2ba6b90a1c
Fixed starting camera.
...
This was SVN commit r11849.
2012-05-12 06:12:38 +00:00
0cef14be54
Removed these wall entities, which were throwing errors.
...
This was SVN commit r11848.
2012-05-12 05:47:04 +00:00
13d8caa0f2
Spartan shield stuff.
...
This was SVN commit r11847.
2012-05-12 05:28:46 +00:00
3d685a2c91
New shield prop textures for Macedonians.
...
This was SVN commit r11846.
2012-05-12 05:20:18 +00:00
2a719a44f4
Removes unnecessary specular.
...
This was SVN commit r11845.
2012-05-12 04:42:57 +00:00
6fcf84250a
Gallic Fields prettied up a bit.
...
This was SVN commit r11844.
2012-05-12 03:49:59 +00:00
cc2f3647a3
Zagros Mountains 2: Macedonia vs. Persia.
...
This was SVN commit r11843.
2012-05-12 01:15:55 +00:00
3c747d21d4
This was SVN commit r11842.
2012-05-12 01:09:26 +00:00
2b893117c9
Added territory effect to stone walls in order to prevent the creep of enemy territory. Ensured that palisades do not have this effect.
...
Tweaked the description of Athenian temple and dock.
This was SVN commit r11841.
2012-05-11 23:25:04 +00:00
4a73b85a4b
Increase maximum treasure priority distance and check that a dropsite has nearby resources
...
This was SVN commit r11840.
2012-05-11 22:44:37 +00:00
fbc3cbad7c
Fix handling of non-ASCII paths on Unix
...
This was SVN commit r11839.
2012-05-11 14:30:15 +00:00
8c6a1995e5
teams
...
This was SVN commit r11837.
2012-05-11 00:06:06 +00:00
3d6c3752ae
Restores player data to _default.xml as a temporary fix for some problems related to #1398 .
...
This was SVN commit r11836.
2012-05-10 23:35:48 +00:00
3efbd0ab25
Fixes Atlas losing map settings if random map generation failed. Refs #1398 .
...
This was SVN commit r11835.
2012-05-10 23:11:42 +00:00
56269b2489
Fixes Atlas bug where default player data wasn't sent to engine after being displayed in the UI (introduced by 1f5f82f375). Fixes #1398 .
...
This was SVN commit r11834.
2012-05-10 22:49:04 +00:00
9610f72636
Typo.
...
This was SVN commit r11833.
2012-05-10 22:46:14 +00:00
2fa29d0115
Acropolis tweaks.
...
This was SVN commit r11832.
2012-05-10 22:41:12 +00:00
502047b746
Fix unit demo map.
...
This was SVN commit r11831.
2012-05-10 22:35:57 +00:00
6f29e27ae0
"Delian League" bonus for Athenians.
...
This was SVN commit r11830.
2012-05-10 22:25:03 +00:00
8d66340329
Really set Oasis 11 as the default multiplayer map.
...
This was SVN commit r11829.
2012-05-10 22:23:09 +00:00
3b25e106b2
Fix bug in nearby resource caching so that a dropsite which had nearby resource depleted will be marked undepleted if new resources appear (farms) and add soem ecnomic upgrades strongly inspired by Marilyn (thanks Wraitii).
...
This was SVN commit r11828.
2012-05-10 22:17:21 +00:00
ad87febd25
Improve gathering behaviour if the target is exhausted.
...
This was SVN commit r11827.
2012-05-10 22:02:59 +00:00
bcf7c98b66
Nerfed hero Health for Alpha 10 (until we get build limits).
...
This was SVN commit r11826.
2012-05-10 21:52:32 +00:00
831da7f93e
Fixed this map.
...
This was SVN commit r11825.
2012-05-10 21:44:55 +00:00
bfb35a6484
Add SetNextStateAlwaysEnter() function to reload a state when switching to it from itself. Fixes #1395 .
...
This was SVN commit r11824.
2012-05-10 21:14:43 +00:00
a8528f74c6
Greek market by Enrique.
...
This was SVN commit r11823.
2012-05-10 20:58:03 +00:00
db1b4dcc4f
Added an existance check for metadata on unit destruction
...
This was SVN commit r11822.
2012-05-10 19:45:34 +00:00
75433f1d5d
This was SVN commit r11821.
2012-05-10 19:43:47 +00:00
c1c00d1617
Added resource gatherer counting for qBot and fixed nearby gathering locations code.
...
Also switched to SquareVectorDistance in filters as suggested by
wraitii.
This was SVN commit r11820.
2012-05-10 18:38:13 +00:00
23cd022eff
Map stuff.
...
This was SVN commit r11819.
2012-05-10 18:07:25 +00:00
a8e548ff5e
This was SVN commit r11818.
2012-05-10 17:45:50 +00:00
b36b9da9a0
Single player default map now Punjab 3.
...
This was SVN commit r11817.
2012-05-10 17:05:19 +00:00
b247e198d7
Healer has a "Run" value now. It didn't before, so would skate around the map when fleeing.
...
This was SVN commit r11816.
2012-05-10 05:41:15 +00:00
7d00b830aa
Changed default maps.
...
This was SVN commit r11815.
2012-05-10 05:04:10 +00:00
b3f9daead8
Deletes some obsolete data files.
...
This was SVN commit r11814.
2012-05-10 04:36:18 +00:00
e6dcd0480f
Fix promotion.
...
This was SVN commit r11813.
2012-05-10 03:29:25 +00:00
737a2f3de4
Spartans can't build stone walls.
...
This was SVN commit r11811.
2012-05-10 01:41:44 +00:00
cb3d71f43a
New Greek barracks by Enrique.
...
This was SVN commit r11810.
2012-05-10 01:12:26 +00:00
1f5f82f375
Fixes invalid civ check in rmgen.
...
Removes some default data from the Atlas blank map.
Changes default civ in autostart-random mode.
This was SVN commit r11809.
2012-05-09 23:06:03 +00:00
c8d68f6e0b
This was SVN commit r11807.
2012-05-09 21:45:47 +00:00
89821855c7
Check that a nearby resource has >0 resources left. Fixes #1395 .
...
Also added a check to TechnologyManager to see if player is defined.
This was SVN commit r11806.
2012-05-09 21:32:21 +00:00
9fa1145fe8
Update to GUI
...
This was SVN commit r11805.
2012-05-09 19:52:23 +00:00
282d0f39e2
Remove unused variables
...
This was SVN commit r11804.
2012-05-09 15:39:16 +00:00
f2515bec84
Fix some whitespace in scripts
...
This was SVN commit r11803.
2012-05-09 12:14:22 +00:00
a0f122bfd4
Fix #1394 (UnitAI FSM serialization error).
...
Replace evil eval/uneval with deepcopy.
This was SVN commit r11802.
2012-05-09 12:10:01 +00:00
1f51f4a0a3
Trying again.
...
This was SVN commit r11801.
2012-05-09 01:26:48 +00:00
116a9887d2
"Herocide" attack bonus for Alexander.
...
This was SVN commit r11800.
2012-05-09 01:25:42 +00:00
1de1a9b9d8
Fixed error on Necropolis.
...
This was SVN commit r11799.
2012-05-08 23:22:06 +00:00
ddd3e702d5
Fixes units ignoring player orders in most stances by expanding the concept of "forced" orders.
...
Documents more functions of UnitAI.
This was SVN commit r11798.
2012-05-08 23:00:14 +00:00
93eed49d85
Conflict with Michael's last commit fix
...
This was SVN commit r11797.
2012-05-08 21:55:23 +00:00
483dc4cb65
Removing some unused audio files
...
This was SVN commit r11796.
2012-05-08 21:43:41 +00:00
7a59ea16c7
Added shininess to the metal shuttle prop.
...
This was SVN commit r11795.
2012-05-08 20:24:09 +00:00
32a01c2ed8
Temporary palisade foundations for Alpha 10. (We should probably make better looking ones than these.)
...
This was SVN commit r11794.
2012-05-08 19:59:59 +00:00
9fecad12c3
FeXor's updated map stuffs.
...
This was SVN commit r11793.
2012-05-08 17:45:32 +00:00
6b817c9b98
Doc updates
...
This was SVN commit r11792.
2012-05-08 09:19:46 +00:00
e5c9cf6146
Meat units now cannot attack walls.
...
This was SVN commit r11791.
2012-05-08 00:19:00 +00:00
a57a0e22cb
Forgot one spartan unit in da2f7a9000
...
This was SVN commit r11790.
2012-05-07 23:17:14 +00:00
da2f7a9000
Dropped some unused templates
...
Gave spartans their walls back
This was SVN commit r11789.
2012-05-07 23:15:24 +00:00
5881c1e495
Audio files added
...
This was SVN commit r11788.
2012-05-07 22:25:09 +00:00
961db840b2
Work on some descriptions.
...
This was SVN commit r11787.
2012-05-07 21:44:24 +00:00
10e96798e8
Scale images to power of 2 sizes. Fixes #1382 .
...
This was SVN commit r11786.
2012-05-07 17:15:36 +00:00
385f9e13d7
This was SVN commit r11785.
2012-05-07 06:12:41 +00:00
c036a7d7e3
Adds control groups to saved game data, based on patch by mk12. Fixes #1261 .
...
This was SVN commit r11783.
2012-05-07 04:18:54 +00:00
e6afc62545
Adds silhouettes option to in-game settings menu. Refs #1186
...
This was SVN commit r11782.
2012-05-07 02:14:01 +00:00
37a5bedb81
Adds partial support for Debian GNU/kFreeBSD, based on patch by vincent. Refs #1322 .
...
This was SVN commit r11781.
2012-05-07 01:53:35 +00:00
1674a7503f
Fixes error from 79c6a2cecc.
...
This was SVN commit r11780.
2012-05-07 01:29:02 +00:00
79c6a2cecc
Adds config and hotkey options for toggling unit silhouettes, based on patches by Ello and mk12. Fixes #1186 .
...
This was SVN commit r11779.
2012-05-07 01:09:53 +00:00
2fbca07f6d
Adds random civ option to game setup, based on patch by deebee. Fixes #1082 .
...
This was SVN commit r11778.
2012-05-06 23:20:57 +00:00
a40a12e794
Typo
...
This was SVN commit r11777.
2012-05-06 21:21:04 +00:00
8f762b8248
Fix error caused by e8cb2a71da. Refs #1220 .
...
This was SVN commit r11776.
2012-05-06 21:17:29 +00:00
e8cb2a71da
Fix floating units when a building they were tasked to construct finishes while they're still en-route, based on a patch by mattlott.
...
This was SVN commit r11775.
2012-05-06 14:38:03 +00:00
cb599d4ae5
This was SVN commit r11773.
2012-05-06 09:33:36 +00:00
82dcfe4301
Updates to these Oasis maps.
...
This was SVN commit r11772.
2012-05-06 02:21:42 +00:00
4268f43587
This was SVN commit r11771.
2012-05-06 01:19:15 +00:00
088876b23c
Palisade costs.
...
This was SVN commit r11770.
2012-05-06 00:53:43 +00:00
d615ac64da
Fix wall preview not disappearing when starting building placement immediately afterwards.
...
Adds some extra buildings to WallTest map to make Town Phase available
faster.
This was SVN commit r11769.
2012-05-06 00:07:34 +00:00
a6e256bd1e
This was SVN commit r11768.
2012-05-05 23:50:43 +00:00
5befbd1a02
Palisades for all civs. Tweaked stone walls for errbody too.
...
This was SVN commit r11767.
2012-05-05 23:15:11 +00:00
d67d2e2370
Updated some documentation in CmpObstructionManager
...
This was SVN commit r11766.
2012-05-05 23:10:25 +00:00
7180cd9076
Added advanced buildings for new civs and hopefully stopped heroes from being trained.
...
This was SVN commit r11765.
2012-05-05 21:59:15 +00:00
cbed78be37
Wallset stuff for Athens, Sparta, and Macedonia.
...
This was SVN commit r11764.
2012-05-05 21:57:38 +00:00
3be4eb44fa
fix global from commit c4efc223ed
...
This was SVN commit r11763.
2012-05-05 21:29:36 +00:00
c4efc223ed
Don't serialize the technology modifications cache. Fixes #1384 .
...
This was SVN commit r11761.
2012-05-05 21:21:36 +00:00
490182ddd0
Wall placement. Closes #786 .
...
This was SVN commit r11760.
2012-05-05 19:22:22 +00:00
a6a7883af3
Updated map
...
This was SVN commit r11759.
2012-05-05 19:17:25 +00:00
cd833a09b8
This was SVN commit r11758.
2012-05-05 04:38:06 +00:00
ffc89ee1af
Adds some OS X availability macros to support 10.5 SDK. Not foolproof but good enough for now.
...
This was SVN commit r11757.
2012-05-05 03:18:22 +00:00
7fcc350df9
Preferred Classes for these templates.
...
This was SVN commit r11756.
2012-05-05 00:14:33 +00:00
e0f670ddfb
This was SVN commit r11755.
2012-05-05 00:10:03 +00:00
9c3e94acfd
FeXor's Iberian Walls.
...
This was SVN commit r11754.
2012-05-04 23:50:43 +00:00
7797aca9c4
Cuirass icon for techs
...
This was SVN commit r11753.
2012-05-04 23:36:18 +00:00
0c233487ec
Disables broken window resizing and fullscreen toggling on OS X. Fixes #1381 . Refs #741
...
This was SVN commit r11752.
2012-05-04 23:30:46 +00:00
0463068947
Adds more checks for tech manager before using it. Refs #1377 .
...
This was SVN commit r11751.
2012-05-04 22:51:14 +00:00
32d2927449
Adds UTF-8 support for JavaScript files.
...
This was SVN commit r11750.
2012-05-04 21:48:46 +00:00
a5713c1264
Try to fix tech error. Refs #1377 .
...
This was SVN commit r11749.
2012-05-04 18:13:23 +00:00
d0784bd314
Fix minimap issue caused by 5b7027ec53. Fixes #1372 .
...
This was SVN commit r11748.
2012-05-04 17:44:28 +00:00
f2f434ded4
This was SVN commit r11747.
2012-05-04 10:10:42 +00:00
1aaef48ea4
This was SVN commit r11746.
2012-05-04 10:09:21 +00:00
c039fb8b0a
iberian special building main model
...
This was SVN commit r11745.
2012-05-04 09:48:26 +00:00
99672f83f9
iberian special building models
...
This was SVN commit r11744.
2012-05-04 09:47:38 +00:00
99d8d03988
iberian special building actor
...
This was SVN commit r11743.
2012-05-04 09:46:11 +00:00
964f58504c
iberian special building prop actors
...
This was SVN commit r11742.
2012-05-04 09:45:15 +00:00
2e5b62ea3e
iberian special building textures
...
This was SVN commit r11741.
2012-05-04 09:43:51 +00:00
da4c1c8f2b
Fixes handling of UTF-8 encoded JSON files (stripping BOM if necessary). Fixes #1375 .
...
This was SVN commit r11739.
2012-05-04 03:46:05 +00:00
a9faa59545
Adjusting available formations.
...
This was SVN commit r11738.
2012-05-04 02:03:54 +00:00
98c8767b6e
Siege wall moved to City Phase.
...
This was SVN commit r11737.
2012-05-04 01:44:40 +00:00
0035cc37f0
This was SVN commit r11736.
2012-05-04 00:40:23 +00:00
58836c624a
Read formations from civ JSON files. Fixes #1234 , #601 .
...
This was SVN commit r11735.
2012-05-03 23:32:10 +00:00
20afc75657
Champion icon update
...
This was SVN commit r11734.
2012-05-03 22:09:33 +00:00
6efe056fef
Fist holding spear icon for techs
...
This was SVN commit r11733.
2012-05-03 21:36:15 +00:00
e1c8307bb6
First crack at a Special Technology.
...
This was SVN commit r11732.
2012-05-03 21:08:27 +00:00
6db0dc8679
Fixed syntax in these techs.
...
This was SVN commit r11731.
2012-05-03 20:33:37 +00:00
7edc1e7092
Two new technologies (they need debugged for JSON syntax though).
...
This was SVN commit r11730.
2012-05-03 20:18:24 +00:00
e215446ada
Four variants of the corinthian helmet tech icons
...
This was SVN commit r11729.
2012-05-03 19:56:30 +00:00
84c8140f90
Work-in-progress high-level pathfinder documentation
...
This was SVN commit r11728.
2012-05-03 19:31:48 +00:00
af64a2112f
Technology stuff.
...
This was SVN commit r11727.
2012-05-03 19:15:07 +00:00
825e1ec7a3
Allow replace with 0.
...
This was SVN commit r11726.
2012-05-03 18:03:57 +00:00
5b7027ec53
Fix tech overlay issue.
...
This was SVN commit r11725.
2012-05-02 22:57:35 +00:00
d68d8cdee1
Added "class": "Foo", "number": 5 technology requirement
...
This was SVN commit r11724.
2012-05-02 20:31:25 +00:00
f01806772f
Fixed changes from [11719] for case where ent is not set. Thanks to leper.
...
This was SVN commit r11723.
2012-05-02 19:50:48 +00:00
303191b0ad
Really fixed this time. ;)
...
This was SVN commit r11722.
2012-05-02 16:39:42 +00:00
8db5b841e6
Fixes bad character.
...
This was SVN commit r11721.
2012-05-02 16:35:56 +00:00
4d35f78819
Template and tech tweaks.
...
This was SVN commit r11720.
2012-05-02 16:22:33 +00:00
94eaa9d1d5
Bug fixing for common-api
...
Fixed entity collection length sometime being NaN
Added a "not" filter
Added create events to resource map updates, should help with farming.
This was SVN commit r11719.
2012-05-02 16:18:32 +00:00
89978332de
Fixes tests.
...
This was SVN commit r11718.
2012-05-01 23:58:03 +00:00
62adf20f37
Check if we have a postition.
...
This was SVN commit r11716.
2012-05-01 23:06:16 +00:00
7e2dd48d14
Trade convoys tech for the market
...
This was SVN commit r11715.
2012-05-01 23:05:01 +00:00
6f06d7e69e
...
...
This was SVN commit r11714.
2012-05-01 23:01:40 +00:00
9173f3c81f
This was SVN commit r11713.
2012-05-01 22:54:02 +00:00
030771907e
This was SVN commit r11712.
2012-05-01 22:52:24 +00:00
fc47098743
Implements TerritoryInfluence/Radius tech modification. Adds C++ interface for TechnologyManager. Renames its message to MT_TechnologyModification defined in TypeList.h. Refs #1357 .
...
This was SVN commit r11711.
2012-05-01 22:44:27 +00:00
d4347a8466
Add Preferred and RestrictedClasses, based on patch by Zsol. Fixes #1144 .
...
This was SVN commit r11710.
2012-05-01 22:20:08 +00:00
0990f7f395
Stockbreeding tech for the corral
...
This was SVN commit r11709.
2012-05-01 21:46:02 +00:00
e4528af72b
Fix vector allocator types
...
This was SVN commit r11708.
2012-05-01 21:12:43 +00:00
0c03b6a5d1
Changes to Iberian wall obstruction widths
...
This was SVN commit r11707.
2012-05-01 20:44:32 +00:00
d92ef0d13e
Fix a small issue with tech overlays.
...
This was SVN commit r11706.
2012-05-01 18:56:47 +00:00
bfb7526bcf
Fixes bug in tech modifications ("affects" was ignored in some situations).
...
This was SVN commit r11705.
2012-05-01 05:56:53 +00:00
1eaf80d011
Armour and Attack techs for siege weapons
...
This was SVN commit r11704.
2012-04-30 22:42:10 +00:00
68638a92b8
Updates TakeDamage to apply tech modifications.
...
This was SVN commit r11703.
2012-04-30 20:39:27 +00:00
363ac861de
Stop dead sheep from walking
...
This was SVN commit r11702.
2012-04-29 22:20:25 +00:00
2069e57a6c
Territory radius of Civ Centre increased.
...
This was SVN commit r11701.
2012-04-29 21:31:18 +00:00
4406b85883
This was SVN commit r11700.
2012-04-29 21:21:29 +00:00
44ac273d21
Changing range values of defense outpost template
...
This was SVN commit r11699.
2012-04-29 19:35:50 +00:00
c640415f0c
Giving all faction outposts projectile and garrison nodes
...
This was SVN commit r11698.
2012-04-29 19:06:53 +00:00
d03d36b1f3
Add attack ability to outposts.
...
Fix a issue with dying units with stance standground.
This was SVN commit r11697.
2012-04-29 18:43:10 +00:00
10687410cd
Enrique's new Roman siege walls. :)
...
This was SVN commit r11696.
2012-04-29 18:28:37 +00:00
2f5b81a37e
Fix broken test.
...
This was SVN commit r11695.
2012-04-29 17:39:16 +00:00
cafb817446
Reverts broken change from 022fc4c47c.
...
This was SVN commit r11694.
2012-04-29 03:20:00 +00:00
022fc4c47c
Fixes Atlas stealing focus on OS X, based on patch by mk12. Fixes #1317 .
...
This was SVN commit r11693.
2012-04-29 02:04:59 +00:00
13e5c56015
Additional icons for cavalry, ranged, and hack armor
...
This was SVN commit r11691.
2012-04-28 20:20:30 +00:00
88fde1054f
Armor plating tech icon
...
This was SVN commit r11690.
2012-04-28 19:47:28 +00:00
b3ef24b12d
Change gathering behaviour to fix #1353 , based on patch by mattlott.
...
This was SVN commit r11689.
2012-04-28 19:25:44 +00:00
1ac55806ec
This was SVN commit r11688.
2012-04-28 18:19:31 +00:00
734f072d62
Testing out a new selection shape. Should work for citizen-cavalry if you want to try it out.
...
This was SVN commit r11687.
2012-04-28 05:08:56 +00:00
e4365b2f71
New Spartan hero Agis III.
...
Started to update tooltips to show attack bonuses. It would be nice if
this was automatic though, and the tooltip pulled the information from
the templates.
This was SVN commit r11686.
2012-04-28 02:16:36 +00:00
21caaa4573
Fixes some bugs in tech modifications relating to data types. Explicitly convert template data to numbers before calling ApplyModifications (using + operator).
...
This was SVN commit r11685.
2012-04-27 23:06:40 +00:00
7c93499c7d
Fix qBot infinite loop due to NaN priorities
...
This was SVN commit r11684.
2012-04-27 21:57:38 +00:00
97bcdfb208
Tweaks to healing range and rate techs
...
This was SVN commit r11683.
2012-04-26 22:15:16 +00:00
eda4c082fd
Add tech support to BuildingAI, GarrisonHolder and Builder.
...
This was SVN commit r11682.
2012-04-26 21:58:05 +00:00
6fc3d3f9a2
Healing rate and range techs for all temples
...
This was SVN commit r11681.
2012-04-26 21:38:53 +00:00
aca61b3ccf
This was SVN commit r11680.
2012-04-26 20:41:17 +00:00
e6641ad14f
Make some healer modifiable by techs. Refs #1357 .
...
This was SVN commit r11679.
2012-04-26 20:11:18 +00:00
bb81a9d81b
Move single techs to the bottom row.
...
This was SVN commit r11678.
2012-04-26 17:43:33 +00:00
060a1fd004
This tech didn't like the è character.
...
This was SVN commit r11677.
2012-04-26 03:37:47 +00:00
f3fa70cf35
Tech names
...
This was SVN commit r11676.
2012-04-26 03:32:09 +00:00
85b433d48f
Tweaked techs + 2 more techs for Barracks.
...
This was SVN commit r11675.
2012-04-26 03:15:50 +00:00
c396c2a1ca
Fixed default civs.
...
This was SVN commit r11674.
2012-04-26 00:08:29 +00:00
241be5fa7c
Pair of infantry techs for the barracks
...
This was SVN commit r11673.
2012-04-25 23:51:34 +00:00
65e85dcc40
Selection ring tweaks.
...
This was SVN commit r11672.
2012-04-25 21:14:32 +00:00
fee0ec6648
Added some debug commands (quit and set-shading-color) which shoudl be useful for AI development
...
This was SVN commit r11671.
2012-04-25 20:56:35 +00:00
e765f6865f
Add a red overlay to the paired tech on hover. Fixes #1356 .
...
This was SVN commit r11670.
2012-04-25 17:58:16 +00:00
4f905584c9
Clarify tech pairs. Refs #1356 .
...
This was SVN commit r11669.
2012-04-25 17:02:41 +00:00
06996590bb
Fixes typo from [11660]
...
This was SVN commit r11668.
2012-04-24 21:59:46 +00:00
b2d399fe47
A bunch of stuff.
...
This was SVN commit r11667.
2012-04-24 21:36:54 +00:00
29739575cd
Link graphics for technology icons
...
This was SVN commit r11666.
2012-04-24 21:04:17 +00:00
8714eec949
A few more technology icons
...
This was SVN commit r11664.
2012-04-24 18:56:53 +00:00
0bd649294f
Add support for texture-based terrain overlays.
...
Fix GLES compatibility.
This was SVN commit r11663.
2012-04-24 16:46:32 +00:00
e6cb5fade6
Shift-clicking the control group button adds to selection. Patch by mk12. Fixes #1345 .
...
Add AI to Battle for the Tiber map.
This was SVN commit r11662.
2012-04-24 15:58:02 +00:00
770ee1f30c
Build test executable with same linker settings as game executable, to fix --without-fam
...
This was SVN commit r11661.
2012-04-24 15:14:14 +00:00
17c77ad2ac
Adds detection for lower-end Intel Mac GPUs and Apple software renderer. Disables shadows and fancy water on those devices.
...
This was SVN commit r11660.
2012-04-24 01:20:06 +00:00
9680c8637b
grain and meat icons for techs
...
This was SVN commit r11659.
2012-04-23 23:39:36 +00:00
f72bfb1cf1
Add option to disable particles, based on patch by rogue-spectre. Fixes #1222 .
...
This was SVN commit r11658.
2012-04-23 22:57:51 +00:00
49883c2d57
siege ram icon for techs
...
This was SVN commit r11657.
2012-04-23 22:47:48 +00:00
01d8358248
anvil and walk icons for techs
...
This was SVN commit r11655.
2012-04-23 19:29:42 +00:00
97f49954cd
Allocate VBO buffers in OverlayRenderer only after graphics capabilities and shader path have been properly determined. Fixes #824 .
...
This was SVN commit r11654.
2012-04-23 18:55:32 +00:00
ac4e25e17f
Added volcanic lands and a new islands random maps. Changed the name of previous islands map to "cycladic archipelago".
...
This was SVN commit r11653.
2012-04-23 08:58:55 +00:00
1325c4e35f
spear icon for techs
...
This was SVN commit r11652.
2012-04-23 06:06:17 +00:00
f031e2a7e0
Tooltip updates.
...
This was SVN commit r11651.
2012-04-23 01:51:31 +00:00
e4f1cd10ba
Fixes #1349
...
This was SVN commit r11650.
2012-04-23 01:46:04 +00:00
5101393f26
This was SVN commit r11648.
2012-04-23 00:51:21 +00:00
c6291403bd
Fixed some javascript things because the names of the phases were changed. Changed thickness of mine selections.
...
This was SVN commit r11647.
2012-04-23 00:36:06 +00:00
af0769f19d
Nerfed default mining rates slightly, since we now have mining technologies.
...
This was SVN commit r11646.
2012-04-22 23:03:00 +00:00
6821e838c1
This was SVN commit r11645.
2012-04-22 22:53:01 +00:00
2590e62c38
Dropped some remnant debugging code
...
This was SVN commit r11644.
2012-04-22 22:45:28 +00:00
d9a6ee53d0
This was SVN commit r11643.
2012-04-22 22:02:03 +00:00
a0cc289174
This was SVN commit r11642.
2012-04-22 21:50:20 +00:00
5f1f98970f
Yet more tech tweaks.
...
This was SVN commit r11641.
2012-04-22 21:45:28 +00:00
bb9af6da12
Requested update from quantumstate via IRC
...
This was SVN commit r11640.
2012-04-22 21:36:37 +00:00
b01a9c5471
Fixes broken defense tower reference
...
This was SVN commit r11639.
2012-04-22 20:48:53 +00:00
99777c8d3f
4 horseshoe icons for techs
...
This was SVN commit r11638.
2012-04-22 20:24:31 +00:00
a41250b0af
Fixing some name stuff.
...
This was SVN commit r11637.
2012-04-22 20:21:44 +00:00
9c5379c9ed
This was SVN commit r11636.
2012-04-22 20:06:58 +00:00
97715cb617
Added stone and mining rate techs for all Mills
...
This was SVN commit r11635.
2012-04-22 17:50:04 +00:00
61fad4a2b5
Fixed strange selection ring fadeout on unit deselection in Atlas
...
This was SVN commit r11634.
2012-04-22 17:49:43 +00:00
4830cebf5e
Wheel tech graphic
...
This was SVN commit r11633.
2012-04-22 15:38:56 +00:00
d836c6a26e
Returned the "looter" ability to these units because as an unwanted side-effect they could not gain promotion.
...
This was SVN commit r11632.
2012-04-22 15:22:52 +00:00
31cec14575
Selection tweaks.
...
This was SVN commit r11631.
2012-04-22 14:25:44 +00:00
6032ab88e7
Battle axe and wood chopping icons for techs
...
This was SVN commit r11630.
2012-04-22 14:05:06 +00:00
3cbfd9260e
Properly enforce the MAX_QUAD_OVERLAYS constraint
...
Some cleanup of graphics/Overlay.h
This was SVN commit r11629.
2012-04-22 13:19:35 +00:00
62ec2bac69
Selection texture tweaks.
...
This was SVN commit r11628.
2012-04-22 13:17:54 +00:00
d9b8df65be
Some refactoring of the military qbot code.
...
This was SVN commit r11627.
2012-04-22 13:04:31 +00:00
bdc5ad3f0d
Some mining icons for techs
...
This was SVN commit r11626.
2012-04-22 11:19:04 +00:00
0d81325cc7
Fixed Attack and Armour bug by removing Armour/All and Attack/.../All technology modifications.
...
This was SVN commit r11625.
2012-04-22 10:53:38 +00:00
34fc883317
Pretty unit selection overlay rings. Fixes #824 .
...
This was SVN commit r11623.
2012-04-22 04:04:02 +00:00
60944a1439
Updated phase icons.
...
This was SVN commit r11622.
2012-04-22 01:47:30 +00:00
8cf72a5ab9
Fixed syntax error
...
This was SVN commit r11621.
2012-04-22 01:35:08 +00:00
c52d1293d7
Added "Citizen" class to these templates. I feel like "CitizenSoldier" class should be split into Citizen and Soldier, but I was told that this might break some stuff.
...
This was SVN commit r11620.
2012-04-22 01:26:50 +00:00
0befd88deb
Plough tweak.
...
This was SVN commit r11619.
2012-04-22 01:04:06 +00:00
ddafad84f6
Moved 'plough' tech from Civ Centre to Farmstead.
...
This was SVN commit r11618.
2012-04-22 00:32:10 +00:00
1bbd226ff4
Renamed these techs more generically.
...
This was SVN commit r11617.
2012-04-22 00:26:44 +00:00
041da02ff9
This was SVN commit r11616.
2012-04-22 00:23:26 +00:00
db2c7929fd
First tech pair.
...
This was SVN commit r11615.
2012-04-22 00:16:59 +00:00
4881e638e5
Arrow and sword icons for techs
...
This was SVN commit r11614.
2012-04-22 00:12:00 +00:00
93c35964da
New higher quality icons. Fixes #954 . Refs #492 .
...
This was SVN commit r11613.
2012-04-21 23:31:31 +00:00
12e46a35fd
128x128 version of the plough icon
...
This was SVN commit r11612.
2012-04-21 22:54:12 +00:00
60088384a6
Plough tech graphic
...
This was SVN commit r11611.
2012-04-21 22:42:17 +00:00
99c60789da
Tech tweaks.
...
This was SVN commit r11610.
2012-04-21 22:24:55 +00:00
5ceea39a59
Added technology pairs.
...
This was SVN commit r11609.
2012-04-21 21:40:07 +00:00
b9695db52c
Don't add units to selection if the selected unit isn't owned by the player. Fixes #1256 , based on patch by mk12.
...
Update AI API to Health changes.
This was SVN commit r11608.
2012-04-21 20:50:07 +00:00
03f04e54fc
Fix garrisoning issue.
...
This was SVN commit r11607.
2012-04-21 20:12:52 +00:00
b25d7a4bab
Display all trainable/builable (by selected entities) entities.
...
This was SVN commit r11606.
2012-04-21 20:10:11 +00:00
6938ecf431
Allow switching to not yet buildable entities, if they are in the current selection. Use consts if we already define them.
...
This was SVN commit r11605.
2012-04-21 17:26:06 +00:00
96549e0418
Modified caching behavior to work similarly to how k776 suggested. Also added modification level affects as also suggested by k776.
...
This was SVN commit r11604.
2012-04-21 16:37:35 +00:00
9488ca42f6
Disable deadlocking fatal exception handler in Atlas
...
This was SVN commit r11603.
2012-04-21 14:12:37 +00:00
4c372aa6d8
Remove some unused component setters
...
This was SVN commit r11602.
2012-04-21 13:12:36 +00:00
58eb0c97bb
Reuse terrain texture name formatting function
...
This was SVN commit r11601.
2012-04-21 13:09:01 +00:00
177d7856a6
Avoid assertion failure when editing terrain off the edge of the map
...
This was SVN commit r11600.
2012-04-21 13:07:47 +00:00
dfc86d8ab2
This was SVN commit r11599.
2012-04-21 11:32:52 +00:00
3e3a8d5414
Fix error when no items of a class exist and that class is used for techology requirements.
...
This was SVN commit r11598.
2012-04-21 10:55:02 +00:00
1b49c53f4c
Buildings now unlock per phase. :)
...
This was SVN commit r11597.
2012-04-21 10:51:32 +00:00
b101f5ad01
Adds hardware cursors for Linux and OS X. Requires libxcursor on Linux. Fixes #748 .
...
Adds explicit links to frameworks we need on OS X.
This was SVN commit r11596.
2012-04-21 07:53:53 +00:00
d3d95c6b66
This was SVN commit r11595.
2012-04-21 07:19:43 +00:00
6f18a42269
Fixes bug detecting mouse focus change. Refs #748 .
...
This was SVN commit r11594.
2012-04-21 07:14:39 +00:00
497c1ff948
A few portrait tweaks.
...
This was SVN commit r11593.
2012-04-21 04:48:13 +00:00
774809b0a9
Allow training in all selected buildings. Fixes #1210 .
...
This was SVN commit r11592.
2012-04-21 00:21:01 +00:00
a6ceceb79c
Renaming the old celt wall files and new templates for them
...
This was SVN commit r11591.
2012-04-20 22:27:17 +00:00
06b342db46
Fix save/load with common-api-v2
...
This was SVN commit r11590.
2012-04-20 21:31:43 +00:00
85d5962328
Roman wall gate model updated
...
This was SVN commit r11589.
2012-04-20 21:25:34 +00:00
03d625dd2e
Added tech modification for carrying capacity and fixed warning for min range
...
This was SVN commit r11588.
2012-04-20 20:37:12 +00:00
b7cf51be34
Check properties exist in resourceSupplyAmount and resourceCarrying to avoid warnings. Code from wraitii
...
This was SVN commit r11587.
2012-04-20 19:48:25 +00:00
ed6e5bdaf0
Fixed phase detection in GUIInterface and added Armour and Attack tech modification.
...
This was SVN commit r11586.
2012-04-20 19:47:01 +00:00
755e407aeb
Technologies. Refs #3 . Full unlocking technology implementation. Only unit gathering rates can be modified currently because the patch was big enough already.
...
This was SVN commit r11584.
2012-04-20 17:21:04 +00:00
be0109331c
New update. Tightens up some of the military side of things.
...
This was SVN commit r11583.
2012-04-20 16:53:31 +00:00
2037c1fc6e
Spartan Helot Skirmishers less reliable. Spartan female citizen stronger.
...
This was SVN commit r11582.
2012-04-20 04:02:03 +00:00
c93621d2ad
Moved these to Public.
...
This was SVN commit r11580.
2012-04-20 03:12:09 +00:00
813f7e9102
Updated Prytaneion template.
...
This was SVN commit r11579.
2012-04-20 03:09:25 +00:00
4d8ba45375
Removes unnecessary change from [11575]
...
This was SVN commit r11578.
2012-04-20 03:01:09 +00:00
a99e1236be
New Prytaneion by Enrique.
...
This was SVN commit r11577.
2012-04-20 02:48:27 +00:00
c8745ee41f
Handle game ending in Atlas a bit more gracefully, it now continues until the user stops the simulation test. Fixes #641 .
...
This was SVN commit r11575.
2012-04-20 01:41:54 +00:00
7d47407c70
Carthaginian wall segments
...
This was SVN commit r11574.
2012-04-20 00:08:31 +00:00
9a58afcb62
Internal to Public.
...
This was SVN commit r11573.
2012-04-19 22:38:00 +00:00
b535c76ca1
This was SVN commit r11572.
2012-04-19 21:40:31 +00:00
ba17009767
Deposit resources when garrisoned in a dropsite. Patch by MattDoerksen. Fixes #1124 .
...
This was SVN commit r11571.
2012-04-19 20:34:59 +00:00
388d77f37d
Structures from Internal to Public. Thanks Leper.
...
This was SVN commit r11570.
2012-04-19 18:43:39 +00:00
82263fd3d3
Shift-N adds that groups units to selection. Fixes #1262 .
...
This was SVN commit r11569.
2012-04-19 09:00:51 +00:00
496445c615
New mapz0rz
...
This was SVN commit r11568.
2012-04-19 08:31:05 +00:00
0e6ecdcf48
Some art assets moved from Internal mod.
...
This was SVN commit r11567.
2012-04-19 08:28:48 +00:00
4a54b29250
Moving some minor stuff from Internal to Public mod.
...
This was SVN commit r11566.
2012-04-19 08:21:13 +00:00
aa07511739
This was SVN commit r11565.
2012-04-19 08:09:24 +00:00
65f4cb1d18
Units arent as efficient food gatherers anymore.
...
This was SVN commit r11564.
2012-04-19 07:56:25 +00:00
d9cb518904
Updated maps.
...
This was SVN commit r11563.
2012-04-19 07:19:23 +00:00
3d0d59b4c0
Fixed this horseman. Attempting to make a Theban fireraiser.
...
This was SVN commit r11562.
2012-04-19 06:26:19 +00:00
75e7ea497b
Add comment about incorrect array-bounds warning
...
This was SVN commit r11560.
2012-04-18 22:00:07 +00:00
7653043759
Changed some old class filters from Super to Champion
...
This was SVN commit r11559.
2012-04-18 21:05:36 +00:00
edc62a240a
Try to avoid some type warnings
...
This was SVN commit r11558.
2012-04-18 21:02:11 +00:00
a9475c3854
Stops qBot training heroes and makes it build a market after abuot 10 minutes.
...
This was SVN commit r11557.
2012-04-18 20:54:14 +00:00
769350a3e7
Compute camera height and zoom limits based on smoothed terrain heightmap. Fixes #794 , based on patch by Dietger.
...
This was SVN commit r11556.
2012-04-18 20:39:00 +00:00
9572a4314a
Iberian wall.
...
This was SVN commit r11555.
2012-04-18 19:59:53 +00:00
2e65416489
Healer range tweaks.
...
This was SVN commit r11554.
2012-04-18 19:57:49 +00:00
454af1928d
Selection groups for healers.
...
This was SVN commit r11553.
2012-04-18 19:53:10 +00:00
131d5eb88f
Tweak default healer behaviour, fix a small bug.
...
This was SVN commit r11552.
2012-04-18 18:26:49 +00:00
f5344d37e1
The new Iberian fortress model
...
This was SVN commit r11551.
2012-04-18 17:55:39 +00:00
159453f13d
adjusted prop positions for the new Iberian fortress
...
This was SVN commit r11550.
2012-04-18 17:54:03 +00:00
032a6b1557
adjusted prop positions for the new Iberian fortress
...
This was SVN commit r11549.
2012-04-18 17:53:38 +00:00
3ffeb1eee5
adjusted dirt decal reference from size 4x4 to 6x6.
...
This was SVN commit r11548.
2012-04-18 17:52:32 +00:00
13281e230d
Handle updates for foundation progress, resource carrying and resource supply amount for AIProxy. Fixes #1327
...
This was SVN commit r11547.
2012-04-18 11:30:28 +00:00
4b4411116f
Actually committed the Filters.byOwners fix mentioned in 167cd7151e
...
This was SVN commit r11546.
2012-04-18 10:49:45 +00:00
167cd7151e
Bug fixes and dead code removal
...
Fixed Filters.byOwners, before it was using indexOf() which caused
problems with number/string inequality.
Fixed the countUnassignedUnits and getAvailablenits functions to work
with the new filters.
Removed old updating entity collection code since it has been replaced
by the common-api-v2
This was SVN commit r11545.
2012-04-18 10:46:24 +00:00
3027ce1a04
Rationalise terrain dirty-rect coordinates.
...
Clean up some whitespace.
This was SVN commit r11543.
2012-04-17 22:35:34 +00:00
41f50e6b4c
specular added for more objects.
...
Boosted healing stats for healer ranks.
This was SVN commit r11542.
2012-04-17 21:57:55 +00:00
4926dc53ee
Celt wall segments
...
This was SVN commit r11541.
2012-04-17 21:51:43 +00:00
a16d56cc72
Delete an unused obsolete method
...
This was SVN commit r11540.
2012-04-17 21:06:47 +00:00
46bf2cac22
Fix remaining issue
...
This was SVN commit r11539.
2012-04-17 21:05:01 +00:00
54fb33841e
Fix some issues.
...
This was SVN commit r11537.
2012-04-17 20:44:18 +00:00
c56f96040e
Implement healing. Fixes #999 .
...
This was SVN commit r11536.
2012-04-17 20:22:13 +00:00
80277e3da9
Fix #953 (local.cfg adds keys instead of replacing them)
...
This was SVN commit r11535.
2012-04-17 13:14:34 +00:00
9a719c32be
This was SVN commit r11533.
2012-04-17 12:01:34 +00:00
3edb8248e5
This was SVN commit r11532.
2012-04-17 06:39:54 +00:00
bee7ecc90c
Iberian Walls for these maps.
...
This was SVN commit r11531.
2012-04-17 05:39:12 +00:00
be453771cf
Fixes OS X build.
...
This was SVN commit r11529.
2012-04-17 03:57:53 +00:00
5cfeccea09
Adds eyedropper tool to Atlas terrain brush (Shift+Click to activate). Fixes #1122 .
...
Adds preview box showing currently selected terrain.
This was SVN commit r11528.
2012-04-17 02:43:52 +00:00
772b38e6be
Fixes player colors in actor viewer, based on patch by mk12. Fixes #1022 .
...
This was SVN commit r11527.
2012-04-17 01:26:24 +00:00
af207e1c0a
Fixed the gameState.GetEntityById() function
...
This was SVN commit r11526.
2012-04-16 16:54:11 +00:00
cf11aa8dea
Fixes Atlas canvas resolution init on OS X. Replaces hacky solution for the same problem on wxGTK. Fixes #1176 .
...
This was SVN commit r11525.
2012-04-16 00:57:30 +00:00
d7b31da2dc
Loot stuffs. :)
...
This was SVN commit r11524.
2012-04-16 00:17:41 +00:00
7f612c266a
Calculate new random variations where necessary upon graphics object reloads. Fixes #979 .
...
This was SVN commit r11523.
2012-04-15 23:04:25 +00:00
52efb54673
Added serialize and deserialize functions to common-api-v2
...
This was SVN commit r11522.
2012-04-15 22:31:17 +00:00
c6f9df4020
Map name tweaks. Use Arabic numerals instead of Roman.
...
This was SVN commit r11521.
2012-04-15 20:55:27 +00:00
cb45fd2800
Tweaked Iberian civ file.
...
This was SVN commit r11520.
2012-04-15 20:44:01 +00:00
46c23d1c3c
Template tweaks, namely attack bonuses.
...
This was SVN commit r11519.
2012-04-15 20:35:38 +00:00
4a795dd631
Wall costs and health.
...
This was SVN commit r11518.
2012-04-15 19:08:29 +00:00
f004b0cd94
Roman wall segments - long, medium, and short. Gate needs work
...
This was SVN commit r11517.
2012-04-15 18:28:09 +00:00
c942d3e8c6
Fixed these maps.
...
This was SVN commit r11516.
2012-04-15 18:23:45 +00:00
1ee8bfe231
Update wall_builder and add wall_demo map. Patch by FeXoR. Closes #1311 .
...
This was SVN commit r11515.
2012-04-15 17:23:05 +00:00
9c4a7b8086
Clean up gui code.
...
This was SVN commit r11514.
2012-04-15 16:27:44 +00:00
544f5ff048
Fixing errors in a number of demo maps
...
This was SVN commit r11513.
2012-04-15 11:25:07 +00:00
27906080e2
Wall bonus for Iberians on these maps.
...
This was SVN commit r11512.
2012-04-15 06:50:21 +00:00
7cc39dc461
Wall bonus for Iberians on Acropolis II.
...
This was SVN commit r11511.
2012-04-15 06:34:11 +00:00
72056a32e7
Removed shadow casting from grass.
...
This was SVN commit r11510.
2012-04-15 05:31:20 +00:00
20a1a2855e
This was SVN commit r11509.
2012-04-15 05:02:12 +00:00
600b79498e
Tweaked default zoom a bit.
...
This was SVN commit r11506.
2012-04-15 03:53:32 +00:00
2c3801743a
Hide the barter buy button when it is the same as selected sell button
...
This was SVN commit r11505.
2012-04-15 03:44:57 +00:00
8848099dc3
Pericles and Craterus are in.
...
This was SVN commit r11504.
2012-04-15 03:09:12 +00:00
a07dd82a70
Allow materials to disable receiving shadows
...
This was SVN commit r11500.
2012-04-14 17:32:22 +00:00
6410d36a55
Fix engine to respect lack of castshadow flag in actors.
...
Remove unused variable.
This was SVN commit r11499.
2012-04-14 17:31:18 +00:00
8a5539f349
Add explicit castshadow flag to all actors, since the engine currently enables it implicitly anyway
...
This was SVN commit r11498.
2012-04-14 17:21:43 +00:00
43a30fcddd
Add explicit castshadow flag to all actors, since the engine currently enables it implicitly anyway
...
This was SVN commit r11497.
2012-04-14 17:21:20 +00:00
78105070a9
Convert actor line endings from CRLF to LF for consistency
...
This was SVN commit r11496.
2012-04-14 16:43:00 +00:00
97a67662c5
Some Internal stuff.
...
Gave trees uniform portraits.
Fixed costs for ranged heroes.
This was SVN commit r11495.
2012-04-14 06:02:45 +00:00
9028c354e6
Fix non-PCH build more. Fixes #1313 .
...
This was SVN commit r11494.
2012-04-13 15:01:51 +00:00
789036fb90
Fix #1299 (page up in console doesn't scroll up)
...
This was SVN commit r11493.
2012-04-13 12:15:50 +00:00
2312d1379a
Be more robust to invalid positions
...
This was SVN commit r11492.
2012-04-12 22:32:58 +00:00
55e576177d
Fix non-pch build. Fixes #1313 .
...
This was SVN commit r11491.
2012-04-12 20:55:21 +00:00
227f9e403f
Experimental GPU skinning.
...
Share inverse bind pose matrices between models.
This was SVN commit r11490.
2012-04-12 15:43:59 +00:00
ce215cace3
Add support for custom vertex attributes and array-of-matrix uniforms in GLSL.
...
This was SVN commit r11489.
2012-04-12 14:10:02 +00:00
5e38f4b49d
Themistocles now has shiny helmet!
...
This was SVN commit r11488.
2012-04-12 07:40:31 +00:00
5184edde14
New patch for JuBot
...
- Speeds up a lot of functionality by using persistent entity
collections, speed boost should be significant and noticeable.
- Adds defence towers covering all dropsites, with garrisons
This was SVN commit r11487.
2012-04-12 07:08:12 +00:00
3ca6ee461c
Palisade wall models optimised
...
This was SVN commit r11486.
2012-04-11 22:12:45 +00:00
25b3242ba4
Adds a "byNotOwner" filter for finding enemies, non-gaia objects, etc more easily.
...
This was SVN commit r11485.
2012-04-11 20:32:25 +00:00
17daa5ce8b
Fixed a couple of helmets.
...
This was SVN commit r11483.
2012-04-11 05:31:43 +00:00
fb0e2377a3
Fixed these two JSONs.
...
This was SVN commit r11482.
2012-04-11 05:30:05 +00:00
d42ac2b106
This was SVN commit r11481.
2012-04-11 00:23:30 +00:00
056962b5c5
Greek building stuffs.
...
This was SVN commit r11480.
2012-04-11 00:19:01 +00:00
368dda421a
New Hele walls
...
This was SVN commit r11479.
2012-04-10 23:14:58 +00:00
71a57ed3a7
Allow gathering regardless of resource owner
...
This was SVN commit r11478.
2012-04-10 21:09:21 +00:00
d3a24c26ba
Do alpha-testing earlier in ARB shaders, for performance.
...
This was SVN commit r11477.
2012-04-10 21:08:54 +00:00
e6a82fff48
Bind textures correctly to GLSL sampler uniforms.
...
This was SVN commit r11476.
2012-04-10 21:07:52 +00:00
f2260892bd
Add config option to force alpha-tested materials.
...
This was SVN commit r11475.
2012-04-10 21:03:22 +00:00
11115770ec
Fix memory leak
...
This was SVN commit r11474.
2012-04-10 20:56:18 +00:00
05008d190e
Clean up terrain shader a bit
...
This was SVN commit r11473.
2012-04-10 20:55:01 +00:00
9796fbf59b
Eggbird's new Iberian Temple.
...
This was SVN commit r11472.
2012-04-10 18:27:25 +00:00
577676810b
Make domestic herd animals controllable by the player
...
This was SVN commit r11471.
2012-04-10 16:37:34 +00:00
a035fc3949
Delete some unnecessary folders and files. Add shiny stuff to more helmets.
...
This was SVN commit r11469.
2012-04-10 02:43:42 +00:00
764b173f6e
Shield tweaks.
...
This was SVN commit r11467.
2012-04-10 01:25:03 +00:00
b3e519c278
Remove sheets.
...
This was SVN commit r11466.
2012-04-09 23:13:45 +00:00
e5d3a2b312
Adjusting the Iberian wall tower's windows
...
This was SVN commit r11465.
2012-04-09 19:23:48 +00:00
67bca5a6ed
Use an overlay image to mark selected icons instead of using a separate image.
...
Remove some useless sheets.
This was SVN commit r11464.
2012-04-09 18:58:03 +00:00
a21fc77212
A minor improvement for enabling/disabling user feedback. It was set to enabled/disabled in every tick which triggered some code.
...
Now it's only enabled or disabled when the user clicks the button and
therefore much less events are triggered.
This was SVN commit r11463.
2012-04-09 12:30:56 +00:00
3db7f32d17
Specular for a few more things.
...
This was SVN commit r11462.
2012-04-09 00:37:50 +00:00
25d1affef2
Adding specular to some items.
...
This was SVN commit r11461.
2012-04-08 23:53:05 +00:00
4b5bd36d9b
Multiply specular lighting by sun color
...
This was SVN commit r11460.
2012-04-08 23:03:22 +00:00
c93f17827f
Make use of the grayscale opion.
...
Move some icon files to a more adequate location.
Closes #1214 as that was already commited and this commit fixes some
minor issues.
This was SVN commit r11459.
2012-04-08 22:56:11 +00:00
f3a393d2e5
Add alpha-tested materials
...
This was SVN commit r11457.
2012-04-08 21:55:21 +00:00
b6ef80b741
Fix GCC build
...
This was SVN commit r11456.
2012-04-08 17:44:29 +00:00
566a4588b6
This update to JuBot transfers to the v2 SVN, and adds tower garrisoning.
...
This was SVN commit r11455.
2012-04-08 16:58:57 +00:00
f3617822e0
Make AlwaysVisible objects always visible in shader mode. Fixes #908 .
...
This was SVN commit r11454.
2012-04-08 16:36:23 +00:00
b7888aea52
Add support for specular materials.
...
Let materials specify shader uniform values.
Use interned strings for shader uniform/attribute names.
Remove confusing float* cast operator on CVector4D.
Simplify and clean up CVector4D.
Remove non-supported 'old' lighting model.
This was SVN commit r11453.
2012-04-08 15:55:06 +00:00
8a0e47fdd6
Adds the GarrisonTower and GarrisonFortress classes to towers and fortresses.
...
This was SVN commit r11452.
2012-04-08 12:09:49 +00:00
2dc3c36ee6
Adds the classes "GarrisonTower" and "GarrisonFortress" to more easily demarcate the buildings the AI wants to garrison for defense.
...
This was SVN commit r11451.
2012-04-08 12:08:21 +00:00
fda1d07794
Tweaking some pop costs.
...
This was SVN commit r11450.
2012-04-08 07:27:56 +00:00
b253cbbee6
Don't unnecessarily die when loading empty files
...
This was SVN commit r11449.
2012-04-07 21:36:27 +00:00
6b5034e313
Iberian wall model updates
...
This was SVN commit r11448.
2012-04-07 10:36:32 +00:00
6a82b215e1
This was SVN commit r11447.
2012-04-07 05:31:15 +00:00
b5e4916f03
New "Laconia" map. Update to Spartan female citizen.
...
This was SVN commit r11446.
2012-04-07 01:31:49 +00:00
4a12049df5
Put resource accessibility checks back for the new worker code
...
This was SVN commit r11445.
2012-04-06 19:53:50 +00:00
83422923aa
Added deep forest map by FeXoR. Fixes #1287 .
...
This was SVN commit r11444.
2012-04-06 19:15:58 +00:00
07ea6673c3
Use grayscale option instead of grayscaled icons
...
This was SVN commit r11443.
2012-04-06 15:51:26 +00:00
32d6b09c3c
Set goods for every selected trader. Based on patch by Spahbod, fixes #1209 .
...
This was SVN commit r11442.
2012-04-06 15:07:04 +00:00
305723f9a7
Prevent AABB/frustum intersections from blowing up on empty input bounds. Fixes #1027 .
...
This was SVN commit r11441.
2012-04-05 22:29:01 +00:00
7ff99cc218
Prevent trade with foundations, based on patch by Spahbod, fixes #1215 .
...
This was SVN commit r11440.
2012-04-05 22:00:15 +00:00
a5076c1eb1
Added dummy PostMessage and BroadcastMessage functions for tests
...
This was SVN commit r11439.
2012-04-05 14:13:36 +00:00
9d353b7df9
fixes
...
This was SVN commit r11438.
2012-04-05 08:03:44 +00:00
ea66f950e7
Making M_s look better. Removed 2nd special building for S_s.
...
This was SVN commit r11437.
2012-04-05 04:01:53 +00:00
a569194d37
Fixing some missing units.
...
This was SVN commit r11436.
2012-04-05 04:01:24 +00:00
d56d65bc87
Removing old unused Iberian structural models
...
This was SVN commit r11435.
2012-04-04 23:16:33 +00:00
ba296eb7d9
Iberian wall segments. New design and models
...
This was SVN commit r11434.
2012-04-04 23:14:00 +00:00
6efbf65a90
Demo map for S_ and M_
...
This was SVN commit r11433.
2012-04-04 22:33:33 +00:00
6670195fcf
Some cool stuff.
...
This was SVN commit r11432.
2012-04-04 22:32:43 +00:00
2ba6b4d185
Missed anatolian plateau in previous commit
...
This was SVN commit r11431.
2012-04-04 21:06:05 +00:00
47ea2ef167
Convert rmgen to use anticlockwise angle from the positive x axis for unit placement, patch from FeXoR, fixes #1289 .
...
This was SVN commit r11430.
2012-04-04 20:53:17 +00:00
7eb5480494
AI common-api-v2 and a qbot which works with the new API but it not fully transitioned to make use of it properly
...
This was SVN commit r11429.
2012-04-04 20:23:41 +00:00
21a39dedfb
Add check to prevent error when ranged attack target is destroyed
...
This was SVN commit r11428.
2012-04-04 20:03:04 +00:00
6d57808b84
Fix build with old Boost
...
This was SVN commit r11427.
2012-04-04 11:48:07 +00:00
e686c65fe6
Partial support for alpha-tested materials
...
This was SVN commit r11425.
2012-04-03 20:00:04 +00:00
59447bce2e
Move shaders into appropriate subdirectories.
...
Delete some obsolete shader files.
This was SVN commit r11424.
2012-04-03 19:45:58 +00:00
6bc33fe8bd
Update renderer design to be more flexible and data-driven based on material and shader definitions.
...
Support conditional expressions in shader effect XML files.
Consolidate fixed-function model rendering into the shader system.
Remove lots of now-obsolete renderer code.
Move shader defines from std::map to new class with interned data, for
performance.
Move texture from model into material.
Alleviate singletonitis.
Remove obsolete lodbias setting.
Remove unused terrain shadow transparency.
This was SVN commit r11423.
2012-04-03 18:44:46 +00:00
a56169ff8c
Add interned string class, for fast comparisons and reduced memory usage.
...
This was SVN commit r11422.
2012-04-03 18:26:52 +00:00
8f59cb7b90
This was SVN commit r11421.
2012-04-03 09:26:38 +00:00
1daee6bbc2
Updating some campaign assets.
...
This was SVN commit r11420.
2012-04-03 03:04:58 +00:00
59851231bd
Minor tweaks. New thracian peltast portrait.
...
This was SVN commit r11419.
2012-04-02 17:15:11 +00:00
3792b02963
Fix CPreprocessor uninitialised data causing error messages on "#endif" followed by EOF with no newline. Warn about unrecognised "#elif".
...
This was SVN commit r11418.
2012-04-02 16:12:46 +00:00
25762f1f0d
Persian wall segments
...
This was SVN commit r11417.
2012-04-01 18:57:05 +00:00
bf70e99b00
Celt Murus Gallicus wall, tower, and gate
...
This was SVN commit r11416.
2012-04-01 16:36:38 +00:00
41c7fe7901
For fcxsanya
...
This was SVN commit r11415.
2012-04-01 15:46:43 +00:00
316584d71a
Corrected in game manual about creating control groups to include 0, fixes #1279 .
...
This was SVN commit r11414.
2012-04-01 14:00:15 +00:00
9198c449ad
This was SVN commit r11413.
2012-03-31 19:19:33 +00:00
315a41f479
Some more emblems. Some updated portraits.
...
This was SVN commit r11412.
2012-03-31 04:27:22 +00:00
16a5d74b35
Campaign map tree assets' poly count reduced between 75% and 90%.
...
This was SVN commit r11411.
2012-03-30 22:04:22 +00:00
99da24c7a3
Correctly check whether an existing formation controller can be reused. Fixes #1255 .
...
This was SVN commit r11410.
2012-03-30 20:09:50 +00:00
8680c6ce06
Delete rally point marker entity when entity is destroyed. Fixes #1254 .
...
This was SVN commit r11409.
2012-03-28 23:09:05 +00:00
e5c85bc540
More campaign proof of concept stuff. A "Leonidas" army pawn.
...
This was SVN commit r11408.
2012-03-28 06:09:38 +00:00
6cb97e3e01
This was SVN commit r11407.
2012-03-27 21:38:12 +00:00
f0897e05cd
New Roman Merchant ship by Kenobi and Enrique.
...
This was SVN commit r11406.
2012-03-27 18:31:47 +00:00
ad49f58468
Random new stuff.
...
This was SVN commit r11405.
2012-03-27 04:08:24 +00:00
44a3af8d29
This was SVN commit r11404.
2012-03-27 04:07:04 +00:00
82c8af3ad5
More proof of concept stuff for campaigns.
...
This was SVN commit r11403.
2012-03-27 02:20:21 +00:00
d0fc32af4c
Fix failure in replay mode
...
This was SVN commit r11402.
2012-03-26 22:11:30 +00:00
99576ab44a
More campaign conceptual stuff.
...
This was SVN commit r11401.
2012-03-26 09:59:39 +00:00
666936a5e3
Test campaign stuff. Just proof of concept stuff. *NOT FINAL ARTWORK*
...
This was SVN commit r11400.
2012-03-26 08:35:59 +00:00
a7af9b028b
2 shield texture tweaks. 1 dust texture tweak.
...
This was SVN commit r11399.
2012-03-26 08:20:29 +00:00
856a6e7135
Some shield prop tweaking for consistency.
...
This was SVN commit r11398.
2012-03-26 07:53:20 +00:00
893cb2c1c4
typos
...
This was SVN commit r11397.
2012-03-24 22:22:51 +00:00
0fd6cc8873
Adding music to these civ files.
...
This was SVN commit r11396.
2012-03-24 22:11:14 +00:00
4659d60c19
This was SVN commit r11395.
2012-03-24 03:20:36 +00:00
11889f4221
New horse model
...
This was SVN commit r11393.
2012-03-22 08:39:00 +00:00
8d3434722d
New loading screen tips for Roman Army Camp, Palisade walls, and Persian Architecture.
...
This was SVN commit r11392.
2012-03-22 07:57:53 +00:00
c8d7e1c006
Tweaked a bunch of templates.
...
This was SVN commit r11391.
2012-03-22 07:12:00 +00:00
b90cedf0a6
Cost tweaks and other things.
...
This was SVN commit r11390.
2012-03-22 02:07:17 +00:00
0fda0019d1
Updates data paths on OS X and Windows. On OS X only write to locations inside ~/Library. On Windows make the distinction between local and roaming appdata, and use folder inside My Documents for user-created data. Fixes #1145 .
...
Adds proper OS X app bundle support.
Updates Windows installer script.
This was SVN commit r11389.
2012-03-22 00:23:31 +00:00
1095782d1a
Increase maximum VBO size, to support larger meshes
...
This was SVN commit r11387.
2012-03-21 18:45:10 +00:00
0d385f4112
Make selected stances and formations more obvious. Patch from leper, fixes #1190 .
...
This was SVN commit r11386.
2012-03-21 16:45:02 +00:00
a957455647
Shift-click ungarrisons all units of a type. Patch from leper, fixes #1206 .
...
This was SVN commit r11385.
2012-03-21 15:18:31 +00:00
f53823b498
Oasis X tweaks.
...
This was SVN commit r11384.
2012-03-21 06:19:36 +00:00
65c39cb74e
This was SVN commit r11383.
2012-03-21 05:33:58 +00:00
2c913b4a9f
Removed qbot entity extend functions since they are now in the common-api
...
This was SVN commit r11382.
2012-03-20 23:34:03 +00:00
f718ddaee7
Slightly updated Iberian cc meshes.
...
Delete old vesta mesh.
Crocodile from Historicity.
This was SVN commit r11381.
2012-03-20 22:35:28 +00:00
10fd5e57db
Fix #916 (complain about spaces in build paths), based on patch from philip_flohr
...
This was SVN commit r11380.
2012-03-20 22:29:56 +00:00
97479830e9
New Iberian civic centre.
...
Made Indibil a cavalry dude.
Tweaked Army Camp entity.
This was SVN commit r11378.
2012-03-20 19:00:11 +00:00
f1e73807a8
Fix formatting
...
This was SVN commit r11377.
2012-03-20 18:13:27 +00:00
e97547dbd4
Fix FFP renderer
...
This was SVN commit r11376.
2012-03-20 13:32:30 +00:00
02c848d1f1
Adjustments to palisade walls and rotated gate
...
This was SVN commit r11375.
2012-03-20 00:13:55 +00:00
0e1b5522d6
Fix #868 (move wxWidgets Unix config files to XDG basedir location), based on patch from leper.
...
Fix handling of set but empty XDG environment variables.
This was SVN commit r11374.
2012-03-19 22:40:06 +00:00
700e28480d
Add command-line option to enable archivebuilder compression
...
This was SVN commit r11373.
2012-03-19 21:16:12 +00:00
36107cb7e1
GLES compatibility for particles and shadows.
...
Fix invalid enum errors.
Fix shader texture binding.
This was SVN commit r11372.
2012-03-19 21:10:14 +00:00
8c6231f940
Fix black-square cursor on 16bpp Windows
...
This was SVN commit r11371.
2012-03-19 20:46:12 +00:00
4b3d98ad71
Fixed bug in library.js GetAngle function
...
This was SVN commit r11370.
2012-03-19 09:32:49 +00:00
af7a914bae
Fixed Army Camp turf.
...
This was SVN commit r11369.
2012-03-19 04:22:28 +00:00
9bbb341e23
Temperate and Tropic farmland terrains.
...
This was SVN commit r11368.
2012-03-19 04:06:21 +00:00
c12125018c
Farmland and other terrain updates.
...
This was SVN commit r11367.
2012-03-19 03:41:55 +00:00
5e145c8b2d
This was SVN commit r11366.
2012-03-19 01:53:44 +00:00
5f06766ead
Replace isUnit, isAnimal, ... with calls to hasClass using patch from leper. Fixes #1201 .
...
This was SVN commit r11365.
2012-03-18 21:16:30 +00:00
5a21140093
Added grayscale option for ui textures
...
This was SVN commit r11364.
2012-03-18 19:43:03 +00:00
7c51e743fa
Modified rmgen GetAngle function to use atan2 and the standard mathematical angle convention (WARNING this changes return values so will break scripts using the old version) and changed getGradient so it returns Infinity for infinite gradient lines. Added errors if people try and use unsafe javascript maths functions.
...
This was SVN commit r11363.
2012-03-18 18:40:27 +00:00
b72d72dec2
Minor changes.
...
This was SVN commit r11362.
2012-03-18 14:47:13 +00:00
208e642089
More random maps and FeXoR's wall system.
...
This was SVN commit r11361.
2012-03-18 07:53:18 +00:00
d7128572ae
Removed logger output for XML token node tests
...
This was SVN commit r11360.
2012-03-17 23:03:02 +00:00
b68d770c89
This was SVN commit r11359.
2012-03-17 22:17:45 +00:00
148f84b708
Tweaked garrison capacity.
...
This was SVN commit r11358.
2012-03-17 22:16:48 +00:00
dc920f3c50
This was SVN commit r11357.
2012-03-17 22:14:38 +00:00
78840ad7b4
Roman Temple of Mars, and sword rack. :)
...
This was SVN commit r11356.
2012-03-17 22:06:35 +00:00
f71cdd90a3
This was SVN commit r11355.
2012-03-17 17:41:33 +00:00
78a427eef2
Fix to Celt merchant ship prop points
...
This was SVN commit r11354.
2012-03-17 15:23:23 +00:00
d195263215
Celt fishing boat prop fix
...
This was SVN commit r11353.
2012-03-17 15:07:13 +00:00
6dac7f30d7
Fixed the description for archipelago.
...
This was SVN commit r11352.
2012-03-17 08:24:50 +00:00
41cbe0a315
Tweaked some maps.
...
This was SVN commit r11351.
2012-03-17 08:13:52 +00:00
7d52cbc540
Roman army tents. Try out Oasis IX. :)
...
This was SVN commit r11350.
2012-03-17 02:42:02 +00:00
f347939909
Carthaginians +25% sea trading bonus.
...
Persians +25% land trading bonus.
This was SVN commit r11349.
2012-03-16 17:56:58 +00:00
b6ec143aee
Added Engine.ProfilerStop() to qBot so it doesn't cause memory leaks when it has no units to control
...
This was SVN commit r11348.
2012-03-16 17:36:07 +00:00
cab65bb932
Added new random maps. Tweaked some existing ones. Added tree actors to randombiome.js. Added new functions.
...
This was SVN commit r11347.
2012-03-16 14:06:32 +00:00
a37ce96dcf
Running dust for all of these actors.
...
This was SVN commit r11346.
2012-03-16 02:15:42 +00:00
cdd987c0f8
Running dust for Roman cav.
...
This was SVN commit r11345.
2012-03-16 01:51:07 +00:00
f923667657
Palisade segments for the click-drag wall system
...
This was SVN commit r11344.
2012-03-15 23:28:21 +00:00
2207786c05
Missed a bit of indentation in previous commit
...
This was SVN commit r11343.
2012-03-15 22:58:25 +00:00
31da0a746b
Fixes crash when removing non-existent tokens from XML 'token' nodes
...
This was SVN commit r11342.
2012-03-15 22:57:08 +00:00
c70cbe1e00
Made it so that there isn't a huge puff of smoke when the Celt Temple and Roman Army Camp are selected for construction.
...
This was SVN commit r11341.
2012-03-15 07:33:30 +00:00
1819276b1e
A test for dust kicked up by cavalry when running.
...
This was SVN commit r11340.
2012-03-15 06:42:07 +00:00
c5f61b660e
Fix old references to scout tower
...
This was SVN commit r11339.
2012-03-14 13:09:36 +00:00
acb853056b
Fix XML error
...
This was SVN commit r11338.
2012-03-14 13:09:01 +00:00
9edd53a796
Fixed a bug with getTerrainTexture function.
...
This was SVN commit r11337.
2012-03-14 11:59:44 +00:00
10410e4e3b
This was SVN commit r11336.
2012-03-14 02:49:28 +00:00
24b38da680
Tweaked Army Camp cost.
...
This was SVN commit r11334.
2012-03-14 02:28:31 +00:00
095f7a2381
#New Roman army camp.
...
This was SVN commit r11333.
2012-03-14 02:19:46 +00:00
4eec2bf5d2
Fixes some bugs related to deleting saved games (in particular, load/delete was broken if the file was deleted externally while the game was running).
...
Adds saved game directory to the hotload watch list.
Logs error instead of crashing when saved game is not found.
Changes Atlas double-click selection to only pick units from the same
player.
This was SVN commit r11332.
2012-03-14 00:23:28 +00:00
e57730ecce
This was SVN commit r11331.
2012-03-14 00:22:46 +00:00
5ffee8e4e0
Fixing a minor error.
...
This was SVN commit r11330.
2012-03-14 00:10:02 +00:00
bfe5772315
xml changes
...
This was SVN commit r11329.
2012-03-14 00:09:27 +00:00
f1ba777a76
Ides of March
...
This was SVN commit r11328.
2012-03-13 22:54:15 +00:00
6fc508f662
Fix non-PCH build.
...
Fix typo.
This was SVN commit r11327.
2012-03-13 21:39:01 +00:00
0c49ac92fe
Ides of March
...
This was SVN commit r11326.
2012-03-13 20:52:42 +00:00
9ff8d706f5
Acropolis IV.
...
This was SVN commit r11325.
2012-03-13 08:21:02 +00:00
e35d8f7df9
This was SVN commit r11324.
2012-03-13 02:59:14 +00:00
83c276afc4
Ruins gathering sounds.
...
Portrait for Rhodian Slinger.
Updated the name of the Roman merchant.
Updated the names of these maps.
This was SVN commit r11323.
2012-03-13 01:59:06 +00:00
0cace671b7
Fixed bug with economy not finding food.
...
The problem was with the new caching and unhuntable animals. The cache
would have an unhuntable food source so would show as not being empty
but then when this was filtered out at a later stage. After this later
stage there would be no attempt to search a larger area.
This was SVN commit r11321.
2012-03-11 23:09:12 +00:00
cd906e074f
Added support for romans to qBot
...
This was SVN commit r11320.
2012-03-11 22:24:02 +00:00
f027a64251
This was SVN commit r11319.
2012-03-11 08:46:54 +00:00
8dd841b116
Fixed a pop limit thing. Seems to be an Atlas bug with this.
...
This was SVN commit r11318.
2012-03-11 07:44:51 +00:00
d7fa7477ab
Updated trade cursor.
...
This was SVN commit r11317.
2012-03-11 07:41:41 +00:00
b099676175
A couple of new Death Canyon variants.
...
This was SVN commit r11316.
2012-03-11 07:35:10 +00:00
915bc8d263
I noticed some units were missing promotion animations. :)
...
This was SVN commit r11315.
2012-03-11 04:47:31 +00:00
0741d0ccd6
Fixed Celt slinger sound effects.
...
Tweaked cav spear tooltip.
This was SVN commit r11314.
2012-03-11 04:39:53 +00:00
8e94dea94d
This was SVN commit r11313.
2012-03-11 00:23:26 +00:00
ae1d57a4c7
Made Oasis X the default map.
...
This was SVN commit r11312.
2012-03-10 20:13:25 +00:00
d3727a99f9
Updated Oasis X
...
This was SVN commit r11311.
2012-03-10 20:08:48 +00:00
e8c31dc9a3
This was SVN commit r11310.
2012-03-10 19:49:59 +00:00
7934e3ab0b
Fixed missing cmpIdentity null check in Barter.js:60 (causes failure on Isthmus when territory_pull entity is iterated over). Fixes #1199 .
...
This was SVN commit r11309.
2012-03-10 16:34:59 +00:00
5282d77c19
This was SVN commit r11304.
2012-03-10 15:03:09 +00:00
f062610daf
This was SVN commit r11303.
2012-03-10 14:41:44 +00:00
e18bb4adc7
This was SVN commit r11301.
2012-03-10 13:56:17 +00:00
987df3b72b
This was SVN commit r11300.
2012-03-10 13:54:02 +00:00
c8fde142af
New Greek trader portrait. Tweaked Greek and Roman trade cart footprints.
...
This was SVN commit r11298.
2012-03-10 07:08:31 +00:00
63b2743338
Tweaked garrison healing. Temple is now more important for healing than before.
...
This was SVN commit r11297.
2012-03-10 05:55:18 +00:00
4b7a5ac814
Allows garrison heal rate of "0" (disables healing).
...
This was SVN commit r11296.
2012-03-10 04:08:15 +00:00
39844eaadc
tweaked this map
...
This was SVN commit r11295.
2012-03-10 02:10:03 +00:00
48b744a7f5
Fixed blue player color.
...
This was SVN commit r11294.
2012-03-10 01:36:33 +00:00
b6cd9a47a5
Fixed Greek temple prop point error.
...
Also: Re-added the B and C variants, by working around the root node
problem with smoke. Added 'smoke' prop nodes to the A, B, &C base meshes
so that the prop meshes for these variants can continue to use the
'root' node.
Fixed some Player 1 color issues in a few maps. More to come.
This was SVN commit r11293.
2012-03-10 01:25:39 +00:00
d1ed264c9b
Fixes stance change during garrison causing instant garrison. Fixes #1184 .
...
Adds range check to garrisoning, with <LoadingRange> element added to
GarrisonHolder. Adds maximum range values to templates (2 for land
units/structures, 10 for ships).
Adds retry to garrison failure due to unreachable target.
Cleans up a few templates.
This was SVN commit r11292.
2012-03-09 23:33:55 +00:00
cba0c42783
Updated trader cart model
...
This was SVN commit r11291.
2012-03-09 22:24:13 +00:00
aae8a06576
This was SVN commit r11290.
2012-03-09 04:09:19 +00:00
506cea7d54
This was SVN commit r11289.
2012-03-09 04:05:34 +00:00
050a194d73
tweaked merchant ship tooltip.
...
This was SVN commit r11288.
2012-03-09 02:23:52 +00:00
829a5444fe
Updated Trade Demo map.
...
Updated some Greek horse textures.
Tweaked Greek and Roman Traders.
This was SVN commit r11287.
2012-03-09 02:12:50 +00:00
497aadb653
trader tweaks. trading demo map
...
This was SVN commit r11286.
2012-03-09 00:34:53 +00:00
8484a2b2e2
New Roman and Hele trader units
...
This was SVN commit r11285.
2012-03-08 23:52:46 +00:00
6a2e5a9f16
This was SVN commit r11283.
2012-03-08 21:40:44 +00:00
b3f4b9af7f
Some temp trader stuff until we can make them look prettier at a later date.
...
This was SVN commit r11282.
2012-03-08 21:31:59 +00:00
9a30da9726
Fix the trade tooltips order
...
This was SVN commit r11281.
2012-03-08 21:28:55 +00:00
f4ae18b710
This was SVN commit r11280.
2012-03-08 21:03:48 +00:00
894dc30c69
Trade. Closes #30 .
...
This was SVN commit r11279.
2012-03-08 20:42:28 +00:00
84f1914434
Added Rhine Marshlands
...
This was SVN commit r11278.
2012-03-08 19:46:38 +00:00
82378702cf
This was SVN commit r11277.
2012-03-08 09:40:23 +00:00
af05b96c0f
Animation tweaks on these two units.
...
This was SVN commit r11276.
2012-03-08 06:26:13 +00:00
c393732939
Adds slightly more helpful error message when failing to validate an entity template.
...
This was SVN commit r11273.
2012-03-08 05:13:35 +00:00
e6c58b2a3e
Adds log rendering to actor viewer.
...
This was SVN commit r11272.
2012-03-08 01:16:29 +00:00
95dede0b4d
Siege ballista attack animation
...
This was SVN commit r11271.
2012-03-07 23:32:52 +00:00
d3d866ed28
Roman trireme animations
...
This was SVN commit r11270.
2012-03-07 22:03:45 +00:00
98c8a47192
Fix crash on Clang
...
This was SVN commit r11269.
2012-03-07 20:40:38 +00:00
e73cae7507
Update to Roman wall tower
...
This was SVN commit r11268.
2012-03-07 20:17:18 +00:00
3c677ee425
Prevent unnecessary work, especially on maps with many actors
...
This was SVN commit r11267.
2012-03-07 19:54:54 +00:00
9016b8d866
#Corsica random map script by wraitii.
...
This was SVN commit r11266.
2012-03-07 19:17:01 +00:00
d115561a26
Fixed a crash when less than 8 players were present in some random maps.
...
This was SVN commit r11265.
2012-03-07 12:36:22 +00:00
3f6ae7554d
This was SVN commit r11264.
2012-03-07 11:25:50 +00:00
38bcefebee
Updated wall tower
...
This was SVN commit r11262.
2012-03-06 22:29:34 +00:00
8eb390287d
Updated Isthmus map.
...
This was SVN commit r11261.
2012-03-06 09:24:39 +00:00
2223e7c857
New "Isthmus" map.
...
This was SVN commit r11260.
2012-03-06 08:01:42 +00:00
15cb081163
Removes Makefile PCH support for Obj-C/C++ source files. Apple's latest command line tools encountered an error because the source file was compiled with Obj-C++ but the PCH was compiled with C++. If we really needed PCH for Obj-C++ we could simply compile it separately for each language. Refs #1148 .
...
This was SVN commit r11259.
2012-03-06 05:40:11 +00:00
5f8135edb0
Fixes clang warning about precompiled.h in C++ mode. Fixes #1178 .
...
This was SVN commit r11258.
2012-03-06 04:12:21 +00:00
4cdde2b62a
Replaces Atlas "Screenshot" option with normal lower-res version (saves result as PNG).
...
Adds new "Big screenshot" option (saves result as 6400x4800 BMP). Refs
#984 .
This was SVN commit r11257.
2012-03-06 00:15:48 +00:00
b3f22597e3
Tweaked Oasis IX
...
This was SVN commit r11256.
2012-03-06 00:05:12 +00:00
2552b10b9d
Added forgotten peacock actor file.
...
This was SVN commit r11255.
2012-03-05 22:19:26 +00:00
e0052aa863
Added the peacock.
...
This was SVN commit r11254.
2012-03-05 22:14:49 +00:00
0b0f2e9e30
Fixed broken tests by silently failing if Math.js is not found. This is not ideal but seems better than everything else.
...
This was SVN commit r11253.
2012-03-05 21:20:39 +00:00
e9bbf25997
Remove some redundant code
...
This was SVN commit r11252.
2012-03-05 18:30:00 +00:00
2afc4d9d8f
Fix #1140 (signedness warning on some platforms).
...
This was SVN commit r11251.
2012-03-05 17:05:02 +00:00
dc715fe57f
Remove some unused includes
...
This was SVN commit r11250.
2012-03-05 16:15:07 +00:00
26efdaf216
Try to improve ambiguous bit descriptions
...
This was SVN commit r11249.
2012-03-05 16:09:47 +00:00
a08aa2ca0d
This was SVN commit r11248.
2012-03-05 12:40:17 +00:00
85847c3da6
Attempting to make the map more challenging.
...
This was SVN commit r11247.
2012-03-05 06:55:17 +00:00
e02ad39830
Fixed a pop cap bug on Oasis IX
...
This was SVN commit r11246.
2012-03-05 05:33:48 +00:00
38ec523c01
This was SVN commit r11245.
2012-03-05 04:39:27 +00:00
89e36154bc
Made Oasis IX more challenging. Added destruction dust to the Greek theatron.
...
This was SVN commit r11244.
2012-03-05 04:17:30 +00:00
5ac30ea199
Tweaked destruction dust.
...
This was SVN commit r11243.
2012-03-05 02:28:15 +00:00
07ab38cdcb
Implements COLLADA -1 vertex weight support, using simpler initial solution. Fixes #1012 .
...
This was SVN commit r11242.
2012-03-05 00:42:34 +00:00
f3a52dd440
Fixes incorrect and inconsistent tests for undefined.
...
Removes unused buggy GUI script.
Corrects some inconsistent formatting.
This was SVN commit r11241.
2012-03-04 22:59:14 +00:00
24f0e123cb
Propped corral and added a variation with the doors closed.
...
This was SVN commit r11240.
2012-03-04 21:26:08 +00:00
8ca6d1a6fa
Roman gate and wall update
...
This was SVN commit r11239.
2012-03-04 13:30:16 +00:00
986bd39ef4
Minor tweaks and fixes.
...
This was SVN commit r11238.
2012-03-04 13:18:59 +00:00
ed575eee54
arch portrait
...
This was SVN commit r11237.
2012-03-04 07:47:59 +00:00
92b50ed078
Tweaked Oasis X.
...
This was SVN commit r11236.
2012-03-04 06:59:03 +00:00
8c68625ca2
New faction emblem for the Romans. Celt cav skirms now gather meats correctly.
...
This was SVN commit r11235.
2012-03-04 06:47:35 +00:00
d60df4b127
Adds saved game deletion. Refs #1090
...
Documents a few things related to saved games.
This was SVN commit r11233.
2012-03-04 05:27:17 +00:00
4cb7972ec2
Renamed some Atlas classes and g_GameLoop to better reflect their Atlas-related nature and to lower potential confusion with similar main-game-related functionality. Refs #678 .
...
This was SVN commit r11232.
2012-03-03 23:48:04 +00:00
291a9e797b
Added atan and atan2. Refs #1193
...
This was SVN commit r11231.
2012-03-03 23:37:47 +00:00
649cb7ee7b
Added PickFriendlyEntitiesOnScreen function to the JS side for #1187 .
...
This was SVN commit r11230.
2012-03-03 21:42:23 +00:00
06672f0001
This was SVN commit r11229.
2012-03-03 20:47:49 +00:00
d755402aec
Destruction dust for these buildings.
...
This was SVN commit r11228.
2012-03-03 06:04:24 +00:00
cc955af3b1
Added javascript file for previous commit.
...
This was SVN commit r11227.
2012-03-03 00:07:11 +00:00
e2e5c81272
Added safe (identical across platforms) replacement sin and cos functions for scripts. This is part of #1193 .
...
This was SVN commit r11226.
2012-03-03 00:06:16 +00:00
1657c34979
More formation buttons and changes.
...
This was SVN commit r11225.
2012-03-02 20:00:17 +00:00
3ac3d60d6c
Moved formation buttons to a new folder
...
This was SVN commit r11224.
2012-03-02 19:40:50 +00:00
f66fab3ec2
Updated formation buttons.
...
This was SVN commit r11223.
2012-03-02 19:13:27 +00:00
0f0eef7ed4
Consistent whitespace
...
This was SVN commit r11221.
2012-03-02 18:03:19 +00:00
59ce8b3081
Tweaks player starting positions so that allies are near each other. Adds some useful functions to the game.
...
This was SVN commit r11220.
2012-03-02 13:17:35 +00:00
4653dc62e9
This was SVN commit r11219.
2012-03-02 06:31:35 +00:00
acf63afeaa
Fix some whitespace, and spelling, and capitalisation, and unnecessary array wrapping.
...
This was SVN commit r11218.
2012-03-01 23:16:01 +00:00
561d09c7d5
Selected Stances icons.
...
This was SVN commit r11217.
2012-03-01 20:28:57 +00:00
f92a9dfb68
This was SVN commit r11215.
2012-03-01 10:16:03 +00:00
6b4eb1b848
This was SVN commit r11213.
2012-03-01 09:01:31 +00:00
70c8e26c12
Oasis maps galore!
...
This was SVN commit r11212.
2012-03-01 06:45:33 +00:00
edbbe38ee1
Fixes idle champion units not being found. Fixes #1188 .
...
Adds trade class to merchant ship (for use in "find idle workers").
Explicitly adds females, traders/merchant ships, fishing boats, and
healers to "find idle workers".
Fixes typos in fire ship template.
This was SVN commit r11211.
2012-03-01 05:41:18 +00:00
c01004a686
Removed a few oars from the Roman trireme. Tweaked Trireme texture.
...
This was SVN commit r11210.
2012-03-01 04:13:10 +00:00
7fa6afac37
Corrects some Doxygen comments and adds a few others of interest.
...
This was SVN commit r11209.
2012-03-01 03:55:05 +00:00
a247da1585
Siege status bars tweaked. Tweaked hoplite portrait.
...
This was SVN commit r11208.
2012-03-01 00:12:51 +00:00
a01e1cd46a
Fixes incorrect use of jschar (broke Linux builds)
...
This was SVN commit r11207.
2012-02-29 23:41:23 +00:00
4163197d10
Oasis VIII
...
This was SVN commit r11206.
2012-02-29 22:12:15 +00:00
d5fe7004bc
This was SVN commit r11205.
2012-02-29 22:08:39 +00:00
2d65ee60f3
Tweaks minimap water color.
...
This was SVN commit r11202.
2012-02-29 01:12:52 +00:00
1498469730
Player 1 is a bit bluer.
...
This was SVN commit r11201.
2012-02-29 00:29:35 +00:00
e58b2614ef
Updated Greek female portrait.
...
This was SVN commit r11200.
2012-02-28 23:52:46 +00:00
366cd7f15a
Fixes broken selections in saved games (CmpSelectable needed to call Init on deserialization).
...
Adds function name to log output when serializer fails on functions, to
aid in debugging.
This was SVN commit r11199.
2012-02-28 22:12:30 +00:00
c169898a18
Made qBot not serialize the metadata which conatins too complicated a data structure and wasn't being used in any case. Fixes #1185 .
...
This was SVN commit r11198.
2012-02-28 20:40:17 +00:00
131758e1ac
committed a couple minimap color changes
...
This was SVN commit r11197.
2012-02-28 19:51:23 +00:00
437e9bb1b1
New hoplite portrait. Fixed civ on Nile River.
...
This was SVN commit r11196.
2012-02-28 19:23:14 +00:00
eb5425c139
Roman trireme portrait.
...
This was SVN commit r11195.
2012-02-28 18:49:45 +00:00
c480f41164
This was SVN commit r11194.
2012-02-28 10:41:10 +00:00
e73d70b371
This was SVN commit r11193.
2012-02-28 09:07:17 +00:00
9bb33fcc68
This was SVN commit r11192.
2012-02-28 05:02:17 +00:00
e3bacd948f
Adds defense tower and Romans support to JuBot, based on patch by gudo. Fixes #1152 .
...
This was SVN commit r11191.
2012-02-28 04:26:08 +00:00
d755af157f
Fixes constant logical operand warning on OS X build.
...
This was SVN commit r11190.
2012-02-28 03:34:33 +00:00
ef1e8de44e
Removes size_t from shareable types to prevent 32/64-bit errors.
...
Adds unsigned int to shareable types. In the future, use
int32/player_id_t for player IDs and uint32/entity_id_t for entity IDs.
This was SVN commit r11189.
2012-02-27 23:16:31 +00:00
f52bf1e5fd
Roman walls
...
This was SVN commit r11188.
2012-02-27 23:09:17 +00:00
fe38587112
Tweaked Roman army camp and fortress.
...
This was SVN commit r11187.
2012-02-27 22:51:19 +00:00
5f23cd6d10
Changes Atlas ObjectID type to unsigned int, fixes 64-bit build errors caused by size_t.
...
This was SVN commit r11186.
2012-02-27 22:29:53 +00:00
5fa9f01245
Tweaked starting unit for Iberians.
...
This was SVN commit r11185.
2012-02-27 22:28:57 +00:00
6f2f1b5cbb
New portrait for hoplite. Tweaked peacock skin.
...
This was SVN commit r11184.
2012-02-27 21:51:03 +00:00
088f076fb4
Tweaked Rome's starting units.
...
This was SVN commit r11183.
2012-02-27 21:39:40 +00:00
b8e8602e39
Fixed test failure in test_CmpTemplateManager.h after atlas selection improvement
...
This was SVN commit r11182.
2012-02-27 19:10:49 +00:00
64f0a91efc
Adds new metal and stone mines for polar and alpine biomes.
...
This was SVN commit r11181.
2012-02-27 15:09:56 +00:00
e82182252c
Fixed a major bug.
...
This was SVN commit r11180.
2012-02-27 11:56:53 +00:00
7a75e068e7
Swaps the game's double- and triple-click selections, by popular demand (double-click now selects similar units, triple-click selects exact matches by rank)
...
This was SVN commit r11178.
2012-02-27 05:46:02 +00:00
7d9e98b00e
Adds multiple entity selection to Atlas (including move/delete). Fixes #678 .
...
Makes all actors selectable in Atlas and gives them selection rings (an
EditorOnly flag is used in the template for Atlas-only selectables).
Adds player colors to Atlas selection rings.
Fixes decal selection by falling back to old-style AABBs. Refs #1032 .
Replaces UnitManager selections with EntitySelection helpers.
Adds DrawOverlays to Atlas views, for Atlas-specific rendering.
Fixes bug where selection rings conflicted with Move/rotate tool in
Atlas simulation test.
This was SVN commit r11177.
2012-02-27 05:32:35 +00:00
8651452d33
Adds Romans to random maps.
...
This was SVN commit r11176.
2012-02-27 00:21:42 +00:00
9b6863e78e
This was SVN commit r11175.
2012-02-26 18:19:56 +00:00
9272153ee7
Adds "Arennes Forest" by mmayfield45. Fixes the river texture for snowy biome of "Rivers".
...
This was SVN commit r11174.
2012-02-26 15:01:24 +00:00
298f844c2d
This was SVN commit r11173.
2012-02-26 07:46:40 +00:00
2b16f0cdc8
Tiger texture.
...
This was SVN commit r11172.
2012-02-26 07:38:35 +00:00
d033c757f7
Historicity's tiger mesh. Tweaked Roman tireme texture.
...
This was SVN commit r11171.
2012-02-26 06:38:32 +00:00
f8d335ce85
#Roman Trireme
...
This was SVN commit r11170.
2012-02-26 04:52:26 +00:00
0051a5e4cf
Fixes encoding of intro.txt to UTF-8 without BOM, based on patch by bird. Fixes #1181 .
...
This was SVN commit r11169.
2012-02-26 04:46:59 +00:00
ed4e834a6a
Peacock texture
...
This was SVN commit r11168.
2012-02-26 00:56:23 +00:00
cf09baa94e
Updated and improved zebra death animation.
...
This was SVN commit r11167.
2012-02-26 00:16:43 +00:00
b9a5d4725f
This was SVN commit r11166.
2012-02-25 23:56:33 +00:00
a3c04b62c0
Added some caching in the reassignIdleWorkers code for a large performance gain.
...
Also fixed a bug in entitycollection-extend.js when calculating length
for updating entity arrays
This was SVN commit r11165.
2012-02-25 23:32:01 +00:00
81a127433d
This was SVN commit r11164.
2012-02-25 23:04:22 +00:00
7663e78861
Fix terrain overlay rendering
...
This was SVN commit r11163.
2012-02-25 22:11:34 +00:00
41fd207089
Player color for sheep
...
This was SVN commit r11162.
2012-02-25 20:09:56 +00:00
9b15970a48
Update healer templates and scenarios to add ranks.
...
Also added a comment to FSM.js to clrify that state names must be A-Z
only
This was SVN commit r11161.
2012-02-25 20:07:30 +00:00
f5fc636b4e
Initial support in the templates for healer ranking
...
This was SVN commit r11159.
2012-02-25 18:44:33 +00:00
42d60d52c0
Adds "TILE_CENTERED_HEIGHT_MAP" to aegean sea.
...
This was SVN commit r11158.
2012-02-25 17:50:01 +00:00
811e8b7efd
Fix GLSL terrain.
...
This was SVN commit r11157.
2012-02-25 17:47:41 +00:00
cb5669e3d7
Add terrain effect files.
...
This was SVN commit r11156.
2012-02-25 17:31:19 +00:00
5009636e39
Improve Android compatibility.
...
Basic touchscreen input for testing.
Better GLSL support for map rendering.
This was SVN commit r11155.
2012-02-25 17:29:27 +00:00
c888c00377
Avoid unnecessary use of printf in text renderer.
...
This was SVN commit r11154.
2012-02-25 17:14:47 +00:00
b104bec238
Fix Android build scripts.
...
This was SVN commit r11153.
2012-02-25 16:11:08 +00:00
bc805bd357
Adds the path placer library by historic_brunno to rmgen. Fixes #892 .
...
Also takes all the duplicated parts of random maps including the new
player start entities and random biome system into rmgen libraries.
Tweaks nile river and snowflake random maps.
This was SVN commit r11152.
2012-02-25 15:53:43 +00:00
ce82f83798
This was SVN commit r11151.
2012-02-25 15:51:49 +00:00
122d5c9a05
This was SVN commit r11150.
2012-02-25 15:39:18 +00:00
9b0a3830df
Support more commands in shader technique XML files.
...
Always print GLSL shader logs, to help debugging.
This was SVN commit r11149.
2012-02-25 15:38:38 +00:00
7286fbaf90
This was SVN commit r11148.
2012-02-25 09:06:43 +00:00
629cd1645e
Added the forgotten ashes DAEs.
...
This was SVN commit r11147.
2012-02-25 09:00:44 +00:00
f50adb0c04
Added zebra attack animation.
...
This was SVN commit r11146.
2012-02-25 08:53:45 +00:00
dbf8dc3893
Added some useless ash to the temples for prettification.
...
This was SVN commit r11145.
2012-02-25 08:14:46 +00:00
1fdf6ea7d1
Tweaked zebra run speed
...
This was SVN commit r11144.
2012-02-25 07:28:52 +00:00
3a3f946d16
Median Oasis II complete.
...
This was SVN commit r11143.
2012-02-25 07:07:56 +00:00
b7e848de23
Avoid unused parameter warnings due to safe bool operators.
...
This was SVN commit r11142.
2012-02-25 06:24:24 +00:00
17b8c6360e
fixed player thing
...
This was SVN commit r11141.
2012-02-25 05:44:14 +00:00
7548464256
Updated zebra animations and added a proper idle animation.
...
This was SVN commit r11140.
2012-02-25 05:22:25 +00:00
a533a38f31
Renamed icon for leper.
...
This was SVN commit r11139.
2012-02-24 20:04:21 +00:00
2379c10e0c
Tweaks for Median oasis II
...
This was SVN commit r11138.
2012-02-24 19:59:22 +00:00
a9b963c3a5
Added new Random maps. Updated the existing ones with the new starting unit formation.
...
This was SVN commit r11137.
2012-02-24 10:34:05 +00:00
d3038bbb5c
Fixes Atlas assertion failure on wxOSX/Cocoa by properly checking combo box selection index.
...
This was SVN commit r11135.
2012-02-24 04:40:29 +00:00
6db9c41e7c
This was SVN commit r11134.
2012-02-24 01:08:29 +00:00
c1e3c6ecb0
This was SVN commit r11133.
2012-02-24 01:04:00 +00:00
f98abf1bf2
Fixed idle animation being used as walk animation.
...
This was SVN commit r11132.
2012-02-23 21:58:44 +00:00
3c299a80e5
Adding WIP zebra animations.
...
This was SVN commit r11131.
2012-02-23 21:49:20 +00:00
ba19767f7d
This was SVN commit r11130.
2012-02-23 21:45:29 +00:00
ec357cc8a2
Updated healing cursors.
...
This was SVN commit r11129.
2012-02-23 21:40:49 +00:00
c55b631eee
A rank-up icon for testing.
...
This was SVN commit r11128.
2012-02-23 21:10:21 +00:00
0b494d4834
Tweaked date palm leaf colors. tweaked environment for the ships demo map.
...
This was SVN commit r11127.
2012-02-23 08:14:55 +00:00
1b84b7c618
stat tweaks
...
This was SVN commit r11126.
2012-02-23 06:07:49 +00:00
720fed278c
Typo fix
...
This was SVN commit r11125.
2012-02-23 05:21:17 +00:00
0e8d47d35b
#Ishtar Gate.
...
Destruct dust for a few other buildings.
This was SVN commit r11124.
2012-02-23 05:18:33 +00:00
ee8f05554f
Last big construction dust commit.
...
This was SVN commit r11123.
2012-02-23 04:39:54 +00:00
ce478b7ece
Updating ship demo map with new ships
...
This was SVN commit r11122.
2012-02-23 00:21:48 +00:00
23f122988a
Added and fixed some functions in entity.js from RootBot. Fixes #1165 .
...
This was SVN commit r11121.
2012-02-23 00:11:39 +00:00
b87803b8b9
Fixes inconsistent dates and typos in civ data files, based on patches by bird. Fixes #1168 .
...
This was SVN commit r11120.
2012-02-23 00:09:30 +00:00
31c6d681a4
Made fire ship a bit faster. Tweaked burnt wood texture.
...
This was SVN commit r11119.
2012-02-22 21:56:55 +00:00
2a27448b8c
This was SVN commit r11118.
2012-02-22 21:47:33 +00:00
fb15ff0ea1
Iberian fireship updates
...
This was SVN commit r11117.
2012-02-22 21:19:12 +00:00
46b1c53b31
Some interim improvements to the Roman bireme and trireme in case Amish and Emjer don't come through on modeling new ones.
...
This was SVN commit r11116.
2012-02-22 19:54:53 +00:00
b82efa5242
#Iberian Fire Ship.
...
This was SVN commit r11115.
2012-02-22 01:24:49 +00:00
d34abc2abd
Iberian Fireship model and basic template files
...
This was SVN commit r11114.
2012-02-22 00:06:33 +00:00
457961555b
More pierce armour for siege engines.
...
This was SVN commit r11113.
2012-02-21 23:59:56 +00:00
95e9d72323
Adds install_name to libCollada link options for OS X.
...
This was SVN commit r11112.
2012-02-21 20:27:25 +00:00
46ee6f0566
Adds more specific error messages to failed model or animation loading.
...
This was SVN commit r11111.
2012-02-21 05:00:21 +00:00
ce6820698a
This was SVN commit r11110.
2012-02-21 03:54:34 +00:00
489138ce3d
Fixes spurious test of "unix" in Premake (prevented X11 from linking properly)
...
This was SVN commit r11109.
2012-02-20 23:58:59 +00:00
0a42dcb01b
"Large" destruction particle emitters and actors for "large" buildings, specifically Civ Centres and Fortresses.
...
This was SVN commit r11108.
2012-02-20 04:57:50 +00:00
6d110048c0
Slightly smaller footprint/obstruction.
...
This was SVN commit r11107.
2012-02-20 00:50:50 +00:00
590228804e
Fixed rally line attachment point for circular buildings (refs #1172 )
...
This was SVN commit r11106.
2012-02-20 00:13:46 +00:00
73d19555fc
More player color for Vesta temple.
...
Altered the footprint and obstruction for the Vesta temple.
This was SVN commit r11105.
2012-02-19 22:58:01 +00:00
d4c32b8a80
Fixes tests broken by [11100]
...
This was SVN commit r11104.
2012-02-19 22:00:29 +00:00
4e9e9e8cc0
Added player colour to Vesta temple
...
This was SVN commit r11103.
2012-02-19 18:44:26 +00:00
ec2b42f4a7
Roman Vesta temple
...
This was SVN commit r11102.
2012-02-19 18:07:18 +00:00
a1aea94435
Some footprint resizing.
...
This was SVN commit r11101.
2012-02-19 06:19:28 +00:00
b4a33851e6
Improves CColladaManager caching behavior: skeletons.xml changes now invalidate cached .pmd/psa files, CCacheLoader is used for consistency, adds support for archived files. Fixes #1167 .
...
Adds COLLADA conversion to archive builder.
Fixes archive builder on Windows.
Moves error logging from CCacheLoader::TryLoadingCached to its callers,
because this failure can be legitimate (in the case of uncached .pmd/psa
files).
This was SVN commit r11100.
2012-02-19 03:30:59 +00:00
338c66ae66
This was SVN commit r11099.
2012-02-19 02:38:21 +00:00
ccf1b1290f
Added destruction dust to a bunch of structures.
...
Made the Parthenon prettier.
This was SVN commit r11098.
2012-02-19 02:26:47 +00:00
16d42ad880
Documents writableRoot option in readme.txt
...
This was SVN commit r11097.
2012-02-18 23:28:12 +00:00
42a407ee23
Fixing typos and updating tooltips to be somewhat more consistent.
...
This was SVN commit r11096.
2012-02-18 20:54:03 +00:00
5a53c29d4f
Fixed player color for this house.
...
This was SVN commit r11095.
2012-02-18 19:35:10 +00:00
2873bbd2be
This was SVN commit r11094.
2012-02-18 19:03:28 +00:00
04655c2751
Rome healer texture and portrait.
...
Changed Temple tooltip to let people know it's no longer a "useless"
structure.
Continuing to tweak the destruction dust.
This was SVN commit r11093.
2012-02-18 06:40:13 +00:00
e18e7514ea
Tweaks to the medium destruction particles.
...
This was SVN commit r11092.
2012-02-18 03:42:19 +00:00
11aec4d67f
Tweaking destruction smoke for Barracks test.
...
This was SVN commit r11091.
2012-02-18 01:51:42 +00:00
cf5254b1e6
#Initial test for Destruction Dust.
...
This was SVN commit r11090.
2012-02-18 00:19:41 +00:00
6cc36dac72
Updates readme.txt with some undocumented options and reorganizes content more logically. Also clarifies a few options.
...
This was SVN commit r11089.
2012-02-17 23:22:45 +00:00
5a4aa790ad
Fix spelling and whitespace and add rationale
...
This was SVN commit r11088.
2012-02-17 14:34:44 +00:00
7b0d3aea83
Punjab II map.
...
This was SVN commit r11087.
2012-02-17 05:35:30 +00:00
e09403c792
This was SVN commit r11086.
2012-02-17 00:37:35 +00:00
57e656cf23
Added boar animations, changed boar attack range to 2 and fixed unrealistic sheep walk animation
...
This was SVN commit r11085.
2012-02-16 23:55:46 +00:00
a5c90de5cd
Fixed some rally point stuff. Made Roman army camp cost 800 Wood instead of 1000 Wood.
...
This was SVN commit r11084.
2012-02-16 18:30:33 +00:00
4c43d1f9c5
Fixing building with older versions of Boost
...
This was SVN commit r11083.
2012-02-16 18:01:10 +00:00
7656ffa265
Be more informative about errors in CreateDirectories
...
This was SVN commit r11082.
2012-02-16 13:50:31 +00:00
645a6e31be
Basic touch input for testing
...
This was SVN commit r11081.
2012-02-15 22:27:02 +00:00
832a51da80
GLSL text support
...
This was SVN commit r11080.
2012-02-15 21:53:13 +00:00
5f6e3de42f
Convert shaders to GLSL ES automatically
...
This was SVN commit r11079.
2012-02-15 20:33:43 +00:00
56378ea9f1
Experimental Android build support
...
This was SVN commit r11078.
2012-02-15 19:57:49 +00:00
cb2956b485
tweaked Market footprint.
...
This was SVN commit r11077.
2012-02-15 16:28:13 +00:00
ff7653d012
Update Premake for Android
...
This was SVN commit r11076.
2012-02-15 15:53:17 +00:00
20d23eb340
Sysdep code for Android/ARM
...
This was SVN commit r11075.
2012-02-15 15:40:31 +00:00
f4625e69af
Partial Android compatibility.
...
Remove unnecessary VM allocation (which seemingly causes problems on
Android due to mmap during static initialization).
Allow building without NVTT.
This was SVN commit r11074.
2012-02-15 13:58:58 +00:00
c63d06d59f
#New Roman buildings from Enrique.
...
This was SVN commit r11072.
2012-02-14 07:08:35 +00:00
d9531e59c7
Temporary Roman bireme and trireme. Updated dock template.
...
This was SVN commit r11071.
2012-02-14 05:27:33 +00:00
d368f57a45
Enrique's new Roman dock.
...
This was SVN commit r11070.
2012-02-14 03:09:50 +00:00
11c4f6909c
Added garrison flag and updated Roman barracks model
...
This was SVN commit r11069.
2012-02-14 00:15:01 +00:00
d70a981377
Android fixes
...
This was SVN commit r11068.
2012-02-13 23:53:09 +00:00
b9e623a6d5
Added some extra garrison related functions. Fixes #1164 .
...
This was SVN commit r11067.
2012-02-13 22:41:15 +00:00
f3bde45c7b
This was SVN commit r11066.
2012-02-13 22:35:21 +00:00
18043d88a5
Fix solid shader for GLSL
...
This was SVN commit r11065.
2012-02-13 21:00:41 +00:00
9972eb8cae
Enough GLES compatibility to reach the menu screen
...
This was SVN commit r11064.
2012-02-13 20:53:24 +00:00
d89c82092a
Fix GLSL shaders on Mesa
...
This was SVN commit r11063.
2012-02-13 20:47:14 +00:00
4f5a02acc4
Changes CCmpProjectileManager's culling to use recursive world bounds. Fixes instantly-disappearing smoke trails on projectiles going off-screen.
...
This was SVN commit r11062.
2012-02-13 20:06:57 +00:00
677ccf53e6
Yet more GLES compatibility
...
This was SVN commit r11061.
2012-02-13 16:41:17 +00:00
a9eca31bad
Even more GLES compatibility
...
This was SVN commit r11060.
2012-02-13 15:06:25 +00:00
4bf59b9a7d
More GLES compatibility, mainly around terrain rendering.
...
This was SVN commit r11059.
2012-02-13 14:02:14 +00:00
cba82eec2f
Tweaking Barracks actor.
...
This was SVN commit r11058.
2012-02-13 02:02:46 +00:00
25cd83f2ed
This was SVN commit r11057.
2012-02-12 23:51:19 +00:00
c65395d155
Roman barracks model
...
This was SVN commit r11056.
2012-02-12 23:35:57 +00:00
409f03652e
Fixes animal auto-hunting by removing 10HP limit on possible targets. Units will now look for the same type of animal to hunt (matching templates).
...
This was SVN commit r11055.
2012-02-12 21:18:50 +00:00
baff889321
Fix invalid varargs
...
This was SVN commit r11054.
2012-02-12 21:05:13 +00:00
531b40578a
More GLES compatibility.
...
Add config option to disable hardware cursors on Windows.
This was SVN commit r11053.
2012-02-12 20:45:31 +00:00
7e86d2fa98
This was SVN commit r11052.
2012-02-12 16:09:24 +00:00
1185ebdea5
Fix build
...
This was SVN commit r11051.
2012-02-12 13:26:57 +00:00
db85833655
More GLES compatibility.
...
Move more rendering code to shader API.
This was SVN commit r11050.
2012-02-12 13:20:49 +00:00
4029d409bb
Handle CBrush assertion failure less fatally
...
This was SVN commit r11049.
2012-02-12 12:36:05 +00:00
1519704cd3
Player color for the Persian Bireme.
...
This was SVN commit r11048.
2012-02-12 03:31:38 +00:00
75152fc16e
This was SVN commit r11047.
2012-02-11 23:29:06 +00:00
425348fa30
Persian structures bonus. Their structures are generally ~25% greater strength than others, but also take longer to construct.
...
This was SVN commit r11046.
2012-02-10 20:42:04 +00:00
202a8e17c4
Fixes camera constraints by clamping the camera focus point to within the map bounds instead of outside, since the constraints are partially based on terrain height. Should improve scrolling behavior on both circular and square maps. Refs #656 , #850
...
This was SVN commit r11044.
2012-02-10 02:17:40 +00:00
b2fd7a54f0
Removes hard-coded choices from Identity.js to allow easy modification of civs, classes and formations. Note: incorrect/misspelled choices will no longer be rejected by the parser.
...
This was SVN commit r11043.
2012-02-10 01:59:25 +00:00
33ca04a7a5
#Siege Ram balancing.
...
This was SVN commit r11042.
2012-02-09 21:08:12 +00:00
2bf3383624
Attempt to fix minimap rendering issues
...
This was SVN commit r11041.
2012-02-09 20:45:19 +00:00
a3f168b887
Initial support for GLSL generic vertex attributes in shader API, for GLES compatibility.
...
Specify GLSL version in shader files, for better error detection.
This was SVN commit r11040.
2012-02-09 17:55:25 +00:00
1f5b8f1c9a
Move GUI renderer towards using shader infrastructure.
...
Remove support for unused GUI sprite effects.
Use vertex arrays for bounding box rendering.
This was SVN commit r11039.
2012-02-08 20:43:38 +00:00
bbded2db91
Another leaf color variation for palm trees.
...
This was SVN commit r11038.
2012-02-08 19:39:56 +00:00
659272a29c
Fixes Celt war dog's selection group name, and renames icon for consistency.
...
This was SVN commit r11037.
2012-02-08 03:05:16 +00:00
08bd07ddd6
Adds safe bool operator to ICmpPtr, replacing the null() method, based on patch by leper. Also changes bool operator in AtSmartPtr to safe bool. Fixes #1077 .
...
Changes some CmpPtr variable names for consistency.
This was SVN commit r11036.
2012-02-08 02:46:15 +00:00
046729dfa7
Fixes Atlas double-click behavior in simulation test, by handling the events in Canvas and recognizing wxWidgets' ButtonDown and ButtonDClick events are mutually exclusive.
...
This was SVN commit r11035.
2012-02-07 00:40:55 +00:00
5c69809fe0
This was SVN commit r11034.
2012-02-07 00:01:38 +00:00
3fab2729b5
Partial SDL2 compatibility
...
This was SVN commit r11033.
2012-02-06 22:47:35 +00:00
5ad1664ed6
This was SVN commit r11032.
2012-02-06 16:10:52 +00:00
fbf1f9cb26
Altered some default hotkeys.
...
This was SVN commit r11031.
2012-02-06 05:56:31 +00:00
ba84c54535
Render GUI quads with consistent winding order, to stop them vanishing with negative sizes.
...
This was SVN commit r11030.
2012-02-05 22:57:58 +00:00
57d16bb93d
Increased pop cost of Rams.
...
This was SVN commit r11029.
2012-02-05 20:52:05 +00:00
190c6e80c6
Roman helm tweaks.
...
This was SVN commit r11028.
2012-02-05 18:10:56 +00:00
80a2b65911
Roman hero helmet models and textures
...
This was SVN commit r11027.
2012-02-05 13:19:05 +00:00
90fabfc215
Fixed war dog issue.
...
This was SVN commit r11026.
2012-02-05 03:35:44 +00:00
4530c3f31e
Some footprint changes.
...
Female heads stuff.
This was SVN commit r11025.
2012-02-05 03:01:03 +00:00
867df2e6c1
Fixed qbot for the scout tower to defense tower rename and updated the build restriction for the defense tower for consistent naming.
...
This was SVN commit r11024.
2012-02-04 23:42:55 +00:00
a61a682e2a
This was SVN commit r11023.
2012-02-04 23:25:09 +00:00
6a0cb66af0
Tweaked Market.
...
This was SVN commit r11022.
2012-02-04 23:01:42 +00:00
d739995d78
#New Roman Market
...
This was SVN commit r11021.
2012-02-04 22:42:47 +00:00
ffe6d0c6a7
Remapped Roman temple.
...
This was SVN commit r11020.
2012-02-04 22:12:59 +00:00
1a016a4727
Scout tower -> Defense tower.
...
This was SVN commit r11019.
2012-02-04 21:51:06 +00:00
fa0891901b
Renaming "Scout" Tower to "Defense" Tower (to help differentiate from the Outpost).
...
This was SVN commit r11018.
2012-02-04 20:43:22 +00:00
ec98b68b58
This was SVN commit r11017.
2012-02-04 20:16:01 +00:00
fa5f7e3e1d
Made these elephants defensive instead of aggressive. Helps out the AI a bit.
...
This was SVN commit r11016.
2012-02-04 17:49:58 +00:00
5ff1427eb9
Persian trireme movement animations
...
This was SVN commit r11015.
2012-02-04 13:23:29 +00:00
275e5b9620
Fixes signed/unsigned comparison warnings in GCC.
...
This was SVN commit r11014.
2012-02-04 06:17:17 +00:00
1fe6d4780a
Includes Objective-C++ (*.mm) files in Premake generated projects. Premake and GCC handle the rest. Fixes #1148 .
...
This was SVN commit r11013.
2012-02-04 01:20:33 +00:00
374242bcfc
Fix warnings in autobuild script
...
This was SVN commit r11012.
2012-02-03 17:08:43 +00:00
4ee994d1db
Fixes typo in theatron construction sound.
...
This was SVN commit r11011.
2012-02-03 05:00:21 +00:00
868b256cce
Throw error in PSA converter if animation has no frames, as this will lead to a divide-by-zero error in the engine, and it's good to catch that as early as possible.
...
This was SVN commit r11009.
2012-02-03 01:49:32 +00:00
0f697afbe3
Persian bireme animations
...
This was SVN commit r11008.
2012-02-03 01:00:51 +00:00
0f4928bd0a
Use dummy IO tracer, to avoid overhead of storing data that will never be used. (See #1143.)
...
This was SVN commit r11007.
2012-02-02 23:12:36 +00:00
b9c406551b
Cache shader effects. Fixes #1143 .
...
This was SVN commit r11006.
2012-02-02 22:58:42 +00:00
38c26c8924
Tweaking pop bonuses. Updated "palisade" portrait. New Oasis VII map.
...
This was SVN commit r11005.
2012-02-02 22:45:02 +00:00
8389d26c1f
Tweaked portrait
...
This was SVN commit r11004.
2012-02-02 16:35:39 +00:00
ef76738dac
This was SVN commit r11003.
2012-02-02 01:50:37 +00:00
7f710fbe91
Renamed celt cav spear to celt war dog. Hopefully it doesn't break anything.
...
This was SVN commit r11002.
2012-02-01 22:34:40 +00:00
91a209d2cc
Made temples heal units 2x faster than other buildings.
...
Reduced pop bonus for Fortresses. I've been finding that Houses can be
skipped altogether if other buildings give too large of a pop bonus.
Reduced gathering rates for a few things.
This was SVN commit r11001.
2012-02-01 19:35:31 +00:00
5919a62564
Rounds applied damages to the nearest integer.
...
This was SVN commit r11000.
2012-02-01 04:11:47 +00:00
075951881d
This was SVN commit r10999.
2012-01-31 19:55:33 +00:00
6545d3bb43
I've noticed that a lot of times it's unnecessary to build houses, so I'm testing out some populationbonus tweaks.
...
This was SVN commit r10998.
2012-01-31 19:41:42 +00:00
c1a66d380c
This was SVN commit r10997.
2012-01-31 05:55:09 +00:00
b1283c657f
Fixes a few more broken actor references.
...
This was SVN commit r10996.
2012-01-31 03:31:55 +00:00
6f105130ba
New Roman houses
...
This was SVN commit r10995.
2012-01-31 00:52:41 +00:00
41e3bad341
More build fixes for FreeBSD.
...
Adds BSD sysdep.
Adds support for MAKE variable, overriding make command in our build
scripts.
Fixes more files not ending with newline.
This was SVN commit r10994.
2012-01-31 00:06:56 +00:00
5470d7c233
#Addresses some interim farming balancing issues.
...
This was SVN commit r10993.
2012-01-30 23:23:31 +00:00
5cdb2ebd70
Fix cursor winding
...
This was SVN commit r10992.
2012-01-30 12:13:43 +00:00
fc27a5c0ea
More FreeBSD build fixes.
...
Fixes some warnings about files that don't end with newline.
This was SVN commit r10991.
2012-01-30 06:21:11 +00:00
2d0e8021aa
Fixes old g++ build error with default template arguments, by wrapping them in parentheses.
...
This was SVN commit r10990.
2012-01-30 04:57:39 +00:00
cc5a0fba4e
Use shader API for GUI text.
...
Flip GUI quads so we don't have to disable back-face culling.
This was SVN commit r10989.
2012-01-30 00:27:23 +00:00
4ab9df2a31
Fix qBot's errors when it have no CC at the start of a game. Fixes 1084.
...
This was SVN commit r10987.
2012-01-29 22:11:47 +00:00
63572a5247
Fix build
...
This was SVN commit r10986.
2012-01-29 20:16:47 +00:00
04c63a4093
Clean up some text rendering to avoid relying on deprecated GL matrix state.
...
Use scissor instead of deprecated clip planes for GUI text.
Remove unused support for generic font names.
This was SVN commit r10985.
2012-01-29 20:04:21 +00:00
8be430eb30
Remove obsolete ogl_shader
...
This was SVN commit r10984.
2012-01-29 12:23:16 +00:00
9884d21830
Be more consistent in using the ARB forms of functions. Fixes #1138 , based on patch by Echelon9.
...
This was SVN commit r10983.
2012-01-29 12:15:22 +00:00
8324a8981d
Simplify GLSL program files.
...
Move water shaders to new shader system.
This was SVN commit r10982.
2012-01-29 12:04:39 +00:00
19c6ae7b1e
Adds incomplete FreeBSD support to Premake scripts.
...
Properly detects amd64 system architecture on FreeBSD.
Adds support for WX_CONFIG variable (works just like SDL_CONFIG).
Adds bsd_names for BSD-specific library names.
This was SVN commit r10981.
2012-01-29 03:58:08 +00:00
debc4138d1
Some "Red" Savanna terrains.
...
This was SVN commit r10979.
2012-01-29 01:50:27 +00:00
adbd7633dd
# Initial GLSL rendering support
...
This was SVN commit r10978.
2012-01-29 01:22:22 +00:00
8ca59d418d
Partially fix hotloading (see #848 )
...
This was SVN commit r10977.
2012-01-29 01:19:54 +00:00
d9840c83c3
Modifying the 3ds max biped formatting
...
This was SVN commit r10976.
2012-01-29 00:23:20 +00:00
63e151fbd5
Slightly more Android compatibility
...
This was SVN commit r10975.
2012-01-28 16:38:21 +00:00
27687873d5
Fix SSE skinning normalisation ( fixes #1136 ). Add a few more comments.
...
This was SVN commit r10974.
2012-01-28 12:17:44 +00:00
f27d010330
Added "Fortress" sounds to the Roman Army Camp. Fixed the errors with the Roman dock.
...
This was SVN commit r10973.
2012-01-28 01:00:50 +00:00
47fb1dc377
Removed old ugly Roman arch.
...
This was SVN commit r10972.
2012-01-28 00:47:07 +00:00
a17eccae68
House cleaning.
...
This was SVN commit r10971.
2012-01-28 00:32:51 +00:00
6480ea0c2d
Cleans up a few broken references. Converts remaining known static PMDs to DAEs.
...
This was SVN commit r10970.
2012-01-27 23:49:37 +00:00
7ae3d7b092
This was SVN commit r10969.
2012-01-27 21:25:08 +00:00
b37f0f55c9
*TEMPORARY* Roman Army Camp placeholder.
...
This was SVN commit r10968.
2012-01-27 21:09:00 +00:00
257736abeb
New Roman mill model
...
This was SVN commit r10967.
2012-01-27 20:43:35 +00:00
901d507687
HistoryGuy's requested Oasis match up.
...
This was SVN commit r10966.
2012-01-27 20:19:17 +00:00
15c50dd2ed
Replaces most remaining static PMDs with DAEs. Updates actor references accordingly.
...
This was SVN commit r10965.
2012-01-27 05:44:57 +00:00
73e33d2719
Carthaginian quinquereme movement animations
...
This was SVN commit r10964.
2012-01-25 22:54:20 +00:00
acc78e7e79
Carthaginian trireme animations
...
This was SVN commit r10963.
2012-01-25 21:46:24 +00:00
bab593fc6b
#New audio additions, notably resource selections and ship selection and death.
...
This was SVN commit r10962.
2012-01-25 02:51:48 +00:00
9da4f99d1d
Carthaginian bireme rowing animations
...
This was SVN commit r10959.
2012-01-24 00:10:45 +00:00
cdcd259dd9
Tweaking foliage colors.
...
Tweaked outpost/scout towers tips.
Touched up Gambia River and Punjab.
This was SVN commit r10958.
2012-01-23 13:23:51 +00:00
60e6a71870
This was SVN commit r10957.
2012-01-22 23:19:34 +00:00
3b811a930f
Updating the hele trireme's mesh UV mapping
...
This was SVN commit r10956.
2012-01-22 23:12:37 +00:00
69a6015929
Updated Ships Demo map to feature all the latest ships.
...
This was SVN commit r10955.
2012-01-22 23:04:12 +00:00
c089f59b61
hele trireme rowing animations and model updates
...
This was SVN commit r10954.
2012-01-22 22:12:26 +00:00
7f679a7975
# Support separate rotation and scaling for each terrain texture
...
This was SVN commit r10952.
2012-01-22 18:20:33 +00:00
2b96eafdb4
This was SVN commit r10951.
2012-01-22 18:10:34 +00:00
ae6f144eda
More house cleaning.
...
This was SVN commit r10950.
2012-01-22 17:28:03 +00:00
ee0c4db2ac
Cleaning house.
...
This was SVN commit r10949.
2012-01-22 16:03:53 +00:00
1b8d52dd6b
Cleaning out unused PMD mesh files. 272 files, total.
...
This was SVN commit r10948.
2012-01-22 15:22:21 +00:00
d40e4797de
Report timer_Resolution via hwdetect
...
This was SVN commit r10947.
2012-01-22 13:49:09 +00:00
c7e9894d44
Fixes #947 by generating a plain executable instead of an app bundle for development-builds.
...
The plan is to create a bundle later as a separate deployment-step after
building.
NVTT build is also changed because the installnames were not correct
when doubleclickig the executable.
This was SVN commit r10946.
2012-01-22 10:38:08 +00:00
1f9e87c60f
Running animation for sheep created by Zaggy. Movement speed reduced
...
This was SVN commit r10945.
2012-01-22 01:21:56 +00:00
9bc10c2231
hele pentekonter ship rowing animations and model update
...
This was SVN commit r10944.
2012-01-22 00:39:03 +00:00
42fc573b2c
#Updated chicken animations by Zaggy1024
...
This was SVN commit r10943.
2012-01-21 20:04:59 +00:00
8c989cba0f
#Sheep animations by Zaggy1024
...
This was SVN commit r10942.
2012-01-21 19:39:18 +00:00
206d83636d
#Punjab map, still a work in progress.
...
#Tropical grass sprites.
This was SVN commit r10941.
2012-01-21 14:42:32 +00:00
8fabaa4f8c
Fixes Atlas crashing when random map generator fails, load the blank map for now.
...
This was SVN commit r10939.
2012-01-21 00:53:34 +00:00
23959ec119
Made the menu background scroll slightly faster.
...
This was SVN commit r10938.
2012-01-20 23:21:27 +00:00
c7baf204e7
Outpost work.
...
This was SVN commit r10937.
2012-01-19 21:04:37 +00:00
d068c1dd09
Fix build with old versions of Mesa
...
This was SVN commit r10936.
2012-01-19 18:23:54 +00:00
2da41a2ac3
#Updated Roman Scout Tower.
...
This was SVN commit r10935.
2012-01-19 13:41:32 +00:00
fbf19649c1
Updating Mediterranean terrains.
...
This was SVN commit r10934.
2012-01-19 01:56:46 +00:00
0831c4497c
Update to camel run animation by Athos
...
This was SVN commit r10933.
2012-01-19 00:05:51 +00:00
95e6673ed4
Fixes include in wsdl.
...
This was SVN commit r10932.
2012-01-18 22:51:49 +00:00
dac87093c6
Hero attack balancing.
...
Updated a few terrains.
This was SVN commit r10931.
2012-01-18 22:26:33 +00:00
7a79418d3e
New movement animations for all Persian chariots. Additions to skeletons.xml
...
This was SVN commit r10930.
2012-01-18 22:00:02 +00:00
91652bdf6e
Implemented nested territory boundaries. Fixes #918 .
...
Fixed out of bounds memory access in Atlas due to always using global
terrain in TerrainOverlay
Fixed wrong player ID calculation in TerritoryOverlay
This was SVN commit r10929.
2012-01-18 21:22:58 +00:00
86e6f378e3
tweaked body textures for roman swordsmen.
...
This was SVN commit r10928.
2012-01-18 18:03:32 +00:00
73143f48fe
Tweaked a couple maps.
...
Made outpost last a little longer.
Adjusted war dog cost again.
This was SVN commit r10927.
2012-01-18 16:00:34 +00:00
8099388bec
final sync with work - add VECTOR_ALIGNED, fix wsdl to match new SDL include path
...
This was SVN commit r10926.
2012-01-18 15:36:44 +00:00
b928b334b3
Nerfed the War Dog a bit.
...
Tweaked Gambia River to have tributaries.
This was SVN commit r10925.
2012-01-18 10:41:18 +00:00
14b798c63f
Fix to irregular Blender bone rotations in wheeled vehicles
...
This was SVN commit r10924.
2012-01-18 00:10:31 +00:00
182bf2b4af
Vague start at hypothetical Android support
...
This was SVN commit r10923.
2012-01-17 22:05:43 +00:00
bed2a781c2
Update to Roman siege ram texture and mesh
...
This was SVN commit r10922.
2012-01-17 21:59:59 +00:00
cd940b408c
Gambia River is now more like the random map description.
...
This was SVN commit r10921.
2012-01-17 15:40:32 +00:00
45b628acac
Roman ram template work.
...
This was SVN commit r10920.
2012-01-17 11:08:31 +00:00
52c289dfd5
Roman siege ram with animations
...
This was SVN commit r10919.
2012-01-16 23:46:02 +00:00
126be40e22
Fixed attack errors when there are no targets left
...
This was SVN commit r10918.
2012-01-16 19:42:48 +00:00
b63f8d264a
Fixed attackMoveToLocation apart from when it runs out of targets.
...
Thanks to iap for pointing out a stupid error I had made.
This was SVN commit r10917.
2012-01-16 19:33:28 +00:00
09907adae3
Prevents game from running with root permissions with appropriately scary message on Unix-like OSes, based on patch by leper. Fixes #1058 .
...
This was SVN commit r10916.
2012-01-16 03:30:55 +00:00
e64a3d3946
Experiment a little with OpenGL ES
...
This was SVN commit r10915.
2012-01-15 23:15:31 +00:00
c8bf34948c
Fixes no PCH build. Fixes #1113 .
...
This was SVN commit r10914.
2012-01-15 21:48:41 +00:00
a985b7bb39
#New horse textures for Roman heroes.
...
This was SVN commit r10913.
2012-01-15 20:01:15 +00:00
adfc535a29
Persian Apple Bearer
...
This was SVN commit r10912.
2012-01-15 17:27:34 +00:00
6d3b9c5cf0
This was SVN commit r10911.
2012-01-15 16:14:35 +00:00
bf8f019480
Added Carthaginians to Acropolis III. So now it is Rome vs. Carthage.
...
This was SVN commit r10910.
2012-01-15 15:28:14 +00:00
e4b2de4bba
Delete obsolete AoE3Ed code
...
This was SVN commit r10909.
2012-01-14 19:12:18 +00:00
c9cdde256f
Disable GCC warning triggered by wx headers
...
This was SVN commit r10908.
2012-01-14 19:06:47 +00:00
1389e754de
Include *.DELETED files when building archives. See #1110 .
...
This was SVN commit r10907.
2012-01-14 18:46:20 +00:00
906e713880
This was SVN commit r10906.
2012-01-13 16:52:08 +00:00
40b9fc8c1e
This was SVN commit r10905.
2012-01-13 09:49:05 +00:00
893cb2668e
Renames our sdl.h to libsdl.h, to avoid case sensitivity errors when it includes SDL.h.
...
This was SVN commit r10904.
2012-01-12 23:32:27 +00:00
72bd886f80
Delete ancient obsolete simulation code.
...
This was SVN commit r10903.
2012-01-12 12:56:15 +00:00
ce67dfd333
Rename CELL_SIZE to TERRAIN_TILE_SIZE, to free up the term "cell" for other concepts.
...
This was SVN commit r10902.
2012-01-12 12:51:10 +00:00
4f559e8aff
Report quicksave/quickload times, to help identify performance problems.
...
This was SVN commit r10901.
2012-01-12 12:47:24 +00:00
2b59c16d16
Updated grass terrains.
...
Tweaked maps.
New "outposts" tip.
This was SVN commit r10900.
2012-01-12 10:34:58 +00:00
a4dd25db90
Tweaked outpost entity.
...
This was SVN commit r10899.
2012-01-12 05:54:22 +00:00
c349fb0b3c
Make Premake makefile compatible with OS X
...
This was SVN commit r10898.
2012-01-12 00:03:37 +00:00
ed237ff1a6
Implements GetVideoMode on OS X (10.6+ compatible), based on patch by Echelon9. Fixes #847 .
...
This was SVN commit r10897.
2012-01-11 23:41:59 +00:00
6bb54ee1d4
Fix Windows build
...
This was SVN commit r10896.
2012-01-11 23:04:33 +00:00
d07eac218c
SDL 1.3 build fixes.
...
Support SDL_CONFIG environment variable in update-workspaces to pick
non-default sdl-config.
Avoid non-standard use of SDL/ in include paths.
This was SVN commit r10895.
2012-01-11 22:50:39 +00:00
11737926a1
Remove Premake's (seemingly undocumented) usage of the ARCH environment variable, which is usually unset but causes build failures in some build environments that set it.
...
Remake Premake's Makefiles with current patched version of Premake.
This was SVN commit r10894.
2012-01-11 17:43:07 +00:00
bab3fc0849
This was SVN commit r10893.
2012-01-11 13:32:21 +00:00
8c10507112
Fixed roman struct texture.
...
7x7 decal
This was SVN commit r10892.
2012-01-11 13:12:11 +00:00
bf403a0e71
Trophy heads for Gallic champ cav.
...
Names for Cart naval shipyard and Celt fanatic.
Prop points for Roman Fortress.
This was SVN commit r10891.
2012-01-11 12:42:47 +00:00
033881612d
This was SVN commit r10890.
2012-01-09 00:30:49 +00:00
77ead59320
New Roman fortress model and struct_2 texture by Enrique
...
This was SVN commit r10889.
2012-01-08 16:03:42 +00:00
7e48a9863b
Took away the garrison element for the outpost.
...
This was SVN commit r10888.
2012-01-08 12:37:22 +00:00
2da15b6d85
Projectile loaded on roman ballista
...
This was SVN commit r10887.
2012-01-08 10:17:11 +00:00
4a4e266d11
Animated Roman ballista siege weapon with delayed attack sounds.
...
This was SVN commit r10886.
2012-01-08 01:59:59 +00:00
62746f1a05
palisade outpost files
...
This was SVN commit r10885.
2012-01-07 20:34:16 +00:00
ea415620b3
Greek shield tweaks.
...
This was SVN commit r10884.
2012-01-07 14:41:24 +00:00
0e66f24e51
Roman cavalry horse textures.
...
This was SVN commit r10883.
2012-01-07 10:34:37 +00:00
bc76b0568e
Fix healing for garrisoned units. Fixes #1098 .
...
This was SVN commit r10882.
2012-01-07 07:13:27 +00:00
add75cffe5
Tweaked textures.
...
This was SVN commit r10881.
2012-01-06 05:42:38 +00:00
38beb81653
#Higher resolution Roman shield textures.
...
#Wolfskin hats for Velites.
This was SVN commit r10880.
2012-01-06 01:37:26 +00:00
2fb0fa36be
New outpost model
...
This was SVN commit r10879.
2012-01-05 23:38:57 +00:00
cf729d7bb1
Added TILE_CENTERED_HEIGHT_MAP flag to the mapgen scripts. This allows easy height based terrain painting if enabled. This is false by default for backwards compatibility.
...
This was SVN commit r10878.
2012-01-05 22:09:53 +00:00
888817441b
wolfskin helmets. wolf textures provided by woxys from deviantart
...
This was SVN commit r10877.
2012-01-05 20:52:35 +00:00
8b61376977
This was SVN commit r10876.
2012-01-05 20:51:42 +00:00
240142346b
Fix unreachable resources on random maps by Spahbod ( fixes #1078 )
...
This was SVN commit r10875.
2012-01-05 14:27:42 +00:00
c2c4e23f27
Updated hotkey list in the in-game manual
...
This was SVN commit r10874.
2012-01-05 13:57:58 +00:00
1730dd6d8d
Add military only drag select (Alt modifier) by gerbilOFdoom. Closes #277
...
This was SVN commit r10873.
2012-01-05 13:31:54 +00:00
c5d62aff98
Fixing the menu backgrounds. Sorry bout that guys.
...
This was SVN commit r10872.
2012-01-05 10:49:44 +00:00
c7b2aae5fb
Beefed up Hero Health.
...
Added a new farm field texture.
This was SVN commit r10871.
2012-01-05 10:32:40 +00:00
1e4b950ed1
This was SVN commit r10870.
2012-01-05 03:38:54 +00:00
29a8f01254
Adds missing attributes when using autostart-random (caused undefined variable warning in saved games list).
...
This was SVN commit r10869.
2012-01-04 22:48:32 +00:00
10527b4551
Fix #1092 (script runtime mismatch when saving games)
...
This was SVN commit r10868.
2012-01-04 15:28:48 +00:00
6f2eec3c2e
Fix warnings
...
This was SVN commit r10867.
2012-01-04 13:19:38 +00:00
c1c741be9a
Fix dangling pointer in Atlas
...
This was SVN commit r10866.
2012-01-04 13:18:45 +00:00
f73e3c7668
Fix uninitialised members
...
This was SVN commit r10865.
2012-01-04 13:17:26 +00:00
83690ccf95
This was SVN commit r10864.
2012-01-04 10:56:18 +00:00
5bc1aef3ec
New "Outpost" class structure for all factions. Can only be built in neutral territory and is very weak. Same function as the "Outpost" in Age of Empires II.
...
Needs a new <BuildRestrictions><Category> added to the scripts.
"Outpost"?
This was SVN commit r10863.
2012-01-04 00:28:54 +00:00
8b6a3923d3
instead of wcscasecmp, use std::string operator< (i.e. case-sensitive comparison)
...
closes #1036 (see rationale/discussion there)
This was SVN commit r10862.
2012-01-04 00:25:34 +00:00
3335bdaf9f
Added treasure collection similar to Marilyn and a performance increase for reassignIdleWorkers.
...
This was SVN commit r10861.
2012-01-03 21:26:37 +00:00
56bd4b37cd
Fix #1064 more
...
This was SVN commit r10860.
2012-01-03 15:42:03 +00:00
4aed173f02
Blowing snow particle. Map tweaks. Tweaked snowy pine texture.
...
This was SVN commit r10859.
2012-01-03 09:50:42 +00:00
785b6efa4b
by default, don't attempt to start the aken driver
...
addresses security concerns
[http://www.wildfiregames.com/forum/index.php?showtopic=15482 ]
This was SVN commit r10858.
2012-01-02 23:38:46 +00:00
c5cb50421f
This was SVN commit r10857.
2012-01-02 23:22:47 +00:00
dfc254af5b
Added new config file to qbot
...
This was SVN commit r10856.
2012-01-02 23:09:09 +00:00
5bf70e52de
Fixes Atlas startup in Windows when using SDL.
...
This was SVN commit r10855.
2012-01-02 22:48:43 +00:00
fa37c9b441
Reverted some of bad commit (10853) because I hit the wrong button
...
This was SVN commit r10854.
2012-01-02 22:15:21 +00:00
a4e1f3c292
This was SVN commit r10853.
2012-01-02 21:46:09 +00:00
97c847c4d9
Stuff for Roman Veles--updated textures, new verutum javelins, updated actors. Still need wolfskin hat.
...
Some texture stuff, including updated portraits.
This was SVN commit r10852.
2012-01-02 06:53:18 +00:00
506a4d2647
More changes to Roman ballista
...
This was SVN commit r10851.
2012-01-02 02:28:33 +00:00
a902eca2a2
Tweaking Ballista template.
...
This was SVN commit r10850.
2012-01-02 01:22:43 +00:00
a16b645002
Roman siege ballista templates
...
This was SVN commit r10849.
2012-01-02 00:23:16 +00:00
fc4832c996
A few texture updates.
...
This was SVN commit r10848.
2012-01-01 23:00:55 +00:00
6cafb6caac
Roman Ballista model and texture
...
This was SVN commit r10847.
2012-01-01 19:06:02 +00:00
0ec4242962
Detect and fix printf signedness errors. Fixes #1086 , #1087 .
...
This was SVN commit r10846.
2012-01-01 16:43:10 +00:00
cc405939c2
Fix #1085 (incorrect buffer size), based on patch by Echelon9
...
This was SVN commit r10845.
2012-01-01 14:42:58 +00:00
3cbeb09ae8
Some stats tweaks.
...
This was SVN commit r10844.
2012-01-01 10:27:18 +00:00
55e68afc5d
Some updated portraits.
...
This was SVN commit r10843.
2012-01-01 10:03:57 +00:00
02b7736bce
#Balancing: Added a 2x bonus vs. siege engines for melee cavalry.
...
This was SVN commit r10842.
2012-01-01 06:08:19 +00:00
ccb51cebb7
# Happy new year
...
This was SVN commit r10841.
2012-01-01 00:00:03 +00:00
e1f7d7e599
Detect and fix characters missing from fonts
...
This was SVN commit r10840.
2011-12-31 16:34:42 +00:00
4d41b064a8
This was SVN commit r10839.
2011-12-31 10:26:05 +00:00
f556df8e68
Updated Roman portraits.
...
This was SVN commit r10838.
2011-12-31 07:00:37 +00:00
616ed1e366
A bunch of Roman template and actor stuff.
...
Added siege weapons.
This was SVN commit r10837.
2011-12-31 05:15:57 +00:00
7cefd9a94c
Template work.
...
Converted Ekdromos to swordsman.
This was SVN commit r10836.
2011-12-30 08:19:00 +00:00
dca6d41d45
Added civ support to the attack bonuses and removed unnecessary classes
...
This was SVN commit r10835.
2011-12-29 22:08:59 +00:00
325c344ddd
increase size of error message buffer, don't complain about "invalid image hash" (known issue with aken.sys on Win7 x86).
...
fixes #1083
This was SVN commit r10834.
2011-12-29 20:15:47 +00:00
ca56add718
Add GUI and civ files to reference checker
...
This was SVN commit r10833.
2011-12-29 19:25:41 +00:00
a18195d0a1
Add checks for terrain texture references
...
This was SVN commit r10832.
2011-12-29 17:57:01 +00:00
3e28d9124c
Fix filename cases
...
This was SVN commit r10831.
2011-12-29 17:47:31 +00:00
7380d2c615
Add incomplete script for detecting data errors (broken references and unused files)
...
This was SVN commit r10830.
2011-12-29 17:39:27 +00:00
1e0074e9da
Fix crash with missing shader support
...
This was SVN commit r10829.
2011-12-29 13:35:07 +00:00
081feaad34
Some name fixes and tweaking a map.
...
This was SVN commit r10828.
2011-12-29 10:23:55 +00:00
78ba79209d
more minor fixes. rename uname.machine to x64 (less confusing than amd64)
...
This was SVN commit r10827.
2011-12-29 09:47:42 +00:00
23308f0259
wsdl: add error checks, add support for bpp in sdl_surface
...
This was SVN commit r10826.
2011-12-29 09:01:09 +00:00
1e210165f2
Fix some MSVC static analysis warnings
...
This was SVN commit r10825.
2011-12-29 02:06:09 +00:00
9ef1cd8ba8
Avoid the deprecated (and fallible) SHGetMalloc, per current MSDN documentation
...
This was SVN commit r10824.
2011-12-29 01:50:18 +00:00
dbf27dbc5e
Fix #1065 (incorrect printf format string), based on patch by Echelon9
...
This was SVN commit r10823.
2011-12-29 01:40:24 +00:00
c4bb67a1ca
Fix #1064 (use ++it instead of it++ for consistency), based on patch by Echelon9
...
This was SVN commit r10822.
2011-12-29 01:17:03 +00:00
6ac6d4f1ec
Fix #1062 (incorrect check for empty string), based on patch by Echelon9
...
This was SVN commit r10821.
2011-12-29 01:07:20 +00:00
eb45a8e0f0
Fix profile visualiser
...
This was SVN commit r10820.
2011-12-28 22:01:30 +00:00
52756535f3
Fix crash in GL_EXT_timer_query profiler
...
This was SVN commit r10819.
2011-12-28 22:00:52 +00:00
c134221739
minor fixes
...
waio: ensure error is disk_full on failure
cache_adt: scaffolding code wrongly used std::remove_if instead of
list::remove. thanks to Echelon9 for catching this! fixes #1063
This was SVN commit r10818.
2011-12-28 11:21:05 +00:00
4946b079f3
Fixed up the Celtic Homestead with proper prop points.
...
Added some new smoke particles.
This was SVN commit r10817.
2011-12-28 05:02:39 +00:00
0d05c96be2
[gcc] compile fix.
...
fixes #1074
thanks to Echelon9!
This was SVN commit r10816.
2011-12-27 18:56:20 +00:00
3537ae31d5
sync with work:
...
x86_x64: update MSR definitions to include model 2F (westmere ex);
update bus clock computation for sandy bridge; remove unused
cpu_Serialize; use namespace, add model names
mahaf: cope with stricter security for services/drivers
ApicId -> GetApicId, move to apic module
aken: add batch file to install driver (optional)
This was SVN commit r10815.
2011-12-27 14:12:31 +00:00
9911f561d3
Closes #1050 (Codeblocks not relinking after static libraries change)
...
This was SVN commit r10814.
2011-12-25 21:25:04 +00:00
1bca9ce693
fixed by zaggy
...
This was SVN commit r10813.
2011-12-25 01:15:05 +00:00
480bda4e99
This was SVN commit r10812.
2011-12-25 00:48:46 +00:00
02bbcd4c34
Fixed some spellings per Infy. Lion riggings needs fixed now though.
...
This was SVN commit r10811.
2011-12-25 00:30:20 +00:00
b5e18a3ff6
#Updated chicken animations by Zaggy.
...
This was SVN commit r10810.
2011-12-24 22:59:34 +00:00
dba2bd2da2
First Roman map.
...
This was SVN commit r10809.
2011-12-24 08:32:06 +00:00
2ad69c8603
This was SVN commit r10808.
2011-12-24 04:37:52 +00:00
8535f33f26
Moving more stuff from Internal to Public.
...
This was SVN commit r10807.
2011-12-24 04:25:02 +00:00
99e4fb4c0e
Moving all Roman materials from Internal to Public.
...
This was SVN commit r10806.
2011-12-24 04:19:36 +00:00
4d2c87c5a0
This was SVN commit r10805.
2011-12-24 03:59:28 +00:00
8b511dd053
#New ATTACK BONUSES code.
...
This was SVN commit r10804.
2011-12-24 03:49:30 +00:00
1f38526444
Fix test failures on Windows
...
This was SVN commit r10802.
2011-12-23 13:37:11 +00:00
4f6f0b7baf
Fix tests, and warnings, and non-PCH build
...
This was SVN commit r10801.
2011-12-23 13:01:29 +00:00
779278d376
Added check that a resource is not in enemy territory before trying to gather from it and increased field priority.
...
This was SVN commit r10800.
2011-12-23 10:22:07 +00:00
587487811b
Fixes typo in pool allocator stats, based on patch from Echelon9. Fixes #1061 .
...
This was SVN commit r10799.
2011-12-23 03:54:36 +00:00
d4fea62800
Regenerate font textures
...
This was SVN commit r10797.
2011-12-22 22:47:47 +00:00
9f0e357f09
Add a hack for a-macron-acute characters (see #1039 )
...
This was SVN commit r10796.
2011-12-22 22:44:57 +00:00
4e52b2cceb
Removed territory decay.
...
This was SVN commit r10795.
2011-12-22 22:00:07 +00:00
9f9569cdec
Removed territory decay for these structures.
...
This was SVN commit r10794.
2011-12-22 21:59:44 +00:00
8256d00c3c
This was SVN commit r10793.
2011-12-22 17:55:00 +00:00
3bd371ae64
Persian menu-background, updated structure for background functions.
...
This was SVN commit r10792.
2011-12-22 17:54:33 +00:00
3c1dc9ec32
Tidy some whitespace
...
This was SVN commit r10791.
2011-12-22 17:05:34 +00:00
c989f52c46
Use heap-based queue in pathfinder to improve worst-case performance (in exchange for terrible VS2008 debug-mode performance)
...
This was SVN commit r10790.
2011-12-22 16:58:03 +00:00
c270f2a375
Made qBot call the deserialize function from BaseAi and then delete the metadata so any future chanegs won't be overidden
...
This was SVN commit r10789.
2011-12-22 16:01:20 +00:00
c472c07e7a
Added override for Deserialize
...
This was SVN commit r10788.
2011-12-22 15:49:23 +00:00
6399ec0cd2
# Partial support for saved games with AI.
...
Support cancelling loads while inside a loader callback.
Fix use of ArchiveReader/Writer since their API changed.
Improve error-detection in deserializer to avoid crashes.
Report deserializer errors to users.
Expand load-error message box to fit message about invalid saved games.
This was SVN commit r10787.
2011-12-22 14:04:32 +00:00
5f0d5e4137
Tidy some whitespace
...
This was SVN commit r10786.
2011-12-22 13:50:11 +00:00
708e192d20
This was SVN commit r10785.
2011-12-22 07:54:11 +00:00
9120046f8e
This was SVN commit r10784.
2011-12-22 07:53:28 +00:00
a8423ac8e8
Adding more checks that the path found is valid to follow, also redisabled the debug messages
...
This was SVN commit r10783.
2011-12-21 15:39:18 +00:00
cb1e8c11a2
Fixed clearTimer() function, made coding style consistent with qBot and removed commented section of code since it would cause a bug if enabled.
...
The commented code would have put a new timer into the id of a limited
repeat timer after it had finished. Then two pieces of code would have
the same id for a timer causing problems.
This was SVN commit r10782.
2011-12-21 12:26:09 +00:00
0c84a6125b
Support larger profiler JSON output
...
This was SVN commit r10781.
2011-12-21 11:28:24 +00:00
fe80045024
This was SVN commit r10780.
2011-12-21 05:40:30 +00:00
90acc38ffc
Build-in Timer. now working.
...
This was SVN commit r10779.
2011-12-21 01:59:53 +00:00
12dc33ab5f
Build-in timer class. Not tested, might have bugs.
...
This was SVN commit r10778.
2011-12-21 00:34:17 +00:00
6e974e3a78
Haxamanis
...
This was SVN commit r10777.
2011-12-20 21:40:03 +00:00
2a61188356
Stopped qBot from trying to gather floating treasures
...
This was SVN commit r10776.
2011-12-20 10:23:55 +00:00
eb5b3bba10
Fixes broken UnitAI test.
...
This was SVN commit r10775.
2011-12-19 23:09:38 +00:00
1d8f136e80
whale animation updates
...
This was SVN commit r10774.
2011-12-19 19:43:55 +00:00
436163a60f
Made terrain analysis pick better starting points and increased the distance check in economy to match the changed distance measure using distance to dropsite.
...
Terrain analysis now only picks a start point if it is within a region
of size >10.
The economy code only does a distance check if there are >100 entities
of that resource on the map so rare resources are gathered.
Modified some debug output as well.
This was SVN commit r10773.
2011-12-19 19:41:36 +00:00
e56a0edc2c
This was SVN commit r10772.
2011-12-19 18:20:45 +00:00
51550814ce
new mediterranean fin whale model and animations
...
This was SVN commit r10771.
2011-12-19 15:04:42 +00:00
2bc2666e4e
sync with work - minor fixes
...
This was SVN commit r10770.
2011-12-19 11:55:30 +00:00
36f3d2f0de
Disables rally point on corrals, since goats don't respond to orders. Fixes #1049 .
...
This was SVN commit r10769.
2011-12-19 00:34:42 +00:00
4c76547187
This was SVN commit r10768.
2011-12-18 23:19:25 +00:00
79703558b8
This was SVN commit r10767.
2011-12-18 23:11:58 +00:00
500861d42f
Updated the formation buttons.
...
Portrait for Persian fishing boat.
This was SVN commit r10766.
2011-12-18 22:11:52 +00:00
2079339a73
Added more checks in case pathfinding found no routes to a destination
...
This was SVN commit r10765.
2011-12-18 22:05:11 +00:00
40c1c0010f
Added another check for whether a valid path is set in attackMoveToLocation
...
This was SVN commit r10764.
2011-12-18 13:15:15 +00:00
574c4135a3
Tweaked attack code and fixed building liimit checks
...
This was SVN commit r10763.
2011-12-18 13:05:53 +00:00
286ce58b1c
more restrictive permissions required by tightened vista/win7 security (still unable to launch services without admin - but could install them once)
...
This was SVN commit r10762.
2011-12-18 12:21:57 +00:00
00e7db4e57
This was SVN commit r10761.
2011-12-18 06:45:06 +00:00
bfca6f0b58
Fixes UnitAI attack test for domestic animals. Fixes #1048 .
...
This was SVN commit r10760.
2011-12-18 05:17:34 +00:00
dda706eeea
Marking naval maps as multiplayer only maps and removing AI defaults from them
...
This was SVN commit r10759.
2011-12-18 01:11:35 +00:00
c3902e7b76
adjustments to some animal movement speeds
...
This was SVN commit r10758.
2011-12-18 00:43:54 +00:00
937efa7245
Smooth fish
...
This was SVN commit r10757.
2011-12-18 00:15:33 +00:00
dd3a9b1915
Some more fish animations
...
This was SVN commit r10756.
2011-12-17 23:40:47 +00:00
c8243a50dc
Large qBot update.
...
Key changes are:
Support for Persians
Revamped defence system supoprting groups of attackers
Dynamic priorities based on enemy strength and number of workers
Better placement of towers and fortresses
Randomised raiding in early game
This was SVN commit r10755.
2011-12-17 21:59:27 +00:00
36ef0a376d
workaround hardware/BIOS craziness
...
fixes #1047
This was SVN commit r10754.
2011-12-17 20:41:32 +00:00
5ec89d68eb
This was SVN commit r10753.
2011-12-17 20:34:41 +00:00
b9351306b6
Fixed whale hunting thanks to philip.
...
This was SVN commit r10752.
2011-12-17 18:07:36 +00:00
12fa398bc1
Adjusting the fishes.
...
This was SVN commit r10751.
2011-12-17 16:57:24 +00:00
5db77b5dea
Animated fish shoal
...
This was SVN commit r10750.
2011-12-17 16:31:57 +00:00
4a42b6bf28
Solves/Works around some linking problems for ActorEditor, ArchiveViewer and FileConverter. Closes #1004
...
This was SVN commit r10749.
2011-12-17 12:59:29 +00:00
0ff9035cfa
This was SVN commit r10747.
2011-12-17 11:14:00 +00:00
c12215d65d
This was SVN commit r10745.
2011-12-17 03:37:10 +00:00
42f0aec84a
Allows setting rally points on resources and buildings. closes #745
...
This was SVN commit r10744.
2011-12-16 16:08:26 +00:00
e62b9b6d8f
Fixed rally point lines being displayed for entities with rally points no longer set. Closes #1043 .
...
This was SVN commit r10743.
2011-12-16 15:14:59 +00:00
78d50b4149
Added check for the existence of a resource somewhere on the map
...
This was SVN commit r10742.
2011-12-16 10:46:20 +00:00
81372522f3
Carthaginian and Persian trader sounds
...
This was SVN commit r10741.
2011-12-15 21:23:59 +00:00
c44964a7f5
Beefed up Iberian scout tower.
...
Enrique's Roman cc changes.
This was SVN commit r10740.
2011-12-15 20:26:58 +00:00
78dfb6e9f9
Fast Oasis map player giraffe fix
...
This was SVN commit r10739.
2011-12-15 11:04:45 +00:00
f45badecf6
Decal stuff.
...
This was SVN commit r10738.
2011-12-15 05:16:47 +00:00
806744cadb
A bunch more garrison flag stuff.
...
This was SVN commit r10737.
2011-12-15 04:24:24 +00:00
f9b2e34017
Moar garrison flag stuff.
...
This was SVN commit r10736.
2011-12-15 03:37:46 +00:00
7cd70f44d5
New garrison flag models UV mapped to new textures
...
This was SVN commit r10735.
2011-12-15 00:46:00 +00:00
0c06150086
updated garrison flag textures.
...
This was SVN commit r10734.
2011-12-14 23:56:56 +00:00
eed68cb924
This was SVN commit r10730.
2011-12-14 20:34:06 +00:00
d6050afc71
This was SVN commit r10729.
2011-12-14 20:32:58 +00:00
8f01e41850
Persian Fishing Ship
...
This was SVN commit r10728.
2011-12-14 20:28:02 +00:00
eaeaff3737
Garrison flags
...
This was SVN commit r10727.
2011-12-14 04:26:31 +00:00
0273398fe8
New Persian trader
...
This was SVN commit r10726.
2011-12-14 00:36:58 +00:00
03e65fe8d8
This was SVN commit r10725.
2011-12-13 23:56:35 +00:00
88da757641
Deleting useless files.
...
This was SVN commit r10724.
2011-12-13 23:31:43 +00:00
6b91c697a0
This was SVN commit r10723.
2011-12-13 21:28:47 +00:00
292ed1d9e0
Allocated rally point flag entity on-demand instead of at initialization time. Fixes #1042 .
...
This was SVN commit r10722.
2011-12-13 14:14:41 +00:00
df7d3afd64
Fixed bug where only a tiny accessible region was being found so qBot didn't build or gather due to the rest of the map being inaccessible.
...
This was SVN commit r10721.
2011-12-12 21:28:14 +00:00
1e46e1a195
This was SVN commit r10720.
2011-12-11 23:15:01 +00:00
aee3c1a572
Change of default AI for random maps
...
This was SVN commit r10719.
2011-12-11 21:30:17 +00:00
f739935e29
Adding garrisoned prop point to Persian barracks
...
This was SVN commit r10718.
2011-12-11 19:38:30 +00:00
e9153d0a66
Animated garrison flag
...
This was SVN commit r10717.
2011-12-11 19:29:55 +00:00
ec315b720b
Updating map files to use the same AI
...
This was SVN commit r10716.
2011-12-11 18:00:02 +00:00
035f398a36
This was SVN commit r10715.
2011-12-11 14:50:20 +00:00
ebf160a531
re-added deleted garrison flags
...
This was SVN commit r10714.
2011-12-11 14:40:14 +00:00
a2296c6000
Cleaning unused waypoint flag files and adding new animations
...
This was SVN commit r10713.
2011-12-11 13:58:37 +00:00
6156fa7c9a
Changed default idle animation speed to 1 so that waypoint flags will animate properly
...
This was SVN commit r10712.
2011-12-11 13:35:51 +00:00
6342cc8a00
This was SVN commit r10711.
2011-12-11 03:36:14 +00:00
46a09ced71
Fixed some compilation warnings
...
This was SVN commit r10710.
2011-12-11 02:11:05 +00:00
e4f69a2ffb
waypoint flag animation example
...
This was SVN commit r10709.
2011-12-10 22:51:03 +00:00
a55633068f
Persian sb2 building model redesign
...
This was SVN commit r10707.
2011-12-10 20:08:24 +00:00
0d58e77a92
Cleaned up Apadana model
...
This was SVN commit r10706.
2011-12-10 18:32:53 +00:00
427674f713
Fix for compilation failure of [10703] on 64-bit systems
...
This was SVN commit r10705.
2011-12-10 11:53:39 +00:00
db864f10c3
Rendering marker lines between buildings and rally points
...
Added command button to focus on rally point
(implements #524 )
This was SVN commit r10704.
2011-12-10 07:07:04 +00:00
fbb0e3995f
Added prop point axes markers to Atlas' Actor Viewer panel
...
This was SVN commit r10703.
2011-12-10 05:11:25 +00:00
8755eb0323
Persian scout tower prop variations
...
This was SVN commit r10702.
2011-12-09 23:54:07 +00:00
504922e280
Iberian Ram animations
...
This was SVN commit r10701.
2011-12-09 20:54:35 +00:00
201055a1aa
Iberian ram actor update
...
This was SVN commit r10700.
2011-12-09 19:06:49 +00:00
527190d0a5
Ram attack and attack order sound files
...
This was SVN commit r10699.
2011-12-09 18:38:35 +00:00
40f4fd1694
Updated Celt Ram model and new animations for it
...
This was SVN commit r10698.
2011-12-09 17:36:56 +00:00
4a6e945c00
New Persian gate structure model
...
This was SVN commit r10697.
2011-12-09 13:06:09 +00:00
1c19e905b1
Added prop points to Atlas' Actor Viewer
...
This was SVN commit r10696.
2011-12-09 10:49:08 +00:00
e04e19c561
This was SVN commit r10695.
2011-12-09 10:29:37 +00:00
b2e877282a
updated temple model
...
This was SVN commit r10694.
2011-12-09 00:43:20 +00:00
4b8bdc1b7d
New Persian Temple
...
This was SVN commit r10693.
2011-12-09 00:22:36 +00:00
6d7b7839c6
This was SVN commit r10692.
2011-12-08 22:40:30 +00:00
806e431c2e
This was SVN commit r10691.
2011-12-08 22:39:14 +00:00
d010b7019e
Persian Apadana sb1 new model
...
This was SVN commit r10690.
2011-12-08 19:37:47 +00:00
e52d0914ec
This was SVN commit r10689.
2011-12-08 10:51:11 +00:00
d19726a8bf
This was SVN commit r10688.
2011-12-08 08:31:05 +00:00
32703e6f12
garrisoned prop for the hele siege tower
...
This was SVN commit r10687.
2011-12-08 00:31:52 +00:00
dd9ba1e10a
Added check for if a position is defined in qBot. Fixes an unusual error.
...
This was SVN commit r10686.
2011-12-07 21:54:21 +00:00
da540aca77
trader prop model
...
This was SVN commit r10685.
2011-12-07 19:54:14 +00:00
a5c5f47427
Updated Persian chariot animations and models
...
This was SVN commit r10684.
2011-12-07 19:22:11 +00:00
a8b479b804
Persian horse/chariot stuff.
...
This was SVN commit r10683.
2011-12-07 14:56:26 +00:00
ae2725bcc1
Default maps for alpha 8 release
...
This was SVN commit r10682.
2011-12-07 14:27:41 +00:00
7f22118787
Testing some different barter values.
...
This was SVN commit r10681.
2011-12-06 18:25:40 +00:00
8424dfb75d
Oops. Fixed. ;)
...
This was SVN commit r10680.
2011-12-06 10:37:08 +00:00
18e0b374ee
More accurate <SpecificNames> for Greek entities.
...
This was SVN commit r10679.
2011-12-06 10:16:12 +00:00
f4e46d166d
sync with work; minor fixes (wsdl must report gfx memory in KB to match sdl)
...
This was SVN commit r10678.
2011-12-06 09:17:39 +00:00
7d77aa45f5
Persian wall tower prop
...
This was SVN commit r10677.
2011-12-05 22:49:45 +00:00
5d48c85e7b
New Persian wall, wall tower, and gate placeholder
...
This was SVN commit r10676.
2011-12-05 22:35:11 +00:00
eed62dc17c
Fix to celt homestead projectile error messages
...
This was SVN commit r10675.
2011-12-05 20:08:36 +00:00
3334868f8f
Added Darius to the Palace.
...
This was SVN commit r10674.
2011-12-05 17:16:22 +00:00
cb6f507aeb
#Darius The Great.
...
This was SVN commit r10673.
2011-12-05 17:10:30 +00:00
c5f8fefb96
Oodles of Persian stuff.
...
This was SVN commit r10672.
2011-12-05 16:34:48 +00:00
c1c740d359
#New Persian faction emblem.
...
This was SVN commit r10671.
2011-12-05 00:36:43 +00:00
cc23ea8f04
New Persian Farmstead.
...
Updated Oases maps.
This was SVN commit r10670.
2011-12-04 18:06:22 +00:00
592ae80021
Crown for Xerxes.
...
Pers ram edit.
This was SVN commit r10669.
2011-12-04 04:53:46 +00:00
9d238c3f4c
This was SVN commit r10668.
2011-12-03 15:28:07 +00:00
7805f70b6d
This was SVN commit r10667.
2011-12-03 15:06:50 +00:00
9388a0246c
This was SVN commit r10666.
2011-12-03 15:04:29 +00:00
3de6025d64
Persian stuff.
...
This was SVN commit r10665.
2011-12-03 14:29:22 +00:00
6ea3c49e37
Moved siege ram actor.
...
This was SVN commit r10664.
2011-12-03 13:10:20 +00:00
f4821d9230
# Assyrian Ram
...
This was SVN commit r10663.
2011-12-03 13:00:44 +00:00
fe91f37673
Xerxes work. Not complete yet.
...
This was SVN commit r10662.
2011-12-03 10:00:39 +00:00
6a2cf46a1b
Updates player assignment colors in game setup.
...
This was SVN commit r10660.
2011-12-02 22:26:53 +00:00
855f39f693
New "royal" (i.e. tall) Persian kidaris. Useful for Heroes and high ranking units.
...
This was SVN commit r10659.
2011-12-02 20:30:31 +00:00
ef58da1ba3
#Xerxes starting to take shape.
...
Adjusted some default AIs on a couple maps.
Moved training of Persian heroes to their palace.
This was SVN commit r10658.
2011-12-02 19:10:49 +00:00
1e7298c9b1
This was SVN commit r10657.
2011-12-02 14:53:38 +00:00
45d9ad2d25
This was SVN commit r10656.
2011-12-02 14:52:04 +00:00
218f1af68e
#Cyrus The Great (Kurush II)
...
Persian Healer
Tweaked Acropolis map.
This was SVN commit r10655.
2011-12-02 13:49:57 +00:00
b146f53d7b
This was SVN commit r10654.
2011-12-02 12:44:31 +00:00
8383f35eb8
Added queued as an optional parameter so that AI's can set waypoints
...
This was SVN commit r10653.
2011-12-02 00:25:20 +00:00
6599200a9e
# Added control group and idle unit hotkey's to the in-game manual
...
This was SVN commit r10652.
2011-12-01 23:39:46 +00:00
2d373d5353
Update to some maps.
...
Slightly touched up alpha channel in pers_struct.dds.
Tweaked territory radius for special buildings to look pretty.
Treasure templates.
This was SVN commit r10651.
2011-12-01 12:19:27 +00:00
e5eef18165
#New Persian Treasures.
...
This was SVN commit r10650.
2011-12-01 04:46:38 +00:00
68c88498e7
Fix to SB2
...
This was SVN commit r10649.
2011-11-30 16:19:31 +00:00
405ae7b4fc
Update to Zagros Mountains.xml
...
Persian siege ram placeholder.
This was SVN commit r10648.
2011-11-30 16:14:31 +00:00
afdfd51d31
Moving unused audio files from public to internal
...
This was SVN commit r10645.
2011-11-30 15:23:56 +00:00
0ad19f67cd
#New Persian Markets by Enrique!
...
Updates to Oasis 3, 4, and 5, which add the SB2 as the Persian starting
structure.
This was SVN commit r10644.
2011-11-30 15:01:09 +00:00
1c60aeca3c
Iberian portrait updates
...
This was SVN commit r10643.
2011-11-30 14:10:47 +00:00
81f550fdec
Changed fortress projectiles from flaming to non-flaming.
...
This was SVN commit r10642.
2011-11-30 12:17:33 +00:00
eed06c68a9
Large Persian chariot movement animations
...
This was SVN commit r10641.
2011-11-30 12:07:40 +00:00
759aa6c6bb
Persian medium chariot animations
...
This was SVN commit r10640.
2011-11-30 11:23:06 +00:00
613878da88
Spinning blade animations
...
This was SVN commit r10639.
2011-11-30 10:32:57 +00:00
e60f39f955
Rome civ centre
...
This was SVN commit r10638.
2011-11-30 05:32:53 +00:00
acb01541c3
Animations for the smaller Persian chariot
...
This was SVN commit r10637.
2011-11-29 23:44:34 +00:00
7236073877
# New camel animations by Athos
...
This was SVN commit r10636.
2011-11-29 21:32:02 +00:00
0ba908816f
Fix line endings
...
This was SVN commit r10635.
2011-11-29 21:04:38 +00:00
8492426a14
Rough support for profiling replay mode and scripts
...
This was SVN commit r10634.
2011-11-29 20:32:43 +00:00
4da8bf001f
Add pathfinders to new profiler
...
This was SVN commit r10633.
2011-11-29 20:29:50 +00:00
2d017698e1
Fix random maps in replay mode
...
This was SVN commit r10632.
2011-11-29 20:29:06 +00:00
24aa71b566
safely handle the case where an archive required for populating a directory cannot be opened (e.g. because it is open within 7-zip, which apparently wants exclusive access)
...
fixes #1021
This was SVN commit r10631.
2011-11-29 16:51:58 +00:00
b54ad51054
Fixed an error in the plumed conical helm.
...
Added Amish's bushy Persian hair helmet. ;)
Added Amish's new building portraits to their respective Persian
Buildings.js
Adjusted tooltips on some units.
Added an 8x8 foundation (for the Roman Civic Centre and anything else
that might need it).
This was SVN commit r10630.
2011-11-29 14:47:46 +00:00
2dab7a8180
This was SVN commit r10629.
2011-11-29 09:33:35 +00:00
1dc20b117f
Persian sb2 building placeholder
...
This was SVN commit r10628.
2011-11-29 00:41:07 +00:00
ee417e8fd0
Attempts to fix incorrect destructor order in random map generator. See #1037 , #1035 .
...
This was SVN commit r10627.
2011-11-29 00:14:34 +00:00
774c9e63e6
Oasis V
...
This was SVN commit r10626.
2011-11-28 13:11:25 +00:00
1941577abb
This was SVN commit r10625.
2011-11-28 03:53:47 +00:00
526e5b4c03
Adjusted obstructions and territory radii of these 5 buildings.
...
This was SVN commit r10624.
2011-11-28 02:14:23 +00:00
ede60520a0
Fixes Atlas and Actor Editor's wxMouseCaptureLostEvent handling, which caused assertion failures in Windows debug builds. Mouse capture events are currently wxMSW only.
...
This was SVN commit r10623.
2011-11-28 01:12:18 +00:00
e74d6707e4
Avoid calling glGenQueries while a timer query is active (hopefully fixes #1033 )
...
This was SVN commit r10622.
2011-11-27 22:24:05 +00:00
5a69860388
Adjusted Persian Civ Centre staircase texture to make usable for Apadana as well.
...
This was SVN commit r10621.
2011-11-27 18:06:18 +00:00
b1fa90b8ef
Use a deterministic order when loading multiple archive files from within a single mod
...
This was SVN commit r10620.
2011-11-27 17:33:42 +00:00
8712008ba8
missing horns
...
This was SVN commit r10619.
2011-11-27 17:30:39 +00:00
1acfcd4cb0
Persian Civ Centre update
...
This was SVN commit r10618.
2011-11-27 17:15:58 +00:00
810f4b264b
new Persian staircase texture.
...
This was SVN commit r10617.
2011-11-27 16:02:10 +00:00
e30b00e5fa
Updates to Persian Civ Centre - prop points, flags, etc.
...
This was SVN commit r10616.
2011-11-27 12:40:53 +00:00
c0d4b9c299
Adds Persians to random maps.
...
This was SVN commit r10615.
2011-11-27 04:06:27 +00:00
e2af05895e
Made Persian CC player color.
...
This was SVN commit r10614.
2011-11-27 02:21:23 +00:00
0afe4b1da8
Fixed some spacing in game setup screen. Found out that StoneScrollBars are broken (work, but don't display actual scrollbar) - using wheatScrollBars for now
...
This was SVN commit r10613.
2011-11-27 01:57:35 +00:00
3a240a5d92
Updated Zagros Mountains.
...
This was SVN commit r10612.
2011-11-27 01:41:37 +00:00
91965928d3
New Persian Civ Centre
...
This was SVN commit r10611.
2011-11-27 01:26:01 +00:00
301854702c
add support for removing individual files from VFS and a mechanism for automatically doing so (add filename.extension.DELETED to the same directory/archive), as discussed in meeting.
...
refactor: split up Invalidate into RemoveFile+RepopulateDirectory
GameSetup: fix: ensure the first mod always overrides game files,
irrespective of timestamp.
This was SVN commit r10610.
2011-11-26 18:37:53 +00:00
d82b85b8f3
Fix #1025 (add config option to toggle pause on window focus loss), based on patch by markcho.
...
This was SVN commit r10609.
2011-11-26 15:23:41 +00:00
565e9aa8a7
This was SVN commit r10608.
2011-11-26 12:54:37 +00:00
257a55e5e0
#Bartering resource buttons redone to look better.
...
This was SVN commit r10607.
2011-11-26 11:24:15 +00:00
4e62e0b59c
Updating the foundation actors and meshes, and dirt decals.
...
Added an "embassy" template.
This was SVN commit r10604.
2011-11-26 05:08:32 +00:00
2a44e8202e
Fixes tests after recent GuiInterface and UnitAI changes.
...
This was SVN commit r10603.
2011-11-26 01:58:39 +00:00
2b7657b855
Map tweaks.
...
This was SVN commit r10602.
2011-11-25 23:35:05 +00:00
dfdeb4ec4c
Make Victory / Defeat message more dramatic
...
This was SVN commit r10601.
2011-11-25 21:04:06 +00:00
8b41509b80
Hotfix for broken field selection boxes. Closes #1030 .
...
This was SVN commit r10598.
2011-11-25 17:01:19 +00:00
69d5b07bb4
Rearrange buttons in ingame menu
...
This was SVN commit r10597.
2011-11-25 16:04:30 +00:00
6ab2a62c3f
Dead tree entity.
...
This was SVN commit r10596.
2011-11-25 09:07:34 +00:00
151d6293c2
This was SVN commit r10595.
2011-11-25 08:08:17 +00:00
85186c98b2
Better selection boxes. Closes #914 , #295 , #810 .
...
This was SVN commit r10593.
2011-11-25 06:36:13 +00:00
9e97c73544
This was SVN commit r10592.
2011-11-25 03:25:19 +00:00
f1c227b7da
This was SVN commit r10590.
2011-11-24 23:34:27 +00:00
d417cb6ad1
Updated Zagros Mountains with eye candy.
...
This was SVN commit r10589.
2011-11-24 23:14:49 +00:00
8cbab40137
Barter. Closes #23 .
...
This was SVN commit r10588.
2011-11-24 15:43:32 +00:00
d81516defd
A bunch of "Persia" terrain textures.
...
This was SVN commit r10587.
2011-11-24 10:19:01 +00:00
8caef28726
This was SVN commit r10586.
2011-11-24 03:56:18 +00:00
9489076c51
Fixes logic error in 8d977e4818.
...
This was SVN commit r10585.
2011-11-24 01:16:30 +00:00
8d977e4818
Allows building in fog of war. Fixes #958 .
...
This was SVN commit r10584.
2011-11-24 00:58:34 +00:00
2878102ed7
Avoid some code duplication
...
This was SVN commit r10583.
2011-11-23 21:26:14 +00:00
ab88151ed0
Fix uninitialised value
...
This was SVN commit r10582.
2011-11-23 21:24:41 +00:00
c311e8abba
Improves Persian support.
...
This was SVN commit r10581.
2011-11-23 19:32:02 +00:00
3e23e2b621
This was SVN commit r10580.
2011-11-23 12:49:59 +00:00
f8303b51c5
Fixes gathering after dropsite construction.
...
This was SVN commit r10579.
2011-11-23 04:59:02 +00:00
b9373a9dd3
Tweaks to Death Canyon II.xml
...
Fixed Persian bireme template.
Added Persian bireme to Persian Dock.
This was SVN commit r10577.
2011-11-23 02:29:29 +00:00
37b8f8b0d0
Fixes missing template errors on combat demo.
...
This was SVN commit r10576.
2011-11-22 23:32:06 +00:00
c48216e055
Persian Bireme
...
This was SVN commit r10575.
2011-11-22 23:11:27 +00:00
ca8e0aa5f5
Reorganized the Sparabara shields a bit.
...
This was SVN commit r10574.
2011-11-22 12:24:29 +00:00
52c01aa311
2nd Kardakes texture.
...
Added War Elephants to Persian Fortress until the Assyrian Siege Ram is
complete.
This was SVN commit r10573.
2011-11-22 11:42:11 +00:00
235a107aa3
Kardakes Skirmisher.
...
This was SVN commit r10572.
2011-11-22 03:44:48 +00:00
3f7f7bf66f
Agrianian Peltasts.
...
New "Taka" shield meshes.
This was SVN commit r10571.
2011-11-22 03:14:27 +00:00
5cc856aedc
Re-enables build restrictions for AIs since they have basic compliance now.
...
Moves target ownership checks from Commands.js to UnitAI.
Adds more robust target checking in UnitAI by calling CanFoo functions
more frequently.
Adds optional debugging mode to Commands.js (useful for AI developers).
This was SVN commit r10570.
2011-11-22 00:16:35 +00:00
e9041a392b
Garrison flags for Celt Temple and Barracks.
...
This was SVN commit r10568.
2011-11-21 03:53:55 +00:00
4de8954798
#Fixed Celt temple prop point.
...
Tweaked some tooltips.
This was SVN commit r10567.
2011-11-21 01:55:44 +00:00
29df8546c0
Updated Persian mill
...
This was SVN commit r10566.
2011-11-20 21:00:29 +00:00
c556926e3a
New Persian Barracks
...
This was SVN commit r10565.
2011-11-20 14:24:52 +00:00
aad5437125
New Persian "taka" shield designs.
...
This was SVN commit r10564.
2011-11-20 05:09:06 +00:00
18eefc7303
Fixes simulation replay mode in Windows.
...
This was SVN commit r10563.
2011-11-20 02:00:54 +00:00
901a87af2e
Tweaked camera settings.
...
This was SVN commit r10562.
2011-11-19 20:37:16 +00:00
514b22a89e
Support for Persians, should all work properly. Also makes territory expansion proportionally lower priority.
...
This was SVN commit r10561.
2011-11-19 16:00:54 +00:00
f80f1fb86b
This patch adds territory support for JuBot, which is the main thing to get it up to date for the next alpha. More advanced features are in development but some will probably have to wait until Christmas/Early 2012.
...
This was SVN commit r10560.
2011-11-19 13:44:56 +00:00
20df816fbc
Resource building class
...
This was SVN commit r10559.
2011-11-19 13:42:43 +00:00
31bcb5c803
Fixes buggy selection behavior due to incorrect camera plane calculation.
...
This was SVN commit r10558.
2011-11-19 05:05:59 +00:00
8b6714a62d
Some minor tweaks to camera defaults.
...
This was SVN commit r10557.
2011-11-19 02:15:01 +00:00
7772192a69
Fixed smoke prop points on cart tophet
...
This was SVN commit r10556.
2011-11-18 22:52:15 +00:00
5fe97328a6
Fixed run animation.
...
This was SVN commit r10555.
2011-11-18 22:23:04 +00:00
9dec98e5e0
Actor updates trying to get Persian War elephant to use the running animation, with no success.
...
Entity template updates to tooltips.
This was SVN commit r10554.
2011-11-18 21:27:18 +00:00
fc325991a0
Added visionRange function to read this value from the templates for the AI to use.
...
This was SVN commit r10553.
2011-11-18 21:11:15 +00:00
7a164c6a7b
Map tweaks. New shield texture for Elite Persian spearman. Horse actors for the basic chariot.
...
This was SVN commit r10552.
2011-11-18 07:51:12 +00:00
06bd4352c2
Persian unit updates!
...
This was SVN commit r10550.
2011-11-18 01:54:03 +00:00
39d100c732
Moves camera projection settings to default.cfg.
...
Changes field of view (FOV) to 45 degrees per discussion. Fixes #941 .
Tweaks default camera zoom and rotation accordingly.
This was SVN commit r10548.
2011-11-17 23:34:01 +00:00
432a48c849
3rd advanced archer texture.
...
This was SVN commit r10546.
2011-11-17 05:17:31 +00:00
aae10116fe
Persian kidaris hat models and textures
...
This was SVN commit r10545.
2011-11-17 00:25:08 +00:00
6b1ce04aad
Fix VC2008 compatibility
...
This was SVN commit r10544.
2011-11-16 17:49:28 +00:00
56776aa971
Fixed Advanced Persian Archer's rank.
...
This was SVN commit r10543.
2011-11-16 09:01:07 +00:00
c21304900a
Persian stuff.
...
This was SVN commit r10542.
2011-11-16 08:35:52 +00:00
d9339b4497
Kidaris hats.
...
This was SVN commit r10541.
2011-11-16 03:48:02 +00:00
545ad5e8da
#Persian Kardakes hoplite.
...
This was SVN commit r10540.
2011-11-15 09:26:36 +00:00
e21eb8eec4
Prop and animation fixes.
...
This was SVN commit r10539.
2011-11-15 03:38:10 +00:00
afb77be687
#Changed up the Greek hoplite.
...
Tweaked some animation speeds and footprints.
Added a Roman Healer for the Roman Temple.
This was SVN commit r10538.
2011-11-15 03:06:14 +00:00
f66a3e726f
Avoid overflow identified by /RTCc warning
...
This was SVN commit r10537.
2011-11-14 22:22:38 +00:00
98b62d9733
New fortresses for the Persians
...
This was SVN commit r10536.
2011-11-14 22:04:27 +00:00
5bd7b74ec7
Fix ABI incompatibility with --with-system-mozjs185 in debug mode (see #990 ).
...
This was SVN commit r10535.
2011-11-14 18:18:04 +00:00
ed5a64aae4
Add --with-system-mozjs185 build flag. Fixes #990 , based on patch by infyquest.
...
This was SVN commit r10534.
2011-11-14 16:10:41 +00:00
b56692a2c7
#Roman Temple by Enrique.
...
Some stuff.
This was SVN commit r10533.
2011-11-14 04:19:32 +00:00
27847fb078
Fixes BuildLimits init so its data serializes correctly (they should be objects not arrays).
...
This was SVN commit r10532.
2011-11-14 00:02:54 +00:00
5ae93ddae7
Makes AIProxy keep the garrisoned units array up to date. Fixes #1019
...
This was SVN commit r10531.
2011-11-13 23:23:58 +00:00
ade841efdd
Avoid assertion failures on abnormal exit() (e.g. dumpSchema mode)
...
This was SVN commit r10530.
2011-11-13 21:37:12 +00:00
fbff0aa98d
Fix printf argument types
...
This was SVN commit r10529.
2011-11-13 18:31:06 +00:00
97d3f1cfc9
Added a squared vector function for A^2 + B^2 without the rooting, in case massively large nos of vector calculations are needed.
...
This was SVN commit r10528.
2011-11-13 15:56:37 +00:00
3a678a0c7c
Fix time elapsed counter briefly showing old value when toggled on
...
This was SVN commit r10527.
2011-11-13 13:23:54 +00:00
e7f0639054
Set Atlas canvas size before potentially rendering to it. Fixes #987 .
...
This was SVN commit r10526.
2011-11-13 12:57:34 +00:00
72237c32a2
Avoid release-mode warnings
...
This was SVN commit r10525.
2011-11-13 12:31:41 +00:00
c574a85dd3
Given the new Dropsite classes to mills and farmsteads - they'll need to be added to CCs and Docks at some point, but for the moment I'm dealing with CCs separately and the AI still doesn't build docks so that's lower priority.
...
This was SVN commit r10524.
2011-11-13 12:16:46 +00:00
f3c21d070e
Added some new classes, DropsiteFood/Wood/Stone/Metal, to help with building placement.
...
This was SVN commit r10523.
2011-11-13 12:12:33 +00:00
f0f81827f3
Fix build with old GCCs
...
This was SVN commit r10522.
2011-11-13 01:04:40 +00:00
fc9e89647b
Adds basic support for Code::Blocks on the Mac and Linux.
...
The Project structure is still a bit strange, but it builds successfully
now.
This was SVN commit r10521.
2011-11-12 23:58:35 +00:00
f865401136
Detect allocation failure
...
This was SVN commit r10520.
2011-11-12 23:57:33 +00:00
7fcc76b621
Fix XML formatting
...
This was SVN commit r10519.
2011-11-12 22:26:01 +00:00
ff064aca95
Adds useful stats to training and construction tooltips, based on patch from pejuko. Fixes #872 .
...
This was SVN commit r10518.
2011-11-12 22:23:08 +00:00
99e012ba56
Fix comments
...
This was SVN commit r10517.
2011-11-12 22:08:59 +00:00
95bd6f874e
Fix OS X build by using GL_TIME_ELAPSED consistently
...
This was SVN commit r10516.
2011-11-12 19:29:48 +00:00
70224e7940
Fix missing symbols in old glext
...
This was SVN commit r10515.
2011-11-11 11:56:51 +00:00
0192c24ebc
Fix warning in old GCCs
...
This was SVN commit r10514.
2011-11-11 11:55:27 +00:00
d267657ffe
Added garrison flag to these two barracks.
...
This was SVN commit r10513.
2011-11-11 02:49:18 +00:00
7dbef7c62e
Fixed some garrison flag prop points. Still a lot more to go.
...
This was SVN commit r10512.
2011-11-11 02:38:00 +00:00
3645620df6
Fixed prop points on Celt tower.
...
Other things.
This was SVN commit r10511.
2011-11-11 02:14:37 +00:00
29d61601f9
Persian cavalry actor work.
...
This was SVN commit r10510.
2011-11-11 02:07:49 +00:00
fdf9b6b802
This was SVN commit r10509.
2011-11-11 01:24:32 +00:00
5a008c6787
Switched Elite Hyrcanian look for the Elite Median look. The Hyrcanians had more Scythian influences than the Medians.
...
Added projectiles to Persian CC and Fortress to see if I can get rid of
those error messages in-game.
This was SVN commit r10508.
2011-11-11 01:04:35 +00:00
6be23a5894
Disable shaders on SiS Mirage 3 for compatibility. Fixes #964 .
...
This was SVN commit r10507.
2011-11-11 01:03:32 +00:00
0cb7f6ce02
Fixed Persian Stables prop points.
...
Added something extra to the actor. :)
This was SVN commit r10506.
2011-11-11 00:14:39 +00:00
91fd644982
New "sunny" sky box.
...
This was SVN commit r10505.
2011-11-10 23:59:46 +00:00
d60c87cfa8
Two new sky boxes and an updated Cumulus sky box.
...
This was SVN commit r10504.
2011-11-10 22:45:31 +00:00
56d634bf49
Fix invalid characters in entity templates. Add script to find unrecognised characters.
...
Fixes #960 .
This was SVN commit r10503.
2011-11-10 19:31:35 +00:00
77f8f95d20
Updated the names of the Persian units and structures. Removed Tachara and replaced with Apadana.
...
Took out some random flame and smoke actors from the Median Oasis map.
This was SVN commit r10502.
2011-11-10 00:49:54 +00:00
f2bbc9d4b5
Re-added Median Oasis, as a Greek vs. Persia map.
...
This was SVN commit r10501.
2011-11-09 23:58:07 +00:00
694c131a3a
Fix to Persian scout tower mesh. prop points aligned.
...
This was SVN commit r10500.
2011-11-09 23:28:51 +00:00
3916c25b84
Optimise vertex skinning code with SSE, based on patch by gruby.
...
Fixes #905 .
This was SVN commit r10499.
2011-11-09 23:11:28 +00:00
9545f783a1
Removing old cart props and actors
...
This was SVN commit r10498.
2011-11-09 23:04:54 +00:00
0514f97508
Fixing projectile and garrison points. Adding foundations.
...
This was SVN commit r10497.
2011-11-09 22:52:05 +00:00
87b3b0856f
Fix warning
...
This was SVN commit r10496.
2011-11-09 22:35:31 +00:00
8617dfd0e1
Avoid fatal error on printf overflow in profiler
...
This was SVN commit r10495.
2011-11-09 18:29:08 +00:00
f2ea307507
Moved warning and debug messages to below the top bar.
...
This stops them obscuring the useful inormation in the bar.
This was SVN commit r10494.
2011-11-09 17:01:57 +00:00
b090ec48ce
Add query counter bits to hwdetect
...
This was SVN commit r10493.
2011-11-09 13:10:34 +00:00
cfb79c3062
# Add GPU performance profiling support.
...
Add some profiler region attributes.
Render events in profile visualiser.
Change profiler from GPL to MIT.
This was SVN commit r10492.
2011-11-09 13:09:01 +00:00
8fba3f92b1
Allow better hwdetect debugging
...
This was SVN commit r10491.
2011-11-09 11:54:05 +00:00
7b12132650
New "sagaris" battle axe prop.
...
Tweaking Persian units.
Added Persians to "Oasis III."
This was SVN commit r10490.
2011-11-09 07:58:40 +00:00
f15360e673
Fixed prop points on Persian chariots.
...
This was SVN commit r10489.
2011-11-09 02:46:37 +00:00
8616e89429
Fixed a mistake.
...
This was SVN commit r10488.
2011-11-09 02:25:35 +00:00
7e0de56f1a
More work on Persian units.
...
Also tweaking walking speeds for other units as I run across them.
This was SVN commit r10487.
2011-11-09 02:23:19 +00:00
feb76f9d08
Moar unit tweaks.
...
This was SVN commit r10485.
2011-11-09 00:44:40 +00:00
ab347de754
Fixes PMD converter's handling of static prop points. Coordinate conversion was not performed correctly according to the model's up-axis orientation. Fixes #886 , #243 .
...
This was SVN commit r10484.
2011-11-09 00:10:14 +00:00
cb27a680bf
Fix profiler shutdown order
...
This was SVN commit r10483.
2011-11-09 00:09:19 +00:00
d9f3e329f0
#Tweaked unit walking speeds.
...
This was SVN commit r10482.
2011-11-08 22:14:28 +00:00
9dfe451ea6
skeletons.xml update adding 6 wheel vehicle
...
This was SVN commit r10481.
2011-11-08 20:46:03 +00:00
761ad58f1a
Unit work.
...
This was SVN commit r10480.
2011-11-08 19:28:29 +00:00
b073473d21
hele siege tower animations
...
This was SVN commit r10479.
2011-11-07 19:28:06 +00:00
ff9cc55162
New animation for hele fishing boat
...
This was SVN commit r10478.
2011-11-07 17:08:48 +00:00
5adaa6a095
tweak to fishing boat animation speeds
...
This was SVN commit r10477.
2011-11-07 16:23:49 +00:00
768baee2ca
Added 2nd Cart peace tune to the roster.
...
This was SVN commit r10476.
2011-11-07 08:17:20 +00:00
89be61033f
This was SVN commit r10475.
2011-11-07 08:04:03 +00:00
9f9834cac4
This was SVN commit r10474.
2011-11-07 08:03:13 +00:00
2bdf5d0440
#Big Persian unit update. Still need a lot of work.
...
This was SVN commit r10473.
2011-11-07 03:11:18 +00:00
26501fd8c2
Persian unit tweaks.
...
This was SVN commit r10472.
2011-11-07 00:44:38 +00:00
8f3255f9c8
Fix tests and Atlas with new profiler
...
This was SVN commit r10471.
2011-11-05 23:09:31 +00:00
b13f1cade5
# UI for new profiling tool
...
This was SVN commit r10467.
2011-11-04 01:43:46 +00:00
09a02c96d5
Add initial code annotations for the new profiling tool
...
This was SVN commit r10466.
2011-11-04 01:35:50 +00:00
9965f43067
# Engine support for new profiling tool
...
This was SVN commit r10465.
2011-11-04 01:33:07 +00:00
4ef66a6950
Provide JSON-compatible string escaping
...
This was SVN commit r10464.
2011-11-04 01:18:34 +00:00
9cbf587e59
Import Mongoose HTTP server library
...
This was SVN commit r10463.
2011-11-03 23:36:54 +00:00
05c42846ec
#Persian champion cavalry updates.
...
This was SVN commit r10462.
2011-11-03 04:48:02 +00:00
50d2379709
This was SVN commit r10461.
2011-11-03 01:58:56 +00:00
8f2048db49
Animated hele fishing boat.
...
This was SVN commit r10460.
2011-11-03 01:10:25 +00:00
e33ef0cb73
Iberian Ram animation fix to wheels
...
This was SVN commit r10459.
2011-11-03 00:06:12 +00:00
d1515214ab
Persian scout tower
...
This was SVN commit r10458.
2011-10-31 00:35:59 +00:00
0db6cfd2f7
Fixes crash in Atlas camera handlers, focus loss causes a scroll action, and seg fault if game not initialized. Fixes #988 .
...
Fixes particles lingering in actor viewer when switching actors, by
clearing unattached particle emitters.
This was SVN commit r10457.
2011-10-30 05:09:31 +00:00
cf7aab4425
Avoid errors on loading screen when there are no saved games
...
This was SVN commit r10455.
2011-10-30 00:37:00 +00:00
7064565ff6
# Allow saving and loading single-player games.
...
Support writing zip files based on in-memory data.
Fix menu sliding animations to be framerate independent.
This was SVN commit r10454.
2011-10-30 00:07:28 +00:00
21c6141cdc
Preserve player colours and animations when serializing models
...
This was SVN commit r10453.
2011-10-29 15:30:46 +00:00
b454ccca79
Fix GUI issues when reconnecting to multiplayer games
...
This was SVN commit r10452.
2011-10-29 14:53:13 +00:00
0a676171a5
This was SVN commit r10451.
2011-10-28 23:18:07 +00:00
7edf74c594
some small updates
...
This was SVN commit r10450.
2011-10-28 23:12:47 +00:00
23ae535a1e
Minor enhancements to serialization test mode
...
This was SVN commit r10449.
2011-10-28 13:18:16 +00:00
f31a8f7181
Fix warning
...
This was SVN commit r10448.
2011-10-28 13:16:53 +00:00
05d7742ec8
Increase trace cache size to cope slightly better with serialization test mode
...
This was SVN commit r10447.
2011-10-28 13:16:30 +00:00
959b5a505c
Fix bug in incremental LOS computation
...
This was SVN commit r10446.
2011-10-28 13:15:33 +00:00
69feade908
projectiles speeds.
...
Added pers trireme to pers dock.
This was SVN commit r10445.
2011-10-28 03:23:19 +00:00
9be68c42e1
Larger dock for the Persians
...
This was SVN commit r10444.
2011-10-27 22:23:56 +00:00
b59e27f678
Fix assertion failure in replay mode
...
This was SVN commit r10443.
2011-10-27 21:22:41 +00:00
d57bb00ece
Fix sparse array serialization
...
This was SVN commit r10442.
2011-10-27 20:56:32 +00:00
a739b8f309
Fix some saved-game OOS errors
...
This was SVN commit r10441.
2011-10-27 20:12:00 +00:00
4c561dc3f9
Improve debugging of binary serialization
...
This was SVN commit r10440.
2011-10-27 20:10:53 +00:00
2fa8124c61
Added variations to Persian stable horses
...
This was SVN commit r10439.
2011-10-27 19:50:08 +00:00
530d5216bf
Fix OOS error after saving/loading
...
This was SVN commit r10438.
2011-10-27 17:38:44 +00:00
bfe2126a17
# Support rejoining multiplayer games after disconnection.
...
This was SVN commit r10437.
2011-10-27 16:46:48 +00:00
6d071123cc
Add simple functions for zlib compression with embedded length headers
...
This was SVN commit r10436.
2011-10-27 14:21:58 +00:00
85e16f95b1
Use debug_printf for script print() function, so it's more visible on Windows
...
This was SVN commit r10435.
2011-10-27 14:19:37 +00:00
18e595a5a6
Fix OOS-log paths to work on Windows
...
This was SVN commit r10434.
2011-10-27 14:17:39 +00:00
dfc92de51b
Avoid outputting non-printable-ASCII characters in the network log
...
This was SVN commit r10433.
2011-10-27 14:16:28 +00:00
a2bba82b9d
Let CFsm actions override the default state transition
...
This was SVN commit r10432.
2011-10-27 14:10:55 +00:00
28d7f52578
Updates to Persian Stables
...
This was SVN commit r10431.
2011-10-26 23:09:28 +00:00
ab6863c484
This was SVN commit r10430.
2011-10-26 05:41:57 +00:00
c82ebd7ca9
Fixes Atlas build on OS X.
...
This was SVN commit r10429.
2011-10-26 05:27:03 +00:00
08e37f1a71
Avoid potential aliasing violation in endian functions
...
This was SVN commit r10428.
2011-10-25 14:02:50 +00:00
a3c03815c0
Experimental quicksave/quickload feature
...
This was SVN commit r10427.
2011-10-24 14:55:45 +00:00
29e4f633f1
Add initial serialization test mode.
...
Reduce some dependencies on CSimulation2 to provide more flexibility.
This was SVN commit r10426.
2011-10-24 14:31:05 +00:00
0f3119e36a
Fix deserialization of actor components
...
This was SVN commit r10425.
2011-10-24 12:24:04 +00:00
79faed2ee2
Added 'Naval Maps' scenario filter
...
This was SVN commit r10424.
2011-10-23 22:42:50 +00:00
336552e5fd
Tweak build limits to match what b48c35c512 attempted to set them to
...
This was SVN commit r10423.
2011-10-23 21:07:27 +00:00
3efb3949d3
Clean up unused argument
...
This was SVN commit r10422.
2011-10-23 21:00:59 +00:00
f4ed019c46
Avoid hypotf
...
This was SVN commit r10421.
2011-10-23 12:27:34 +00:00
83955072b6
Fix typos
...
This was SVN commit r10420.
2011-10-23 12:26:47 +00:00
bd73308d49
Avoid apparent bug in VirtualBox's GL implementation
...
This was SVN commit r10419.
2011-10-22 10:25:09 +00:00
017e8d66eb
Fixes GUIInterface tests.
...
This was SVN commit r10418.
2011-10-22 00:10:17 +00:00
5acf38c095
Randomizes player starting positions on random maps.
...
This was SVN commit r10417.
2011-10-21 01:15:02 +00:00
d966c5e10b
Fixes Atlas map saving to force PMP extension on all OSes. See #889 .
...
Fixes Atlas map loading to more gracefully handle missing files. Atlas
should no longer crash if a map was not found in VFS. Fixes #986 .
This was SVN commit r10416.
2011-10-20 23:45:27 +00:00
887b6633c2
Adds per-player BuildLimits data to GUIInterface.
...
Adds BuildLimits accessors to GameState for JuBot and Testbot.
This was SVN commit r10415.
2011-10-20 23:35:52 +00:00
ff256528f2
sync with work. faster PopulationCount; avoid invalid param handler when debug string length exceeded; return error instead of dialog box when waio_Preallocate fails
...
This was SVN commit r10414.
2011-10-19 10:58:02 +00:00
a41b0e30fe
Changes AI entity destroy events to maintain some data about the entity, based on patch by quantumstate. Fixes #983 .
...
This was SVN commit r10413.
2011-10-18 22:51:04 +00:00
686ffa9758
Fixes error in AI entity. Fixes #991 .
...
This was SVN commit r10412.
2011-10-16 17:21:37 +00:00
f3e081a122
Fix couple simulation templates.
...
This was SVN commit r10411.
2011-10-16 17:03:43 +00:00
8af8326563
replace old pool_allocator/RawPoolAllocator with ProxyAllocator that draws upon the new-style Arena (more efficient, avoids slow VirtualAlloc)
...
This was SVN commit r10410.
2011-10-16 10:37:21 +00:00
1c081135ad
Adds territory map to AI GameState, based on patch from quantumstate. Fixes #969 .
...
Updates testbot and Jubot to support basic build restrictions.
This was SVN commit r10408.
2011-10-16 02:55:58 +00:00
c73c0870f1
Adds attackTimes to AI entity templates. Fixes #991 .
...
This was SVN commit r10407.
2011-10-15 23:38:58 +00:00
20047ffe76
Remove old duplicate directory.
...
This was SVN commit r10406.
2011-10-15 23:26:15 +00:00
6c102ea712
add instrumentation to diagnose failed VM commit
...
This was SVN commit r10405.
2011-10-15 22:03:42 +00:00
3624f7c417
fix: pthread_self now returns a unique value in each thread (before, it was using the windows pseudo handle functionality)
...
This was SVN commit r10404.
2011-10-15 20:12:59 +00:00
581b4f7997
This was SVN commit r10403.
2011-10-14 05:32:11 +00:00
d9820fb0cb
Add optional time elapsed counter to session screen.
...
This was SVN commit r10402.
2011-10-13 23:20:34 +00:00
3e71b3e864
Removing old Persian files
...
This was SVN commit r10401.
2011-10-13 20:17:09 +00:00
9a7f09abe2
New Persian dock
...
This was SVN commit r10400.
2011-10-13 20:14:50 +00:00
f0df97d773
add support for retrieving all WMI class instances (required for detecting multiple graphics and sound cards)
...
fixes #998
This was SVN commit r10399.
2011-10-13 18:53:59 +00:00
9fdcc7a2fa
A couple of updated maps.
...
This was SVN commit r10398.
2011-10-13 13:25:18 +00:00
9bb22c91a1
A package of chariot updates.
...
This was SVN commit r10397.
2011-10-12 11:59:43 +00:00
d8e49c4ca8
Chariot portrait.
...
This was SVN commit r10396.
2011-10-12 08:13:09 +00:00
22d169f3c6
A bunch of Persian chariot stuff.
...
This was SVN commit r10395.
2011-10-12 07:16:55 +00:00
2a39ba2f91
Changes new AI GameState functions to accept Entity objects instead of raw entities.
...
This was SVN commit r10394.
2011-10-12 00:33:07 +00:00
b28ae93dc8
Adds armour and attack strengths to AI entity template, based on patch by infyquest. Fixes #991 .
...
This was SVN commit r10393.
2011-10-11 20:02:21 +00:00
81abd0342f
Made Greek prodromoi use knives to gather meats. Balanced hyps and thors.
...
This was SVN commit r10392.
2011-10-11 15:16:30 +00:00
c83a79f239
This was SVN commit r10391.
2011-10-11 15:12:07 +00:00
c1cd29f2f4
Tweaks to thorakites and thureophoros.
...
This was SVN commit r10390.
2011-10-11 14:28:54 +00:00
baf8028e4c
This was SVN commit r10389.
2011-10-11 14:20:51 +00:00
d05592e77f
#Miscellaneous units. Thanks SMST!
...
This was SVN commit r10388.
2011-10-11 14:05:14 +00:00
956e6b5f77
Persian texture updates and chariot updates.
...
This was SVN commit r10387.
2011-10-11 12:56:58 +00:00
0fa54bc56a
fix compile error due to GCC restriction.
...
thanks to daniel.santos for reporting and alex for creating the
ticket/notifying me.
fixes #992
[heh, the amount of comments are proportional to the trouble caused by
this code :S ran into VC++ compile errors when __declspec came after
void* return type *sigh*]
This was SVN commit r10385.
2011-10-10 20:08:04 +00:00
8ac994e4e6
sync with work: add and use NOTHROW; export file_system functions; throw Status from File ctor; add WARN_THROW equivalents of WARN_RETURN
...
This was SVN commit r10384.
2011-10-10 10:04:36 +00:00
6c6c374a11
This was SVN commit r10383.
2011-10-09 21:50:58 +00:00
470bff16c7
This was SVN commit r10382.
2011-10-09 21:34:43 +00:00
22c7346dbd
Persian stable actor and template
...
This was SVN commit r10381.
2011-10-09 19:57:29 +00:00
bb32cc9794
This was SVN commit r10379.
2011-10-09 12:18:25 +00:00
6ef517d3c4
Updating Persians. Added Persians to Oasis IV map.
...
This was SVN commit r10378.
2011-10-09 11:00:01 +00:00
45cd62fc93
#Persian infantry unit actor/animation work. They now use the proper animations and props when performing various tasks.
...
This was SVN commit r10377.
2011-10-09 10:13:48 +00:00
a240958de3
Removes Conquest Critical class from obelisks
...
This was SVN commit r10375.
2011-10-08 23:53:34 +00:00
a106b9da0b
apic: avoid warning message for ancient single-core, non-HT processors. fixes #985
...
wvm: improve diagnostics if allocation failed
This was SVN commit r10374.
2011-10-08 16:53:57 +00:00
39e5cb5dc9
proper fix for brain-dead Linux affinity API (that code was disabled in #547 )
...
refs #985
This was SVN commit r10373.
2011-10-08 16:42:30 +00:00
90cac1b7b0
Persian Scythed Chariot
...
This was SVN commit r10372.
2011-10-08 15:43:11 +00:00
8b88ae6302
Persian Corral building
...
This was SVN commit r10371.
2011-10-08 14:38:02 +00:00
7bbe2b3bab
Removing old unused Persian house assets
...
This was SVN commit r10370.
2011-10-08 14:26:55 +00:00
de7596a3a8
New Persian houses
...
This was SVN commit r10369.
2011-10-08 14:20:20 +00:00
706dea144f
This was SVN commit r10368.
2011-10-08 03:44:48 +00:00
45b8889479
Yeah there is.
...
This was SVN commit r10367.
2011-10-07 20:42:51 +00:00
1a81324e4e
Misc stuff:
...
-- Updated some Persian shield textures.
-- Made a portrait for the Persian merchant ship.
-- Created entity for Persian fishing boat.
This was SVN commit r10366.
2011-10-07 05:02:00 +00:00
e7cbe197a6
New sail design.
...
This was SVN commit r10365.
2011-10-06 05:51:25 +00:00
b0ad0d97be
Remove Premake3 files. Closes #934 .
...
This was SVN commit r10362.
2011-10-03 19:09:03 +00:00
c53c098fec
Fix to lion run speed
...
This was SVN commit r10361.
2011-10-02 19:36:42 +00:00
fce9b9a37e
Fix to skeleton unit crash in Atlas
...
This was SVN commit r10360.
2011-10-02 18:39:44 +00:00
9cc13a2b80
This was SVN commit r10359.
2011-10-02 04:16:55 +00:00
3f3b5ee3e5
Adds player ID to PlayerDefeated message for AI usage.
...
This was SVN commit r10358.
2011-10-01 17:38:43 +00:00
0028d1640d
Removes ConquestCritical class from certain non unit-producing structures.
...
This was SVN commit r10357.
2011-10-01 17:29:09 +00:00
5336ad0eea
This was SVN commit r10356.
2011-10-01 09:31:40 +00:00
88ee37d0f6
Oops. Revert market template changes.
...
This was SVN commit r10355.
2011-10-01 05:14:36 +00:00
48c7eab4e8
Add 'Not implemented yet' note to healer tooltips.
...
This was SVN commit r10354.
2011-10-01 05:03:23 +00:00
55e9ffe294
Adds the ForestPlant class.
...
This was SVN commit r10353.
2011-09-30 21:12:11 +00:00
3bb05d77a6
Adds a new class, ForestPlant
...
This was SVN commit r10352.
2011-09-30 21:11:50 +00:00
47c9f6ca2d
Changes IsSeaCreature to SeaCreature
...
This was SVN commit r10351.
2011-09-30 21:05:26 +00:00
df6cf0c5e8
Changes IsSeaCreature to SeaCreature, gives whales SeaCreature
...
This was SVN commit r10350.
2011-09-30 21:04:01 +00:00
667d016c83
Changes IsSeaCreature to SeaCreature
...
This was SVN commit r10349.
2011-09-30 21:00:49 +00:00
6dbd081219
Fixes AIs gathering enemy (non-gaia) resources, such as fields.
...
This was SVN commit r10348.
2011-09-30 19:54:04 +00:00
6594a527db
Another bugfix attempt
...
This was SVN commit r10347.
2011-09-30 17:54:04 +00:00
3a7fac7c4d
Bugfix #2
...
This was SVN commit r10346.
2011-09-30 17:11:01 +00:00
b3d5075408
Bugfix
...
This was SVN commit r10345.
2011-09-30 17:03:21 +00:00
64a0a5e58a
Now much more strictly restricts the game to 1 foundation at once.
...
This was SVN commit r10344.
2011-09-30 16:50:33 +00:00
a5a134fa87
CC building now emphasised over house building.
...
This was SVN commit r10343.
2011-09-30 16:43:12 +00:00
d271090bbd
Fixes Carthage starting calvary to CC unit instead of mercenary (affects random maps), based on patch by kephra. Fixes #981 .
...
This was SVN commit r10342.
2011-09-29 21:46:43 +00:00
4fd84919cd
This was SVN commit r10341.
2011-09-28 23:43:26 +00:00
e0255741d8
Adds BuildRestrictions accessors to AI's EntityTemplate (important for proper territory support).
...
This was SVN commit r10340.
2011-09-28 19:51:40 +00:00
b40ba972c1
Adds diplomacy functions to Jubot and Testbot gamestate (eventually replace e.g. Entity.isEnemy() with these).
...
This was SVN commit r10339.
2011-09-28 19:40:50 +00:00
75c7028e24
Stops the builders regrouping to town centre, because this is no longer really needed.
...
This was SVN commit r10338.
2011-09-28 15:50:06 +00:00
9cf932eaee
Persian Healer
...
This was SVN commit r10337.
2011-09-28 05:27:54 +00:00
4f18eddc15
Messing with whale actor/entity.
...
Chariot texture.
Persian healer.
This was SVN commit r10336.
2011-09-28 05:23:18 +00:00
43cebfc2dc
This was SVN commit r10335.
2011-09-28 03:49:54 +00:00
70d9596947
Persian faravahar decal texture.
...
This was SVN commit r10334.
2011-09-28 02:34:27 +00:00
d63947597c
Adds new NaturalBehaviour "domestic" to UnitAI, useful for tame animals who should never flee an attacker. Fixes #971 .
...
Renames herd_passive template to herd_domestic.
This was SVN commit r10333.
2011-09-27 18:03:58 +00:00
71a482cfa3
This was SVN commit r10332.
2011-09-27 10:07:11 +00:00
f7b997c3d9
Fixed the Palace portrait.
...
This was SVN commit r10331.
2011-09-27 08:39:06 +00:00
0e39511b3a
Attempts to fix random map OOS errors by avoiding parsing data to floats (uses CFixedVector3D instead). See #977 .
...
Changes to rmgen API for consistency and support of 3D
position/rotation.
This was SVN commit r10326.
2011-09-26 21:36:33 +00:00
43edf6b237
Changes chicken parent template to herd instead of hunt per DD (no behavior change). See #971 .
...
This was SVN commit r10325.
2011-09-26 19:38:05 +00:00
16f5016a1a
sync with work: add compile-time BITS and CeilLog2 and optional IO instrumentation
...
This was SVN commit r10324.
2011-09-26 08:29:57 +00:00
67d99f3001
Shields for Amish's bireme.
...
This was SVN commit r10323.
2011-09-26 04:03:43 +00:00
1acdd54bc4
This was SVN commit r10322.
2011-09-26 02:15:19 +00:00
7039a75cfd
This was SVN commit r10321.
2011-09-26 01:55:42 +00:00
cf89278cb0
This was SVN commit r10320.
2011-09-25 22:36:58 +00:00
3ead9f0b32
Fix to Jubot economy.js
...
This was SVN commit r10319.
2011-09-25 21:36:37 +00:00
a6eccb1290
Here we go...
...
- Gather weights change over time
- Workers are occasionally moved (about once in every 400 turns, at
random, needs to be improved)
- Workers don't go and try hunting fish and snarl up the engine.
This was SVN commit r10318.
2011-09-25 21:15:26 +00:00
4200e33e5e
Update button text color on game disconnected screen
...
This was SVN commit r10316.
2011-09-24 23:00:27 +00:00
0d708b31b4
avoid rare init-order bug when SRAT ACPI table is available AND APIC IDs are NOT
...
move APIC-related code to separate file, with its own initialization to
avoid circular dependency
fixes #976
This was SVN commit r10315.
2011-09-24 19:47:13 +00:00
5a3a1d780a
A couple portraits.
...
This was SVN commit r10314.
2011-09-24 19:31:34 +00:00
bb3b52fb82
This finishes the militia recalling section - militiamen are now recalled every 30 seconds or so.
...
This was SVN commit r10311.
2011-09-24 16:37:31 +00:00
b9fc207437
Okay, lots of changes here. Houses are now built on demand, there's a lot of restructuring to workers, instead of a static defence force citizen soliders are drafted to a militia as needed (this needs some work still but is mostly done). Any citizen infantry given at the start of a game are used in the workforce properly now, too.
...
This was SVN commit r10310.
2011-09-24 15:26:11 +00:00
17076f2561
Gives all fish the new IsSeaCreature class, so AI can identify them more easily.
...
This was SVN commit r10309.
2011-09-24 15:24:16 +00:00
5fc514ab32
Adds a class called "IsSeaCreature" to identify fish for the AI.
...
This was SVN commit r10308.
2011-09-24 15:22:48 +00:00
759e11e801
Updated background.
...
This was SVN commit r10307.
2011-09-24 07:35:29 +00:00
c3bb3ec57e
Adds event data to BaseAI (so that AIs can handle being attacked, defeated, etc) based on patch from quantumstate. Fixes 972.
...
This was SVN commit r10306.
2011-09-23 22:02:04 +00:00
7828544946
Attempts to fix ArchiveViewer build on OS X (use wxString::wc_str() to construct std::wstring).
...
This was SVN commit r10305.
2011-09-23 02:56:19 +00:00
83cfcd181d
Unit actor tweaks.
...
This was SVN commit r10304.
2011-09-22 01:21:39 +00:00
9812ee2780
avoid error dialog when gamma upload fails twice (for reasons still unknown *sign*)
...
http://www.wildfiregames.com/forum/index.php?showtopic=14058&pid=226211&st=50&#entry226211
This was SVN commit r10303.
2011-09-21 20:38:09 +00:00
c77fb0e841
In TrainingQueue changed place of PostMessage in case when all entities of current batch was spawned. Fixes #963 .
...
This was SVN commit r10302.
2011-09-21 19:27:36 +00:00
2ddd237509
This updates JuBot to use the Carthaginian faction and makes a couple of minor changes to give a fractional speed boost.
...
This was SVN commit r10301.
2011-09-21 18:53:36 +00:00
6ff59cbeeb
Enables Atlas build on OS X.
...
This was SVN commit r10300.
2011-09-20 22:52:21 +00:00
08b4d96cf2
Moves Atlas UI to main thread while engine loop runs in new thread.
...
Fixes Atlas compatibility with OS X (wxOSX/Cocoa requires the UI to run
in the main thread). Fixes #500 .
Fixes Windows shutdown to close COM library properly (and WMI).
This was SVN commit r10299.
2011-09-20 22:49:02 +00:00
e66a0c6dac
This was SVN commit r10298.
2011-09-20 03:15:04 +00:00
8d7504aa2e
This was SVN commit r10297.
2011-09-18 06:24:45 +00:00
8c6926cfb9
Fixed persian trader to use Carth trader actor for now.
...
This was SVN commit r10296.
2011-09-18 04:56:29 +00:00
3c43a59f43
This was SVN commit r10295.
2011-09-18 04:55:26 +00:00
92ba917c5a
#Moving new Alpha 8 faction from Internal to Public.
...
Updated some hero tooltips.
This was SVN commit r10294.
2011-09-18 04:30:03 +00:00
d497c28d5e
Renaming some things before I move them.
...
This was SVN commit r10293.
2011-09-18 04:13:32 +00:00
6287158c17
Widen history section tooltips
...
This was SVN commit r10292.
2011-09-17 15:49:57 +00:00
bb6d8b6094
This was SVN commit r10291.
2011-09-17 04:57:37 +00:00
b885498477
Fixes text alignment and inconsistencies in game setup UI.
...
This was SVN commit r10290.
2011-09-16 23:42:37 +00:00
b6882ca146
Fix default network map js
...
This was SVN commit r10289.
2011-09-16 21:40:42 +00:00
3c5bf35f81
This was SVN commit r10288.
2011-09-16 12:20:18 +00:00
f8443f6ef9
Updated Greek penteconter portrait.
...
This was SVN commit r10287.
2011-09-15 22:34:40 +00:00
9aede79908
Fixed tooltip.
...
This was SVN commit r10286.
2011-09-15 21:46:25 +00:00
b1d98cff04
Fixes in-game music playing (assume filename always contains ogg extension). Fixes #956 .
...
This was SVN commit r10285.
2011-09-15 05:19:36 +00:00
170fc8e8b0
Changed selection and complete sounds.
...
This was SVN commit r10284.
2011-09-15 03:56:24 +00:00
3ce370aadb
Walls demo
...
This was SVN commit r10283.
2011-09-15 03:39:29 +00:00
8e0a4557ed
Fixed shields for Carth spearman.
...
This was SVN commit r10282.
2011-09-14 23:34:34 +00:00
45aedb2874
Should fix the music errors in Atlas (related to #956 ) thanks to Ben's suggestion. I think this should be handled at a lower level, but this should do for now.
...
This was SVN commit r10281.
2011-09-14 12:46:34 +00:00
da94100582
Fixes Jubot mills facing the wrong direction.
...
This was SVN commit r10280.
2011-09-14 03:08:05 +00:00
aba6a7f118
Reorder dialog buttons for consistency
...
This was SVN commit r10279.
2011-09-14 00:43:19 +00:00
d4ffe7c887
Adds Alpha number and name to main menu. Fixes #955 .
...
Inverts (i)nfo button sprites.
Shrinks tooltip box so it doesn't obstruct the background.
This was SVN commit r10278.
2011-09-13 23:58:16 +00:00
4d40c8dc7d
Berry bush updates.
...
This was SVN commit r10276.
2011-09-13 23:32:12 +00:00
c3075c8e5b
Fixes AI building angles to face bottom right corner of the map.
...
Cleans up the same concept in random maps.
This was SVN commit r10275.
2011-09-13 22:51:43 +00:00
d63e9eaef4
This was SVN commit r10274.
2011-09-13 16:28:40 +00:00
cbc1198f19
This was SVN commit r10273.
2011-09-13 15:49:25 +00:00
b65b7d95e7
Make the progress bar finish early so that the user can actually see it finish. Display percent progress rather than details.
...
This was SVN commit r10272.
2011-09-13 12:24:13 +00:00
348fa3347c
This was SVN commit r10271.
2011-09-13 08:32:34 +00:00
e219bb5832
Different decal
...
This was SVN commit r10270.
2011-09-13 04:56:46 +00:00
95d36130e4
Gave more room to chat portion of game setup screen. If we need more room for player slots later, we can always take some from the chat space.
...
This was SVN commit r10268.
2011-09-13 02:02:36 +00:00
c362ce0565
Convert spaces to tabs in main menu files
...
This was SVN commit r10267.
2011-09-13 01:28:49 +00:00
a69f957c86
More entity tweaks. Alexander and Cretan Archer.
...
This was SVN commit r10266.
2011-09-13 01:13:29 +00:00
8a3318240f
Updated tooltips.
...
This was SVN commit r10265.
2011-09-13 01:08:50 +00:00
7e6098a19f
Remove exit button from corner of main menu screen
...
This was SVN commit r10264.
2011-09-13 01:06:29 +00:00
97e4f0fd5d
Update alpha version label, change default single player map, update scripts music system
...
This was SVN commit r10263.
2011-09-13 00:45:33 +00:00
eb5a83fc8f
New Carthaginian camel trader
...
This was SVN commit r10262.
2011-09-12 23:58:11 +00:00
782bf32e53
This was SVN commit r10261.
2011-09-12 23:35:48 +00:00
bf8a0bda32
Berry Bushes texture
...
This was SVN commit r10260.
2011-09-12 22:47:09 +00:00
e9d7aa1879
Tweaked the female building animation speed.
...
This was SVN commit r10259.
2011-09-12 20:46:20 +00:00
eccf787ec8
Fix test for GuiInterface. Fixes #957 .
...
This was SVN commit r10258.
2011-09-12 14:57:58 +00:00
6629323f8d
This was SVN commit r10257.
2011-09-12 10:47:33 +00:00
b1247e77cd
fix start/stop music in settings, double ingame menu speed
...
This was SVN commit r10256.
2011-09-12 02:21:20 +00:00
b50fa144f3
The underlying sound system needs some work, so just get scripts sound working better.
...
This was SVN commit r10255.
2011-09-11 22:42:40 +00:00
9c66b4d4f3
Cart scout tower model updates
...
This was SVN commit r10254.
2011-09-11 19:44:28 +00:00
c198e27e89
Updates to Cart civ centre and wall tower
...
This was SVN commit r10253.
2011-09-11 19:16:10 +00:00
f21eb03bf2
This was SVN commit r10252.
2011-09-11 17:46:26 +00:00
bdc1946dc3
This was SVN commit r10251.
2011-09-11 14:08:48 +00:00
cccfaecdfe
This was SVN commit r10250.
2011-09-11 13:30:16 +00:00
be69735582
Trying to clean up music in the scripts. It is still broken.
...
This was SVN commit r10249.
2011-09-11 03:30:41 +00:00
7d95a68a20
This was SVN commit r10248.
2011-09-11 03:06:59 +00:00
80df13f47b
add support for recursive mutex on windows; ensure h_mgr uses them (pthread doesnt guarantee default type is recursive)
...
This was SVN commit r10247.
2011-09-10 22:51:51 +00:00
579f1acb6f
A couple of new loading screen "tips."
...
This was SVN commit r10246.
2011-09-10 22:08:44 +00:00
424410ea07
Some portrait updates.
...
This was SVN commit r10245.
2011-09-10 21:27:51 +00:00
96787667cb
Scorpio tweaks
...
This was SVN commit r10244.
2011-09-10 20:17:24 +00:00
78fe8e1e62
h_mgr: fix simple double-free warning triggered at shutdown when an object's child was freed AND the all objects were forcibly freed (complicated by the fact that the pool allocator overwrites freed storage, which made this appear to be a tag conflict).
...
fixes #860 , #915 , #920
This was SVN commit r10243.
2011-09-10 20:04:01 +00:00
f7a7e9765a
Moved Roman Scorpion to Public as an Alpha 7 Easter Egg.
...
This was SVN commit r10242.
2011-09-10 19:38:29 +00:00
7e3ca5516f
Projectile work on Carth Ballista actor.
...
This was SVN commit r10241.
2011-09-10 19:27:36 +00:00
7c0c044fa8
Kart ballista shifted root, smoothed some faces, uv edits
...
This was SVN commit r10240.
2011-09-10 09:34:50 +00:00
db137737ba
Because we don't randomly change to new tracks and some of the existing ambient ones are too annoying if played constantly, we'll just set a default for now.
...
This was SVN commit r10239.
2011-09-10 01:49:30 +00:00
d2adbca5c6
Updated shrouds texture.
...
This was SVN commit r10238.
2011-09-09 20:00:21 +00:00
a4bf03996b
This was SVN commit r10237.
2011-09-09 09:55:22 +00:00
5233e4c0a7
This was SVN commit r10236.
2011-09-09 09:25:24 +00:00
f2de3ea2ee
Tweaked death anim speeds.
...
This was SVN commit r10235.
2011-09-09 01:24:47 +00:00
2f1f528f1c
Capes for Gallic mercenary swordsmen
...
This was SVN commit r10234.
2011-09-09 01:12:32 +00:00
0eeffd05bd
Adds max player population to sim state, based on patch from quantumstate. Fixes #951 .
...
This was SVN commit r10233.
2011-09-09 00:45:06 +00:00
b8a375656e
Fixes bug in player init (AI is configured by game setup, not always matching map settings).
...
This was SVN commit r10232.
2011-09-09 00:28:56 +00:00
486e002008
Giraffe, infant, lion, lioness death animations
...
This was SVN commit r10231.
2011-09-08 22:56:01 +00:00
3082da9be9
Fixed
...
This was SVN commit r10230.
2011-09-08 21:50:00 +00:00
d5c664e36e
# In-game manual updated to mention AI, map filters, and random maps.
...
This was SVN commit r10229.
2011-09-08 17:21:52 +00:00
3eb4d73438
This was SVN commit r10228.
2011-09-08 09:13:54 +00:00
0e5ef2f2e8
This was SVN commit r10227.
2011-09-08 07:26:20 +00:00
0a168f8436
This was SVN commit r10226.
2011-09-08 07:09:33 +00:00
f489e1205a
new icons for the embassies
...
This was SVN commit r10225.
2011-09-08 07:04:46 +00:00
aa6ad53e80
Shroud texture for ships
...
This was SVN commit r10224.
2011-09-08 07:00:00 +00:00
255bb29ab8
This was SVN commit r10223.
2011-09-08 06:00:33 +00:00
5f720dcace
This was SVN commit r10222.
2011-09-08 05:56:54 +00:00
10b94a6741
Until we deal with networked mode, return to main menu after match. Removed some console.write statements.
...
This was SVN commit r10220.
2011-09-08 04:18:12 +00:00
bab589e8a3
Tweaked game setup screen options area.
...
This was SVN commit r10219.
2011-09-08 04:04:04 +00:00
d22656034e
Tweaked summary screen.
...
This was SVN commit r10218.
2011-09-08 03:59:12 +00:00
238792a524
Reworked game setup and loading screens, and adjusted title decoration for some windows.
...
This was SVN commit r10217.
2011-09-08 03:49:57 +00:00
19e258d36c
Oasis tweaks.
...
Oasis III with 2 Carthage players.
Updated animations for Italian swordsman.
New portrait for shipyard.png
#Islands random map script.
This was SVN commit r10216.
2011-09-08 03:35:31 +00:00
c12d2ac0be
This was SVN commit r10215.
2011-09-08 03:03:08 +00:00
9e2d97a9c0
Fixes actor viewer button (label didn't update after switching tools).
...
This was SVN commit r10214.
2011-09-08 03:00:56 +00:00
06d95fb861
This was SVN commit r10213.
2011-09-08 00:39:57 +00:00
8fa5e80043
Carthage building names.
...
This was SVN commit r10212.
2011-09-08 00:20:00 +00:00
bc59102801
Make menu start out higher so that it is not visible when it is not opened (it appeared as a gold band around menu button)
...
This was SVN commit r10211.
2011-09-08 00:19:38 +00:00
b6f1251089
cart mechanical siege ballista xml
...
This was SVN commit r10210.
2011-09-07 23:43:24 +00:00
4332f37462
Siege ballista entity setup
...
This was SVN commit r10209.
2011-09-07 23:38:44 +00:00
2a0c04c930
Fix prop error on cart wall towers
...
This was SVN commit r10208.
2011-09-07 23:26:18 +00:00
cd3277d101
Maps fix #950 .
...
#New units for Carthage.
This was SVN commit r10206.
2011-09-07 23:01:54 +00:00
e3c3dd1026
Fixes missing template in Bridge Demo map.
...
This was SVN commit r10205.
2011-09-07 22:04:15 +00:00
f6120eb8e6
Carthaginian ballista unit
...
This was SVN commit r10204.
2011-09-07 21:37:14 +00:00
a088a9e3aa
This was SVN commit r10203.
2011-09-07 21:26:17 +00:00
63c7d3d52f
fix warning about missing registry key (happens on one system for unknown reasons)
...
see
http://www.wildfiregames.com/forum/index.php?showtopic=14058&pid=225336&st=50&#entry225336
This was SVN commit r10202.
2011-09-07 19:15:20 +00:00
185571845f
Renaming cancel button to main menu which makes more sense when returning from a match.
...
This was SVN commit r10201.
2011-09-07 02:07:38 +00:00
b65f8ae23a
Return to game setup directly from the summary screen. (BFME2 does this; will see if it's any good.)
...
This was SVN commit r10200.
2011-09-07 02:03:11 +00:00
550cac253d
Resize stances panel to fit better and move delete command to end of list.
...
This was SVN commit r10199.
2011-09-07 01:54:08 +00:00
3f0f1f78fb
Portraits for Carthaginian Bireme and Quinquereme.
...
This was SVN commit r10198.
2011-09-07 01:51:09 +00:00
85f60c4d28
New session tooltip colors and some code cleanup.
...
This was SVN commit r10197.
2011-09-07 01:43:56 +00:00
56ce7f7809
Added new sounds for mining and lumbering
...
- Ryan
This was SVN commit r10196.
2011-09-06 21:43:19 +00:00
21c52b5dcd
Added new sounds for mining and lumbering
...
- Ryan
This was SVN commit r10195.
2011-09-06 21:37:49 +00:00
7a7ebaa983
Allow ingame menu to reverse, add sounds to all menu buttons, and some organizing and cleanup
...
This was SVN commit r10194.
2011-09-06 18:15:27 +00:00
1a76c3b848
Tweaked Sicilia map.
...
This was SVN commit r10193.
2011-09-06 05:16:44 +00:00
81191a6ea7
Fixes garrisoned units disappearing when eject occurs too frequently. See #910 .
...
This was SVN commit r10192.
2011-09-06 03:11:16 +00:00
0210288ef1
Sacred Band Cavalry Easter egg unit. Trainable from the Carthaginian Tophet structure.
...
This was SVN commit r10191.
2011-09-06 02:15:35 +00:00
8b33f5cfd2
Fixes UI becoming unresponsive when ordering units to garrison.
...
This was SVN commit r10190.
2011-09-06 02:06:24 +00:00
e100f7264b
This was SVN commit r10189.
2011-09-05 19:10:27 +00:00
db3deba8dd
This was SVN commit r10187.
2011-09-05 10:32:37 +00:00
d9a56d2765
This was SVN commit r10185.
2011-09-05 04:24:26 +00:00
c4eb410d0d
Fixed devotio calling missing texture.
...
This was SVN commit r10184.
2011-09-04 22:31:13 +00:00
5b120012df
cart long wall gate upgrade mesh and actor
...
This was SVN commit r10183.
2011-09-04 12:35:47 +00:00
cf667d335a
Reorganize sound functions, play new defeat music, clean up some tab versus space issues.
...
This was SVN commit r10182.
2011-09-04 01:54:54 +00:00
d578f53ee2
This was SVN commit r10181.
2011-09-03 16:30:29 +00:00
ac76bd6fef
Carth Bireme Update
...
This was SVN commit r10180.
2011-09-03 05:06:36 +00:00
dfcabe4db3
Adjust main menu background scrolling speed and make submenu use random sounds when opening.
...
This was SVN commit r10179.
2011-09-03 03:18:40 +00:00
8f26bff788
Fix menu and dev commands overlay issue. Add music to Carthage civ file.
...
This was SVN commit r10177.
2011-09-03 02:12:14 +00:00
cb7a4f8b1a
Hopefully fix replay mode
...
This was SVN commit r10175.
2011-09-02 23:47:26 +00:00
33fef3a6fb
This was SVN commit r10174.
2011-09-02 22:51:42 +00:00
832c4d3a57
Added Carthage to Serengeti map. Tweaks to Celt SB and Celtic "Trireme."
...
This was SVN commit r10173.
2011-09-02 22:10:47 +00:00
cef1c1b69a
Some updated portraits.
...
This was SVN commit r10172.
2011-09-02 21:46:32 +00:00
e0ed496458
This was SVN commit r10170.
2011-09-02 14:45:58 +00:00
89532feab6
Fixes Atlas file open dialog on OS X (filters not shown by default in wxOSX 2.9).
...
This was SVN commit r10168.
2011-09-02 02:27:55 +00:00
706153f8ee
This was SVN commit r10167.
2011-09-02 00:40:00 +00:00
e847f5f69e
Removes old mapgen scripts.
...
This was SVN commit r10166.
2011-09-02 00:37:23 +00:00
05c5596827
Fix squished menu background and make clicking on background hide the submenu
...
This was SVN commit r10165.
2011-09-02 00:33:19 +00:00
ec6b9dfc28
Fixes broken color to string conversion in UI. Fixes #939 .
...
This was SVN commit r10164.
2011-09-02 00:24:30 +00:00
65f3126f04
Fixed the rocks on the left edge of this menu background piece. Just need someone to tweak up the code so it isn't crunched. :)
...
This was SVN commit r10163.
2011-09-01 21:56:45 +00:00
a28a5ef934
This was SVN commit r10162.
2011-09-01 19:59:07 +00:00
e2ad017092
Carthaginian entity tweaks. Made Super Dock construct biremes and quinqueremes. Adjusted cost and health for embassies. Made the commercial port less expensive.
...
This was SVN commit r10161.
2011-09-01 19:30:56 +00:00
48aabdf177
This was SVN commit r10160.
2011-09-01 11:08:46 +00:00
90fdd26cf1
Sets default wxFileDialog filters in Atlas.
...
This was SVN commit r10159.
2011-09-01 04:47:45 +00:00
d5b8a39fdd
Fix misaligned text in dialogs
...
This was SVN commit r10158.
2011-09-01 03:27:30 +00:00
5c7b1d8241
Make pause text larger
...
This was SVN commit r10157.
2011-09-01 02:54:05 +00:00
ee0c812b67
Tweaked style of manual and history
...
This was SVN commit r10156.
2011-09-01 02:49:02 +00:00
142bd05380
Menu: removed autohiding, doubled speed, added sound effects. GUI art: changed gold titlebar back to bronze, made progressbar consistent with titlebar. Repositioned start game button.
...
This was SVN commit r10155.
2011-09-01 02:36:38 +00:00
1389f11b6e
Applies Yves' latest patch for premake4.
...
Fixes test generation path in XCode and MSVC.
Fixes PCH dependency tracking in GCC. Fixes #903 .
Fixes PCH being included in its own input (caused GCC bus error).
Ensures premake4 gets rebuilt on *nix after running clean-workspaces.sh.
Updates Windows premake4 binary.
This was SVN commit r10154.
2011-09-01 01:58:04 +00:00
1433bd9ad9
Fixes gaia animals without UnitAI (e.g. fish) blocking foundation construction, by destroying them. Fixes #936 .
...
This was SVN commit r10153.
2011-08-31 23:41:55 +00:00
2d10077581
This was SVN commit r10152.
2011-08-31 16:04:49 +00:00
a267c64ff7
Gold border frame
...
This was SVN commit r10151.
2011-08-31 15:54:44 +00:00
0fe7cd7edc
Some small layout alignment tweaks/fixes
...
This was SVN commit r10150.
2011-08-31 03:23:14 +00:00
c23497f326
Placing "g_GameEnded = true;" first. (Doesn't really matter, but is more clear.)
...
This was SVN commit r10149.
2011-08-31 03:13:33 +00:00
7d2411e6cb
Convert win / loss dialogs to new style.
...
This was SVN commit r10148.
2011-08-31 03:09:18 +00:00
2469fdf8c6
Convert delete dialog to new style. Fixes #937
...
This was SVN commit r10147.
2011-08-31 02:58:57 +00:00
9a00398e24
Converted menu hotkey and ai config to new style. Added basic sliding menus. (Need to evaluate potential performance issues here.)
...
This was SVN commit r10146.
2011-08-31 02:41:21 +00:00
b48c35c512
After a lot of playtesting, I've adjusted the build limits on the Fortresses and Scout Towers. See if these are 'ok'.
...
This was SVN commit r10145.
2011-08-31 02:07:35 +00:00
cda3a7eedf
Tweaked ship health and Super Dock health.
...
Disabled <TerritoryDecay> for some miscellaneous things.
This was SVN commit r10144.
2011-08-31 01:08:58 +00:00
07d48a5c9a
Prevents gaia buildings from decaying in enemy territories.
...
This was SVN commit r10143.
2011-08-30 23:53:34 +00:00
7429cc2b95
Updated Cart trireme portrait.
...
Added Carthaginians to map.
This was SVN commit r10142.
2011-08-30 23:28:49 +00:00
fd52ec7786
This was SVN commit r10141.
2011-08-30 23:23:51 +00:00
1ff6d44f9e
Fixes promoted entities dropping from control groups, based on patch from gruby. Fixes #859 .
...
This was SVN commit r10140.
2011-08-30 22:29:03 +00:00
a9e3368c8b
Persian Trireme Updated
...
This was SVN commit r10139.
2011-08-30 22:24:07 +00:00
4530b45665
Updated Carth Sandbox.
...
This was SVN commit r10138.
2011-08-30 21:30:16 +00:00
8a096711ae
Update to Italian embassy building
...
This was SVN commit r10137.
2011-08-30 20:14:18 +00:00
7b4f6dece1
Props for the Iberian embassy.
...
This was SVN commit r10136.
2011-08-30 05:11:22 +00:00
05afd7796c
Improvements to the Cart Wall entities and to the general wall templates.
...
Removed pop bonus for embassies.
This was SVN commit r10135.
2011-08-30 00:01:07 +00:00
e8253249a2
Switches Atlas player panel to our custom ColourDialog for consistency.
...
This was SVN commit r10134.
2011-08-29 22:27:58 +00:00
fc7d303ee4
Adjusts Atlas sidebar and bottombar to look better on different platforms.
...
This was SVN commit r10133.
2011-08-29 22:12:20 +00:00
a4fbf46deb
Updates to Carthaginian building models
...
This was SVN commit r10132.
2011-08-29 20:07:26 +00:00
6366ad728f
Fixes Atlas toolbar in wxOSX (only Realize() it after creation).
...
Fixes terrain preview not displaying first page in wxOSX.
Formats terrain page labels more nicely.
Adds a bunch of tooltips.
This was SVN commit r10131.
2011-08-29 03:50:29 +00:00
ded514644e
Commented out most of old styles.xml and changed references to new styles, outlined tabs in summary, fixed chat color in multiplayer setup
...
This was SVN commit r10130.
2011-08-28 21:32:35 +00:00
769a927446
Changes Atlas toolbar construction to use CreateToolBar instead of explicitly setting it (which doesn't work on wxOSX 2.9).
...
Adds a call to Atlas_GLSetCurrent after setting Atlas resolution on OS X
(otherwise the canvas doesn't seem to update properly).
This was SVN commit r10129.
2011-08-28 21:10:45 +00:00
c1b6b6d76e
This was SVN commit r10128.
2011-08-28 19:50:46 +00:00
ce17fc4e3f
This was SVN commit r10127.
2011-08-28 19:49:46 +00:00
ba4de704b0
Carthaginian building updates
...
This was SVN commit r10126.
2011-08-28 17:44:35 +00:00
8c09b777e2
This was SVN commit r10125.
2011-08-28 10:58:12 +00:00
3dc491efb7
Updates to Carthaginian buildings
...
This was SVN commit r10124.
2011-08-28 10:34:39 +00:00
47e1e23721
Fixes bug on object panel (assert fail when map was loaded before the panel was displayed).
...
This was SVN commit r10123.
2011-08-28 05:57:09 +00:00
4185aa348a
change button height from 32 to 28
...
This was SVN commit r10122.
2011-08-28 03:04:32 +00:00
ad6c4b6abe
removed close button from ingame menu, updated button texture
...
This was SVN commit r10121.
2011-08-28 02:02:38 +00:00
ab5d1f8482
Changed size of the manual to be based off of the center of the screen, instead of the edges of the screen.
...
This was SVN commit r10120.
2011-08-28 01:49:17 +00:00
6146d948ad
hide yellow border between main menu and submenu
...
This was SVN commit r10119.
2011-08-28 01:28:50 +00:00
f2b61d2e56
Fixes Atlas canvas on OS X (needs to be shown before setting GL context - fixes invalid drawable error).
...
This was SVN commit r10118.
2011-08-28 00:28:06 +00:00
cd6ce56632
Fixes some Atlas button layouts with wxWidgets 2.9 (wxGridSizer seems preferable to wxBoxSizer for equally sized buttons).
...
This was SVN commit r10117.
2011-08-27 23:43:18 +00:00
52b73d4445
Make ingame exit button leave the current game rather than exit the entire program
...
This was SVN commit r10116.
2011-08-27 23:28:12 +00:00
0e81ee4f60
Made ingame resource counters use percent-based positioning. Lined up ingame bottom panel textures better. Remove old session dialog sprites.
...
This was SVN commit r10115.
2011-08-27 23:17:14 +00:00
e933986351
removed session dialog, updated ingame menu
...
This was SVN commit r10114.
2011-08-27 22:44:08 +00:00
e33124631b
Projectile nodes added to civ centre mesh
...
This was SVN commit r10113.
2011-08-27 21:35:34 +00:00
3b958b4a1c
Fixing yet another problem: make sure the submenu closes if we click a button that doesn't use the submenu
...
This was SVN commit r10112.
2011-08-27 19:36:55 +00:00
abda9576b1
Updated panel style and made main menu "x" exit game without confirmation
...
This was SVN commit r10111.
2011-08-27 19:23:32 +00:00
ae866e2cb4
Fix typo in tooltip
...
This was SVN commit r10110.
2011-08-27 18:50:23 +00:00
e1cb8f6e10
Update main menu buttons tooltip text
...
This was SVN commit r10109.
2011-08-27 18:46:00 +00:00
e909567004
Convert most dialogs over to new style
...
This was SVN commit r10108.
2011-08-27 18:34:54 +00:00
2915e9a85e
Update submenu code
...
This was SVN commit r10107.
2011-08-27 15:21:12 +00:00
8729d1115d
Render territory borders in non-shader render path.
...
Add basic support for fixed-function implementations of shader API.
This was SVN commit r10106.
2011-08-27 14:31:24 +00:00
9d25dad969
This was SVN commit r10105.
2011-08-27 13:18:35 +00:00
be02410dd4
Updates to cart civ centre and superdock meshes
...
This was SVN commit r10104.
2011-08-27 11:01:09 +00:00
fc958db168
moved some buttons to second tier, updated style of history section
...
This was SVN commit r10103.
2011-08-27 06:20:16 +00:00
29dc9c3094
Fixes bug in Atlas player panel (AtIter definition must be checked before incrementing).
...
This was SVN commit r10102.
2011-08-26 22:58:55 +00:00
dace16913f
Update to Carthaginian Sandbox
...
This was SVN commit r10101.
2011-08-26 22:37:02 +00:00
fcc02d85c4
This was SVN commit r10100.
2011-08-26 22:35:07 +00:00
bb77e3a300
Changes player panel spin controls to use default style.
...
This was SVN commit r10099.
2011-08-26 22:11:30 +00:00
53de4a8d5d
remove ghost=true to allow clicking on communication buttons
...
This was SVN commit r10098.
2011-08-26 04:32:53 +00:00
9f6f4d8bd1
Beginning of the submenu
...
This was SVN commit r10097.
2011-08-26 04:25:41 +00:00
072751858b
polish the alpha version label
...
This was SVN commit r10096.
2011-08-26 01:56:50 +00:00
2d1fe050b9
Fixes use of deprecated wxWidgets constants as they don't work on all platforms (only when the library was built with WXWIN_COMPATIBILITY_2_6).
...
This was SVN commit r10095.
2011-08-26 01:56:14 +00:00
9090545852
Scenario only embassy simulation template
...
This was SVN commit r10094.
2011-08-25 23:43:03 +00:00
0a3b120aa8
Basic Italiote embassy mesh placeholder
...
This was SVN commit r10093.
2011-08-25 23:07:22 +00:00
b059824b76
Cart embassy updates
...
This was SVN commit r10092.
2011-08-24 23:14:15 +00:00
cbebe83b37
Cart celtic embassy update
...
This was SVN commit r10091.
2011-08-24 21:03:28 +00:00
f9ef989f6d
Carthage embassy and unit updates.
...
Some Barracks cost updates.
This was SVN commit r10090.
2011-08-24 19:30:06 +00:00
9a53cc1395
__SSE[2]__ didn't work on MSVC/ICC after all; introduce HAVE_SSE[2] instead
...
This was SVN commit r10089.
2011-08-24 09:23:44 +00:00
1890b1df49
Align tags to avoid confusion
...
This was SVN commit r10088.
2011-08-24 05:12:17 +00:00
81121ca1e8
Add alpha warning back
...
This was SVN commit r10087.
2011-08-24 05:03:11 +00:00
bf5e94c6e4
Adjusted main menu panel background
...
This was SVN commit r10086.
2011-08-24 04:35:53 +00:00
8a4443e4c7
Update styles to match mockup better
...
This was SVN commit r10085.
2011-08-24 04:16:37 +00:00
37dad6eb62
This was SVN commit r10084.
2011-08-24 02:54:31 +00:00
85336397a3
Don't render neutral territory borders on minimap.
...
This was SVN commit r10083.
2011-08-24 00:28:48 +00:00
f9dc6d9d69
Removes superfluous test build configuration from premake4.
...
This was SVN commit r10082.
2011-08-24 00:15:00 +00:00
60985a3bc9
Fixes training queue behavior when spawning fails due to lack of space (the queue will be blocked). Fixes #893 .
...
Changes training queue to support partial batch success and removal.
This was SVN commit r10081.
2011-08-23 22:43:34 +00:00
9e487bac30
Carthaginian embassy buildings update
...
This was SVN commit r10080.
2011-08-23 21:09:13 +00:00
13dc7a9210
Fix non-PCH build
...
This was SVN commit r10079.
2011-08-23 17:48:06 +00:00
192107a522
New "standing stone" treasures.
...
Updated Gallic Fields with Standing Stone treasures.
Updated Celtic Temple to not use the large celt_struct texture. One more
building to go before we can delete this texture forever.
This was SVN commit r10078.
2011-08-23 06:24:05 +00:00
d204180ed0
Road demo map
...
This was SVN commit r10077.
2011-08-23 04:07:43 +00:00
976529d280
Fix size issue with main menu panel shading
...
This was SVN commit r10076.
2011-08-23 04:01:05 +00:00
762aad3be5
Clean up some styles
...
This was SVN commit r10075.
2011-08-23 03:51:04 +00:00
eb9d5c9f39
This was SVN commit r10074.
2011-08-23 03:38:45 +00:00
05122a4e80
This was SVN commit r10073.
2011-08-23 03:38:32 +00:00
dc2b2aeff4
Converted some more screens over
...
This was SVN commit r10072.
2011-08-23 03:27:13 +00:00
a5a8367ed8
#Temperate stone road decals.
...
This was SVN commit r10071.
2011-08-23 03:08:18 +00:00
c84d31e298
Cart tophet extra building.
...
Touched up the smoke particle.
Took territory effect away from Super Dock.
Touched up the Cart temple footprint.
This was SVN commit r10069.
2011-08-23 01:44:01 +00:00
605e9f97bf
Update chat dialog and some labels in game setup to new style
...
This was SVN commit r10068.
2011-08-22 23:56:42 +00:00
0cd825e552
Converted parts of the game setup dialog and some general GUI elements over to new styles. There are duplicate sprites / textures that will need to be removed later when all references to them are changed.
...
This was SVN commit r10067.
2011-08-22 23:42:16 +00:00
f627229294
kart embassy actor and mesh commit
...
This was SVN commit r10066.
2011-08-22 23:14:07 +00:00
e13aeee36c
Report desktop display size (not just window size)
...
This was SVN commit r10065.
2011-08-22 22:34:59 +00:00
27e5581d27
Fixes Atlas player panel getting out of sync with simulation. Fixes #927 .
...
Fixes object panel not being notified of map loading.
Fixes bug where opening a new map before using the player panel
prevented default player data being displayed for new players.
Fixes wxGTK 2.8 bug: wxChoicebook control doesn't update the choice
control when adding/removing pages.
Notifies player that deleting player in Atlas will delete all their
objects (and gives them the option).
Changes DeleteObject to DeleteObjects to support multiple selections.
Implements undo for map resize (experimental).
Removes annoying debug message from attempted undo of map settings.
Tweaks a few Atlas UI controls.
This was SVN commit r10064.
2011-08-22 21:45:39 +00:00
a4dc290c23
Map tweaks.
...
This was SVN commit r10063.
2011-08-22 19:15:55 +00:00
da438151f0
adjust border around pre-release warning text
...
This was SVN commit r10062.
2011-08-22 17:41:46 +00:00
d9c65c82cf
More work on main menu, and added new button style
...
This was SVN commit r10061.
2011-08-22 17:36:53 +00:00
32f68b7a4b
This was SVN commit r10060.
2011-08-22 12:10:22 +00:00
ed959b8da7
minor fixes: add missing arena.cpp; add required NONCOPYABLE annotation; fix UNUSED2 to work in the case of references.
...
This was SVN commit r10059.
2011-08-22 08:54:56 +00:00
a6f5784c5c
Remove junk characters from beginning of Alpha Warning
...
This was SVN commit r10058.
2011-08-22 04:18:43 +00:00
f2f0263a3d
Made menu panel use a more relative layout to work better with lower resolutions
...
This was SVN commit r10057.
2011-08-22 04:13:05 +00:00
9af4851508
Adds few more animation to Atlas actor viewer (promotion, feeding, garrisoned).
...
This was SVN commit r10056.
2011-08-22 04:11:21 +00:00
4bd86230b1
Old Cart civ centre files renamed
...
This was SVN commit r10055.
2011-08-21 16:10:17 +00:00
b37185f6db
Cart civ centre update
...
This was SVN commit r10054.
2011-08-21 16:06:20 +00:00
6c859fc6bb
add documentation on pointer types and RESTRICT as per yesterday's meeting
...
This was SVN commit r10053.
2011-08-21 15:09:09 +00:00
509f4387d7
Fix build
...
This was SVN commit r10052.
2011-08-21 13:10:44 +00:00
881d3cebf4
lay groundwork for more efficient and flexible allocators. add new sysdep/vm that provides access to additional features on Windows (large pages, autocommit). add Pool/Arena allocators that avoid overhead and support arbitrary storage (not just the expensive virtual memory allocator in DynArray)
...
This was SVN commit r10051.
2011-08-21 11:00:09 +00:00
3eb1ed0139
(actually remove)
...
This was SVN commit r10050.
2011-08-21 10:31:23 +00:00
c26a369762
remove Bucket allocator (superseded by upcoming Arena/Pool with expandable Storage policies)
...
This was SVN commit r10049.
2011-08-21 10:30:35 +00:00
1c2472e67a
Lowered TerritoryDecay from 20 to 5 (hps).
...
Disabled territory decay for Docks.
This was SVN commit r10048.
2011-08-21 05:06:05 +00:00
6368331412
Map tweaks.
...
This was SVN commit r10047.
2011-08-21 02:13:34 +00:00
d92e74ee51
This was SVN commit r10046.
2011-08-21 01:02:01 +00:00
730a89152c
Fixes typecast performance warning in MSVC.
...
This was SVN commit r10045.
2011-08-21 00:09:28 +00:00
5406a68959
feature request by philip: instead of refusing to load textures larger than the OpenGL limit, ensure they have mipmaps (unless it's s3tc, which would be too expensive to recompress) and skip levels until it fits
...
This was SVN commit r10043.
2011-08-20 17:56:12 +00:00
36d897c694
# New menu background image
...
This was SVN commit r10042.
2011-08-20 17:17:53 +00:00
d05d410b46
thicker mast
...
This was SVN commit r10041.
2011-08-20 16:17:51 +00:00
82e044c790
This was SVN commit r10040.
2011-08-20 05:59:25 +00:00
947efe70d1
#Greek trireme changes.
...
This was SVN commit r10039.
2011-08-20 05:12:32 +00:00
5d116c2b8f
This was SVN commit r10038.
2011-08-19 14:27:40 +00:00
5f07107609
Fix build with wxWidgets 2.9
...
This was SVN commit r10037.
2011-08-18 23:38:11 +00:00
49af1880f8
Fix tests
...
This was SVN commit r10035.
2011-08-18 21:12:15 +00:00
308cb26dd4
# Health decay for buildings not in a civ center's territory.
...
This was SVN commit r10034.
2011-08-18 20:28:53 +00:00
6b26820090
Build fix
...
This was SVN commit r10033.
2011-08-18 11:16:52 +00:00
5c3f3c2e15
This was SVN commit r10032.
2011-08-18 04:05:10 +00:00
36c6318296
This was SVN commit r10031.
2011-08-18 03:28:32 +00:00
a0fb46b5d6
#3rd new Celtic Market. :)
...
#Horse fauna entity.
This was SVN commit r10030.
2011-08-18 00:33:22 +00:00
89c22993a4
Adds terrain fill (bucket) tool to Atlas.
...
This was SVN commit r10029.
2011-08-17 23:44:52 +00:00
5a2d7365f9
This was SVN commit r10028.
2011-08-17 21:58:50 +00:00
b12845e6b4
Avoid shaders on GeForce FX, for performance.
...
Update list of Intel device names.
This was SVN commit r10027.
2011-08-17 21:42:32 +00:00
8872bad668
AoEO BAR compatibility in AoE3Ed
...
This was SVN commit r10026.
2011-08-17 16:17:22 +00:00
e8f6be0bf3
Fix GCC build (only reference SIMD types when supported by the compiler (though this might not work in MSVC))
...
This was SVN commit r10025.
2011-08-17 13:41:25 +00:00
9f97610cb2
refactor: remove "wrapping" and "read" functionality for DynArray (in preparation for replacing it with template policies for more flexible Pool etc.)
...
This was SVN commit r10024.
2011-08-17 08:38:53 +00:00
939f056794
Preliminary work on Roman units.
...
This was SVN commit r10023.
2011-08-17 07:23:54 +00:00
7bd2f1c925
Temp fix for autobuild: VC2008 doesn't define hypotf.
...
This was SVN commit r10021.
2011-08-17 04:34:20 +00:00
7679d1073b
Fixes garrison behavior for ships - they no longer unload units underwater. See #893 .
...
Fixes behavior when ships are destroyed (garrisoned units at the time
will also be killed).
Updates ship templates accordingly.
This was SVN commit r10020.
2011-08-17 01:43:23 +00:00
b9df1d3451
Be less grossly inefficient when computing minimap territory texture
...
This was SVN commit r10019.
2011-08-16 23:39:16 +00:00
fab7bf4fcf
Fixes manifest dependencies for Actor Editor. Fixes #924 .
...
This was SVN commit r10018.
2011-08-16 22:08:47 +00:00
609f1643d5
Fix -Wconversion warnings in simulation code.
...
Cast to smaller integer types explicitly.
Generally avoid platform-dependent types (size_t) in simulation code.
Use float versions of math.h functions, not double.
This was SVN commit r10017.
2011-08-16 11:18:32 +00:00
b40b5b8414
Adjusting territory effects.
...
This was SVN commit r10016.
2011-08-16 05:01:35 +00:00
a13f38c9b4
Moves build limits counter to BuildLimits component, to avoid some weirdness with BuildRestrictions for preview entities (caused some warnings in Atlas).
...
This was SVN commit r10015.
2011-08-16 04:44:15 +00:00
a85c8218e9
Fixes player diplomacy init (again)
...
This was SVN commit r10014.
2011-08-16 04:03:57 +00:00
ec973ee005
This was SVN commit r10013.
2011-08-16 03:42:42 +00:00
18c48492ef
Added cast to convert from unsigned to int
...
This was SVN commit r10012.
2011-08-16 02:01:11 +00:00
0f0ac2bcd5
Fixes #898
...
This was SVN commit r10011.
2011-08-16 01:01:39 +00:00
cda5dfbf12
New foundation for Hellene dock.
...
Tweaking warship attacks.
This was SVN commit r10010.
2011-08-15 04:02:01 +00:00
ff85950cb7
Disables build restrictions and limits for AIs (until they can be fixed).
...
Simplifies player diplomacy/team setup.
This was SVN commit r10008.
2011-08-15 00:25:22 +00:00
1b8471da1f
Changes shore definition to distance on land (all water included) for better dock placement.
...
Updates build passability classes.
Fixes tile expansion in CheckBuildingPlacement (don't use FromFloat).
Changes dock rotation snapping to search outward.
This was SVN commit r10007.
2011-08-14 23:36:13 +00:00
132f9bd63b
Fixes bug in Atlas random map generator UI.
...
This was SVN commit r10006.
2011-08-14 06:11:35 +00:00
7b27fcb716
Disables water rendering in the actor viewer.
...
This was SVN commit r10005.
2011-08-13 23:00:58 +00:00
8e5f87f240
Adjusts random map starting entities to face consistent direction.
...
This was SVN commit r10004.
2011-08-13 00:54:24 +00:00
5288cda0ba
Greek warship sail.
...
This was SVN commit r10003.
2011-08-12 15:19:48 +00:00
ecee073860
#New Greek Trireme
...
This was SVN commit r10002.
2011-08-12 12:08:21 +00:00
68fe745eb7
Fix packaging scripts for 5-digit revision numbers
...
This was SVN commit r10001.
2011-08-11 18:16:00 +00:00
9be60bf29d
Unit texture updates. Getting rid of "high" res texture folder.
...
This was SVN commit r10000.
2011-08-11 18:11:39 +00:00
e4c6cd8b85
This was SVN commit r9999.
2011-08-11 17:58:08 +00:00
13705a71e0
cleanup
...
This was SVN commit r9998.
2011-08-11 17:57:37 +00:00
ca0f54f17a
Moving textures.
...
This was SVN commit r9997.
2011-08-11 17:51:45 +00:00
dc909411a8
This was SVN commit r9996.
2011-08-11 17:46:01 +00:00
d724ff2b69
Remove rally point for House (females previous removed)
...
This was SVN commit r9995.
2011-08-11 06:39:06 +00:00
a681ff1189
Projectile prop point work for Civic Centres and Fortresses.
...
New foundation for Iberian Dock.
This was SVN commit r9994.
2011-08-11 03:48:52 +00:00
26e249797f
Removed legacy description.
...
This was SVN commit r9993.
2011-08-11 01:45:36 +00:00
bcebde9c8e
#Unit balancing for Carthaginian unit ranks. Closes #923
...
This was SVN commit r9992.
2011-08-11 01:41:49 +00:00
e51849b29f
Fixes incorrect distance calculation.
...
Improves dock foundation snapping.
This was SVN commit r9991.
2011-08-10 23:57:54 +00:00
19ae44ad17
This was SVN commit r9990.
2011-08-10 23:54:37 +00:00
819f354cca
Removes Devil. Fixes #666 .
...
Adds no_delayload to OpenAL, which has been causing startup problems.
This was SVN commit r9989.
2011-08-10 23:15:40 +00:00
2726f6ed88
Changes GetFocus to return points above water.
...
Fixes camera following of boats.
This was SVN commit r9988.
2011-08-10 22:45:55 +00:00
d605e85ae5
Removes ColourTester utility (needs update-workspaces).
...
Adds busy cursor to Atlas map generator.
This was SVN commit r9987.
2011-08-10 22:23:35 +00:00
6d2ff5162e
Made female only trainable from the Civ Centre, then made them train faster. This is a test to see what everybody thinks.
...
This was SVN commit r9986.
2011-08-09 23:10:05 +00:00
5fd0d3b543
New foundation for Carth Market.
...
This was SVN commit r9985.
2011-08-09 23:05:54 +00:00
0adcad8662
Change promoted unit health to the same percent of hitpoints as unit had before promotion. Closes #922 .
...
This was SVN commit r9984.
2011-08-09 18:42:21 +00:00
c513b5e35e
Foundation for the Super Dock. Updated Carthaginians Sandbox demo map.
...
This was SVN commit r9983.
2011-08-09 18:20:31 +00:00
a02eb067f4
Makes Carthaginians selectable in game setup and random maps
...
This was SVN commit r9982.
2011-08-08 20:13:11 +00:00
0952fa879c
This was SVN commit r9981.
2011-08-08 07:13:58 +00:00
511a36e45a
This was SVN commit r9980.
2011-08-08 02:44:41 +00:00
ed3d4c5197
A couple of dock foundations. Tweaked some Carth dock stuff.
...
This was SVN commit r9979.
2011-08-08 02:38:32 +00:00
4a2adece07
Fixes class types for Atlas pathfinding overlay
...
This was SVN commit r9978.
2011-08-08 01:04:18 +00:00
065e13b4d5
Pikemen walk at 6.0 now.
...
This was SVN commit r9977.
2011-08-07 19:25:59 +00:00
5570126bca
Carthaginian dock and superdock files.
...
This was SVN commit r9976.
2011-08-07 10:46:18 +00:00
336c938296
Beefed walking speeds.
...
This was SVN commit r9974.
2011-08-07 06:17:59 +00:00
633c366847
Roman Arch
...
This was SVN commit r9973.
2011-08-07 03:03:06 +00:00
b9bd7ff86e
Fix signed/unsigned comparison warning
...
This was SVN commit r9972.
2011-08-06 12:31:48 +00:00
f378e2e651
Implements building restrictions (by terrain, territory, category, and distance). See #41 . Fixes #804 , #287 .
...
Implements build limits. See #687 .
Implements autorotation for dock placement.
Fixes unit spawning to consider terrain passability. See #893 .
Adds new passability criteria based on distance from shore.
Updates build restrictions on some templates.
Changes unit spawning search to 4 tiles away from foundation.
Changes garrison/training spawn failure to nicer UI notification.
This was SVN commit r9970.
2011-08-06 08:11:05 +00:00
76e6b04c71
Greek Trireme Model
...
This was SVN commit r9969.
2011-08-06 08:04:33 +00:00
c5b512584a
New kart roof tile color.
...
This was SVN commit r9967.
2011-08-05 07:42:48 +00:00
52eabed63d
Resized the carthaginian trade ship. Tweaked its texture color. Added cargo prop.
...
This was SVN commit r9966.
2011-08-05 04:43:54 +00:00
fc5c998dc6
Some updates to Necropolis--trees and such.
...
This was SVN commit r9965.
2011-08-04 22:40:10 +00:00
81c9a9b1f1
Fix build with old GCC
...
This was SVN commit r9964.
2011-08-04 21:36:57 +00:00
93125e29d4
This was SVN commit r9963.
2011-08-04 19:15:24 +00:00
083e7a41fd
fix typo
...
This was SVN commit r9962.
2011-08-04 17:27:14 +00:00
0748c5a75e
cleanup and simplification of the really old h_mgr code.
...
replace array-of-pages data structure with demand-committed VM => allows
simple allocation of new resources without having to search for the
first free index. I suspect the cause of multiple reported bugs (refs
#860 , #899 , #915 ) was a race. Most issues are fixed, but the pool's
freelist also needs to be made thread-safe and lock-free. this has
performance and 64-bit portability implications, so I'll leave it for
later (Pool is due for some serious refactoring anyway).
please post a comment if this or similar issues persist.
This was SVN commit r9961.
2011-08-04 17:11:16 +00:00
22191bfcc6
Windows fix (smaller type conversion)
...
This was SVN commit r9960.
2011-08-04 15:31:01 +00:00
fad5182d6c
This was SVN commit r9959.
2011-08-04 00:51:33 +00:00
9ed3b3f801
Tweaks to the skies textures.
...
This was SVN commit r9958.
2011-08-04 00:49:54 +00:00
154bee8f5c
More vision adjustments.
...
This was SVN commit r9957.
2011-08-03 22:57:52 +00:00
5d992994d4
Territory demo map.
...
Updated vision ranges and territory ranges for templates.
This was SVN commit r9956.
2011-08-03 01:24:06 +00:00
2d662a1228
Add WELL512 RNG
...
This was SVN commit r9955.
2011-08-02 22:58:10 +00:00
94e9a8b459
Fix hang with Boost 1.47
...
This was SVN commit r9954.
2011-08-02 21:07:58 +00:00
acbb59d982
Some texture and actor updates, specifically in regards to capes.
...
This was SVN commit r9953.
2011-08-02 02:14:10 +00:00
6aeb5c64de
# Remove SoD inside territories.
...
Fix some serialisation issues.
This was SVN commit r9951.
2011-08-01 21:25:12 +00:00
9430de3d85
Support TerrainChanged messages in scripts, and report use of unsupported messages
...
This was SVN commit r9950.
2011-08-01 21:01:06 +00:00
7e67e816c9
Add small 'X' exit button to corner
...
This was SVN commit r9949.
2011-08-01 03:30:13 +00:00
bd3c395d00
This was SVN commit r9948.
2011-08-01 02:46:29 +00:00
6bcb3f5695
A very rough attempt at the new main menu style.
...
This was SVN commit r9947.
2011-08-01 00:41:24 +00:00
0401d07659
kart_struct texture update. Updates to civcentre, market, temple models
...
This was SVN commit r9946.
2011-07-31 16:51:51 +00:00
22cf7d4d83
Fix #913 (corrupted map file)
...
This was SVN commit r9945.
2011-07-31 12:19:06 +00:00
6304797cbd
pool - safely handle zero-sized allocations ( fixes #909 )
...
snd_mgr - remove no longer needed hacks for native OpenAL
implementations
test_wdbg_sym.h - belated commit of warning fix
This was SVN commit r9944.
2011-07-31 09:42:57 +00:00
14fbdb9aae
This was SVN commit r9943.
2011-07-31 07:41:34 +00:00
f258ce921d
Territory tweaks for structures. Playtest and see what you think.
...
This was SVN commit r9942.
2011-07-31 04:52:53 +00:00
0cf9dbf9c6
Cavalry version for the cape. New updated shields for Cart and Samnite units.
...
This was SVN commit r9941.
2011-07-31 04:41:20 +00:00
f73a44527d
Miscellaneous stuff, like Kart Samnite unit stuff, and brand new capes.
...
This was SVN commit r9940.
2011-07-31 01:42:41 +00:00
e7ac0926a7
Replace console prefix-search behaviour with more standard history navigation, based on patch by Ross Bearman.
...
Fixes #906 .
This was SVN commit r9939.
2011-07-30 23:06:09 +00:00
3cc1c7e24e
Templates sorting utility. Closes #801 .
...
This was SVN commit r9938.
2011-07-30 20:20:34 +00:00
328d33b9e9
Simulation templates sorting in internal mod. See #801 .
...
This was SVN commit r9937.
2011-07-30 20:18:21 +00:00
2ecbfa81c3
Simulation templates sorting. See #801 .
...
This was SVN commit r9936.
2011-07-30 20:09:46 +00:00
22f2878c26
This was SVN commit r9935.
2011-07-30 18:34:08 +00:00
a1f925a378
Fix broken entity reference
...
This was SVN commit r9934.
2011-07-30 16:40:42 +00:00
b63cc7b18d
Delete seemingly bogus file
...
This was SVN commit r9933.
2011-07-30 16:38:32 +00:00
04ec40259b
Use player colours for territory borders in minimap
...
This was SVN commit r9932.
2011-07-30 12:07:27 +00:00
4e4a5fd8a6
Increase territory border thickness
...
This was SVN commit r9931.
2011-07-30 12:06:07 +00:00
8fee3d8ef8
# New territory border rendering.
...
Add textured line overlay rendering.
Change terrain height calculations to be triangulation-dependent for
improved accuracy.
Add triangulation-dependent terrain normal function.
Support separate S/T wrap modes for textures.
Rename CVector2D_Maths since it no longer conflicts with simulation
CVector2D.
Coalesce freed chunks in vertex buffers, to avoid excessive
fragmentation.
Add some things to help debug vertex buffer allocation a little.
This was SVN commit r9929.
2011-07-30 00:56:45 +00:00
239685d754
#New Carthaginian Merchant Ship
...
This was SVN commit r9927.
2011-07-27 15:23:14 +00:00
e7677a48e2
1 more Samnite shield texture.
...
This was SVN commit r9926.
2011-07-27 05:32:40 +00:00
29a178d9d6
Samnite portraits.
...
This was SVN commit r9925.
2011-07-27 05:06:06 +00:00
8a400f7b97
#Samnites.
...
#Greek shield guides.
This was SVN commit r9924.
2011-07-27 04:48:44 +00:00
b892d35fea
Removes ConquestCritical token from fauna units, so they don't count against victory. Fixes #911 .
...
This was SVN commit r9923.
2011-07-26 22:26:49 +00:00
f32beb879b
Kart wall and tower testing
...
This was SVN commit r9922.
2011-07-26 20:13:30 +00:00
8bc942d271
A bunch of "Samnite" i.e. Italic Cavalry stuff.
...
This was SVN commit r9921.
2011-07-26 06:35:29 +00:00
27e895b1b0
Closed palisade gate
...
This was SVN commit r9920.
2011-07-25 17:53:05 +00:00
2a9e7f9449
Unit actor work. Updated some portraits. Started work on a samnite shield, but the collada files are being goofy (looks like the normals are flipped, but they aren't).
...
This was SVN commit r9919.
2011-07-25 08:56:54 +00:00
3afbab309a
Tweaks to Carth corral.
...
Made the palisade fort shoot from the proper place.
This was SVN commit r9917.
2011-07-25 01:53:18 +00:00
713197b98d
This was SVN commit r9916.
2011-07-25 00:53:20 +00:00
3b70097dbe
New palisade Outpost, Watchtower, and Spike structures
...
This was SVN commit r9915.
2011-07-25 00:10:20 +00:00
cbbc4e148b
Updates to some of the palisade models
...
This was SVN commit r9914.
2011-07-25 00:00:41 +00:00
5516f11fc2
This was SVN commit r9913.
2011-07-24 22:20:30 +00:00
3d9d6bd3dc
Greek wall tower shoots from the proper place now.
...
Tweaks to the black capes.
This was SVN commit r9912.
2011-07-24 22:19:19 +00:00
cdfeeab25f
Fixes Atlas non-PCH build.
...
This was SVN commit r9911.
2011-07-24 21:50:58 +00:00
c072e8a85d
New Kart corral files
...
This was SVN commit r9910.
2011-07-24 21:42:38 +00:00
f0fe1b0b28
Fixes rmgen to use GetCivData and handle invalid/unfinished civs.
...
This was SVN commit r9909.
2011-07-24 20:04:04 +00:00
b2837e2878
Fix compatibility more with Boost 1.47
...
This was SVN commit r9907.
2011-07-24 11:59:57 +00:00
955f94976e
# New dynamic territories design
...
This was SVN commit r9906.
2011-07-24 11:42:35 +00:00
78fd3a2ba2
Fix compatibility with Boost 1.47
...
This was SVN commit r9905.
2011-07-24 11:41:06 +00:00
2612cd511d
This was SVN commit r9904.
2011-07-24 09:18:42 +00:00
51b99950c4
Thespian Melanochitones.
...
This was SVN commit r9903.
2011-07-24 08:52:06 +00:00
18f6d55dc0
#Italic Cavalry stuff.
...
This was SVN commit r9902.
2011-07-24 05:45:58 +00:00
813fed5b9e
Adds GetCivData to map generator API (to replace the hardcoded starting entities in rmgen).
...
Adds some starting entities to unfinished civs.
This was SVN commit r9901.
2011-07-24 03:28:18 +00:00
17d8807566
Touched up some animal stuff. Added Asian elephant entity.
...
This was SVN commit r9900.
2011-07-23 21:17:16 +00:00
3f950d1774
Elven Ship(under the name noldor_ship_trireme)
...
This was SVN commit r9899.
2011-07-23 10:24:36 +00:00
44742dd78d
#Hannibal updated.
...
This was SVN commit r9898.
2011-07-22 21:48:35 +00:00
cdd10cf8d2
#New Carthaginian shields.
...
This was SVN commit r9894.
2011-07-22 06:07:11 +00:00
a32dff97b5
Sail textures.
...
This was SVN commit r9893.
2011-07-21 23:19:03 +00:00
7ff8b75c89
Tooltip for Carthaginian Temple.
...
This was SVN commit r9892.
2011-07-21 05:35:41 +00:00
153357f640
Replaces architecture-dependent cpuid function with inline GCC assembly. Should fix #670 by eliminating nasm dependency.
...
This was SVN commit r9891.
2011-07-21 01:44:29 +00:00
f9d7c1246d
# Initial support for territories
...
This was SVN commit r9889.
2011-07-20 19:48:06 +00:00
cdbd347466
Fix inconsistent function prototype ( fixes #897 )
...
This was SVN commit r9888.
2011-07-20 19:44:31 +00:00
15df4aa4be
OS X fix: if os_cpu_ClockFrequency reports an unknown/invalid value, measure the frequency instead; also avoid reporting invalid freqs in system_info
...
This was SVN commit r9886.
2011-07-20 08:10:36 +00:00
ce42cd611a
Update release packaging script for recent library changes
...
This was SVN commit r9884.
2011-07-19 17:30:49 +00:00
8da2640f5e
Fixes no-PCH build
...
This was SVN commit r9883.
2011-07-19 09:00:15 +00:00
83f7639ac9
Removes hacks for typed array initialization
...
This was SVN commit r9882.
2011-07-19 08:52:17 +00:00
b2be81c51f
#Mauritanian Archers.
...
This was SVN commit r9881.
2011-07-19 07:59:32 +00:00
0b5e959a31
Some updates to Oasis II map.
...
This was SVN commit r9880.
2011-07-18 23:29:15 +00:00
8ed6a0b335
This was SVN commit r9879.
2011-07-18 23:07:33 +00:00
840a404952
Regenerate makefiles for modified Premake using unmodified Premake, for OS X compatibility
...
This was SVN commit r9878.
2011-07-18 21:42:41 +00:00
708e9cea05
Fix looping of non-streaming sounds
...
This was SVN commit r9877.
2011-07-18 17:56:17 +00:00
9edfe0fbcd
Fix clean-workspaces script for new SpiderMonkey
...
This was SVN commit r9876.
2011-07-18 17:32:07 +00:00
b738f27283
hopefully fix non-Windows build errors
...
This was SVN commit r9875.
2011-07-18 15:25:48 +00:00
ead45aa957
Report XML parse errors better in validator tool
...
This was SVN commit r9874.
2011-07-18 14:57:41 +00:00
65d87eaee7
Fix XML error and probable typo
...
This was SVN commit r9873.
2011-07-18 13:35:29 +00:00
c33246d603
Fix build errors
...
This was SVN commit r9872.
2011-07-18 11:10:13 +00:00
0d23e3f333
post-alpha sync with work.
...
debug stack trace fixes, remove more asm, change CONTINUE/OK scheme to
OK/ALL_COMPLETE, fix tests
This was SVN commit r9871.
2011-07-18 09:21:56 +00:00
2d9e473483
fix for non-contiguous APIC IDs within a single package (happens on recent Intel CPUs)
...
This was SVN commit r9870.
2011-07-18 08:08:06 +00:00
bb3e37725d
#Added ranks to Carthaginian units.
...
#Updated some temperate biome terrain textures.
This was SVN commit r9869.
2011-07-18 06:31:57 +00:00
edb063dbc8
Temporary fishing boat (Greek) and merchant ship (Iberian) for Carthage.
...
Touched up maps.
This was SVN commit r9868.
2011-07-18 03:48:24 +00:00
af5fad90fa
UI Portraits for fauna.
...
This was SVN commit r9867.
2011-07-18 02:01:33 +00:00
7c47df6c8e
Touched up Mediterranean Coves map.
...
UI Portrait for Palisades.
This was SVN commit r9866.
2011-07-18 01:18:56 +00:00
68c978ea75
Additional Cretan Date Palms.
...
New and Updated UI Portraits.
This was SVN commit r9865.
2011-07-18 00:31:42 +00:00
37d7769d53
Carthaginian portraits.
...
This was SVN commit r9864.
2011-07-17 20:09:08 +00:00
aeddb5fb48
avoid warning when running a second instance and Mahaf is enabled
...
This was SVN commit r9863.
2011-07-17 19:19:33 +00:00
a31ce6a3ce
Fix "hides overloaded virtual function" warnings in Clang
...
This was SVN commit r9862.
2011-07-17 17:30:07 +00:00
be3eb579d4
fix another cast runtime error
...
This was SVN commit r9861.
2011-07-17 14:48:23 +00:00
d20582e1dc
Slight color correction.
...
This was SVN commit r9860.
2011-07-17 04:55:25 +00:00
426bd5561d
Added some Cretan Date Palms.
...
This was SVN commit r9859.
2011-07-17 04:38:13 +00:00
5eec0485f1
#New Cretan Date Palms.
...
This was SVN commit r9858.
2011-07-17 04:00:12 +00:00
ea7f65818a
Avoid release-mode-only warning
...
This was SVN commit r9857.
2011-07-17 01:26:04 +00:00
7d0b5e2b39
This was SVN commit r9856.
2011-07-17 00:54:57 +00:00
b8819cfe75
Increased walking speed 0.5 for almost all units.
...
This was SVN commit r9855.
2011-07-17 00:54:39 +00:00
2f0bd8d8b0
Upgrade to SpiderMonkey 1.8.5 ( fixes #734 )
...
This was SVN commit r9852.
2011-07-16 23:24:14 +00:00
c7ba150c40
Fix handling of update-workspaces arguments on Windows
...
This was SVN commit r9849.
2011-07-16 22:17:47 +00:00
364f76c5ff
Fix rare use of uninitialised values
...
This was SVN commit r9847.
2011-07-16 19:52:48 +00:00
dd054c8d97
acpi: fix cast error (caught by runtime check)
...
x86_x64: simplify MSC version check
This was SVN commit r9846.
2011-07-16 17:27:07 +00:00
4ca278c48f
A new skybox.
...
Moved billboards from Internal to Public.
Gave the Persian trireme 3 banks of oars for testing.
This was SVN commit r9845.
2011-07-16 08:49:49 +00:00
516b5279a9
This was SVN commit r9844.
2011-07-16 06:01:16 +00:00
5870b77865
Sicilia complete.
...
This was SVN commit r9843.
2011-07-16 05:49:35 +00:00
d3da151676
This was SVN commit r9842.
2011-07-16 04:28:49 +00:00
84608d7001
Palisade "forts" now have ranged attack.
...
This was SVN commit r9841.
2011-07-16 04:09:12 +00:00
dcc8042e61
A few updated unit portraits.
...
This was SVN commit r9840.
2011-07-16 03:21:01 +00:00
9118f5cb98
This was SVN commit r9839.
2011-07-16 03:01:18 +00:00
d86bb7cf73
Gallic Fields, final (I think).
...
A few more Pine Tree variants.
This was SVN commit r9838.
2011-07-16 02:57:58 +00:00
0aba4006cc
Fix object path for .asm files in VC200x
...
This was SVN commit r9837.
2011-07-15 22:48:37 +00:00
e8e4d37c8d
Set up manifest via linkoptions for test executable
...
This was SVN commit r9836.
2011-07-15 22:45:50 +00:00
5dd08d3cb0
This was SVN commit r9835.
2011-07-15 22:32:00 +00:00
1ebc3333b0
Updated Gallic Fields map with new wooden bridge.
...
Updated Leonidas' running speed.
This was SVN commit r9834.
2011-07-15 22:14:43 +00:00
b551a744cc
Premake4 binary for Windows
...
This was SVN commit r9833.
2011-07-15 19:01:50 +00:00
1e470d37ff
Pre-generated Premake4 build files
...
This was SVN commit r9832.
2011-07-15 18:55:36 +00:00
befba20acb
Fix Makefile dependency generation.
...
Fix PCH dependency to work with parallel builds.
This was SVN commit r9831.
2011-07-15 18:51:18 +00:00
0dc3ae487d
Premake4 build scripts for the game, from Yves (plus minor tweaks)
...
This was SVN commit r9830.
2011-07-15 17:56:57 +00:00
76ff2cc83a
Non-standard Premake4 patches from Yves (plus minor tweaks).
...
Add nasm support.
Add cxxtest support.
Some other fixes.
This was SVN commit r9829.
2011-07-15 17:48:21 +00:00
fcab9e3b5e
Import Premake4 source (rev fc0374a03b17), minus samples/ and packages/
...
This was SVN commit r9828.
2011-07-15 17:32:06 +00:00
8eb7af4ac9
Be a bit more robust to build environment changes.
...
Reduce some module dependencies.
Clean up some unused instantiations.
This was SVN commit r9827.
2011-07-15 13:22:48 +00:00
a3e88e6705
Temperate stone and metal quarries.
...
Tweaked Thracian animations.
Renamed Celtic Fortress to Gallic Fields.
This was SVN commit r9825.
2011-07-15 05:43:28 +00:00
de2f377ee0
Changed Tholos to Prytaneion.
...
Sicilia map, still wip.
This was SVN commit r9824.
2011-07-15 00:01:08 +00:00
486d2854e4
This was SVN commit r9823.
2011-07-14 22:57:48 +00:00
ce7ffb24ff
Celtic Fortress is a wip map.
...
Ship Formations is a mockup showing what I think ship formations should
be.
This was SVN commit r9821.
2011-07-14 20:50:34 +00:00
ca42649c5b
Fix MSVC warning
...
This was SVN commit r9820.
2011-07-13 19:28:31 +00:00
f28ae0d427
Disable SDL's DGA mouse support by default, to fix Linux fullscreen mouse sensitivity problems
...
This was SVN commit r9819.
2011-07-13 17:40:12 +00:00
7f74693052
Disable culling of transparent objects in shadows/reflections, to fix trees
...
This was SVN commit r9818.
2011-07-13 13:51:40 +00:00
f02e67d012
Tweaked Loot values to be roughly 10% of the unit cost. Still seems kinda weird to get Food loot from a corpse.
...
Shield fixes and tweaks.
Touch-ups to Siwa Oasis.
This was SVN commit r9817.
2011-07-13 08:31:33 +00:00
5940c64886
All Public scout towers/outposts shoot arrows from the correct spot. :)
...
This was SVN commit r9816.
2011-07-13 03:10:54 +00:00
b08e142193
Graphics optimisations and features from eihrul.
...
Add shadow filtering (PCF) option.
Fix ugly shadow saturation in old lighting mode.
Fix fancy water shader.
Fix camera matrix computation.
Support scissoring of camera frustum.
Optimise vertex skinning.
Inline various matrix functions.
Support filtering of the list of submitted models before a rendering
pass, for more precise culling.
Optimise water renderer (fixes #721 , based on patch by ortalo).
Use scissoring when generating reflection/refraction textures.
Skip reflection/refraction texture generation when no water is visible.
Render alpha-blended objects differently (fixes #434 ).
Reduce shadow swimming effects.
This was SVN commit r9814.
2011-07-12 23:48:05 +00:00
5ada37e8fa
Wooden bridge edge files
...
This was SVN commit r9812.
2011-07-12 23:26:31 +00:00
6e13e0fa49
Update to palisade wall 3D models
...
This was SVN commit r9811.
2011-07-12 23:22:03 +00:00
7a4d86b58f
Javelin Updates.
...
This was SVN commit r9810.
2011-07-12 22:24:52 +00:00
e31e3aa763
Updated Carthaginian scout tower with properly firing projectiles.
...
This was SVN commit r9808.
2011-07-11 23:29:32 +00:00
af57bc2262
Palisade spikes template files
...
This was SVN commit r9807.
2011-07-11 22:51:20 +00:00
e03138ea22
fixed projectiles
...
This was SVN commit r9806.
2011-07-11 22:15:05 +00:00
c8c7799528
Palisades committed. Some need obstruction offset
...
This was SVN commit r9805.
2011-07-11 22:09:57 +00:00
fe878cedc2
Fix promotion element in Carthage units templates
...
This was SVN commit r9804.
2011-07-11 13:28:47 +00:00
9c3b41644a
Stats tweaks.
...
This was SVN commit r9803.
2011-07-11 08:10:27 +00:00
6217522b6f
Add lava terrain set to the terrain tabs.
...
This was SVN commit r9802.
2011-07-11 06:14:55 +00:00
6396ad950a
Updated Demetrius portrait.
...
This was SVN commit r9801.
2011-07-11 05:01:21 +00:00
799bc98d86
Moving more Carthage stuff from Internal to Public.
...
This was SVN commit r9800.
2011-07-11 02:27:06 +00:00
704ce541ba
Move Carthage from Internal to Public.
...
This was SVN commit r9799.
2011-07-11 02:06:48 +00:00
6d95933cd7
This was SVN commit r9798.
2011-07-11 01:51:20 +00:00
bb33a259b6
Fixes Atlas build errors on OS X (specifically MacPorts' version of wxWidgets doesn't support constructing wxString with std::wstring)
...
This was SVN commit r9797.
2011-07-10 21:00:21 +00:00
21830623d5
Temporary user interface button sounds
...
This was SVN commit r9796.
2011-07-10 14:03:41 +00:00
51c574bcc5
Made the siege tower's status bar bigger.
...
This was SVN commit r9795.
2011-07-10 06:15:58 +00:00
0496007f5e
Added <GenericNames> to some Greek units.
...
This was SVN commit r9794.
2011-07-10 06:01:28 +00:00
73e825f9f7
This was SVN commit r9793.
2011-07-10 05:27:10 +00:00
0fd79bf9cd
Lots of Actor fixes for Carthaginians (animation speeds, props).
...
Lots of entity fixes that include SelectionGroupName and GenericName
tags.
This was SVN commit r9792.
2011-07-10 05:09:24 +00:00
bfef903c94
Adds hotkey for finding idle warriors (comma). See #792 .
...
Updates finding idle units to be more flexible.
Resets finding idle units when unit is deselected.
Adds Warship class to relevant templates.
This was SVN commit r9791.
2011-07-10 02:11:51 +00:00
20ebb2b829
Fix incorrect string type in log message on non-Windows
...
This was SVN commit r9790.
2011-07-09 18:41:58 +00:00
c964904e1b
Carthaginian units actor fixes.
...
This was SVN commit r9789.
2011-07-09 05:24:33 +00:00
5169a05237
Fixed something in the description.
...
This was SVN commit r9787.
2011-07-09 03:00:34 +00:00
a4637c25d0
Fix no-PCH builds
...
This was SVN commit r9786.
2011-07-08 15:07:08 +00:00
dff4add6a6
Making unfinished Neareastern Badlands map hidden
...
This was SVN commit r9784.
2011-07-07 23:25:53 +00:00
e0eed68835
Sets default single player map to Acropolis II (also moves these constants to the top of gamesetup.js for clarity)
...
This was SVN commit r9783.
2011-07-07 23:16:09 +00:00
1771545a3b
Stop BuildingAI picking up messages for other components' range queries
...
This was SVN commit r9782.
2011-07-07 23:07:36 +00:00
e705e366d6
Fixes missing templates in Peloponnese map
...
This was SVN commit r9781.
2011-07-07 22:54:14 +00:00
db9e05d83e
Bump version number
...
This was SVN commit r9780.
2011-07-07 22:21:34 +00:00
58c33071d6
Disable unnecessary noisy AI greeting message
...
This was SVN commit r9779.
2011-07-07 22:18:55 +00:00
871d321050
Fix undefined property warning
...
This was SVN commit r9778.
2011-07-07 22:14:37 +00:00
6371afbc76
Remove the rarely-used source code option from the Windows installer. See #855 .
...
This was SVN commit r9777.
2011-07-07 20:11:47 +00:00
b6d04004b6
Avoid errors when using planes in formations, by not allowing them to join formations
...
This was SVN commit r9776.
2011-07-07 17:05:22 +00:00
519b0020ba
Updated text from "Super" to "Champion."
...
This was SVN commit r9775.
2011-07-07 07:56:43 +00:00
bc7991028b
Preliminary Carthaginian stuff. Will move Carthage to Public very soon after Alpha VI release.
...
This was SVN commit r9774.
2011-07-07 06:58:26 +00:00
fed5830189
Updated shield pattern.
...
This was SVN commit r9773.
2011-07-07 06:06:07 +00:00
c1eb1c3b7a
Fixed portrait.
...
This was SVN commit r9771.
2011-07-07 03:54:14 +00:00
65baa6d567
Quick update to Acropolis II
...
This was SVN commit r9770.
2011-07-07 03:18:30 +00:00
899f5105b9
Fix glwprintf errors on OS X with non-ASCII strings, by setting LC_CTYPE to UTF-8
...
This was SVN commit r9768.
2011-07-06 21:19:59 +00:00
e9b3bcf467
Disable building Atlas by default on OS X
...
This was SVN commit r9766.
2011-07-06 20:14:25 +00:00
df9270a892
Hopefullyfixeslag.
...
This was SVN commit r9765.
2011-07-06 18:04:30 +00:00
1bc2db56ea
Stops unit following when other object selected. Fixes #775
...
This was SVN commit r9764.
2011-07-05 21:29:11 +00:00
d2d631d2ed
This was SVN commit r9763.
2011-07-05 06:00:52 +00:00
ba52ff7604
made Triremes and Quinquiremes able to garrison siege engines.
...
Added some sound stuff to all siege weapons.
Tweaked siege tower.
This was SVN commit r9762.
2011-07-05 05:59:28 +00:00
315dfbff5d
Fix use of outdated cached transform when computing bounding boxes.
...
Should fix #867 .
This was SVN commit r9761.
2011-07-05 00:12:00 +00:00
c766f40da3
Changes Cantabrian Highlands random map to temperate biome
...
This was SVN commit r9760.
2011-07-04 23:54:04 +00:00
f8c62201b2
Siege tower update
...
This was SVN commit r9759.
2011-07-04 20:50:52 +00:00
2763c7817d
In theory, should make buildings point in the right direction.
...
This was SVN commit r9758.
2011-07-04 17:40:13 +00:00
528b833db0
Fix assertion failure in replay mode
...
This was SVN commit r9757.
2011-07-04 15:17:46 +00:00
fc2b89a780
This was SVN commit r9756.
2011-07-03 23:23:01 +00:00
3c6789747b
This was SVN commit r9755.
2011-07-03 22:32:26 +00:00
9d7a5da65a
#New Thracian unit.
...
Tweaked Acropolis II.
This was SVN commit r9754.
2011-07-03 22:26:12 +00:00
f01097b23c
Avoid crash when pressing 'h' while multiplayer host game setup screen is loading
...
This was SVN commit r9753.
2011-07-03 18:36:43 +00:00
4065cb1cd2
Few minor tweaks.
...
This was SVN commit r9750.
2011-07-03 09:43:31 +00:00
b4d0c09569
Building directions now 100% random. Can set it to a specific angle if we'd prefer, but someone needs to tell me what.
...
This was SVN commit r9749.
2011-07-03 08:46:30 +00:00
c9b2273532
Fixed an error with the Iberian fortress.
...
This was SVN commit r9748.
2011-07-03 07:52:52 +00:00
f138be6565
#New Greek shields patterns.
...
This was SVN commit r9747.
2011-07-03 06:10:02 +00:00
972ca3cd22
Increases unit selection limit to 200 (equal to max population). See #789
...
This was SVN commit r9745.
2011-07-02 23:04:59 +00:00
3da5afd8d5
Stop siege tower garrisoning itself inside itself
...
This was SVN commit r9744.
2011-07-02 22:52:17 +00:00
5c4b6e2320
Fixes #878
...
This was SVN commit r9743.
2011-07-02 22:26:51 +00:00
9b601d7ad4
Map updates to fix moved templates.
...
This was SVN commit r9741.
2011-07-02 17:47:23 +00:00
12eb4919be
Stone and Metal added.
...
This was SVN commit r9740.
2011-07-02 17:17:07 +00:00
9a6f90b90d
This was SVN commit r9739.
2011-07-02 16:57:51 +00:00
3756aaef48
This might help speed a fraction.
...
This was SVN commit r9738.
2011-07-02 16:49:26 +00:00
6267a61962
This was SVN commit r9737.
2011-07-02 15:32:16 +00:00
7bba760801
This was SVN commit r9736.
2011-07-02 15:29:20 +00:00
f1eb662cf6
This was SVN commit r9735.
2011-07-02 15:29:08 +00:00
8612600a13
This was SVN commit r9734.
2011-07-02 15:27:35 +00:00
5183a5d4de
Mechanical siege tower update
...
This was SVN commit r9733.
2011-07-02 11:56:57 +00:00
4139140916
# Giraffe, giraffe infant, lion, and lioness movement animations by Athos
...
This was SVN commit r9732.
2011-07-02 10:37:45 +00:00
f833529e63
skeletons xml update
...
This was SVN commit r9731.
2011-07-02 10:17:10 +00:00
885c220e9f
This was SVN commit r9730.
2011-07-02 06:15:35 +00:00
8da4334a85
Re-skinned Belgian Bog.
...
This was SVN commit r9729.
2011-07-02 02:06:41 +00:00
fa812a5ac5
A bunch of texture additions and changes, mostly to temperate terrains.
...
This was SVN commit r9728.
2011-07-02 02:04:15 +00:00
805dbe7640
Some new Greek shields.
...
This was SVN commit r9727.
2011-07-02 01:46:19 +00:00
4d188452f8
Adds ownership checks to UI selections.
...
Adds ownership and diplomacy checks to Commands.js (fixes #880 ).
Adds control all units setting to Player component (network synced).
Adds helpers for diplomacy checks - use these instead of directly
accessing diplomacy array.
Fixes tests according to these changes.
This was SVN commit r9726.
2011-07-02 00:06:39 +00:00
24f981cb2c
Adds hack for random map data saved as typed arrays (see #658 )
...
This was SVN commit r9725.
2011-06-30 23:09:59 +00:00
3dc70800ee
Changed tooltip to reflect the current uselessness of this structure.
...
This was SVN commit r9724.
2011-06-30 21:56:51 +00:00
c7fd1eaaf2
Tweaking some temperate terrains.
...
This was SVN commit r9723.
2011-06-29 04:49:25 +00:00
834271b878
Some updated maps.
...
This was SVN commit r9722.
2011-06-29 02:49:41 +00:00
6ba00117e0
Fixes bug in Atlas player editor: saving team as "None" had no effect
...
This was SVN commit r9721.
2011-06-29 00:57:02 +00:00
996a32125c
Add per-player LOS-reveal flag.
...
Reveal LOS for Gaia and AI players (fixes #879 ).
Use player_id_t slightly more consistently in interfaces.
This was SVN commit r9720.
2011-06-28 23:24:42 +00:00
d9c944c975
fix one last super_unit - at least given the following search criteria:
...
Find all "super_unit", Match case, Subfolders, Find Results 1,
"0ad\svn\binaries\data", "*.xml;*.xsl;*.xslt;*.xsd;*.dtd"
0ad\svn\binaries\data\mods\public\art\actors\units\celts\boudicca_chariot.xml(16):
<prop actor="units/celts/super_unit_4_d.xml" attachpoint="driver"/>
This was SVN commit r9717.
2011-06-28 19:32:49 +00:00
7ee28348ec
Garrison multiplier for hele siege tower
...
This was SVN commit r9716.
2011-06-28 19:11:46 +00:00
709260e339
Fix occasional script error with planes
...
This was SVN commit r9715.
2011-06-28 18:26:29 +00:00
151539a92b
Fix #882 (test failure)
...
This was SVN commit r9714.
2011-06-28 18:25:38 +00:00
293adad0ba
Fix #829 - Stuck units bug
...
This was SVN commit r9713.
2011-06-28 07:27:03 +00:00
da79f8edbe
Last Champion fix. Or is it? <_<
...
This was SVN commit r9712.
2011-06-28 04:46:44 +00:00
f0c2c15d3f
Champion fix for this unit.
...
This was SVN commit r9711.
2011-06-28 04:42:02 +00:00
7f79dcd379
Champion FIX for maps.
...
This was SVN commit r9710.
2011-06-28 04:28:09 +00:00
91a972238a
Champion FIXES commit.
...
This was SVN commit r9709.
2011-06-28 04:19:01 +00:00
520788cafb
Champions. Commit #3 .
...
This was SVN commit r9708.
2011-06-28 04:02:54 +00:00
ac0576f326
Champions. Commit #2 .
...
This was SVN commit r9707.
2011-06-28 03:56:04 +00:00
75c1ae84d5
This was SVN commit r9706.
2011-06-28 03:30:35 +00:00
d8725c1df7
This was SVN commit r9705.
2011-06-28 03:29:12 +00:00
f3fe7aaa67
Changing nomenclature from "Super Units" to "Champions." Commit Part 1.
...
This was SVN commit r9704.
2011-06-28 03:24:50 +00:00
c2f9496a4f
Temp solution to Ship finished sound.
...
This was SVN commit r9703.
2011-06-28 01:52:40 +00:00
f4e773f7ba
Celt Temple costs Wood, not Stone.
...
Greek Fortress builds the new Greek siege tower.
Females have order acknowledgments. This is a temp solution until we
have dedicated female sounds.
Added verbal acknowledgments to the Priests as well.
Siege Tower stat tweaks.
This was SVN commit r9702.
2011-06-28 01:50:42 +00:00
85e49e9d13
Fixed a team error on the map.
...
This was SVN commit r9701.
2011-06-28 01:30:58 +00:00
7baab8e221
Moved stances and idle worker button to more appropriate locations
...
This was SVN commit r9700.
2011-06-28 01:09:55 +00:00
a8fdcfde59
Fixes broken autostart for random maps with AI
...
This was SVN commit r9699.
2011-06-27 23:27:25 +00:00
bdde44d9aa
Balancing war elephants.
...
This was SVN commit r9698.
2011-06-27 22:43:36 +00:00
a7ea5ed3ae
Hele siege tower basic setup
...
This was SVN commit r9697.
2011-06-27 22:43:03 +00:00
20030f1515
This was SVN commit r9696.
2011-06-27 22:41:17 +00:00
d78d4f7169
# Moved Roman and Carthaginian Champion Units to Public.
...
This was SVN commit r9695.
2011-06-27 22:23:03 +00:00
c276a45fae
Tweaked Greek Farmstead and Gymnasion.
...
This was SVN commit r9694.
2011-06-27 21:45:37 +00:00
552d81e1c9
Temple select OGG file update
...
This was SVN commit r9693.
2011-06-27 20:01:44 +00:00
aef4db11c0
Sound effects for wall gate
...
This was SVN commit r9691.
2011-06-27 19:56:29 +00:00
f044c7f6df
This was SVN commit r9690.
2011-06-27 06:55:13 +00:00
c8f63fc366
Updated license wording for CGTextures.
...
This was SVN commit r9689.
2011-06-27 05:47:25 +00:00
0ff7997d9f
Moving the last of the terrains.
...
This was SVN commit r9688.
2011-06-27 05:39:53 +00:00
2c9835cbc4
Moving and deleting terrains.
...
This was SVN commit r9687.
2011-06-27 05:11:17 +00:00
27b68a5a88
Deleting from Internal
...
This was SVN commit r9686.
2011-06-27 04:51:29 +00:00
25bbfb81c4
This was SVN commit r9685.
2011-06-27 04:50:25 +00:00
89d388669d
This was SVN commit r9684.
2011-06-27 04:28:30 +00:00
2e1200fa8c
This was SVN commit r9683.
2011-06-27 04:27:08 +00:00
0503fea0d8
This was SVN commit r9682.
2011-06-27 04:25:11 +00:00
45017504aa
This was SVN commit r9681.
2011-06-27 04:22:18 +00:00
9da83a992e
Renaming and deleting some terrains, preparing to move to Public.
...
This was SVN commit r9680.
2011-06-27 04:17:28 +00:00
b43ca11379
This was SVN commit r9679.
2011-06-27 03:29:34 +00:00
577aaedc7c
Portrait for plane.
...
This was SVN commit r9678.
2011-06-27 00:41:50 +00:00
a47ef2060a
Updated the Plane entity.
...
This was SVN commit r9677.
2011-06-27 00:32:28 +00:00
a64f1356cb
P-51 Mustang
...
This was SVN commit r9676.
2011-06-27 00:26:33 +00:00
ff1277d4d8
Barracks select sound fix
...
This was SVN commit r9675.
2011-06-26 22:46:29 +00:00
421df0a53c
Selection sound effect xml files updated
...
This was SVN commit r9674.
2011-06-26 22:36:18 +00:00
31832cd9ae
Initialise minimap and LOS textures properly
...
This was SVN commit r9673.
2011-06-26 21:47:07 +00:00
3f51747440
Fix uninitialised value
...
This was SVN commit r9672.
2011-06-26 21:45:58 +00:00
9901f47065
Universal select audio file update
...
This was SVN commit r9671.
2011-06-26 21:06:23 +00:00
cc70aacdb7
Added new building constructed and selected sound effects
...
This was SVN commit r9670.
2011-06-26 21:01:16 +00:00
1f20444e4c
Trigger 'constructed' sound when a building finishes construction
...
This was SVN commit r9669.
2011-06-26 18:27:10 +00:00
df2e499efc
Post code review version - previous commit was pre code review version.
...
This was SVN commit r9666.
2011-06-26 07:47:03 +00:00
2aedf48304
#788 Eliminate delay in path finding (and therefore moving)
...
This was SVN commit r9665.
2011-06-26 07:03:08 +00:00
5bc125a91f
Changes terrain data returned by CMapGenerator to typed arrays, instead of an array of objects (this greatly reduces the size of the serialized data)
...
This was SVN commit r9664.
2011-06-26 02:56:54 +00:00
d89eafaf83
stances improvement and bugfixing. units now targets buildings last, after workers, and after every other units.
...
This was SVN commit r9663.
2011-06-26 02:03:36 +00:00
95756627ec
New aeroplane stuff.
...
Polishing up the Persian cataphract.
More edits to Peloponnese map.
This was SVN commit r9662.
2011-06-25 20:57:06 +00:00
fed56af8a7
avoid trying to attack (before gathering) for ever an animal which is not visible anymore (bug not yet met because unlikely)
...
This was SVN commit r9661.
2011-06-25 20:56:46 +00:00
c8b0d7c11c
fix a small bug related to units stances and gathering
...
This was SVN commit r9660.
2011-06-25 19:14:08 +00:00
8bdc1b0882
Enforces max population limit, cleans up population variables in Player component. See #862
...
Max population defaults to 200
This was SVN commit r9659.
2011-06-25 00:47:46 +00:00
33e8ac6fa5
Applies Kenny's patch for CInput pasting behavior ( fixes #640 )
...
Simplifies some clipboard hotkeys
This was SVN commit r9658.
2011-06-25 00:04:41 +00:00
92fcb737cd
Attempt minor improvements to stances code (see #865 ).
...
Don't chase units that are no longer visible, beyond where they were
last seen (fixes #595 ).
This was SVN commit r9657.
2011-06-24 12:35:15 +00:00
4e809a02e8
Moving some prop actors over.
...
This was SVN commit r9656.
2011-06-24 05:49:22 +00:00
1bf469755f
This was SVN commit r9655.
2011-06-24 05:19:23 +00:00
99f9d3f159
Bunch of helmet fixes and random other stuff.
...
This was SVN commit r9654.
2011-06-24 05:18:28 +00:00
94460f6994
Moved the rest of the props to Public with MOVE command.
...
Moved Persian Cataphract and War Elephant to Public.
This was SVN commit r9653.
2011-06-24 04:25:02 +00:00
53d1293da9
Added treasures and other stuff to Peloponnese.
...
This was SVN commit r9652.
2011-06-24 03:28:54 +00:00
90a06957e9
This was SVN commit r9651.
2011-06-24 02:49:06 +00:00
1ce1cfea45
Hero Stars
...
This was SVN commit r9650.
2011-06-24 02:45:49 +00:00
195c7a00e9
Adds player settings shortcut to Atlas map panel. Fixes #874
...
Tweaks some control positions and layouts for consistency
This was SVN commit r9649.
2011-06-23 22:38:26 +00:00
bd80c1ea42
Stars for public heroes *(to be replaced with something better in the future).
...
This was SVN commit r9648.
2011-06-23 21:26:59 +00:00
05898c75d1
# Increase maximum camera distance
...
This was SVN commit r9647.
2011-06-23 12:52:43 +00:00
492e49da38
add support for selection and deletion of entire words in text controls (ctrl+backspace/delete/left/right) based on patch by Chakakhan/kenny (thanks!)
...
also refactored wclipboard
closes #511
This was SVN commit r9646.
2011-06-23 10:12:43 +00:00
889f4698f2
Moves population bonus to new line in construction tooltip (based on patch from pejuko). Fixes #873
...
This was SVN commit r9645.
2011-06-22 21:11:37 +00:00
b99b37387b
Updated cliff texture. Updated Peloponnese map.
...
This was SVN commit r9644.
2011-06-22 04:05:42 +00:00
abdc846a65
Adds getInt to AtlasObject
...
Uses this instead of wxAtoi for consistency, and adds brief comment
about why wxAtof should be avoided
This was SVN commit r9643.
2011-06-21 02:56:49 +00:00
ef4df42895
add support for .dylib on OS X based on patch by Yves (thanks!)
...
c.f.
http://www.wildfiregames.com/forum/index.php?showtopic=14173&pid=220828&st=0&#entry220828
This was SVN commit r9642.
2011-06-20 20:06:51 +00:00
d41e859b67
#Updated Iberian Corral by Zaggy.
...
This was SVN commit r9641.
2011-06-20 05:57:45 +00:00
5005398619
Update to the Peloponnese map. Still incomplete.
...
This was SVN commit r9640.
2011-06-20 05:57:28 +00:00
10481ca174
Avoid potentially dangerous locale-dependent atof functions
...
This was SVN commit r9639.
2011-06-19 19:51:53 +00:00
9b930d9617
Test 'selected' stance icon
...
This was SVN commit r9638.
2011-06-19 19:02:32 +00:00
9965c1ef1b
Remove label that is no longer labelling anything
...
This was SVN commit r9636.
2011-06-19 14:55:43 +00:00
db5e483266
Fix typo in comment
...
This was SVN commit r9635.
2011-06-19 14:18:07 +00:00
74f849ad0b
Adds message when profiler snapshot is first saved (Shift+F11)
...
This was SVN commit r9633.
2011-06-17 23:40:13 +00:00
e01917b961
Entities faces toward themself. fixed.
...
This was SVN commit r9632.
2011-06-17 23:08:46 +00:00
71a6775b92
Stances draft, refs #865
...
This was SVN commit r9631.
2011-06-17 22:13:39 +00:00
032794b7c8
This was SVN commit r9629.
2011-06-16 22:58:14 +00:00
578936d7d0
Moved all the Skies to Public.
...
This was SVN commit r9628.
2011-06-16 22:31:02 +00:00
86505030cb
Made huntable animals easier to kill. We may change this again later, so we can have some hunting techs.
...
This was SVN commit r9627.
2011-06-16 22:21:37 +00:00
0dcaa3d9a1
Greece real-world map. Work-In-Progress.
...
This was SVN commit r9626.
2011-06-16 22:03:26 +00:00
3a9f7b9884
Some terrain texture updates and moves.
...
This was SVN commit r9625.
2011-06-16 21:44:08 +00:00
80391fc30a
Cleaning out bad textures. Preparing to move the rest of the good ones to Public.
...
This was SVN commit r9624.
2011-06-16 21:32:36 +00:00
3be43ede41
Adds rotation to starting camera (currently unused)
...
This was SVN commit r9623.
2011-06-16 21:21:33 +00:00
2fa7c8aeca
Moving terrain assets to Public.
...
This was SVN commit r9622.
2011-06-16 20:12:55 +00:00
9e486cd6e3
Fixes bug in Atlas camera control (clear button didn't erase the setting)
...
This was SVN commit r9620.
2011-06-14 01:03:35 +00:00
3e4d74480d
Adds AI control to Atlas player panel
...
Adds camera control to Atlas player panel
Changes map reader to handle per-player starting camera position. See
#55
Adds entity name filter to Atlas object panel
Fixes bug in Atlas map settings (caused crash when object panel was not
loaded)
This was SVN commit r9617.
2011-06-13 23:32:41 +00:00
7e1cbf6ece
increase length of main menu version number field to accommodate longer version text
...
This was SVN commit r9616.
2011-06-11 14:22:03 +00:00
29edc1b8e9
Delete previous player icon and use Michael's
...
This was SVN commit r9615.
2011-06-10 21:32:09 +00:00
543c02c149
This was SVN commit r9614.
2011-06-10 19:16:04 +00:00
ec1e1a4042
Undo and redo icons for Atlas.
...
This was SVN commit r9613.
2011-06-10 19:00:59 +00:00
b3e7b80b68
New players icon.
...
This was SVN commit r9612.
2011-06-10 18:50:47 +00:00
4a3230a870
This was SVN commit r9610.
2011-06-09 23:52:29 +00:00
0c803f99e8
This was SVN commit r9609.
2011-06-09 23:47:20 +00:00
23f1072a2e
Adds player editor to Atlas scenario editor. See #91
...
Fixes object panel so the list of players updates correctly.
Atlas map settings are now observable and shared between various panels.
Fixes panels for maps missing settings (caused JSON error)
Changes map reader so that entities with invalid players cause a warning
but are not added to the game. That prevents further errors. Fixes #869
Uses map size choices from simulation/data/map_sizes.json instead of
multiple locations. Fixes #787
Prepares Atlas map settings for undo/redo support
This was SVN commit r9608.
2011-06-09 23:45:12 +00:00
266977bc78
Attempt to fix manifest problems in autobuild.
...
This was SVN commit r9607.
2011-06-09 23:16:27 +00:00
2c58b07223
# Add experimental fighter planes.
...
This was SVN commit r9605.
2011-06-09 19:44:40 +00:00
1357000401
Fix #805 more so it doesn't ignore the second click on non-double-clickable buttons.
...
This was SVN commit r9604.
2011-06-09 17:30:34 +00:00
7b8a33f374
Fix tests.
...
This was SVN commit r9603.
2011-06-09 17:15:01 +00:00
5132f814e3
Clean up some formatting and comments.
...
This was SVN commit r9602.
2011-06-09 17:01:01 +00:00
902b33a181
Remove redundant code for animal fleeing, and don't omit expected arguments.
...
This was SVN commit r9601.
2011-06-09 16:41:55 +00:00
28d952404e
Improve selection details debug display.
...
This was SVN commit r9600.
2011-06-09 16:40:29 +00:00
8720b4a220
Fix Atlas saving game type under wrong property name.
...
This was SVN commit r9599.
2011-06-09 16:39:31 +00:00
8eadd4e25f
#Ship balance.
...
This was SVN commit r9598.
2011-06-09 05:06:34 +00:00
24b0e1cafb
This was SVN commit r9597.
2011-06-08 21:12:57 +00:00
f1c1f400c9
Lots of Helmet stuff.
...
This was SVN commit r9596.
2011-06-08 07:18:52 +00:00
24cca252e3
Ranged units always face their targets when attacking. fixes #831
...
This was SVN commit r9595.
2011-06-06 22:08:26 +00:00
43d817bc22
--
...
This was SVN commit r9593.
2011-06-06 19:39:19 +00:00
9906a86a2e
Support double-click on unit group buttons. patch by Merolum. fixes #805 .
...
This was SVN commit r9592.
2011-06-06 19:31:34 +00:00
6b0cbd10c3
Finished the new Cycladic Archipelago map.
...
Added promotion animations to some units.
Added triple-click to Hypaspists and Roman Legions.
This was SVN commit r9591.
2011-06-06 00:46:58 +00:00
18dd17ea4a
fixed a Scipio animation problem. Edited some Roman stuff.
...
This was SVN commit r9590.
2011-06-05 23:54:01 +00:00
d0560bd93e
Playtesting a water map, I came to the conclusion that ships took way too long to build.
...
This was SVN commit r9589.
2011-06-05 20:38:01 +00:00
304d4e82f0
(minor) fix an animation event value
...
This was SVN commit r9588.
2011-06-05 20:03:44 +00:00
d892403f90
Adjusted the look of the Persian temple.
...
This was SVN commit r9587.
2011-06-05 05:57:28 +00:00
091cba16c6
Flipped the Iberian Civ Centre so it faces the correct way.
...
This was SVN commit r9585.
2011-06-05 01:52:25 +00:00
916b4b7e92
Pureon's map, with my edits. Now turning it back over to him for his own edits.
...
This was SVN commit r9584.
2011-06-04 04:19:36 +00:00
97528d25f1
This was SVN commit r9583.
2011-06-04 03:14:49 +00:00
6feb143e61
OS X compile fix
...
This was SVN commit r9582.
2011-05-30 23:06:16 +00:00
ef74ad7f7b
OS X compile fix (hopefully): add definition for O_DIRECT
...
This was SVN commit r9581.
2011-05-30 21:49:33 +00:00
034881d30c
sync with work. simplify wnuma, refactor+fix topology (bugs: APIC IDs array didn't correspond to OS processor number; couldn't handle noncontiguous APIC ID field values)
...
This was SVN commit r9580.
2011-05-30 13:00:20 +00:00
f25407e7fb
Fix typo
...
This was SVN commit r9579.
2011-05-30 11:51:14 +00:00
8ecf3aa1b5
Bumped up the Wood in trees from 150 to 200.
...
Reoriented the Carthaginian House C to face South East.
Working on a new version of Cycladic Archipelago II.
This was SVN commit r9578.
2011-05-30 01:50:49 +00:00
ce647cf8e3
Add a manifest hack to fix building in VC2008+, when loading DLLs built in VC2005
...
This was SVN commit r9576.
2011-05-29 21:13:21 +00:00
59124006c8
Work around problem with quote keys in Windows on an Apple machine
...
This was SVN commit r9575.
2011-05-29 21:12:09 +00:00
c2677b4bb0
Upgrade game and build system to ENet 1.3
...
This was SVN commit r9574.
2011-05-29 20:57:28 +00:00
e3d87b0375
remove no longer necessary lowlevel wsock implementation (superseded by enet) since the delay load hook isn't compatible with a DLL packaging of enet.
...
-> cstr serialization uses lib/byte_order.h instead of htons; removed
hostname/IP from system_info (Philip agrees its utility is negligible)
This was SVN commit r9572.
2011-05-29 19:59:51 +00:00
acb48663d7
Windows fixes
...
This was SVN commit r9570.
2011-05-29 18:14:52 +00:00
6bdafee6a0
Update Atlas sidebar buttons slightly
...
This was SVN commit r9569.
2011-05-29 16:36:15 +00:00
fa7855f3d9
Delete now-unused wxJavaScript library
...
This was SVN commit r9568.
2011-05-29 15:46:07 +00:00
a81f180dd6
Remove Atlas UI scripting support
...
This was SVN commit r9567.
2011-05-29 15:43:08 +00:00
dc2035efc9
Move Atlas map settings from JS to C++.
...
Replace New dialog box with separate tools for resizing maps and
replacing terrain textures, to provide more power and to simplify the
problem of initialising map settings.
Fix engine to cope with dynamic map resizing.
Add JSON support to AtObj, to let C++ interact with JSON more easily.
This was SVN commit r9566.
2011-05-29 15:02:02 +00:00
1618aa9c36
Add missing file for actor viewer
...
This was SVN commit r9565.
2011-05-29 14:57:54 +00:00
f1c4904071
Map tweaks.
...
Rain particle experiment.
This was SVN commit r9564.
2011-05-28 21:21:36 +00:00
ea36fdad2d
New forestfloor texture for Mediterranean biome.
...
This was SVN commit r9563.
2011-05-28 16:56:59 +00:00
bb5a66ac35
Moved Gambia River map to Public.
...
Moved Fog sky to Public.
Made separate fish entities.
This was SVN commit r9562.
2011-05-28 03:16:26 +00:00
0f616d42c6
This was SVN commit r9561.
2011-05-28 03:09:40 +00:00
9b70228997
Updated the terrains of The Massacre of Delphi.
...
New "Gambia River" map using Tropic terrains.
This was SVN commit r9560.
2011-05-28 02:47:17 +00:00
07e307c49a
Move Atlas's terrain and object sections from JS back into C++, per http://www.wildfiregames.com/forum/index.php?showtopic=14741
...
This was SVN commit r9559.
2011-05-27 21:56:43 +00:00
4496fcd2df
Restore some old Atlas files
...
This was SVN commit r9558.
2011-05-27 21:48:23 +00:00
755802d0ce
Fix build errors
...
This was SVN commit r9556.
2011-05-27 13:32:34 +00:00
5da713af2f
Removes debugging output from Latium rms
...
This was SVN commit r9555.
2011-05-27 03:55:01 +00:00
1bf2598429
Fixes square maps to behave like circular maps and fit within the circle. Fixes #822
...
This was SVN commit r9554.
2011-05-27 03:04:59 +00:00
293f7cbae0
This was SVN commit r9553.
2011-05-26 03:16:14 +00:00
a3705a7d11
Updated SMOKE particles. They look much much nicer now. Enjoy!
...
This was SVN commit r9552.
2011-05-26 02:27:34 +00:00
2c05745c7d
Flipped the Celt Barracks so it points to the "front" where units come out.
...
This was SVN commit r9551.
2011-05-26 00:44:58 +00:00
34186dd017
refactor file interface. requires workspace update
...
- separate file_system_util into vfs functions (-> vfs/vfs_util) and
file_system (avoids ugly fs_util namespace prefix)
- get rid of non-portable O_BINARY_NP etc. flags
- use standard O_WRONLY etc. flags instead of LIO_WRITE; but avoid the
need for specifying O_CREAT|O_TRUNC
- only open files for aio when O_DIRECT is specified (which 0ad does
not) - avoids wasting time and security issues
- return file descriptor directly instead of via output param
- waio: safer FCB mechanism that avoids mixing descriptors between lowio
and aio
This was SVN commit r9550.
2011-05-25 10:39:13 +00:00
ceea205782
This was SVN commit r9549.
2011-05-25 05:45:49 +00:00
7600c3862b
refactor gfx detection code (interface), allow exporting from DLL (required at work)
...
This was SVN commit r9546.
2011-05-24 14:17:47 +00:00
f1a1f023df
reinstate aligned_allocator.h (required at work)
...
further fixes to preserve the last error while building error messages
somewhat more accurate NUMA factor computation
This was SVN commit r9545.
2011-05-23 14:10:45 +00:00
d7f4935dce
This was SVN commit r9544.
2011-05-23 01:50:45 +00:00
2239a261ee
Last new Greek house variant.
...
This was SVN commit r9543.
2011-05-23 01:48:22 +00:00
003037e102
Moves "new" terrains elsewhere and reverted the Medit terrains back. I wasn't happy with how the new ones were blending with all the other textures and realized I'd have to redo all the others as well.
...
This was SVN commit r9542.
2011-05-22 01:59:15 +00:00
501f72ec0c
Map updates. Terrain updates.
...
This was SVN commit r9541.
2011-05-21 05:51:28 +00:00
171917d0c6
Terrain updates
...
This was SVN commit r9540.
2011-05-21 02:21:38 +00:00
2c6fc32a57
This was SVN commit r9539.
2011-05-20 19:37:59 +00:00
2f94551716
New Greek house by Privateer! Good work. Test "hero star" for Themistocles.
...
This was SVN commit r9537.
2011-05-20 15:48:12 +00:00
84030de9b7
Fix compile error with Boost 1.39 (ambiguous overloads)
...
This was SVN commit r9536.
2011-05-20 14:45:04 +00:00
608db46c16
Tweaks to the map
...
This was SVN commit r9535.
2011-05-18 20:17:42 +00:00
1075e206f7
Fix some format string errors
...
This was SVN commit r9534.
2011-05-18 19:10:36 +00:00
069f567f7e
check that enemy units don't leave foundations. based on patch from Stork. fixes #724
...
This was SVN commit r9532.
2011-05-17 20:30:21 +00:00
1fac936d68
fixes a bug related to foundations and animals corpses (previously, when an animal has already been ordered to leave a foundation once, it will not leave the construction site if you place an another building on top of it).
...
This was SVN commit r9531.
2011-05-17 16:26:47 +00:00
ea455fa983
Fixed some issues with Belgian Bog
...
This was SVN commit r9529.
2011-05-16 15:09:06 +00:00
a6d519e70f
Fix #779 differently, to avoid problems with building on top of cheering units
...
This was SVN commit r9528.
2011-05-15 23:51:51 +00:00
fd65a492d9
Add button to promote selected units, for testing
...
This was SVN commit r9527.
2011-05-15 21:53:24 +00:00
b9f04a3d27
Fixes some scenario bugs. Fixes #856 , #857
...
This was SVN commit r9526.
2011-05-15 20:43:34 +00:00
d5d5fd3b7d
units are not stuck on construction sites anymore. fixes #779
...
This was SVN commit r9525.
2011-05-15 20:30:54 +00:00
6539456746
Fix format string
...
This was SVN commit r9524.
2011-05-15 19:52:46 +00:00
f4b55a9acf
Fix non-PCH build
...
This was SVN commit r9523.
2011-05-15 19:51:33 +00:00
87a44a6b38
This was SVN commit r9522.
2011-05-15 18:17:41 +00:00
0eae00d75d
Moved Rome struct texture from Internal to Public (so OSers can work on Roman buildings if they want). Updated a terrain.
...
This was SVN commit r9521.
2011-05-15 17:17:21 +00:00
0ea42d3185
avoid stomping on the last error while dumping stack
...
refs #849
This was SVN commit r9519.
2011-05-15 00:00:01 +00:00
886bc301d9
This was SVN commit r9518.
2011-05-14 23:26:37 +00:00
65b75fbb7f
Small fix, it now shuffles troops round the CC every minute or so to avoid issues with gatherers not being able to get in. Crappy way of doing it, but should solve the problem 90+% of the time.
...
This was SVN commit r9517.
2011-05-14 20:31:33 +00:00
45d358dd9a
add code to output both affected paths in case separators are being mixed
...
This was SVN commit r9516.
2011-05-14 20:25:32 +00:00
2dff290c28
Fix entity validation errors
...
This was SVN commit r9515.
2011-05-14 19:15:43 +00:00
05688548d0
Fix a bogus Doxygen comment
...
This was SVN commit r9513.
2011-05-14 17:27:14 +00:00
a976045f0f
Report filename in Collada warning messages.
...
Skip harmless warnings about missing materials in Collada files.
This was SVN commit r9512.
2011-05-14 16:43:08 +00:00
963960fafa
no longer warn when SetFileValidData fails, as it does on all FAT volumes (boo)
...
fixes #849
This was SVN commit r9511.
2011-05-14 10:37:42 +00:00
edd8ef2bf2
Fix units in formation blocking construction and not moving out of the way (see #779 ).
...
Make non-movement-blocking buildings (e.g. farms) not require units to
move out of the way.
This was SVN commit r9510.
2011-05-13 20:32:41 +00:00
c41b7904d2
Fix burst of particles when starting to construct a building.
...
Fix crash when particle XML loading failed.
This was SVN commit r9509.
2011-05-13 19:36:56 +00:00
03b87f9a8d
Fix typo
...
This was SVN commit r9508.
2011-05-13 19:32:19 +00:00
123c00763a
Use JuBot by default.
...
Fixes #774 .
This was SVN commit r9507.
2011-05-12 23:55:35 +00:00
b741feafb1
Add global deepcopy() function in scripts, to do a structured clone of objects.
...
Remove an unused include.
This was SVN commit r9506.
2011-05-12 23:50:42 +00:00
ff7cc75055
Fixes garrisoning bug (units don't have to approach buildings in order to garrison)
...
This was SVN commit r9505.
2011-05-12 21:48:59 +00:00
ba66de2143
Fix #835 more comprehensively (the same bug affects other actions performed on nearby targets while moving)
...
This was SVN commit r9504.
2011-05-12 21:27:15 +00:00
6b499bdc8a
Armour for Persian cataphract.
...
This was SVN commit r9503.
2011-05-12 05:10:56 +00:00
fc9a9789e0
Extra starting resources for Median Oasis.
...
Added XP value to mechanical units.
This was SVN commit r9502.
2011-05-12 03:59:01 +00:00
8a434aae1b
Ensure units don't move while gathering. fixes #835
...
This was SVN commit r9501.
2011-05-11 19:34:39 +00:00
b96a3f74c2
This was SVN commit r9500.
2011-05-11 17:05:21 +00:00
afd8a79f9c
fix #842
...
This was SVN commit r9499.
2011-05-11 16:10:40 +00:00
025a00340e
Fixes garrisoned units being found as idle (even if they are, we can't select them, so skip them instead). Fixes #844 .
...
Garrisoned units now remain in the GARRISONED state until explicitly
ungarrisoned
This was SVN commit r9498.
2011-05-11 04:05:05 +00:00
cda5c5f5c9
Promotion stuff.
...
This was SVN commit r9497.
2011-05-09 07:32:57 +00:00
aad79f54d1
This was SVN commit r9496.
2011-05-09 07:26:03 +00:00
14ecca8052
Lots of work on Temperate and Tropical biome terrains.
...
This was SVN commit r9495.
2011-05-09 06:37:17 +00:00
1420a229ff
Fix various position-related errors with garrisoned units.
...
Fix some formatting consistency.
This was SVN commit r9494.
2011-05-09 02:02:00 +00:00
33a2a50d2c
This was SVN commit r9493.
2011-05-09 01:45:47 +00:00
84817e1a6f
Updated some cavalry attack event times.
...
This was SVN commit r9492.
2011-05-09 01:22:44 +00:00
834b3fc134
This was SVN commit r9491.
2011-05-08 22:56:00 +00:00
2eeaf9f5af
Deleting broken audio files (to be replaced next)
...
This was SVN commit r9490.
2011-05-08 22:53:57 +00:00
452670738a
fix StatusDescription (remove unnecessary and wrong cast)
...
This was SVN commit r9489.
2011-05-08 20:09:31 +00:00
cf80b9bb97
Fixed a bunch of trees being Player 1
...
This was SVN commit r9488.
2011-05-08 16:16:27 +00:00
4ca43e453e
Made aggressive animals a little more formidable. Previously they only has 1H1P attack.
...
This was SVN commit r9487.
2011-05-08 16:12:47 +00:00
8be54aac90
This was SVN commit r9486.
2011-05-08 15:23:34 +00:00
9b7cdef124
ensure WHRT debug messages are always displayed (in case of compatibility trouble)
...
refs #709
This was SVN commit r9485.
2011-05-08 09:14:21 +00:00
2ed0c665b6
Updated Ogg file size.
...
This was SVN commit r9483.
2011-05-08 08:10:05 +00:00
343101588b
This was SVN commit r9482.
2011-05-08 05:23:26 +00:00
821556c50e
This was SVN commit r9481.
2011-05-08 04:27:12 +00:00
a0de656c60
Updated description.
...
This was SVN commit r9480.
2011-05-08 04:22:36 +00:00
be5e4933d8
Added shields to Celt cav skirmisher Advanced and Elite to differentiate from the Basic.
...
Finalized Acropolis II. Please playtest. It's a 1v1 acropolis-style map
with the Mediterranean assets.
This was SVN commit r9479.
2011-05-08 04:19:05 +00:00
ede48a077b
Edited some actors so that the melee sound effect happens at the correct time. I may need to go through all of the melee cavalry unit actors and do this.
...
New Acropolis II map for Alpha 5. Nearly complete. Is already playable.
This was SVN commit r9478.
2011-05-08 03:24:12 +00:00
7ed9a84252
avoid double-free when sounds are reclaimed and then freed.
...
fixes #833
This was SVN commit r9477.
2011-05-07 17:34:47 +00:00
b82913ea14
make explicit that both iterator debugging and _SECURE_SCL (which is less than iterator debugging) are disabled in release builds
...
This was SVN commit r9476.
2011-05-07 16:46:28 +00:00
46e5db4dc4
fix build with ICC
...
This was SVN commit r9475.
2011-05-07 15:47:20 +00:00
9837e23808
Changed release name
...
This was SVN commit r9474.
2011-05-07 15:23:11 +00:00
1a17fde105
Change health bar tooltip from hitpoints to health
...
This was SVN commit r9473.
2011-05-07 02:57:23 +00:00
c49f4c677b
Fix bogus error messages when errno=0
...
This was SVN commit r9472.
2011-05-07 00:14:43 +00:00
5bda00c230
Fix test
...
This was SVN commit r9471.
2011-05-07 00:14:17 +00:00
0fc0335285
Tweaks resources in all random maps.
...
Updates progress steps for random maps.
Latium is not circular, so explicitly set that.
Fixes some weirdness with Atlas random map generation.
This was SVN commit r9470.
2011-05-06 23:50:30 +00:00
f6ffe7f121
Fix triple-click's accepted inter-click timing to match double-click's
...
This was SVN commit r9468.
2011-05-06 22:24:03 +00:00
cd7abda9f1
Handle triple-click selections a bit more efficiently
...
This was SVN commit r9467.
2011-05-06 22:22:56 +00:00
b2bf04c5ae
Reduce projectile decay time
...
This was SVN commit r9466.
2011-05-06 21:53:33 +00:00
e90470020b
Try to make the pathfinder less likely to get stuck
...
This was SVN commit r9465.
2011-05-06 21:52:15 +00:00
c1ed608291
Modified starting resources.
...
This was SVN commit r9464.
2011-05-06 19:35:34 +00:00
05cf7d0249
Added a new "bridge" across the center and some eye candy stuff. :)
...
This was SVN commit r9463.
2011-05-06 19:10:37 +00:00
f608b44d1d
fix self-test and map load on Windows (avoid mixing dir separators).
...
add more specific error codes (used at work)
This was SVN commit r9462.
2011-05-06 18:45:30 +00:00
e7e2e03bb9
Changed tooltip to read "Experience" instead of simply "XP." This is to help spell it out better for the players who may not be familiar with our internal nomenclature.
...
This was SVN commit r9461.
2011-05-06 18:29:01 +00:00
15e4500a01
Fix tests
...
This was SVN commit r9460.
2011-05-06 17:04:32 +00:00
cb612b17b5
Rebalancing some armour stats.
...
This was SVN commit r9459.
2011-05-06 16:46:08 +00:00
0a7aeb23f7
smbios fix
...
This was SVN commit r9458.
2011-05-06 14:54:46 +00:00
6f3761a73a
shrink displayed rank icons to actual resolution of 16x16
...
This was SVN commit r9457.
2011-05-06 02:19:36 +00:00
022950a540
Documents AI autostart option in readme
...
This was SVN commit r9455.
2011-05-05 22:10:09 +00:00
1da3cdb498
Fix build errors
...
This was SVN commit r9453.
2011-05-05 20:24:22 +00:00
a8c087d46b
Missing files
...
This was SVN commit r9451.
2011-05-05 20:07:51 +00:00
45426ac21c
Probably fix build error
...
This was SVN commit r9450.
2011-05-05 18:06:36 +00:00
5ed18a103d
Tweaked the colors a bit.
...
This was SVN commit r9449.
2011-05-05 16:54:04 +00:00
a7aed9957d
Build fix
...
This was SVN commit r9448.
2011-05-05 16:24:06 +00:00
5c76bc12fa
refactor status code definitions: allow modules to define an array of them (more convenient+efficient).
...
merge ERR::NO_SYS, NOT_IMPLEMENTED into NOT_SUPPORTED
renderer: remove unnecessary ogl_shader include
This was SVN commit r9447.
2011-05-05 13:03:34 +00:00
fd561cb88b
hotloading fix on Windows
...
refs #781
This was SVN commit r9446.
2011-05-05 10:50:47 +00:00
a741fb2f33
fix ChooseCacheSize - more simple, no longer relies on available-memory reporting (because Linux has a weird understanding of "available")
...
closes #611 , refs #832
This was SVN commit r9445.
2011-05-05 09:53:07 +00:00
508f56d2dd
Fixes bug in triple-click unit selection for units without a SelectionGroupName defined. In this case, triple-click will behave the same as double-click.
...
This was SVN commit r9444.
2011-05-05 02:06:53 +00:00
26de01cdd1
Adjusts unit selection behavior to account for ranks. Triple-click now selects units regardless of their rank.
...
Adds modifier hotkey to select units offscreen.
Fixes #826 .
This was SVN commit r9443.
2011-05-05 01:27:49 +00:00
f423e269e2
shrunk rank icons
...
This was SVN commit r9442.
2011-05-05 00:19:48 +00:00
141cc51573
reference new rank icons
...
This was SVN commit r9441.
2011-05-05 00:10:43 +00:00
99e45311ab
Possible new rank insignia.
...
This was SVN commit r9440.
2011-05-04 23:15:03 +00:00
db0a2f8cef
Made promotions a little easier for this release so it is more obvious for end users who install the Alpha.
...
This was SVN commit r9439.
2011-05-04 22:36:31 +00:00
3bffcff90d
update experience bar tooltip text and style
...
This was SVN commit r9438.
2011-05-04 22:20:49 +00:00
dcec9c4ca9
gracefully handle the case where the file cache is full of data still referenced elsewhere.
...
fixes #832
This was SVN commit r9437.
2011-05-04 22:19:38 +00:00
002c40ede4
Some miscellaneous stuff. Also Fixes #828
...
This was SVN commit r9436.
2011-05-04 21:51:29 +00:00
fffcdbbf21
Balances random map resources.
...
Attempts to avoid "invalid argument" errors in typed arrays by forcing
them to integer (see #658 ).
Removes script preloading from map generator (VFS is thread-safe now)
Removes thread checking from ScriptInterface file loading functions.
Adjusts starting entities in civ data.
This was SVN commit r9435.
2011-05-04 21:24:25 +00:00
d6b073df22
Fix typo
...
This was SVN commit r9434.
2011-05-04 20:49:17 +00:00
1ba34b973f
clean up
...
This was SVN commit r9430.
2011-05-04 19:36:29 +00:00
dd264f46cf
make music civ specific
...
This was SVN commit r9429.
2011-05-04 19:31:01 +00:00
da40ea8e2c
First 3 completed score pieces from Omri: Celts Peace 1, Hellens Peace 1 and Iberians Peace 1 - 04.05.11.
...
This was SVN commit r9428.
2011-05-04 15:39:33 +00:00
fa16181e84
Fix build error in tests.
...
Don't call wrealpath on the value returned by GetArg0, since it breaks
the tests and changes the semantics of that function.
This was SVN commit r9427.
2011-05-04 14:40:14 +00:00
b560ff5fb7
Fix warning from cccd6849a7
...
This was SVN commit r9426.
2011-05-04 14:18:16 +00:00
9719432ff9
fix memory leak (wasn't freeing the entire chain of SMBIOS structures)
...
This was SVN commit r9425.
2011-05-04 13:08:09 +00:00
a7152270f4
Path now goes to some trouble to prevent mixing / and \ slashes (causes trouble when hotloading, and some Windows APIs can't handle it, either)
...
WARNING: that means stuff like Path(nativeDataPath/"art/") is forbidden
and will raise errors on Windows when nativeDataPath contains \. always
use /"" to add a trailing slash. never embed "/" in OsPath component
strings (it's OK for VFS strings since they consistently use /).
wdir_watch, CmdLineArgs: avoid mixed separators
wutil: remove overzealous assertion (infinite recursion if an error
arose before we create a window)
refs #781
This was SVN commit r9424.
2011-05-04 12:16:51 +00:00
7523894760
ENSURE(0) -> DEBUG_WARN_ERR(ERR::LOGIC) (a bit smaller, and more descriptive)
...
This was SVN commit r9423.
2011-05-04 12:10:17 +00:00
6c3b41db3f
New minimap buttons ready for implementation.
...
This was SVN commit r9422.
2011-05-04 05:55:53 +00:00
9733affb05
Fix non-PCH build
...
This was SVN commit r9419.
2011-05-04 01:17:09 +00:00
962fb41729
Support parallel build jobs in update-workspaces (via JOBS=-j3 or argument -j3 etc)
...
This was SVN commit r9418.
2011-05-03 23:54:29 +00:00
16a654ccae
Fix script tests.
...
Fixes #827 .
This was SVN commit r9416.
2011-05-03 23:16:16 +00:00
1a6e75de4e
updated alpha version name - fixes #816
...
This was SVN commit r9415.
2011-05-03 20:22:42 +00:00
b26d543da1
Fixes #821
...
This was SVN commit r9414.
2011-05-03 19:44:08 +00:00
178a700c16
Fix build
...
This was SVN commit r9412.
2011-05-03 15:58:25 +00:00
cce3bebe0c
fix error propagation/avoid SetLastError pollution
...
This was SVN commit r9411.
2011-05-03 13:46:35 +00:00
cccd6849a7
cleanup (requires update-workspaces)
...
lib_errors.cpp: replace with status.cpp, adapt to needs at work
wutil: fix runtime warning reported via feedback box
config: merge CONFIG_PARANOIA and !CONFIG_FINAL into
CONFIG_ENABLE_CHECKS
add openmp, pointer_typedefs.h
This was SVN commit r9410.
2011-05-03 12:38:42 +00:00
114ca8e4ce
Changed map lighting.
...
This was SVN commit r9409.
2011-05-03 01:44:59 +00:00
0734122a9d
Added some stone quarries to the map.
...
This was SVN commit r9408.
2011-05-03 01:39:45 +00:00
04f5a34f2d
New Mediterranean stonemine "quarry."
...
This was SVN commit r9407.
2011-05-03 01:25:43 +00:00
ae0ac056b3
Changed lighting.
...
This was SVN commit r9406.
2011-05-03 01:14:01 +00:00
333c62a490
Report errors in GL limit detection properly.
...
Report slightly more detailed RAM and CPU data.
This was SVN commit r9405.
2011-05-02 23:46:56 +00:00
0a4a7683b9
Deleted some random particles hanging around.
...
This was SVN commit r9404.
2011-05-02 23:40:15 +00:00
548ed2e4eb
Celt wall turret projectile error fix
...
This was SVN commit r9403.
2011-05-02 22:36:26 +00:00
7ac1ca1122
This was SVN commit r9402.
2011-05-02 22:10:33 +00:00
aa38415b3f
Changes default scenario to Death Canyon. Fixes #820 .
...
This was SVN commit r9401.
2011-05-02 21:52:14 +00:00
8ec73ac5d1
Tinkering with XP/promotions
...
This was SVN commit r9400.
2011-05-02 21:46:29 +00:00
b4889d5346
Fixes broken team init (based on patch by Stork). Fixes #814 .
...
This was SVN commit r9399.
2011-05-02 20:34:48 +00:00
b8595fd196
palisade texture and spike walls added
...
This was SVN commit r9398.
2011-05-02 19:52:33 +00:00
ed105d3ad1
Disable promotion component for elite Iberian units.
...
This was SVN commit r9397.
2011-05-02 19:44:16 +00:00
e8e0d0b576
Promotion animation for Iberian units.
...
This was SVN commit r9396.
2011-05-02 19:31:42 +00:00
a523dc48ac
Add missing file for units promotion.
...
This was SVN commit r9395.
2011-05-02 17:42:48 +00:00
e2f006e1a5
Changes Atlas keyword list to checkboxes, which properly reflect a scenario's keywords.
...
This was SVN commit r9394.
2011-05-02 16:29:53 +00:00
674eaa1283
Latest version of user-report server code
...
This was SVN commit r9393.
2011-05-02 15:47:12 +00:00
0b996bbe75
Prevent selecting unusable civs in random map setup. Fixes #813 .
...
This was SVN commit r9392.
2011-05-02 15:26:38 +00:00
7499b23991
Units promotion. Closes #697 .
...
This was SVN commit r9391.
2011-05-02 15:03:01 +00:00
e8a2ed69f7
Selection sounds added to siege ballista and onager
...
This was SVN commit r9390.
2011-05-02 14:48:02 +00:00
c02818ceea
Tweaks random map appearance and resource placement.
...
Cleans up rmgen library.
Fixes bug in bound checking for circular maps.
This was SVN commit r9388.
2011-05-01 22:29:58 +00:00
e297dac1a5
Initial structure destruction sound effects added.
...
This was SVN commit r9387.
2011-05-01 22:10:40 +00:00
884f4bbbf1
Iberian and Hele wall tower garrison flags
...
This was SVN commit r9386.
2011-05-01 21:06:18 +00:00
bfd6614b55
# Add support for many formation shapes, based on patch from Badmadblacksad.
...
See #13 .
This was SVN commit r9385.
2011-05-01 20:40:53 +00:00
adc0d79d8b
Fixes ticket #808 .
...
This was SVN commit r9384.
2011-05-01 20:15:59 +00:00
1008d60bc3
Deleted some JPEGS out of the props folder.
...
This was SVN commit r9383.
2011-05-01 17:11:02 +00:00
564524df54
This was SVN commit r9382.
2011-05-01 17:07:24 +00:00
4112523878
This was SVN commit r9381.
2011-05-01 17:07:11 +00:00
b34259449f
This was SVN commit r9380.
2011-05-01 17:06:47 +00:00
126c2276cd
This was SVN commit r9379.
2011-05-01 15:03:51 +00:00
02ed11ac54
Removes references to Testbot, replaces with JuBot.
...
This was SVN commit r9378.
2011-05-01 15:02:33 +00:00
88c44c7d73
smbios: add support for structures 34,35,36,39,41 (found on rather new BIOS)
...
This was SVN commit r9377.
2011-05-01 12:18:45 +00:00
f88c61911b
Spring Cleaning.
...
This was SVN commit r9376.
2011-05-01 06:44:00 +00:00
c108a13505
This was SVN commit r9375.
2011-05-01 05:24:38 +00:00
cf78c42761
Move the rest of the helmet assets from Internal to Public (a process I started many moons ago but failed to finish).
...
This was SVN commit r9374.
2011-05-01 01:25:32 +00:00
7087281573
A few updated terrains and I added another ramp to each side of the Death Canyon plateaus.
...
This was SVN commit r9373.
2011-05-01 00:27:12 +00:00
df6ab6688e
Iberian and Celt civ centre garrison nodes added
...
This was SVN commit r9372.
2011-04-30 22:45:58 +00:00
b371686fb7
Rename class to prevent conflict between generated auto_ptr symbols in Atlas and engine
...
This was SVN commit r9371.
2011-04-30 21:08:53 +00:00
1636f062a3
make VFS thread-safe, per long-standing request by Philip
...
This was SVN commit r9369.
2011-04-30 15:57:43 +00:00
635c2a12e2
add error code for file not found. return error code from io::Load, warn and return from io::Store (both without triggering assertions).
...
remove out of date comment in io.cpp
fixes #811
This was SVN commit r9368.
2011-04-30 15:41:19 +00:00
9a125ac5a1
Fix typo
...
This was SVN commit r9367.
2011-04-30 15:27:27 +00:00
3ac72813ef
Relinquish CPU when running RMS scripts, to speed up loading on single-core machines
...
This was SVN commit r9366.
2011-04-30 15:18:11 +00:00
791ecee26b
Build fixes
...
This was SVN commit r9365.
2011-04-30 13:55:55 +00:00
5ca66fc757
cleanup: move ADTs into lib/adts (separate files). fix definition of ASSERT
...
This was SVN commit r9364.
2011-04-30 13:35:36 +00:00
0720025073
cleanup
...
reduce dependency on PCH. move KiB constants to alignment, ARRAY_SIZE to
code_annotation.h.
move glext_funcs.h to external_libraries/glext_funcs.h, move part of
ogl.h to external_libraries/opengl.h
remove unused saturating arithmetic functions
This was SVN commit r9363.
2011-04-30 13:22:46 +00:00
4663ac0fe7
split debug_assert into ENSURE and ASSERT as discussed in a previous meeting.
...
the old debug_assert always ran and tested the expression, which slows
down release builds. wrapping them in #ifndef NDEBUG is clumsy. the new
ASSERT behaves like assert and ENSURE like the old debug_assert. Let's
change any time-critical but not-super-important ENSURE to ASSERT to
speed up release builds. (already done in bits.h and unique_range.h)
This was SVN commit r9362.
2011-04-30 13:01:45 +00:00
6c915291cc
cleanup (requires update-workspaces):
...
major refactor of wfilesystem - remove gotos and workaround for FAT file
times
replace more round_up of constants with Align<>
remove old unused allocators (STL aligned, matrix, some shared_ptr)
move allocator utils into separate headers.
remove lockfree, wterminal
avoid testing __cplusplus
This was SVN commit r9361.
2011-04-30 12:34:28 +00:00
188c020ae0
Fix reading outside buffer, when terrain alpha maps are 8-bit.
...
Change alpha map composite texture to 8-bit to avoid wasting memory.
Warn about non-square alpha maps.
This was SVN commit r9360.
2011-04-30 11:46:23 +00:00
1dcbb02958
This fixes the error messages at game start, makes a few final weaks to training queues, and changes the first base strategy to a small raid rather than the huge 3-prong assault.
...
This was SVN commit r9359.
2011-04-30 11:26:32 +00:00
9bdb54bc76
fix failure to preallocate disk space on Windows by always rounding up the file size regardless of the io::Parameters
...
This was SVN commit r9358.
2011-04-30 09:13:10 +00:00
0b46d58ae8
A couple updated desert terrains. Updated Necropolis map.
...
This was SVN commit r9357.
2011-04-30 07:39:41 +00:00
e292c55e94
Delete warning-prone unused unusable event recording code
...
This was SVN commit r9355.
2011-04-30 00:06:30 +00:00
f22e40b64c
Fix warning
...
This was SVN commit r9354.
2011-04-29 23:55:47 +00:00
335e7db6be
Fix build more
...
This was SVN commit r9353.
2011-04-29 23:30:29 +00:00
34ba390a0d
build fix for pre-C++0x compilers.
...
archive_zip, stream: work around possibly missing support for
std/tr1::bind in GCC by defining a functor manually
also renamed RVREF to RVALUE_REF and ensured RVALUE can convert from
both lvalue and rvalue.
io: avoid dodgy constants and possible overflow by using blockSize=0 to
indicate "don't split"
This was SVN commit r9352.
2011-04-29 22:55:35 +00:00
1139124451
Fix some build errors and warnings
...
This was SVN commit r9351.
2011-04-29 20:38:13 +00:00
2374caac3e
major refactor of file/io and alignment code. requires update-workspaces
...
. completely rewrite waio - use IOCP, add several hardcore
optimizations. now outperforms the
AS SSD and ATTO benchmarks when writing
. refactor file interface - use LIO_READ instead of 'r', allow access to
file descriptor.
. completely rewrite the IO wrapper. now much more simple, less CPU
overhead, adds
support for pre-issue/post-completion hooks and preallocation.
io::Run defaults to simple synchronous IO; use io::Parameters to get
asynchronous.
. add alignment.h with constants and Align() function template (more
efficient than
round_up for compile-time constants)
. add UniqueRange - similar to C++0x unique_ptr (emulated for C++03),
plus a
built-in size. avoids expensive thread-safe reference counting in
shared_ptr.
cleanup:
- move fat_time functions into archive_zip
- remove no longer needed io_align and block_cache
- reduce dependencies in sysdep/compiler (move parts to
code_annotation.h)
- move IOCP into separate file (reused by waio)
This was SVN commit r9350.
2011-04-29 19:10:34 +00:00
7ed6a164ba
Idle worker button now cycles through Worker, Trade, and CitizenSoldier classes in that order (then by increasing entity ID). Fixes #209 .
...
This was SVN commit r9349.
2011-04-29 18:09:07 +00:00
d2e06ecdbb
Fix some obstruction shapes.
...
Fixes #808 .
This was SVN commit r9348.
2011-04-29 17:51:27 +00:00
cb380a9b1c
Simplify profile report code. Bump version number to make it easily distinguishable.
...
This was SVN commit r9347.
2011-04-29 17:32:35 +00:00
d96fefd4a4
Fix linker errors with GCC 4.6, and some warnings.
...
This was SVN commit r9346.
2011-04-29 16:32:58 +00:00
8af82baf67
# Minor particle system fixes.
...
Support emitters that are fully running as soon as the game starts.
Fix particle clumping when moving from off-screen to on-screen, by
computing updates more incrementally.
Fix overzealous culling of models with particle emitters.
Add particles to renderer stats.
This was SVN commit r9345.
2011-04-29 12:26:31 +00:00
96eb76f860
This was SVN commit r9344.
2011-04-29 03:11:02 +00:00
5f634930e2
This was SVN commit r9343.
2011-04-29 03:04:52 +00:00
affea0f2ce
#Updated Iberian unit stats and balance.
...
This was SVN commit r9342.
2011-04-29 02:33:11 +00:00
17ee62bc0b
Iberian and Celt outpost garrison flags
...
This was SVN commit r9341.
2011-04-28 22:51:38 +00:00
67ca7461cd
Adds Skip method to SGUIMessage which works more or less like wxEvent.Skip: GUI objects can allow other event handlers to process an input event after they finish.
...
Allows hotkey handling of mousewheel events after minimap. Fixes #673 .
Adds SendEvent to GUI objects, used in place of separate calls to
HandleMessage and ScriptEvent.
This was SVN commit r9340.
2011-04-28 20:42:11 +00:00
9d5539a215
fix runtime check error - see http://www.wildfiregames.com/forum/index.php?showtopic=14656&pid=218675&st=0&#entry218675
...
thanks to Yves for reporting this + suggesting the fix.
This was SVN commit r9339.
2011-04-28 17:13:55 +00:00
f69c013d68
Beginnings of balancing Iberian units.
...
This was SVN commit r9338.
2011-04-28 05:35:52 +00:00
587b41016f
Fixed the scale of the decal.
...
This was SVN commit r9337.
2011-04-28 03:09:03 +00:00
fb411d3f39
Fixes slightly broken game attributes and setup.
...
Includes random map size and seed in reportPerformance. Fixes #793 .
Fixes loading screen to use actual map names.
This was SVN commit r9336.
2011-04-28 01:21:02 +00:00
fbfecbf802
fortress_briton garrison flag
...
This was SVN commit r9335.
2011-04-27 22:04:16 +00:00
24a1d91feb
iber_fortress garrison flag added
...
This was SVN commit r9334.
2011-04-27 21:35:29 +00:00
4e74798585
Be more robust to visibility checks outside the map. Fixes #765 .
...
This was SVN commit r9333.
2011-04-27 21:03:08 +00:00
6da0027b32
fortress_gallic garrison flag added
...
This was SVN commit r9332.
2011-04-27 21:02:01 +00:00
e4b530fb1a
Clean up some GL state explicitly
...
This was SVN commit r9331.
2011-04-27 20:12:58 +00:00
e9e0f0035f
This was SVN commit r9330.
2011-04-27 17:07:52 +00:00
88f6633b22
Tweaked the Median Oasis map a bit. Slowed down the slinger projectile a little bit so we can see it in-flight. :)
...
This was SVN commit r9329.
2011-04-27 14:38:02 +00:00
6e2bfa0f07
This was SVN commit r9328.
2011-04-27 12:12:01 +00:00
a872e4a6ad
Attempt to fix reported GL error
...
This was SVN commit r9327.
2011-04-27 09:41:28 +00:00
9759362b62
New celt temple. celt_struct texture changes. Renaming old temples to stone monuments
...
This was SVN commit r9326.
2011-04-26 22:40:08 +00:00
51c7a6d193
This was SVN commit r9325.
2011-04-26 22:03:21 +00:00
baabff617d
Iberian Spearman animation line fixed. It was calling an empty animation line in the actor.
...
This was SVN commit r9324.
2011-04-26 21:55:58 +00:00
7a0b545286
New Acropolis map called "Necropolis."
...
This was SVN commit r9323.
2011-04-26 21:48:50 +00:00
8e20c00dd3
# Add numbered unit selection groups, based on patch from Badmadblacksad.
...
Fixes #773 .
This was SVN commit r9322.
2011-04-26 18:19:16 +00:00
0a66f8a188
Larger siege texture.
...
This was SVN commit r9321.
2011-04-25 07:07:25 +00:00
b3ec9b35a5
#3 new Loading Tips.
...
This was SVN commit r9320.
2011-04-25 02:19:28 +00:00
1272587a3e
#5 new Loading Tips.
...
Map tweaks and updates.
This was SVN commit r9319.
2011-04-25 01:04:51 +00:00
0a1313a9ff
#New tips images.
...
This was SVN commit r9318.
2011-04-24 18:49:54 +00:00
6468bfa2c4
Name fix.
...
This was SVN commit r9317.
2011-04-24 16:52:02 +00:00
3698b9acd4
This was SVN commit r9316.
2011-04-24 05:58:05 +00:00
4f3fe0f64c
Updated some Iberian unit animations.
...
This was SVN commit r9315.
2011-04-24 05:55:29 +00:00
a39da292fe
This was SVN commit r9314.
2011-04-24 05:31:08 +00:00
7e4f3cd44c
Map adjustments.
...
This was SVN commit r9313.
2011-04-23 23:37:43 +00:00
84b17115a2
Matching the Iberian names with the Design Document.
...
This was SVN commit r9312.
2011-04-23 22:26:55 +00:00
df847cd9c2
Attack animation speeds
...
This was SVN commit r9311.
2011-04-23 21:51:51 +00:00
2d0c183afb
Fix use of uninitialised variable, causing errors randomly when GL_ARB_fragment_program_shadow is missing
...
This was SVN commit r9310.
2011-04-23 18:51:47 +00:00
17eae9d92a
This was SVN commit r9309.
2011-04-23 18:34:03 +00:00
2d04d78db8
Disable apparently buggy shader mode on r300c drivers. Fixes #780 .
...
This was SVN commit r9308.
2011-04-23 17:06:27 +00:00
f0286a72e3
Ram tweaks.
...
This was SVN commit r9307.
2011-04-23 15:59:59 +00:00
775b6589c0
This was SVN commit r9306.
2011-04-23 15:56:44 +00:00
213b344820
Disable shadows/fancywater by default on more Intel devices. Fixes #623 for now.
...
Add script to help verify correctness of hwdetect.
This was SVN commit r9305.
2011-04-23 15:39:20 +00:00
9f7eef5a1c
Lots of Neareastern Badlands stuff.
...
This was SVN commit r9304.
2011-04-23 05:06:25 +00:00
d7497a71d1
This was SVN commit r9303.
2011-04-23 02:39:47 +00:00
0cd16d8464
New badlands terrains
...
This was SVN commit r9302.
2011-04-23 02:39:24 +00:00
5c768f803d
This was SVN commit r9301.
2011-04-22 19:50:05 +00:00
f9e5bbb8b0
Added Iberians to the map.
...
This was SVN commit r9300.
2011-04-22 19:31:30 +00:00
5a773d4ca0
Be robust to null proxy URL strings. Should fix #778 .
...
This was SVN commit r9299.
2011-04-22 16:05:00 +00:00
c82d619cc4
Make decals only rotate around the Y axis, to avoid buggy stretched appearance when rotated non-horizontally
...
This was SVN commit r9298.
2011-04-22 13:19:23 +00:00
d9cbf6c9a8
Attempting to implement Blood for killed units. It's not quite working as I hoped.
...
The Roman super unit has the blood attached to his chest prop point.
Problem: The Blood decal gets stretched strangely.
The Persian super unit has the blood attached to his root prop point.
Problem: 1.) Blood doesn't look in the right spot when the unit's death
animation ends. 2.) The blood actor (decal) is not randomizing as it
should.
This was SVN commit r9297.
2011-04-22 04:10:04 +00:00
04dc0c2d3c
Moved "civs" json files to Public because we are releasing a few of the other civs' units as a teaser.
...
Lots of unit and map tweaks. Names, stats, civs, etc.
Made the civ icons at the top of the screen 96 pixels instead of 64
pixels just to see if people like them. They are easily changed back to
64 pixels if unsatisfactory.
This was SVN commit r9296.
2011-04-22 03:51:18 +00:00
13b62f6613
Iberian javelinist tweaks.
...
This was SVN commit r9295.
2011-04-22 02:28:47 +00:00
dc98a4a06a
This was SVN commit r9294.
2011-04-21 17:27:26 +00:00
bd67ad73e3
Iberian Javelinist named and shields added.
...
This was SVN commit r9293.
2011-04-21 17:07:34 +00:00
0bd1b7edbd
Animation speeds.
...
This was SVN commit r9292.
2011-04-21 14:46:24 +00:00
712eda131d
Random map tweaks for better, faster resource placement.
...
Moves some constants to rmgen library.
This was SVN commit r9291.
2011-04-21 14:13:13 +00:00
38e4eda857
Adding building sounds to Celt, Hele, and Iberian units
...
This was SVN commit r9290.
2011-04-20 22:14:02 +00:00
697c4731b4
preparing construction sound xml
...
This was SVN commit r9289.
2011-04-20 21:43:09 +00:00
02d7fd1ed8
skeletons.xml addition
...
This was SVN commit r9288.
2011-04-20 19:43:59 +00:00
91ad17c685
Fix entity ID association with animations. Fixes #790 .
...
This was SVN commit r9286.
2011-04-20 00:04:05 +00:00
6d946cc58d
Fix badly-named variable
...
This was SVN commit r9285.
2011-04-20 00:02:59 +00:00
b35d3a5e3d
__cpuidex was added in VC2008 SP1, so don't use it if pre-SP1
...
This was SVN commit r9284.
2011-04-19 23:23:16 +00:00
1caf223410
Max selection size now 64 units (may need further adjusting)
...
This was SVN commit r9283.
2011-04-18 23:31:37 +00:00
7ec3266da5
Fix assertion failures when running RMS in debug mode
...
This was SVN commit r9282.
2011-04-18 17:10:57 +00:00
5759a54b32
Removes few remnants of rmgen from the binaries directory.
...
Updates readme.txt with new command line options.
This was SVN commit r9281.
2011-04-17 20:58:14 +00:00
ab32d3000f
This was SVN commit r9280.
2011-04-17 17:45:56 +00:00
458cfbf48c
Fix 64-bit build error
...
This was SVN commit r9279.
2011-04-16 22:57:00 +00:00
ecdffb6fbd
fire arrow
...
This was SVN commit r9278.
2011-04-16 19:32:56 +00:00
82af989a6e
Fire Arrows for a few structures.
...
This was SVN commit r9277.
2011-04-16 19:32:02 +00:00
a495f298e7
This was SVN commit r9276.
2011-04-16 14:27:52 +00:00
f2b432cbe5
Iberian ram animations
...
This was SVN commit r9275.
2011-04-16 11:56:52 +00:00
87d97000e3
Some nice updates to the Death Canyon map (I think this should be the next 'default' map for Alpha V).
...
Updated the name for the Roman legions.
Fixed footprint for Iberian Fortress.
This was SVN commit r9274.
2011-04-16 06:32:37 +00:00
fa001fdabe
Fixes a typo in Atlas UI scripts affecting actor viewer.
...
This was SVN commit r9273.
2011-04-16 05:09:20 +00:00
b4503bb61e
Simplifies random map output, see #782 .
...
Changes random maps to XZ coordinates, matching the engine.
More documentation for rmgen library.
This was SVN commit r9271.
2011-04-16 04:04:06 +00:00
3adba8721a
Some map updates
...
This was SVN commit r9270.
2011-04-16 03:49:43 +00:00
de613274f0
Added a (not so) super secret unit for Alpha V. Other stuff.
...
This was SVN commit r9269.
2011-04-16 00:59:45 +00:00
ac81892517
Replaced Greeks with Iberians.
...
This was SVN commit r9268.
2011-04-16 00:11:18 +00:00
a52638873e
Adjusting some iberian units.
...
This was SVN commit r9267.
2011-04-15 23:35:53 +00:00
d445e9eb35
Fixed a mistake
...
This was SVN commit r9266.
2011-04-15 22:50:39 +00:00
9b227e4626
Added Iberians and Celts to the Serengeti map.
...
This was SVN commit r9265.
2011-04-15 22:39:42 +00:00
a60f0e0340
first of the minimap buttons.
...
This was SVN commit r9264.
2011-04-15 20:10:57 +00:00
098adf47f5
This was SVN commit r9263.
2011-04-15 06:18:37 +00:00
481f570a0e
CMapGeneratorWorker thread safety issue. Fixes #783 .
...
VFS access moved to main thread, where random map scripts are preloaded
and stored prior to use by the worker thread.
Adds LoadGlobalScript to ScriptInterface, for evaluating script content
in the global scope.
This was SVN commit r9261.
2011-04-15 05:23:51 +00:00
225346ffc9
#Falling leaf particles. New foundation for Greek Temple. Tweaking Gold Mine sparkle.
...
This was SVN commit r9260.
2011-04-15 05:05:07 +00:00
9c44e908d4
This was SVN commit r9259.
2011-04-15 02:15:26 +00:00
e604035c97
Iberian healer update
...
This was SVN commit r9257.
2011-04-15 00:07:49 +00:00
5e5e0354db
This was SVN commit r9256.
2011-04-14 23:48:09 +00:00
b1a566800f
Rotate Iberian corral
...
This was SVN commit r9255.
2011-04-14 23:12:29 +00:00
cb2e1e8f21
Iberian corral fix
...
This was SVN commit r9254.
2011-04-14 22:35:46 +00:00
76a22a6258
Sparkly metal mines. :)
...
This was SVN commit r9253.
2011-04-14 21:34:00 +00:00
f072b47dc1
Warn earlier about some non-thread-safe calls.
...
This was SVN commit r9252.
2011-04-14 14:28:24 +00:00
57e6980465
Fix 64-bit build. Avoid using variable-sized types in Atlas message interface.
...
This was SVN commit r9251.
2011-04-14 14:27:42 +00:00
d3c00a4c61
Added arrows to the Iberian Wall Tower.
...
This was SVN commit r9250.
2011-04-14 08:18:48 +00:00
bb81f679de
New Iberian Fortress.
...
This was SVN commit r9249.
2011-04-14 06:24:08 +00:00
bf53b6f3b5
This was SVN commit r9248.
2011-04-14 04:16:06 +00:00
ad6f305359
Integrates random maps with Atlas. Fixes #460 .
...
Adds various map controls to Atlas.
Adds New Map dialog to Atlas.
Removes a few references to old simulation header files.
This was SVN commit r9247.
2011-04-14 04:01:59 +00:00
3b8e216622
Beginning stages of balancing Iberian units.
...
This was SVN commit r9246.
2011-04-13 23:26:34 +00:00
a627f4a34e
tweaked lighting
...
This was SVN commit r9245.
2011-04-13 22:41:30 +00:00
67b5bc2df3
Sling projectile colour and size updates
...
This was SVN commit r9244.
2011-04-13 22:24:37 +00:00
73add20727
Load original Pagella .otf font with hinting explicitly disabled, instead of loading via .ttf
...
This was SVN commit r9243.
2011-04-13 22:15:04 +00:00
dac7b2d82b
Iberian fishing boat fixes
...
This was SVN commit r9242.
2011-04-13 22:01:05 +00:00
22374de942
This was SVN commit r9241.
2011-04-13 21:40:34 +00:00
17d67b87c3
Iberian sling projectiles
...
This was SVN commit r9240.
2011-04-13 20:42:41 +00:00
22313c1356
Corral footprint.
...
This was SVN commit r9239.
2011-04-13 19:33:18 +00:00
3f9d67889a
Some fixes to the Iberian Corral.
...
This was SVN commit r9238.
2011-04-13 19:29:10 +00:00
24042bec50
Worked on the siege projectile, (made a separate flaming rock, along with a non-flaming one).
...
This was SVN commit r9237.
2011-04-13 18:56:13 +00:00
5a8d291403
Remove old vertexshader renderpath option from Atlas
...
This was SVN commit r9236.
2011-04-13 18:28:27 +00:00
a84f58ecb8
Added projectile to Iberian fortress. Fixed icons for Iberian ships.
...
This was SVN commit r9235.
2011-04-12 20:27:49 +00:00
ef125b4d95
Animation speeds.
...
This was SVN commit r9234.
2011-04-12 20:20:02 +00:00
d3b140fc5f
Move the body textures for the Carth and Iberian skirmishers over to Public.
...
This was SVN commit r9233.
2011-04-12 19:44:51 +00:00
e841ff4095
tweaked the smoke duration to make the plume higher.
...
This was SVN commit r9232.
2011-04-12 18:56:58 +00:00
f09af634cb
This was SVN commit r9231.
2011-04-12 18:50:03 +00:00
216e09afdd
Map tweaks.
...
This was SVN commit r9230.
2011-04-12 07:55:57 +00:00
b330e8ce57
Added flames to the Elite Iberian Javelinist's projectiles. ;) Made a new flame and smoke for it. Tweaked the "original" smoke to emit a little higher above the flame (so the smoke doesn't mask the flame).
...
This was SVN commit r9229.
2011-04-12 03:49:32 +00:00
7414764298
Added Iberian javelinist. Need a name for him though (and added to the Wiki entry).
...
This was SVN commit r9228.
2011-04-12 03:11:35 +00:00
567d3aafea
Iberian resource gathering sounds and animation speed boost
...
This was SVN commit r9227.
2011-04-11 20:42:03 +00:00
9526706b5c
Fix reference to old vertexshader mode
...
This was SVN commit r9226.
2011-04-11 10:04:39 +00:00
64e72f464f
This was SVN commit r9225.
2011-04-11 00:39:21 +00:00
818b02b0fc
Fixes a few error cases in the map generator.
...
This was SVN commit r9224.
2011-04-10 22:21:15 +00:00
a5a2cd3a3c
New HP bars.
...
This was SVN commit r9222.
2011-04-10 10:34:49 +00:00
ebc31bfc43
Name updates.
...
This was SVN commit r9221.
2011-04-10 05:36:29 +00:00
942a45372c
Random maps generated in their own thread, loading GUI is updated with progress.
...
Fixes some bugs in game loader error handling.
This was SVN commit r9220.
2011-04-10 05:31:18 +00:00
469d0fe5c5
Remove rmgen tool.
...
Log error description when sound engine fails (instead of cryptic
LibError code).
This was SVN commit r9219.
2011-04-10 00:54:15 +00:00
a3812af176
smbios: avoid warning when no information is returned (happens on 32-bit XP)
...
This was SVN commit r9218.
2011-04-09 17:09:48 +00:00
ee3190e0e9
Fixed some Iberian Monument issues.
...
This was SVN commit r9217.
2011-04-09 07:05:54 +00:00
8501fd441c
Moved from Internal to Public.
...
This was SVN commit r9216.
2011-04-09 00:20:21 +00:00
c59f7bcb8f
Fix Clang warning ("operands of ? are integers of different signs")
...
This was SVN commit r9214.
2011-04-09 00:07:21 +00:00
bd0063607a
Fix build in Clang
...
This was SVN commit r9213.
2011-04-09 00:05:37 +00:00
7a8aefae34
Fix release-mode warnings in unused code
...
This was SVN commit r9212.
2011-04-09 00:05:00 +00:00
fe51c90cf5
This was SVN commit r9211.
2011-04-08 23:58:43 +00:00
d7fa62b3e6
Tweaks to map. Replaced some stone mines with some stone quarries. Gave a stone quarry to the Player 4 starting area, which erroneously had no stone before.
...
This was SVN commit r9210.
2011-04-08 23:52:33 +00:00
51f0141b6d
Moved from Internal to Public.
...
This was SVN commit r9209.
2011-04-08 23:46:19 +00:00
815a6215e5
This was SVN commit r9208.
2011-04-08 23:45:45 +00:00
d46a892a5d
smbios: avoid displaying unknown maxError value; add enumerators for BIOS characteristics and extended characteristics
...
This was SVN commit r9207.
2011-04-08 07:10:31 +00:00
832f8a5367
Dust particle tweaks.
...
This was SVN commit r9206.
2011-04-08 01:02:18 +00:00
8f6fda9626
Deallocate expired projectiles properly
...
This was SVN commit r9205.
2011-04-08 00:11:27 +00:00
1b606ed276
This was SVN commit r9204.
2011-04-08 00:08:25 +00:00
5d84f0ad09
Shore waves textures for particles.
...
This was SVN commit r9203.
2011-04-07 23:57:16 +00:00
98458988bd
name change
...
This was SVN commit r9202.
2011-04-07 20:25:31 +00:00
50e30ae8af
Be more explicit about function types in font builder to fix crash
...
This was SVN commit r9201.
2011-04-07 19:59:34 +00:00
5b7dbe6bc9
smbios: more convenient interface that avoids having to check if the structures pointer is null (can still detect failure by checking whether all/guaranteed member pointers are zero)
...
This was SVN commit r9200.
2011-04-07 19:35:45 +00:00
b5c6868ac2
smbios SystemSlot fix: add missing field, avoid displaying unknown device/function numbers
...
This was SVN commit r9199.
2011-04-07 19:28:24 +00:00
c754c63376
Greek naming tweaks.
...
This was SVN commit r9198.
2011-04-07 17:29:02 +00:00
aab98f90e0
Fix startup crash on non-Windows
...
This was SVN commit r9197.
2011-04-07 17:22:28 +00:00
e1b9083c41
Fix probable OS X build error
...
This was SVN commit r9196.
2011-04-07 17:18:32 +00:00
99aa427ffa
make use of SMBIOS information to detect CPU frequency and memory size
...
smbios fixes: also ignore max value (used by Dell BIOS to report invalid
MemoryDevice bit width); fix incorrect error check that caused 0 to be
returned on all but the first call; add implicit conversion operator to
allow using size without appending .value
This was SVN commit r9195.
2011-04-07 17:06:00 +00:00
e5e9e38532
Fix GCC 4.6 "set but not used" warnings
...
This was SVN commit r9194.
2011-04-07 16:34:51 +00:00
2b138f47db
Handle map loading errors in autostart and normal setup modes. Adds TODOs for Atlas and Replay modes. See #764 .
...
Fixes loading screen 'title'.
Fixes broken autostart behavior for random maps and multiplayer games.
This was SVN commit r9193.
2011-04-07 02:32:16 +00:00
2a6cfb36d2
#Decal fixing. :)
...
This was SVN commit r9192.
2011-04-06 22:55:33 +00:00
98910972c6
This was SVN commit r9191.
2011-04-06 22:34:10 +00:00
ed62b49a74
Renderer simplification: Remove now-unused texgen stream.
...
This was SVN commit r9190.
2011-04-06 22:09:58 +00:00
1866c2d3b7
Renderer simplification: Remove non-FBO shadow mode.
...
This was SVN commit r9189.
2011-04-06 22:08:51 +00:00
a1eb830f2c
Renderer simplification: Remove old non-depth-texture shadows.
...
This was SVN commit r9188.
2011-04-06 22:08:07 +00:00
7339a346e3
Renderer simplification: Remove fixed-function shadowing. Remove now-unused diffuse-only model lighting mode.
...
This was SVN commit r9187.
2011-04-06 22:07:13 +00:00
8753f881ee
Renderer simplification: Remove old vertexshader path.
...
This was SVN commit r9186.
2011-04-06 22:02:05 +00:00
06903af31f
Fixes build warning in C/C++ preprocessor (moves initialization outside test expression)
...
This was SVN commit r9185.
2011-04-06 21:47:42 +00:00
8e0bfdfc33
Make actor entities stay visible in FoW.
...
This was SVN commit r9184.
2011-04-06 21:01:50 +00:00
a122f55bde
Avoid hardcoding the actor entity template details.
...
This was SVN commit r9183.
2011-04-06 21:01:00 +00:00
df4b74ccf6
Render animationless skeletal meshes in their bind pose at their current position, instead of rendering at the world's origin.
...
This was SVN commit r9182.
2011-04-06 13:49:05 +00:00
a751a2d6f6
added particles for all construction actors + changed color of particles to a more dusty tint
...
This was SVN commit r9181.
2011-04-06 11:13:29 +00:00
59f4848333
This was SVN commit r9180.
2011-04-06 11:00:14 +00:00
3fb9d9e5f6
Fix tests
...
This was SVN commit r9178.
2011-04-06 00:53:35 +00:00
e9cc697c2b
Animate particles in the default editor view
...
This was SVN commit r9177.
2011-04-06 00:22:07 +00:00
8cb19ff1f3
Fixed civs
...
This was SVN commit r9176.
2011-04-06 00:13:47 +00:00
d03559f2c9
Add dust particles on under-construction buildings, varying based on number of active builders.
...
This was SVN commit r9175.
2011-04-06 00:11:40 +00:00
2fd4c62cbb
Remove some unused variable declarations
...
This was SVN commit r9174.
2011-04-06 00:04:35 +00:00
1956e2bd23
Map tweaks and new (work in progress) maps.
...
This was SVN commit r9173.
2011-04-05 23:45:51 +00:00
29dd635d3b
Fix decals and LOS texture in Actor Viewer, by slightly reducing use of globals.
...
Fix particles in Actor Viewer.
Expand terrain in Actor Viewer.
Change background to black so it blends with the LOS texture more
nicely.
This was SVN commit r9172.
2011-04-05 20:32:03 +00:00
329d044a9e
64-bit gcc warning fix
...
This was SVN commit r9171.
2011-04-05 19:49:04 +00:00
67433e65eb
Added smoke to the flaming projectile rock. ;)
...
This was SVN commit r9170.
2011-04-05 19:28:26 +00:00
dcde67038f
ICC compile fixes (VC's overload resolution is apparently quite different)
...
This was SVN commit r9169.
2011-04-05 17:45:47 +00:00
1c2e410b7d
final smbios improvements.
...
add comments
add support for bit flags
use wrapper classes and SFINAE instead of flags to detect enums / sizes
/ handles
avoid potential truncation of byte sizes
avoid displaying numeric_limits::min values ("unknown")
This was SVN commit r9168.
2011-04-05 17:14:18 +00:00
d3ba9a24d3
Fix GCC build errors ("explicit template specialization cannot have a storage class",
...
"need 'typename' before 'static_assert_<...>::type' because
'static_assert_<...>' is a dependent scope").
Fixes #767 .
This was SVN commit r9167.
2011-04-05 17:07:06 +00:00
99a1049ef9
added flame particle to hele_litho projectile and removed from female heads
...
This was SVN commit r9166.
2011-04-05 16:50:48 +00:00
3dbb29d665
smbios improvements: add specializations for bool/Handle (no longer requires a flag); omit empty/meaningless fields
...
convert remaining enumerators to ENUM, lowercase them to avoid conflicts
with macros, wrap them in struct to allow identical enumerator names
This was SVN commit r9165.
2011-04-05 09:52:57 +00:00
c95b88a0c8
New particle textures and campfire.
...
This was SVN commit r9164.
2011-04-05 05:43:32 +00:00
f35da41a0c
smbios: minor fixes, add partial support for displaying enumerator names, move visitors to .cpp, use pragma pack regardless of compiler
...
This was SVN commit r9163.
2011-04-04 17:44:36 +00:00
68bc0a5651
smbios: add support for stringizing the structures
...
This was SVN commit r9162.
2011-04-04 16:50:02 +00:00
a2bad46f27
smbios fixes:
...
- memmove all bytes in the table, not just 8
- end pointer was off by 4
- add support for structures 8,10,22,26,27,28
This was SVN commit r9161.
2011-04-04 15:01:40 +00:00
6beb1ea89b
Exclude FCollada tests from Unix releases, since they rely on non-free data file Eagle.DAE
...
This was SVN commit r9160.
2011-04-04 14:20:16 +00:00
1abbf8b64b
Old changes to compress releases better
...
This was SVN commit r9159.
2011-04-04 14:17:39 +00:00
0ddf2b0f34
Fix build on VC2008
...
This was SVN commit r9157.
2011-04-03 21:41:17 +00:00
66807d40c1
windows build fix: use arb names/function pointers; +noncopyable/struct vs. class warning fix
...
This was SVN commit r9156.
2011-04-03 20:45:43 +00:00
3d21cf98f9
better aio error checking / avoid unnecessary repeated calls to aio_error (investigated on the occasion of the recent Linux aio trouble)
...
This was SVN commit r9155.
2011-04-03 20:07:55 +00:00
a9531bd88c
Add missing files
...
This was SVN commit r9154.
2011-04-03 19:51:25 +00:00
231387d2da
linux compile fix (explicit instantiation must be at namespace scope), adjust end pointer to match 8 bytes removed in workaround
...
This was SVN commit r9153.
2011-04-03 19:29:16 +00:00
9e1850bbe5
Set female citizens' heads on fire.
...
This was SVN commit r9152.
2011-04-03 19:16:20 +00:00
823e63a93b
# Initial version of new particle system.
...
This was SVN commit r9151.
2011-04-03 19:15:15 +00:00
01a0825c94
disable aio on linux until the glibc aio implementation and/or kernel is fixed (see http://www.wildfiregames.com/forum/index.php?showtopic=14561&pid=217711&st=0&#entry217711 )
...
This was SVN commit r9150.
2011-04-03 19:07:35 +00:00
384b8fa3e1
Delete old particle data files
...
This was SVN commit r9148.
2011-04-03 18:54:01 +00:00
253efdad57
Delete non-working particle system code
...
This was SVN commit r9147.
2011-04-03 18:49:48 +00:00
09413d940c
Delete an obsolete particle system editor
...
This was SVN commit r9145.
2011-04-03 18:44:20 +00:00
2c72e1f364
(requires update-workspaces)
...
add initial SMBIOS implementation for retrieving system information
wacpi -> wfirmware (now also used to retrieve SMBIOS table)
This was SVN commit r9144.
2011-04-03 15:38:48 +00:00
1a072a3f37
Use a predictable RNG seed for random actor variations, so they are consistent between runs of the game.
...
This was SVN commit r9143.
2011-04-02 12:51:42 +00:00
97c934ad1c
Apply unit shading colour in shader renderpath.
...
Don't adjust the shading colour of units in FoW (the shading comes from
the LOS texture instead).
This was SVN commit r9142.
2011-04-02 12:04:19 +00:00
012c47057a
Optimise some matrix operations, based on patch from ortalo.
...
Fixes #750 .
This was SVN commit r9141.
2011-04-01 18:33:47 +00:00
6d3d93c355
# Add idle worker button, based on patch from veprbl.
...
Fixes #744 .
This was SVN commit r9140.
2011-04-01 18:00:04 +00:00
ce85f4e825
Fix minimap ignoring GUI z-ordering.
...
This was SVN commit r9139.
2011-04-01 17:58:33 +00:00
5b7a23f75c
Make ResetCameraTarget more sensible if the camera was rotated.
...
This was SVN commit r9138.
2011-04-01 17:57:04 +00:00
6026330fce
updated version of Aken that includes support for MSR and static validation (-> .c instead of .cpp)
...
closes #754 (please re-open if not)
This was SVN commit r9137.
2011-04-01 15:06:52 +00:00
d5b3201bfe
noted while checking MSR prerequisites that the previous HasNehalem is inaccurate. PLATFORM_INFO is also supported by newer processors (e.g. Sandy Bridge), whereas UNCORE_* are tied to Nehalem and Westmere => split up HasNehalem into HasPlatformInfo and HasUncore. (the latter has been replaced by a "system agent" in newer designs)
...
refs #754
This was SVN commit r9136.
2011-03-31 21:30:42 +00:00
bbc5d4142e
This was SVN commit r9135.
2011-03-31 04:45:06 +00:00
7d95b3bc62
Added Iberians to Gold Rush.
...
This was SVN commit r9134.
2011-03-31 02:23:40 +00:00
eac7d55675
Moved Cloudless skybox to Public.
...
This was SVN commit r9133.
2011-03-30 21:50:12 +00:00
1014da1f88
Use pool allocator to avoid apparently expensive dynamic allocations when rendering terrain.
...
Add function to get pool usage, for debugging.
This was SVN commit r9132.
2011-03-30 21:42:35 +00:00
98fa860199
Adjusting lighting.
...
This was SVN commit r9131.
2011-03-30 13:57:37 +00:00
044eaaccf3
Messing with the new lighting.
...
This was SVN commit r9130.
2011-03-30 13:34:05 +00:00
fb872e0bd5
fix: update all pool freelist initializations to reflect the new invariant (prevents null-pointer dereference crash)
...
This was SVN commit r9129.
2011-03-28 21:10:41 +00:00
c396997009
fixes from work: avoid potential 0-pointer dereference in freelist, also avoid branching in freelist functions via sentinel
...
wdll_main.h: avoid warning for DLLs using TLS
file_system_util.h: export functions
This was SVN commit r9128.
2011-03-28 12:28:29 +00:00
0dfc72bc2c
Fixes filter behavior in setup when switching map type.
...
Fixes broken texture in Latium rms.
Adds demo keyword to rms test.
Fixes default rms lighting with new model.
This was SVN commit r9127.
2011-03-27 22:00:49 +00:00
daad510013
fix bug where AI would only train one unit type
...
This was SVN commit r9126.
2011-03-26 22:22:22 +00:00
53f522d220
Fix warning
...
This was SVN commit r9124.
2011-03-26 20:38:42 +00:00
d295dacb9b
# Add new renderer mode based on GL_ARB_fragment_program.
...
Change lighting model for new maps to allow better overbrightness.
Cache player colours instead of loading from scripts every time the
renderer wants them.
This was SVN commit r9123.
2011-03-26 20:17:21 +00:00
8b11b73226
Tweak OGRE preprocessor to fit in our code, and fix bug with #define inside #ifdef.
...
This was SVN commit r9122.
2011-03-26 20:09:54 +00:00
d1241cd6e9
Import original OgreGLSLProcessor from OGRE 1.7.2
...
This was SVN commit r9121.
2011-03-26 20:07:57 +00:00
6e98a886ed
broken rope bridge eyecandy object added
...
This was SVN commit r9120.
2011-03-26 09:32:03 +00:00
e08c5e22a0
Added unit icon to Iberian siege ram
...
This was SVN commit r9119.
2011-03-25 01:00:16 +00:00
2a822eb4d4
Added Iberian siege ram unit
...
This was SVN commit r9118.
2011-03-25 00:46:02 +00:00
afbfca17ce
Fix silhouettes being displayed for some models that always stick into the ground
...
This was SVN commit r9117.
2011-03-24 23:54:08 +00:00
1eb5eeb225
minor fixes from integration with working copy at work.
...
This was SVN commit r9116.
2011-03-24 09:05:06 +00:00
9193ba56f9
Build fixes and whatnot
...
This was SVN commit r9115.
2011-03-23 21:15:22 +00:00
4a2b47689b
kennel.png portrait width to 256px
...
This was SVN commit r9114.
2011-03-23 20:32:14 +00:00
0b8e3b3adf
Fixes rounding error on Latium map, would break with odd number of players. Fixes #761 .
...
This was SVN commit r9113.
2011-03-23 20:25:46 +00:00
8f658ee81d
Change remaining scenarios with "rome" civ. Fixes #758 .
...
This was SVN commit r9112.
2011-03-23 20:16:10 +00:00
1f7e8d7194
per discussion with Philip, remove STL_HASH_MAP etc. because they're ugly, rarely used and superseded by boost::unordered*
...
This was SVN commit r9111.
2011-03-23 16:56:27 +00:00
588bfa11bf
remove unnecessary utf8 includes
...
This was SVN commit r9110.
2011-03-23 16:32:44 +00:00
0999ba0941
refactoring:
...
- simplify sys_get_executable_name interface - return OsPath directly,
rename to sys_ExecutablePathname
- add validation of path components in GetDirectoryEntries
- replace multiple calls to GetModuleFileNameW with
sys_ExecutablePathname
- lift nearly all MAX_PATH limitations (required at work)
This was SVN commit r9109.
2011-03-23 16:14:47 +00:00
64a02932e3
refactor headers: path_util -> path, native_path -> os_path, remove where unnecessary
...
This was SVN commit r9108.
2011-03-23 14:43:35 +00:00
dcd192cb60
refactor path interface:
...
- use wrapper class instead of std::wstring (reduces mixing of
strings/paths; allows safe+easy join via operator/ and convenient
case-insensitive comparison via operator==, avoids NativePathFromString,
similar to boost::filesystem)
- NativePath -> OsPath
- add hash and To/FromJSVal for Path
- add TS_ASSERT_PATH_EQUALS
- replace _wfopen_s with sys_OpenFile
- remove obsolete SortFiles/Directories
This was SVN commit r9107.
2011-03-23 13:36:20 +00:00
e39fb7d0de
This was SVN commit r9106.
2011-03-23 09:04:59 +00:00
8851028832
Moved face textures from Internal to Public.
...
This was SVN commit r9105.
2011-03-23 08:59:23 +00:00
f618605477
Changes default random map sizes.
...
Tweaks random map resources.
Adds support for circular maps to rmgen library.
Various fixes in map generator.
On Miletus map, change player 2 civ, as Romans are not fully implemented
(fixes #758 )
This was SVN commit r9104.
2011-03-23 08:12:04 +00:00
575e3b0a69
Don't enable JITs when they can interfere with profiling.
...
Fix dangerous trailing slashes.
This was SVN commit r9103.
2011-03-23 00:36:34 +00:00
e825a98671
Fix flag filtering of transparent models
...
This was SVN commit r9102.
2011-03-22 23:09:38 +00:00
c4cd85bb98
Build fixes
...
This was SVN commit r9100.
2011-03-22 18:46:39 +00:00
5565b9e898
Fixes bugs in Latium map script. Changes default environment settings for random maps, adds environment setters
...
This was SVN commit r9099.
2011-03-22 08:19:19 +00:00
3050551eae
Move data for non-implemented civs to internal
...
This was SVN commit r9098.
2011-03-22 02:53:53 +00:00
46c54ef62c
Fixes missing texture in Neareastern Badlands random map
...
This was SVN commit r9097.
2011-03-22 02:04:58 +00:00
0e0ed94926
Implements random map system, fixes #6 .
...
Includes default library "rmgen" w/ API based on rmgen tool.
Modifies rmgen scripts Cantabrian Highlands, Neareastern Badlands, and
Latium.
Old map support dropped from MapReader.
Fixes a few bugs in existing game setup and initialization scripts.
This was SVN commit r9096.
2011-03-22 01:34:45 +00:00
23ebe32b4c
Moving old random scripts to avoid conflicts
...
This was SVN commit r9095.
2011-03-22 01:33:17 +00:00
c0a105432e
Use path types and conversions more consistently.
...
This was SVN commit r9094.
2011-03-21 22:59:00 +00:00
5b7ea2371f
Fix some line endings.
...
This was SVN commit r9093.
2011-03-21 22:47:02 +00:00
83271ec816
Fix build errors.
...
Fix VFS root directory failing IsDirectory, which breaks the search for
textures.xml.
Fix incompatible change to loose cache name determination.
This was SVN commit r9092.
2011-03-21 21:06:08 +00:00
c3405e6f50
path improvements/fixes:
...
- replace more std::wstring with Native or VfsPath; wstring_from_utf8 ->
NativePathFromString
- replace sequences of Join(Path(), Basename+extension) with
ChangeExtension in wsdl, CacheLoader
- add Path::IsDirectory to replace .empty() / path_is_dir_sep(.back()).
also changed behavior to reflect the fact that "" is the VFS root
_directory_
- Path::Join now allows 2 identical path types (e.g. VfsPath) or one
char* literal (prevents inadvertently introducing non-safe characters).
to convert from wstring or wchar_t, use an explicit ctor (e.g.
VfsPath(wchar_t_string))
This was SVN commit r9091.
2011-03-21 19:54:08 +00:00
6d25329412
# towards locale-independent pathnames on Linux
...
c.f.
http://www.wildfiregames.com/forum/index.php?showtopic=14541&st=0&p=217250&#entry217250
and 2011-03-19 meeting
This was SVN commit r9090.
2011-03-21 17:53:13 +00:00
1da78409f9
New icon for celtic kennel
...
This was SVN commit r9089.
2011-03-21 11:57:49 +00:00
9a22dc1351
warning fixes
...
This was SVN commit r9088.
2011-03-21 11:55:49 +00:00
cec05f02ea
fix insidious OpenAL issue: the spec doesn't guarantee 0 isn't a valid source name => we need to use an out-of-band mechanism for specifying whether the source is valid.
...
refs #557
This was SVN commit r9087.
2011-03-20 16:40:36 +00:00
2392eb6720
Skip reporting caches that were initialised but never filled in
...
This was SVN commit r9086.
2011-03-19 15:17:14 +00:00
44e1a863e1
Fix cache detection assertion failure
...
This was SVN commit r9085.
2011-03-19 15:16:14 +00:00
0af8cdc54a
Fix likely cache table typos, based on Intel Software Developer's Manual.
...
This was SVN commit r9084.
2011-03-19 15:03:25 +00:00
fb499ff0d0
further refactoring of new cache detect code
...
- add invariant - level/type are always valid, numEntries indicates
whether the cache is actually present and not disabled
- handle pseudo-descriptors 0xF0 and F1 (avoids warning)
This was SVN commit r9083.
2011-03-19 12:48:56 +00:00
4ae8cfe858
Converted remaining old scenarios to the latest format (version 5). Support will soon be dropped from MapReader.
...
This was SVN commit r9082.
2011-03-19 00:04:55 +00:00
89b7b6b52d
Avoid divide-by-zero on AMDs with missing caches
...
This was SVN commit r9081.
2011-03-18 19:48:54 +00:00
25524dc99f
Fix tests
...
This was SVN commit r9080.
2011-03-18 19:35:31 +00:00
22a651bb86
Fix assertion failure when no L3 cache.
...
Fix typo.
This was SVN commit r9078.
2011-03-18 18:42:10 +00:00
ecbd0ae31b
Fix Windows build.
...
Improve compatibility with GL1.3.
This was SVN commit r9077.
2011-03-18 18:07:18 +00:00
d805e764c5
# Render unit silhouettes when behind buildings.
...
Fixes #144 .
Start using stencil buffer.
Simplify materials a little.
This was SVN commit r9076.
2011-03-18 16:57:54 +00:00
d49994a0b4
Explicitly clamp gl_FrontColor, for llvmpipe compatibility
...
This was SVN commit r9075.
2011-03-18 16:55:51 +00:00
5b91e2d7ab
move cache detection into separate file.
...
add support for CPUID.2 cache descriptors (many Bothans died to bring us
this information)
simplify the API - use one structure to describe cache and TLB; only one
accessor for both.
HWDetect: version change, since dtlbs and itlbs are no longer
distinguished
fixes #752
This was SVN commit r9074.
2011-03-18 16:44:03 +00:00
875fce5e63
This was SVN commit r9073.
2011-03-17 07:52:01 +00:00
f73aff7016
Fixed parent code.
...
This was SVN commit r9072.
2011-03-17 07:50:03 +00:00
b6cc8e9cf6
The Big Iberian Move™.
...
This was SVN commit r9071.
2011-03-17 07:31:58 +00:00
be59aa012d
Iberian shield actors.
...
This was SVN commit r9070.
2011-03-17 06:05:50 +00:00
730a119e4f
Moving stuff from Internal to Public. Ongoing project.
...
This was SVN commit r9069.
2011-03-17 06:03:54 +00:00
d3ec3e7c7f
This was SVN commit r9068.
2011-03-17 06:02:34 +00:00
e47e916853
This was SVN commit r9067.
2011-03-17 01:31:56 +00:00
78a54071c4
#Implemented remaining decals.
...
This was SVN commit r9066.
2011-03-15 22:07:22 +00:00
9659ec298b
Fix off-by-one error in date logging, and rearrange to standard format.
...
This was SVN commit r9065.
2011-03-15 20:29:29 +00:00
e70fae8d80
Stop using glMultiDrawElements since it's too buggy
...
This was SVN commit r9064.
2011-03-14 21:57:09 +00:00
099dbdb24a
Fix use of uninitialised variable
...
This was SVN commit r9063.
2011-03-14 21:54:44 +00:00
5fa577ea25
Attempt to fix shadowAlphaFix to generate FBOs in a more widely supported format
...
This was SVN commit r9062.
2011-03-14 02:50:43 +00:00
612539f109
Don't bother creating shadow textures if shadows are disabled
...
This was SVN commit r9061.
2011-03-14 02:49:53 +00:00
f0f87796f0
Farm field edit for decal
...
This was SVN commit r9060.
2011-03-13 23:56:22 +00:00
28096de106
My first try at making a decal. :)
...
This was SVN commit r9059.
2011-03-13 23:24:40 +00:00
8bb5f2e480
Add missed file
...
This was SVN commit r9057.
2011-03-13 19:44:06 +00:00
77e2130ff2
Replace some decal meshes with real decals
...
This was SVN commit r9056.
2011-03-13 19:26:01 +00:00
d24c93237c
# Initial version of terrain decal textures.
...
Rejig CModel to support non-mesh-based props.
Avoid redundant recomputation for non-moving CRenderableObjects.
This was SVN commit r9055.
2011-03-13 19:22:05 +00:00
ba8163e248
# Explicitly triangulate terrain tiles.
...
Store blend splats as indexed triangles.
Remove unnecessary copy of vertex data.
Fixes #169 .
This was SVN commit r9054.
2011-03-13 19:10:38 +00:00
fc2c54c39f
# Optimise terrain renderer.
...
Batch patch splats by texture match.
Use VBOs for patch indices.
Fixes #722 .
This was SVN commit r9053.
2011-03-13 19:06:33 +00:00
2f28b07356
Support storing index data in VBOs.
...
Use index VBOs in model renderers, for performance.
Be more explicit about static/dynamic VBOs.
Add VBO usage to renderer stats.
Clean up some obsolete unused code.
This was SVN commit r9052.
2011-03-13 18:58:09 +00:00
b70a0a5b5a
Latest version of user-report server code
...
This was SVN commit r9051.
2011-03-12 02:36:20 +00:00
a0a245d0ec
sync with work. add u8_from_larger, sys_IsDebuggerPresent, wdll_main.h;
...
robustify waio file mode and remove a safety check (since
OVERLAPPED.Internal is documented to be subject to change)
This was SVN commit r9050.
2011-03-11 16:29:27 +00:00
6abd49d60a
#Added link to online manual (from in-game manual). Also updated the year in the "about box" from 2010 to 2011.
...
This was SVN commit r9049.
2011-03-10 17:37:29 +00:00
51b58328f7
Fix negative 'unlogged' time in profiler at start of game.
...
Remove redundant Reset call.
This was SVN commit r9047.
2011-03-08 16:58:07 +00:00
8a0cbe009a
Stop the AI wasting time chasing after any animals except chickens.
...
Make the AI behave better when it can't find any viable food sources.
This was SVN commit r9046.
2011-03-08 01:40:44 +00:00
9787f963ba
Minor adjustments to feedback details
...
This was SVN commit r9045.
2011-03-08 01:34:25 +00:00
910c1b7c67
make bridge unselectable entity
...
This was SVN commit r9044.
2011-03-08 00:09:17 +00:00
a77c807e06
Simple bridge demo map
...
This was SVN commit r9043.
2011-03-07 22:31:00 +00:00
18f44bebbc
Add workaround for missing tree shadows on certain graphics drivers
...
This was SVN commit r9042.
2011-03-07 00:34:03 +00:00
21785dc97c
hele wall and wall tower obstruction stat changes
...
This was SVN commit r9041.
2011-03-06 14:38:06 +00:00
4261983c9d
Fix reveal map checkbox after winning
...
This was SVN commit r9040.
2011-03-06 02:29:07 +00:00
ecbe92bdda
automatically reveal map when a player wins
...
This was SVN commit r9039.
2011-03-06 01:54:38 +00:00
b4d9ab336b
Simplify hiding of system cursor on non-Windows.
...
Fixes #683 .
This was SVN commit r9038.
2011-03-06 00:48:26 +00:00
7d6cfe58de
Fix non-PCH build
...
This was SVN commit r9037.
2011-03-06 00:01:23 +00:00
6f9da85d9f
Improve performance of full state hash computation, by skipping script components that are known to have no data.
...
Switch to much quicker (and less comprehensive) per-turn hashing in
multiplayer games.
This was SVN commit r9036.
2011-03-05 22:30:32 +00:00
20ebaa5b79
Fix units getting stuck inside foundations
...
This was SVN commit r9035.
2011-03-05 22:18:29 +00:00
52d767a404
This was SVN commit r9034.
2011-03-05 19:59:46 +00:00
c562ed6894
Fixed obstruction.
...
This was SVN commit r9033.
2011-03-05 19:59:02 +00:00
22e16e4554
Make builders look for nearby foundations to help with, once they finish their own building
...
This was SVN commit r9032.
2011-03-05 17:38:15 +00:00
08d5e7bf66
Sort AI list by name, and rename Test Bot so it's a bit clearer and is listed first
...
This was SVN commit r9031.
2011-03-05 16:55:58 +00:00
c0383ffc30
Fix units not auto-gathering after a group is given a construction order
...
This was SVN commit r9030.
2011-03-05 15:56:24 +00:00
b914f82d2a
Celt ram edit.
...
This was SVN commit r9029.
2011-03-05 15:36:22 +00:00
d62e9de7da
Fix shift-click building placement
...
This was SVN commit r9027.
2011-03-05 14:41:44 +00:00
18cdbd9eab
Increase tile-based pathfinder maximum search range, so it's at least enough to reach from one side of Acropolis to the other
...
This was SVN commit r9026.
2011-03-05 14:38:08 +00:00
18a2968919
Fix errors when starting multiplayer games
...
This was SVN commit r9025.
2011-03-05 14:30:24 +00:00
d3929b6af1
Actually, delete the cpuid() inline asm entirely since it still causes various problems in various compilers
...
This was SVN commit r9024.
2011-03-05 14:11:57 +00:00
712a92caa1
Save PIC register in cpuid() to fix "can't find a register in class 'BREG'" error in some versions of GCC
...
This was SVN commit r9023.
2011-03-05 13:53:02 +00:00
18798c3f8d
OS X build fix
...
This was SVN commit r9022.
2011-03-05 13:49:36 +00:00
637412cb5a
update name for alpha 4
...
update default single player map for alpha 4
This was SVN commit r9020.
2011-03-05 03:53:04 +00:00
e608d9269a
Load entity templates for the AI via the progressive loader.
...
Display message while loading the map list for the setup screen.
This was SVN commit r9019.
2011-03-05 01:56:59 +00:00
19c8ca3ef4
siege ram trained sound effect added
...
This was SVN commit r9018.
2011-03-05 00:43:26 +00:00
8b655f4f99
Celt siege ram produced in fortress buildings
...
This was SVN commit r9017.
2011-03-05 00:21:09 +00:00
e6ebfa2ab9
Fix tests
...
This was SVN commit r9016.
2011-03-04 23:22:09 +00:00
2229c10e05
Delete rint/rintf emulation for Windows, since it got broken (the tests fail) and we don't use it any more
...
This was SVN commit r9015.
2011-03-04 23:16:04 +00:00
09cbe4f341
Disable debug messages when instantiating AIs
...
This was SVN commit r9014.
2011-03-04 21:50:30 +00:00
cae4b1b1af
Hide useless 'server name' field on setup screen
...
This was SVN commit r9013.
2011-03-04 21:48:01 +00:00
3e7731e8ca
Stop units wasting their lives chasing animals they'll never be able to catch.
...
Let AI players collect treasures.
This was SVN commit r9012.
2011-03-04 21:42:39 +00:00
3a5ca7fdbc
Improve camera restraints at edge of map to be independent of zoom, and to work on circular maps.
...
Fixes #573 .
This was SVN commit r9011.
2011-03-04 20:02:05 +00:00
bec4c6437b
Make non-combat units flee when under melee attack, and not attack enemies automatically.
...
Fixes #703 .
This was SVN commit r9010.
2011-03-04 14:36:41 +00:00
3e22cf4cae
Focus map-selection list by default in single-player game setup screen, to allow keyboard navigation
...
This was SVN commit r9009.
2011-03-04 14:29:28 +00:00
2ef1b9a867
Make projectiles that miss their target continue until hitting the terrain.
...
Fixes #706 .
This was SVN commit r9008.
2011-03-04 00:43:48 +00:00
6bcce22a88
Tell the profiler about a few more bits of code
...
This was SVN commit r9007.
2011-03-03 22:38:01 +00:00
58ae08522f
Let local.cfg override the hardware-dependent defaults set by hwdetect
...
This was SVN commit r9005.
2011-03-03 01:49:49 +00:00
1c1564daaf
Make profiler JSON output much more concise.
...
Right-align values in in-game profile viewer.
Add alternating row shading in profile viewer, to make it easier to
read.
This was SVN commit r9004.
2011-03-03 01:09:19 +00:00
16a4eb36dd
Various minor optimisations.
...
Enable SpiderMonkey method JIT in Release mode.
Add Engine.ProfileStart/Engine.ProfileStop functions for scripts.
Fix AI to clone initial entity data and shared metadata.
This was SVN commit r9003.
2011-03-03 00:16:14 +00:00
8d2d4a8505
Fix profile parser
...
This was SVN commit r9002.
2011-03-03 00:14:23 +00:00
dbc6d27411
Optimise obstruction grid updates in the common case when terrain hasn't changed
...
This was SVN commit r9001.
2011-02-28 01:24:12 +00:00
794584ea11
Optimise tile-based pathfinder, particularly for large maps.
...
This was SVN commit r9000.
2011-02-28 00:35:53 +00:00
cb0e322a61
# Minor AI fixes.
...
Avoid script errors on Miletus.
Use pre-existing female citizens as workers.
Fix autostart.
This was SVN commit r8999.
2011-02-27 19:20:36 +00:00
b15ea0691f
Attempt to improve AI selection in the game setup screen.
...
This was SVN commit r8998.
2011-02-27 17:58:41 +00:00
d045258c29
Let exceptions in GUI script events triggered by script setters propagate out of the setter, so error messages aren't useless.
...
This was SVN commit r8997.
2011-02-27 17:57:32 +00:00
eb163c8d24
Improve reporting of extensions promoted into GL 1.2
...
This was SVN commit r8996.
2011-02-27 14:25:04 +00:00
18b317bc19
# Improve animal AI, based on patch from Badmadblacksad.
...
Fixes #563 .
This was SVN commit r8995.
2011-02-27 13:34:22 +00:00
83d0492fca
New Celt fishing boat. Hele fishing boat update.
...
This was SVN commit r8993.
2011-02-26 22:52:58 +00:00
407b1ef80f
Bump hwdetect version, to identify reports that include recent bugfixes
...
This was SVN commit r8992.
2011-02-26 19:41:01 +00:00
bb562ce179
fixes:
...
avoid reporting a (not-present) third-level cache for Athlon X2 that
don't have one
add better documentation of cache information
ensure we're running on the same CPU while retrieving cache/TLB
descriptors
wgfx: always check all known graphics driver names (more robust in the
face of changing gfx_card strings), correct the intel driver name
This was SVN commit r8991.
2011-02-26 19:22:02 +00:00
567a698628
check all file names known to belong to a GPU's drivers instead of trying to rule out 32/64 bit variants
...
fixes #737
This was SVN commit r8990.
2011-02-26 17:10:09 +00:00
4f8dc9c777
Fix script error message when starting Atlas
...
This was SVN commit r8989.
2011-02-26 00:19:02 +00:00
6d7c27edfe
Fix occasionally rendering just terrain and no models when starting a game
...
This was SVN commit r8988.
2011-02-26 00:07:16 +00:00
92e84a9112
Fix keys like F11 triggering two events when sent from Atlas to the game engine
...
This was SVN commit r8987.
2011-02-25 23:53:09 +00:00
f0ea32cb8d
Import user-report server side code
...
This was SVN commit r8986.
2011-02-25 19:46:01 +00:00
4e8c305c6e
sync with work - export app_hooks_update; add boost replacement FileExists and FileSize; avoid conflict with stdint.h;
...
remove asm rintf implementation (sse is faster); avoid the need for an
external 64-bit asm file with vc2008/vc2010; allow arbitrarily long
command line args
This was SVN commit r8985.
2011-02-25 16:31:42 +00:00
d805ef356e
FileExists -> VfsFileExists (see next commit)
...
scriptInterface: fix bool cast warning
This was SVN commit r8984.
2011-02-25 16:30:55 +00:00
77fe5c9e40
Disable shadows and fancy-water by default on some slower graphics devices.
...
See #623 .
This was SVN commit r8983.
2011-02-25 02:00:57 +00:00
a903b4c9d3
Fix #684 (disable S3TC on R600 drivers).
...
Clean up hwdetect a tiny bit.
This was SVN commit r8982.
2011-02-25 01:31:00 +00:00
0378500bdc
Fix #712 (remove S3TC warning).
...
Add timer to S3TC decoder so it's still easy to determine if it was
used.
This was SVN commit r8981.
2011-02-25 01:28:46 +00:00
f4f36af852
Block new buildings being placed on top of existing not-yet-started foundations. Fixes #740 .
...
This was SVN commit r8980.
2011-02-24 21:49:24 +00:00
798278a6c1
Fix template validation error
...
This was SVN commit r8979.
2011-02-24 21:45:25 +00:00
63f958878d
Fix GUI errors and glitches when placing buildings and not moving the mouse.
...
This was SVN commit r8977.
2011-02-24 02:12:47 +00:00
e16681f0e5
Fix destruction queue warnings when using some GUI features with time-warp enabled
...
This was SVN commit r8976.
2011-02-24 02:05:06 +00:00
f6c1d98c9a
Fix #739 (test failures).
...
Use JSON in debug serializer output unless it fails due to e.g. cyclic
values, in which case use toSource.
Disable file stats code by default, since its output isn't used.
This was SVN commit r8975.
2011-02-24 00:32:38 +00:00
059a53dd37
Fix startup hang on OS X, caused by using timers before initialising them
...
This was SVN commit r8974.
2011-02-23 09:19:41 +00:00
6b783aebd6
Try to fix build errors
...
This was SVN commit r8973.
2011-02-22 21:50:26 +00:00
0c1e05d672
Fix typo
...
This was SVN commit r8972.
2011-02-22 20:15:59 +00:00
e370223d1d
Fix register handle leak
...
This was SVN commit r8971.
2011-02-21 22:25:51 +00:00
abe07e096a
Build fix
...
This was SVN commit r8970.
2011-02-21 22:22:49 +00:00
9bbda8b80b
HTTP proxy discovery for Windows
...
This was SVN commit r8969.
2011-02-21 21:54:47 +00:00
25039d3aff
Fix build errors with old glext.h.
...
Report full cache details, and lsb-release when available.
This was SVN commit r8968.
2011-02-21 18:56:23 +00:00
ee8b193cdb
Fix profiler crash differently
...
This was SVN commit r8967.
2011-02-21 11:57:01 +00:00
a155809447
avoid crash due to null pointer in profiler (triggered by returning from the root node)
...
This was SVN commit r8966.
2011-02-21 09:41:11 +00:00
8f59d52697
sync with work; fix compile error due to lack of boost/serialization in 0ad svn
...
This was SVN commit r8965.
2011-02-21 09:23:51 +00:00
d75d9c3b75
Make the script profiler more useful, by giving the filename/line for anonymous functions.
...
Fix the turn-based profiler a bit.
This was SVN commit r8964.
2011-02-21 02:16:12 +00:00
0be515280b
Memoize some common entity lists in AI scripts.
...
This was SVN commit r8963.
2011-02-21 02:14:45 +00:00
4ba59510b5
Corral with new type of roof.
...
This was SVN commit r8962.
2011-02-20 23:50:52 +00:00
807663cd54
Fix uninitialised value
...
This was SVN commit r8961.
2011-02-20 20:52:35 +00:00
d7a243343d
Add per-turn counts to profiler, as well as per-frame.
...
Remove percent-of-parent and percent-of-frame timings since they're not
particularly useful.
Simplify profiler update code by using RingBuf.
Handle profiler keys via character codes rather than keysyms, to
hopefully work with different keyboard layouts.
Make console intercept all keys, to stop digits, shift-D, etc having
unexpected side-effects.
Disable console copy/paste when console is inactive.
This was SVN commit r8960.
2011-02-20 20:50:26 +00:00
b24396740c
Disable XML validation when loading templates for AI, to save startup time
...
This was SVN commit r8959.
2011-02-20 20:45:39 +00:00
6ba12dd2ff
Pretty-print JS values in debug serializer
...
This was SVN commit r8958.
2011-02-20 20:44:36 +00:00
720bb3c87d
Remove unnecessary rooting
...
This was SVN commit r8957.
2011-02-20 20:44:13 +00:00
e8a650bc30
Const-correctness
...
This was SVN commit r8956.
2011-02-20 20:42:54 +00:00
2501b42447
Celt warship and merchant ship updates. New Celt sail textures
...
This was SVN commit r8955.
2011-02-20 14:40:15 +00:00
28354159db
Added eyecandy bridge edges.
...
This was SVN commit r8954.
2011-02-20 12:27:12 +00:00
5f64937d02
Skip detecting some not-very-useful GL values that cause errors in some drivers
...
This was SVN commit r8953.
2011-02-20 11:46:48 +00:00
c29f2d26b3
Add some more stuff to hwdetect, because there can never be too much
...
This was SVN commit r8951.
2011-02-20 00:54:36 +00:00
e91434a23d
Extend isImplementedInCore up to GL 3.0
...
This was SVN commit r8950.
2011-02-20 00:52:50 +00:00
b2f5dd1b62
Non-PCH build fixes
...
This was SVN commit r8949.
2011-02-19 22:30:34 +00:00
ffa8bf5ea4
added missing word and reworded some text
...
This was SVN commit r8948.
2011-02-19 21:58:38 +00:00
1a2a7677fd
replace set/map with boost::unordered_* to reduce the number of expensive filesystem::basic_path::operator< calls based on a patch by ortalo (thanks!)
...
This was SVN commit r8947.
2011-02-19 21:24:39 +00:00
007985332b
formatted feedback dialog to look a little nicer
...
This was SVN commit r8946.
2011-02-19 21:24:03 +00:00
a02a5d8e5e
refactor graphics driver detect code, ensure both variants return name.dll(version)
...
This was SVN commit r8945.
2011-02-19 20:46:43 +00:00
83569c8f13
detect when detecting OpenGL driver version failed because the driver didn't describe itself in the registry;
...
fall back to detecting the version of the driver DLL (whose name we
guess)
This was SVN commit r8944.
2011-02-19 20:24:38 +00:00
7445342b61
wdll_ver: avoid errors while reading DLL version due to (lack of) FS redirection
...
UserReport: avoid windows iterator debugging warning due to invalid
operator[]
This was SVN commit r8942.
2011-02-19 19:15:00 +00:00
06a088efa8
Replace libcurl with a self-compiled (in VC2005) copy of 7.21.4 with no SSL/zlib support, in an attempt to fix errors on 64-bit Windows
...
This was SVN commit r8941.
2011-02-19 18:44:09 +00:00
1b1230ca3e
wgl compile fix: add types required by new wglext.h
...
wutsname fix (noticed by Philip from hwdetect information, thanks!):
uname.release wasn't always set.
BinarySerializer.h: warning fix
This was SVN commit r8940.
2011-02-19 18:00:09 +00:00
f3372bf11d
Add some rough performance reporting.
...
Make the profiler converge a bit faster.
This was SVN commit r8939.
2011-02-19 03:14:37 +00:00
3e13c300cc
Fix non-PCH build error
...
This was SVN commit r8938.
2011-02-19 00:46:14 +00:00
ceb4bc9b94
Report more hardware details
...
This was SVN commit r8937.
2011-02-19 00:39:32 +00:00
3e1f09a58f
Fix missing newline in GL error reporting
...
This was SVN commit r8936.
2011-02-19 00:38:08 +00:00
c7f647ae73
Don't bother initialising shadow map textures with data that will never be used.
...
Add some profiling in the shadow rendering code.
This was SVN commit r8934.
2011-02-18 23:41:27 +00:00
04dcbd294c
Push the near clip plane further out, to reduce z-fighting
...
This was SVN commit r8933.
2011-02-18 23:38:28 +00:00
d600a400fe
Fix GUI text input box scrollbars not moving when the window is resized.
...
This was SVN commit r8932.
2011-02-18 22:49:24 +00:00
387b801aed
Fix tooltip crash/corruption, caused by inconsistently changing types.
...
This was SVN commit r8931.
2011-02-18 22:36:39 +00:00
a9e920a467
Iberian corral (still needs new footprint)
...
This was SVN commit r8930.
2011-02-17 23:09:04 +00:00
1c7e33b528
Remove a load of implicit CStr type conversions, since they're error-prone and can cause silent data loss.
...
Handle most CStr8/CStrW conversions via UTF-8 instead of effectively
assuming Latin-1.
Return UTF-8 strings from Xeromyces API.
This was SVN commit r8929.
2011-02-17 20:08:20 +00:00
4f724056d5
Remove some unused bits from CRenderer
...
This was SVN commit r8927.
2011-02-16 22:40:15 +00:00
3d997365d8
Fix CStr numeric constructors on 32-bit platforms.
...
Remove unnecessary assignment operators.
This was SVN commit r8926.
2011-02-16 21:14:08 +00:00
0da7e822ff
# Add opt-in automatic feedback system.
...
Add GL implementation limits to hwdetect.
Make the in-game manual support multiple text files.
Remove unnecessary instruction on how to close the manual window.
Make guitextobject.caption return the original value without stripping
formatting tags.
Remove unused non-VFS support from config system.
Support writing config files back to their original path.
Remove unnecessary user profile directory; use normal config directory.
This was SVN commit r8925.
2011-02-16 20:40:15 +00:00
1c3c962ea1
Import libcurl for Windows
...
This was SVN commit r8924.
2011-02-16 11:22:34 +00:00
3d992ffea6
GCC build fix
...
This was SVN commit r8923.
2011-02-15 16:40:23 +00:00
ddba0cc311
topology.cpp: fix for non-contiguous APIC IDs
...
wcpu: avoid undefined shift right on 64-CPU systems (caught via
assertion)
filesystem: add wrename
path_util: add std::wstring variants of common boost::filesystem
routines
This was SVN commit r8922.
2011-02-15 10:38:11 +00:00
90c60c6580
Hele fishing boat update
...
This was SVN commit r8921.
2011-02-13 19:02:21 +00:00
fca69efd76
Fix build for GCC 4.5
...
This was SVN commit r8920.
2011-02-13 18:38:22 +00:00
11837204b6
Fix archive builder to not compress the recently-renamed terrain blend textures
...
This was SVN commit r8919.
2011-02-13 17:37:33 +00:00
6d798804c3
Quieter resource gathering
...
This was SVN commit r8918.
2011-02-13 17:01:22 +00:00
65af9307ea
Change tooltips in commands panel to be bottom-aligned, so they don't obscure the button you're pointing at
...
This was SVN commit r8917.
2011-02-13 12:17:32 +00:00
dbd3de82ff
Fix #705 (tooltips go off screen when displayed near a corner), based on patch from Leonard
...
This was SVN commit r8916.
2011-02-13 12:16:31 +00:00
c7056490b2
Restrict the initial window size to the screen size (hopefully fixes #532 ).
...
This was SVN commit r8915.
2011-02-12 21:21:07 +00:00
608c7f0e70
Celt siege ram texture update
...
This was SVN commit r8914.
2011-02-12 00:20:22 +00:00
eb074ba28c
Fix #495 (warn when locale is bogus), based on patch from darrenhoffman and sergiovier
...
This was SVN commit r8913.
2011-02-12 00:19:59 +00:00
7476bad7e2
New siege ram sounds added. Celt siege ram files.
...
This was SVN commit r8912.
2011-02-12 00:01:21 +00:00
aa8c3a9ea9
Fixed #582 (add camera reset command in Atlas), based on patch from stilz
...
This was SVN commit r8911.
2011-02-11 23:56:55 +00:00
9b25df5958
Fix #591 (Disable sounds for units in FoW/SoD), based on patch from Bogi
...
This was SVN commit r8910.
2011-02-11 23:02:19 +00:00
fb738766ea
Recompute building placement preview every turn, so its colour responds to changes in the environment
...
This was SVN commit r8909.
2011-02-11 11:17:32 +00:00
6cd212a68d
Female acknowledgement sound placeholder
...
This was SVN commit r8908.
2011-02-11 00:40:25 +00:00
804e817cf5
Fix rendering of main menu buttons after leaving a game
...
This was SVN commit r8907.
2011-02-10 23:58:33 +00:00
11bc751fd3
Save replay log's commands.txt in new locations when playing multiple games in a single session
...
This was SVN commit r8906.
2011-02-10 23:57:19 +00:00
ec97d271d6
Added bark sounds to celt war dog
...
This was SVN commit r8905.
2011-02-10 23:24:10 +00:00
a1ef809904
Fix error when returning resources before having ever collected any
...
This was SVN commit r8904.
2011-02-10 23:09:28 +00:00
b73c544f2a
Fix warning
...
This was SVN commit r8903.
2011-02-10 22:55:41 +00:00
72f1e46b97
Gathering sounds for Celt and Hele infantry units
...
This was SVN commit r8902.
2011-02-10 20:52:29 +00:00
78e174af7d
Fix auto-gathering after constructing fields.
...
Fix building on top of animal corpses.
Fix builders getting in the way of their own building.
This was SVN commit r8900.
2011-02-10 19:50:08 +00:00
b8925fbbc9
# Support AI construction of buildings.
...
Pass terrain passability data to AI scripts.
Expand pathfinder passability data to 16 bits per tile, to allow more
classes.
Support 16-bit ints in serializer.
Partially support JS typed arrays.
Allow foundations to be placed on top of units (fixes #499 ).
Stop farms and fishes blocking movement (fixes #534 ).
Add obstruction flags to allow finer control over what they block.
Associate entity IDs with obstruction shapes, to allow finding colliding
entities.
Support moving to the edge of a target entity with inactive obstruction.
Support foundation entities in AI.
Support playing as non-hele civs.
This was SVN commit r8899.
2011-02-10 16:06:28 +00:00
556664d477
Animation speed tweaks.
...
This was SVN commit r8898.
2011-02-09 23:26:43 +00:00
ddb7bf21f6
Temp fix to fortress_new projectile attachpoint error
...
This was SVN commit r8897.
2011-02-09 22:36:17 +00:00
c63fb49154
Added resource gathering sounds to celt and hellene females
...
This was SVN commit r8896.
2011-02-09 20:55:35 +00:00
64f02d5b47
Remove misleadingly obsolete package scripts
...
This was SVN commit r8895.
2011-02-09 16:36:08 +00:00
7a38272e55
This was SVN commit r8894.
2011-02-08 21:51:51 +00:00
ae48a18258
This was SVN commit r8893.
2011-02-08 21:51:24 +00:00
66f2bc6d57
Flip iteration order in LOS texture blur to improve performance
...
This was SVN commit r8892.
2011-02-06 11:39:06 +00:00
57e5bb878a
Initial terrible AI player scripts.
...
This was SVN commit r8891.
2011-02-05 20:35:34 +00:00
ff785853ad
Expand the selection-state box so the text can all fit in.
...
This was SVN commit r8890.
2011-02-05 20:34:11 +00:00
aa1fcfd20c
Change fog-of-war blur to use a better filter.
...
This was SVN commit r8889.
2011-02-05 18:19:28 +00:00
bf3d5c75f0
Be more robust to broken terrain property files.
...
This was SVN commit r8888.
2011-02-05 13:13:57 +00:00
caad072347
Expand pathfinder boundaries to stop units disappearing off the edge of the visible map.
...
This was SVN commit r8887.
2011-02-03 19:40:41 +00:00
02e7eb69ff
# Add solid black sides to the map, to hide underwater terrain.
...
This was SVN commit r8886.
2011-02-03 14:36:54 +00:00
c710e718aa
Windows fixes
...
This was SVN commit r8884.
2011-02-03 02:33:37 +00:00
cb78822f19
Delete some unused bits.
...
This was SVN commit r8883.
2011-02-03 01:17:16 +00:00
fe21c5e023
# Rewrite fog-of-war rendering.
...
Disable shadows when only 2 TMUs available.
Clean up some other rendering code.
This was SVN commit r8882.
2011-02-03 01:12:24 +00:00
1e02fe70a7
Add texture limits to hwdetect
...
This was SVN commit r8881.
2011-01-31 18:59:37 +00:00
81ac9285b6
This was SVN commit r8880.
2011-01-31 05:25:38 +00:00
0e0f16dedb
Template for super cav swordsmen.
...
This was SVN commit r8879.
2011-01-31 05:08:11 +00:00
18189ef4fc
Simplify terrain blend rendering to use non-indexed arrays
...
This was SVN commit r8878.
2011-01-30 14:43:35 +00:00
566bbf0fa0
Fix assertion failure when running pre-game GUI
...
This was SVN commit r8877.
2011-01-30 02:14:44 +00:00
1243fbaa8c
Fix accidental line duplication
...
This was SVN commit r8876.
2011-01-29 21:30:23 +00:00
5e618e1526
Remove redundant bounds check
...
This was SVN commit r8875.
2011-01-29 21:14:49 +00:00
6af877a1cb
Fix Windows crash caused by calling js_free (which calls free from the wrong CRT).
...
Fix some warnings.
This was SVN commit r8873.
2011-01-29 17:50:42 +00:00
03c75100ab
# Fix terrain blending logic.
...
Add terrain priority rendering mode in Atlas.
Fix terrain painting in Atlas to be less profligate with priority
values.
Support hotloading of blend textures.
Clean up some trivial things.
This was SVN commit r8872.
2011-01-29 16:31:48 +00:00
d0bc4253c9
Add new terrain blend textures.
...
Delete old low-quality ones.
This was SVN commit r8871.
2011-01-29 16:28:41 +00:00
63bd39d4a5
Fix perspective calculation in CCamera::GetScreenCoordinates.
...
Fixes #99 .
This was SVN commit r8870.
2011-01-28 21:51:59 +00:00
fd46b9e370
fixes/improvements from work:
...
file/wfilesystem: avoid error dialog when opening a file that doesn't
exist
precompiled/pch_warnings: remove push/pop that prevented our warning
disables to applying to other code. update comments
topology: refactor APIC field access and add support for constructing
APIC ID from topology
waio: add file_attribute_normal
wsysdep: slightly safer sys_generate_random_bytes implementation
This was SVN commit r8869.
2011-01-28 13:40:07 +00:00
0d8ffa58dc
AoE3Ed build fixes
...
This was SVN commit r8868.
2011-01-17 13:29:45 +00:00
c3b734775b
Simplify component interface: remove explicit context parameter, use GetSimContext() instead.
...
This was SVN commit r8867.
2011-01-16 14:08:38 +00:00
f39f279132
Add AI script code to provide a cleaner API around the engine interface.
...
Handle AIProxy entirely through scripts.
Support structured clones of script values.
Improve performance.
Support multiple script contexts sharing a runtime.
Use a separate context per AI player.
This was SVN commit r8866.
2011-01-15 23:35:20 +00:00
dd501b2a5a
# Add initial basic player AI framework.
...
Support direct access to serializer streams, so serializers can be
nested.
Make component script "this.template" read-only.
Stop globally-subscribed component scripts receiving messages posted to
local components, to reduce out-of-sync risks.
Move pathfinder data out of entity template directory.
Fix GuiInterface deserialization.
This was SVN commit r8865.
2011-01-12 12:29:00 +00:00
1051d10f54
Add "chat" command.
...
Simplify deletion of multiple entities.
Simplify some setTimeouts.
This was SVN commit r8864.
2011-01-12 12:21:41 +00:00
23a3dfe755
Fix typo in error message.
...
This was SVN commit r8863.
2011-01-12 12:19:13 +00:00
d8cd31d4b6
Add probably-unnecessary script serialization test.
...
This was SVN commit r8862.
2011-01-12 12:13:11 +00:00
19548a7379
Fix use of uninitialised variable.
...
This was SVN commit r8861.
2011-01-12 12:11:31 +00:00
0e02272fb5
#Added Hotkeys list to in-game manual, with the help of a patch by dustin_ (the hotkeys list is at the bottom of the list, and the most basic shortcuts are listed in both the Basic controls list and the hotkeys list, but I think that minor duplicate information is fine, feel free to edit if you have a better idea)
...
closes #714
This was SVN commit r8859.
2011-01-09 17:53:27 +00:00
aaef1b0d74
Add script for generating mostly-useless component interaction graphs.
...
Fix some components to use more standard syntax.
This was SVN commit r8857.
2011-01-07 20:31:48 +00:00
002e3f5606
minor fixes from work; also add sys_WideFromArgv
...
This was SVN commit r8856.
2011-01-04 19:53:38 +00:00
a0d2d89863
Fixed Cost element in template_unit_mechanical_siege_ballista template
...
This was SVN commit r8855.
2011-01-03 13:42:57 +00:00
9af7747d76
Adding necessary BuildRestrictions/Category element to some templates
...
This was SVN commit r8854.
2011-01-03 13:36:40 +00:00
75136d84d2
This was SVN commit r8853.
2011-01-03 03:10:29 +00:00
a992bd23ca
Better shuttle meat.
...
This was SVN commit r8852.
2011-01-02 13:10:01 +00:00
31effd1cb3
This was SVN commit r8851.
2011-01-02 13:09:19 +00:00
d6f82d6e8f
This was SVN commit r8850.
2011-01-02 12:16:07 +00:00
c627c4abff
This was SVN commit r8849.
2011-01-02 12:15:40 +00:00
e21ca2f64d
Fixed all Iberian actors for new simulation system, added Iberian healer (though currently without art assets).
...
This was SVN commit r8848.
2011-01-02 12:14:59 +00:00
47f9768da8
# New Roman House
...
This was SVN commit r8846.
2010-12-31 12:41:10 +00:00
2fa3c554de
Windows build fixes
...
This was SVN commit r8845.
2010-12-30 20:10:04 +00:00
40933c06e1
Primitive support for gamepad camera movement
...
This was SVN commit r8844.
2010-12-30 19:45:13 +00:00
37c1c2e9b8
One last fix
...
This was SVN commit r8843.
2010-12-28 06:20:20 +00:00
564c54c1cf
Fixed corral
...
This was SVN commit r8842.
2010-12-28 06:12:12 +00:00
1d05ed7c31
Kart corral updates
...
This was SVN commit r8841.
2010-12-27 07:23:01 +00:00
a0add039bd
New carthaginian corral
...
This was SVN commit r8840.
2010-12-27 05:24:28 +00:00
16be9799fb
Edited the about dialog to reflect the present more open development model.
...
This was SVN commit r8839.
2010-12-25 22:30:17 +00:00
95044194be
fixed where the descriptions for both Shift + WheelUp and Shift + WheelDown said the same thing, now it should be correct (please fix it if I made any mistake)
...
This was SVN commit r8838.
2010-12-23 20:48:37 +00:00
e98c18ce04
This was SVN commit r8837.
2010-12-19 17:10:19 +00:00
5e3049f6b2
BuildLimits. Needs some configuration changes to work
...
This was SVN commit r8836.
2010-12-11 23:19:17 +00:00
2fd6e2e8cc
Fix some more warnings
...
This was SVN commit r8835.
2010-12-11 12:35:50 +00:00
802f22485b
Fix some warnings on Windows
...
This was SVN commit r8834.
2010-12-11 12:33:02 +00:00
ad3f33dd27
Build fix for very old SDL
...
This was SVN commit r8833.
2010-12-11 02:25:21 +00:00
11b767e235
Stop unit deletion prompt text overlapping the window border
...
This was SVN commit r8832.
2010-12-09 22:15:23 +00:00
89b294d536
Disable compression for more UI textures with noticeable artifacts
...
This was SVN commit r8831.
2010-12-09 22:06:11 +00:00
7a9e12613d
Update release number
...
This was SVN commit r8830.
2010-12-09 18:46:56 +00:00
ba2a9d7af3
improvements from work: [update-workspaces required]
...
- split precompiled.h into several headers (simplifies reuse)
- enable additional warnings not in W4
- split ErrorReaction into ErrorReactionInternal - clarifies which
values can actually be returned by debug_DisplayError
- wsdl: slightly safer HDC usage via CS_OWNDC, avoid dipping into DC
cache via ValidateRect instead of BeginPaint; remove unused thread
create
- StdDeserializer - wasn't including byte_order => BYTE_ORDER was
undefined
- wsysdep: clean up error dialog message handling
This was SVN commit r8828.
2010-12-09 11:16:21 +00:00
78f2924f9c
Changed default maps
...
This was SVN commit r8827.
2010-12-09 01:30:51 +00:00
76a67755bc
Garrison flag for wall turret.
...
This was SVN commit r8826.
2010-12-09 00:03:19 +00:00
c7a31987bb
Moar garrison flag work.
...
This was SVN commit r8825.
2010-12-08 23:34:33 +00:00
5cf1995e2c
Fixing up some garrison flag stuff and projectile stuff.
...
This was SVN commit r8824.
2010-12-08 23:10:24 +00:00
0b511e33a7
This was SVN commit r8823.
2010-12-08 21:26:50 +00:00
be4b262919
Removed the dudes from the top of the wall gate. Made a bolt projectile for the Oxybeles.
...
This was SVN commit r8822.
2010-12-08 21:26:08 +00:00
549a4fc51a
Garrisoning bug fixes
...
This was SVN commit r8821.
2010-12-08 20:12:24 +00:00
e486e6fefb
Adjusted health/train time of the Corrals.
...
This was SVN commit r8820.
2010-12-08 19:41:12 +00:00
a80b139a28
Building tooltip tweaks for Alpha III release. These tooltips will be updated as we add more relevant features.
...
This was SVN commit r8819.
2010-12-08 19:29:48 +00:00
2cfd3abf08
This was SVN commit r8818.
2010-12-08 19:16:49 +00:00
e853dd1079
Display "garrisoned" prop on buildings containing units
...
This was SVN commit r8817.
2010-12-08 19:03:57 +00:00
2540e17f45
Fix non-PCH builds
...
This was SVN commit r8816.
2010-12-08 18:54:05 +00:00
3dc6ddc8de
Garrison unload button.
...
This was SVN commit r8815.
2010-12-08 18:46:59 +00:00
ac3e40fe8f
Disable compression for some loading screen textures, to improve quality
...
This was SVN commit r8812.
2010-12-08 16:23:35 +00:00
f04c2561b7
Various resource shuttling improvements. Fixes #672 .
...
This was SVN commit r8811.
2010-12-08 16:12:04 +00:00
0b0b11d2e0
Fix occasional assertion failure in time warp mode
...
This was SVN commit r8810.
2010-12-08 16:09:53 +00:00
e710fd25b4
Minor tweaks to game setup layout: options are now properly aligned and "locked teams" defaults to yes (which is what they are). Fix team indices on one map.
...
This was SVN commit r8809.
2010-12-08 06:19:34 +00:00
76ac9e7f84
This was SVN commit r8808.
2010-12-06 23:24:07 +00:00
0f30f08da5
This was SVN commit r8807.
2010-12-06 23:22:54 +00:00
b7240dc3fe
This was SVN commit r8806.
2010-12-06 22:50:08 +00:00
1932f695c4
Fixes #699
...
This was SVN commit r8805.
2010-12-06 21:30:56 +00:00
4f67615774
Fixes #701
...
This was SVN commit r8804.
2010-12-06 21:27:35 +00:00
8ddef2fee0
Add fast-forward/rewind commands, to help with testing.
...
This was SVN commit r8803.
2010-12-06 19:58:06 +00:00
c2f4f56ad6
Add the Demo keyword to one last map
...
This was SVN commit r8802.
2010-12-06 04:59:44 +00:00
9714b5dd53
Keyword clean-ups
...
This was SVN commit r8801.
2010-12-06 04:34:26 +00:00
6a20743dc3
Add new Keywords tag to maps. Add map list filtering API to game setup. Add some default filters that use map keywords. Cleaned up client game setup a bit. Removed deprecated GUI utility functions.
...
This was SVN commit r8800.
2010-12-06 02:51:21 +00:00
01f699b62d
Too much stuff to itemize. I'm lazy.
...
This was SVN commit r8799.
2010-12-06 02:20:57 +00:00
637b471769
Fixes bug in last change to input.js. Use target HP to determine attack possibility. Thus gaia buildings and animals are attackable, but not trees/mines/etc.
...
This was SVN commit r8798.
2010-12-05 22:00:07 +00:00
f2e1443631
Fix playtest mode in Atlas.
...
This was SVN commit r8797.
2010-12-05 21:09:20 +00:00
4eb9c898ac
Tropic Terrains completely redone.
...
This was SVN commit r8796.
2010-12-05 17:03:01 +00:00
1b9d3fc289
Fix F10 key to open session menu.
...
This was SVN commit r8795.
2010-12-05 16:02:15 +00:00
15a663b91c
New Iberian Walls
...
This was SVN commit r8794.
2010-12-05 13:30:04 +00:00
62dae2279b
Updated the map.
...
This was SVN commit r8793.
2010-12-05 12:10:03 +00:00
1201956b93
Additional cleaning up of logging: removed LOG_CATEGORY macro definitions.
...
This was SVN commit r8792.
2010-12-05 08:50:33 +00:00
19dbbb816d
Changed all references from old CLogger API to use the new API. Removed old API. Fixes #247
...
This was SVN commit r8791.
2010-12-05 08:41:55 +00:00
67f08751f9
Fixes bug where military units that can't collect resources would show an "attack" icon on hovering a resource - instead they should have a default icon
...
This was SVN commit r8790.
2010-12-05 06:34:57 +00:00
95da3789cd
Handle SDL_ACTIVEEVENT which notifies us of mouse focus change. If mouse focus is lost don't render cursor, reverting back to OS style. When focus is regained, render cursor again. Fixes #626
...
This was SVN commit r8789.
2010-12-05 05:17:28 +00:00
819bacd538
Automatically disable audio on OS X since it's stupid and broken.
...
This was SVN commit r8788.
2010-12-04 19:42:50 +00:00
5df240d97d
Disable broken GUI error reporter on OS X
...
This was SVN commit r8787.
2010-12-04 19:09:41 +00:00
53b1447007
Fix what looks like miscompilation with GCC 4.0 on OS X
...
This was SVN commit r8786.
2010-12-04 19:06:13 +00:00
4575c26616
Disable compression of public.zip ( fixes #671 ).
...
This was SVN commit r8785.
2010-12-04 15:57:55 +00:00
4b37898ab9
Fix tests.
...
This was SVN commit r8784.
2010-12-04 15:08:18 +00:00
1de0ce051f
This was SVN commit r8783.
2010-12-04 00:12:51 +00:00
74114bf09a
Handle XMB caching with the same system as texture caching.
...
Fixes #694 .
This was SVN commit r8782.
2010-12-04 00:08:26 +00:00
6e37762e3c
fix some more issues with the loading tips
...
This was SVN commit r8781.
2010-12-03 23:52:11 +00:00
83f297182e
Fix tip loading issue with pre-converted textures
...
This was SVN commit r8780.
2010-12-03 23:31:02 +00:00
6662195f66
New desert plants! Updated Death Canyon with the new plants.
...
This was SVN commit r8779.
2010-12-03 21:33:45 +00:00
238925f927
Minor garrisoning related tweaks
...
This was SVN commit r8778.
2010-12-03 20:25:21 +00:00
3b817d2162
Moved the sails from structural/ to props/ (which is what they are).
...
This was SVN commit r8777.
2010-12-03 19:22:56 +00:00
cf2638da09
This was SVN commit r8776.
2010-12-03 14:42:19 +00:00
88a21a6e8a
The Persian trireme was already in the Public mod and properly scaled. Ask next time before committing junk.
...
This was SVN commit r8775.
2010-12-03 02:37:09 +00:00
252d9b831b
Revert bogus config changes
...
This was SVN commit r8774.
2010-12-03 01:21:49 +00:00
c917a2d6a7
This was SVN commit r8773.
2010-12-03 00:42:27 +00:00
c6593fd0ce
This was SVN commit r8772.
2010-12-03 00:40:58 +00:00
ef6cba9fe9
This was SVN commit r8771.
2010-12-03 00:40:40 +00:00
e5792285ab
This was SVN commit r8770.
2010-12-02 23:58:00 +00:00
4a66605e49
This was SVN commit r8769.
2010-12-02 23:46:28 +00:00
b0dc3c72c9
This was SVN commit r8768.
2010-12-02 23:45:11 +00:00
8086433e2b
This was SVN commit r8767.
2010-12-02 23:42:59 +00:00
6b0f06f839
This was SVN commit r8766.
2010-12-02 23:42:14 +00:00
88efdd5cbb
This was SVN commit r8765.
2010-12-02 23:29:12 +00:00
a7a858b9c0
This was SVN commit r8764.
2010-12-02 23:28:31 +00:00
11f7296188
Persian Trireme updated (added detail)
...
This was SVN commit r8763.
2010-12-02 21:51:37 +00:00
da3fd69276
Iberian ship textures.
...
This was SVN commit r8762.
2010-12-02 20:08:29 +00:00
ead65712eb
Delete obsolete archbuild tool
...
This was SVN commit r8761.
2010-12-02 18:05:16 +00:00
a6ca28ccf9
Fix reference to big screenshot key (see #627 ).
...
This was SVN commit r8760.
2010-12-02 17:44:18 +00:00
f9fb602445
Iberian sail.
...
This was SVN commit r8759.
2010-12-01 18:29:24 +00:00
85d093eae1
Made a garrison flag. Added it to the Greek Civic Centre and scout Tower for testing.
...
This was SVN commit r8758.
2010-12-01 10:40:25 +00:00
1a7f927946
This was SVN commit r8757.
2010-12-01 07:33:26 +00:00
c09d6dcb83
Added garrison & repair button on the unit's command panel
...
This was SVN commit r8756.
2010-12-01 03:01:17 +00:00
1a1bed1294
This was SVN commit r8755.
2010-11-30 16:16:53 +00:00
a58e7cfb4c
Fix call to renamed function
...
This was SVN commit r8754.
2010-11-30 15:39:48 +00:00
6b4478209b
Fix accidental use of hard-coded constant.
...
Don't bother recomputing terrain speeds multiple times per turn.
This was SVN commit r8753.
2010-11-30 14:48:04 +00:00
ab186c2b16
Update UnitMotion logic, to partially simplify it.
...
Do all pathfinding asynchronously.
Recalculate paths when the target has moved.
Fix vertex pathfinder start point heuristic, to avoid finding
zero-length paths.
When units fail to reach a resource to gather, look for another resource
of the same type.
This was SVN commit r8751.
2010-11-30 12:31:54 +00:00
3401672887
Update pathfinding demo map for testing.
...
This was SVN commit r8750.
2010-11-30 12:28:51 +00:00
e509887341
Complain better about invalid player IDs.
...
This was SVN commit r8749.
2010-11-30 12:27:38 +00:00
3b405efc6b
Increase serializer reserved buffer space to cope with huge maps.
...
This was SVN commit r8748.
2010-11-30 12:24:46 +00:00
89b0f3a9d7
New session tooltip styles
...
This was SVN commit r8747.
2010-11-30 04:27:04 +00:00
103aacd035
Misc stuff.
...
This was SVN commit r8746.
2010-11-29 22:00:57 +00:00
f17d318359
Projectile for Celtic warship.
...
This was SVN commit r8745.
2010-11-29 20:19:05 +00:00
6e602c15cd
Renamed tips
...
Shorted Spartan tip text
This was SVN commit r8744.
2010-11-29 19:12:48 +00:00
f60485be02
New Hellenes Mill. Deleted old mill assets.
...
This was SVN commit r8743.
2010-11-29 17:55:22 +00:00
e4694b2d9c
updated meshes
...
This was SVN commit r8742.
2010-11-29 15:01:11 +00:00
693425c716
New Greek corral by Amish.
...
This was SVN commit r8741.
2010-11-29 14:21:19 +00:00
bee013b586
Define CONFIG_FINAL in Release builds, to enable better compression in codec_zlib.cpp
...
This was SVN commit r8740.
2010-11-29 12:51:45 +00:00
7ee0ba6e07
This was SVN commit r8739.
2010-11-29 12:12:46 +00:00
75d6eec95d
This was SVN commit r8738.
2010-11-29 08:36:35 +00:00
9b9eaed50f
This was SVN commit r8737.
2010-11-29 08:35:40 +00:00
28edb498d3
This was SVN commit r8736.
2010-11-28 19:03:23 +00:00
c922912ac5
Cleaned up loading files
...
Changed single player start game text
This was SVN commit r8735.
2010-11-28 17:27:00 +00:00
e53616f857
Fix non power-of-two middle progress bar section dimensions
...
This was SVN commit r8734.
2010-11-28 16:49:43 +00:00
8019ee8b5f
This was SVN commit r8733.
2010-11-28 16:08:58 +00:00
f06eba3da5
yet another awesome tip. :)
...
This was SVN commit r8732.
2010-11-28 14:35:48 +00:00
9ab58ce6e8
Another great "tip".
...
This was SVN commit r8731.
2010-11-28 14:22:42 +00:00
216eeea5c9
Updated the Celt ship portraits. Made an Iberian fishing boat.
...
This was SVN commit r8730.
2010-11-28 14:10:32 +00:00
31717a71ba
Removed rally command from these buildings, since they neither have garrison capacity nor do they train anything.
...
This was SVN commit r8729.
2010-11-28 13:18:35 +00:00
1ebcd2e7e3
This was SVN commit r8728.
2010-11-28 11:56:15 +00:00
4cd93b6105
This was SVN commit r8727.
2010-11-28 09:17:43 +00:00
1f02df5abc
Moved some things. Deleted other things. Updated a few maps.
...
This was SVN commit r8726.
2010-11-28 09:15:26 +00:00
7819c4707c
Moving a lot of stuff. Deleting duplicate objects.
...
This was SVN commit r8725.
2010-11-28 08:19:41 +00:00
98687bfbf6
Removing duplicate and unnecessary textures.
...
This was SVN commit r8724.
2010-11-28 08:13:25 +00:00
1b0f3498fe
Moved from Internal.
...
This was SVN commit r8723.
2010-11-28 07:54:13 +00:00
94aee121fd
Removing duplicate or unnecessary textures
...
This was SVN commit r8722.
2010-11-28 07:53:16 +00:00
3de4ed7649
Added decals to the Greek buildings.
...
Updated Saharan Oases.
New "underbrush" object.
This was SVN commit r8721.
2010-11-28 06:46:45 +00:00
6ff423e45b
changed tooltip
...
This was SVN commit r8720.
2010-11-28 04:24:25 +00:00
9837f6207f
New session dialog style
...
This was SVN commit r8719.
2010-11-28 01:39:31 +00:00
2640f4c346
Changed victory/defeat dialogs to new session dialog style
...
Changed title of exit game dialog
Only show resources carried when the quantity is greater than 1
This was SVN commit r8718.
2010-11-27 21:58:19 +00:00
e486467430
Changed delete dialog text again (to make for easier translating later)
...
This was SVN commit r8717.
2010-11-27 20:11:42 +00:00
961a50b0a2
Changed delete dialog text
...
This was SVN commit r8716.
2010-11-27 20:03:16 +00:00
0b0cd938d5
Made settings and menu use new dialog
...
Made chat and ESC hotkey interact better with the dialog
Made command icons reference individual icons rather than sheets
Removed menu object cache
This was SVN commit r8715.
2010-11-27 19:46:12 +00:00
bbe49141ec
Lots of building stuff.
...
This was SVN commit r8714.
2010-11-27 17:18:29 +00:00
3c318af2e0
Started work on new dialogs for session GUI style
...
Resized quote area in loading screen
This was SVN commit r8713.
2010-11-27 17:06:32 +00:00
c1cc8d3a19
Updating the Cycladic Archipelago map.
...
This was SVN commit r8712.
2010-11-27 12:37:23 +00:00
6c793d6663
Slightly updated greek building texture.
...
This was SVN commit r8711.
2010-11-27 12:15:42 +00:00
e30698c0c1
New Greek gymnasion by Amish. :)
...
This was SVN commit r8709.
2010-11-27 09:46:51 +00:00
bbd6f50af9
Resize quote area so that long quotes don't get cut off
...
This was SVN commit r8708.
2010-11-27 08:57:09 +00:00
51312f84c4
Add gradient to tip image
...
Resize tip images to fill out rectangle
This was SVN commit r8707.
2010-11-27 08:44:03 +00:00
ed0fe5b47b
Shrink space between tip title and message
...
This was SVN commit r8706.
2010-11-27 08:10:22 +00:00
1197d7872e
Redone tips screenshots. New shadow overlay.
...
This was SVN commit r8705.
2010-11-27 08:02:54 +00:00
9edd94f0fa
Make tip image 512x384 (inside border dimensions)
...
This was SVN commit r8704.
2010-11-27 07:59:13 +00:00
08bfe7b7f9
tweaked image sizes
...
This was SVN commit r8703.
2010-11-27 07:45:27 +00:00
55b6fbc669
4th tip. Made tip images use transparency.
...
This was SVN commit r8702.
2010-11-27 07:00:06 +00:00
8bcf6b782f
tips
...
This was SVN commit r8701.
2010-11-27 06:09:55 +00:00
90b4e85b51
New Chinese ships for a mod some of the guys are working on.
...
This was SVN commit r8700.
2010-11-27 04:56:20 +00:00
db22548ecb
New loading screen style (may need more polishing)
...
This was SVN commit r8699.
2010-11-27 03:07:48 +00:00
6d51c3a751
For Kimball, forever may he reign.
...
This was SVN commit r8698.
2010-11-26 14:13:08 +00:00
ddd2f2a193
Made Units Demo map bigger to accommodate all the entities.
...
This was SVN commit r8697.
2010-11-26 10:39:56 +00:00
e5d5a76384
This was SVN commit r8696.
2010-11-26 10:21:59 +00:00
cc3d9de386
New berry bushes. Finished Cycladic Archipelago.
...
This was SVN commit r8695.
2010-11-26 07:08:18 +00:00
5f6dce1b6e
Testing stuff for Bob.
...
This was SVN commit r8694.
2010-11-26 05:52:51 +00:00
710c32b712
New Persian sails.
...
This was SVN commit r8693.
2010-11-26 04:12:15 +00:00
959da16fdf
New texture for the Roman Quinquereme (and remapped mesh). The ekdromos now slings his shield onto his back when he throws his spears.
...
This was SVN commit r8692.
2010-11-26 03:09:23 +00:00
35344e243e
Wrinkles for the Celt sail textures.
...
This was SVN commit r8691.
2010-11-26 00:53:03 +00:00
0d0af824e7
Treasures collected counter for summary screen
...
This was SVN commit r8690.
2010-11-25 18:01:23 +00:00
f959390d0b
Mostly fix hypothetical thread/fork interaction dangers
...
This was SVN commit r8689.
2010-11-25 16:11:16 +00:00
7820c51673
#New loading screen assets.
...
This was SVN commit r8688.
2010-11-25 06:51:01 +00:00
404f7d4caa
Don't put 64-bit OS X code in the 32-bit-only file. Do put it in the 64-bit-only file.
...
This was SVN commit r8687.
2010-11-24 17:08:00 +00:00
8fe513aba5
1) Added decals to some Iberian buildings. 2) New Greek house variations. 3) skeleton eyecandy thing.
...
This was SVN commit r8686.
2010-11-24 06:04:03 +00:00
8148987e59
Added the "cheering" idle animations to the Celt super infantryman so people can see the animations that we could use for capturing buildings and leveling-up.
...
Also added a skull eyecandy object. lol
This was SVN commit r8685.
2010-11-24 03:09:16 +00:00
94dca529b1
Fix OS X build errors
...
This was SVN commit r8684.
2010-11-23 19:20:03 +00:00
5672275298
edited starting resources and teams.
...
This was SVN commit r8683.
2010-11-23 04:24:48 +00:00
180ab8a748
#New Celt ships.
...
Some new siege engines. Caution: They need a lot of work.
This was SVN commit r8682.
2010-11-23 02:54:38 +00:00
f378a63d94
Add some tests for UnitAI.
...
Fix said tests for UnitAI.
Hopefully fix #647 too.
Document HFSM interface a bit.
Add Engine.DumpSimState() console command for debugging.
This was SVN commit r8681.
2010-11-22 20:12:04 +00:00
78ae72d87a
Message to let players know formations don't work yet
...
This was SVN commit r8680.
2010-11-22 00:07:38 +00:00
e4d356c3bf
Map exploration counter for summary screen
...
This was SVN commit r8679.
2010-11-21 19:42:26 +00:00
333492b4a9
Add SetInterval to Timer.
...
Add tests for Timer.
This was SVN commit r8678.
2010-11-21 19:27:53 +00:00
fe5c7cb978
Buildings now target units randomly. Firing interval also made random
...
This was SVN commit r8677.
2010-11-21 18:41:13 +00:00
47246c8155
Fixes #572 . Changed MoveCameraToTarget so that for minimap scrolling it will ignore changes in Y position, to maintain previous zoom level as expected (constraint keeps the new view from being inappropriate)
...
This was SVN commit r8676.
2010-11-21 04:59:59 +00:00
2963422173
Add screenshot location logging w/ rendered console message. Rendered messages are hidden before screenshot is taken. Fixes #675
...
This was SVN commit r8675.
2010-11-21 01:25:16 +00:00
e7b859b8a5
Add allied victory condition to EndGameManager, defaults to true for now because we can't change teams, but later it can be changed during setup
...
This was SVN commit r8674.
2010-11-21 00:35:08 +00:00
e1fa9cd22b
Show resource subtype in GUI if main type is treasure
...
This was SVN commit r8673.
2010-11-20 22:36:04 +00:00
68a63d62c8
Displaying civ icons on summary screen, moving "Civ centres built" and "Enemy civ centres destroyed" to new "Conquest" tab
...
This was SVN commit r8671.
2010-11-20 21:42:54 +00:00
7e41f6d664
Changed treasures gathering: now units will gather treasures immediately, rather than carry resources from treasures to dropsites.
...
This was SVN commit r8670.
2010-11-20 21:37:31 +00:00
80888a7325
Avoid buffer overflow assertion failures when dumping stack trace on Windows.
...
Try to be marginally less likely to get stuck in infinite recursion.
This was SVN commit r8669.
2010-11-20 21:26:22 +00:00
ed5d91e71f
blood
...
This was SVN commit r8668.
2010-11-20 21:09:11 +00:00
35e43e133b
This was SVN commit r8667.
2010-11-20 21:06:28 +00:00
1d8972a540
Add automatic 'root' prop point when loading old PMDs
...
This was SVN commit r8666.
2010-11-20 20:16:06 +00:00
eeb9fc2145
Resized the Persian trireme a little.
...
This was SVN commit r8665.
2010-11-20 19:48:44 +00:00
fee8668887
PMDs can't use 'root' prop point, so I removed the blood prop.
...
This was SVN commit r8664.
2010-11-20 19:48:10 +00:00
c36fc2b8d7
Add script-based system for doing messy stuff based on system configuration.
...
Display warning for certain broken NVIDIA drivers.
This was SVN commit r8663.
2010-11-20 19:46:49 +00:00
2925ab4ce4
Ghosted version labels in session GUI
...
This was SVN commit r8662.
2010-11-20 17:40:54 +00:00
74c19b5015
Add xmessage-based GUI dialog box for debug messages on Linux ( fixes #663 ).
...
Switch out of fullscreen before displaying dialog boxes.
Add Engine.DebugWarn for testing.
This was SVN commit r8661.
2010-11-20 17:14:45 +00:00
e971c85da5
map tweaks
...
This was SVN commit r8660.
2010-11-20 11:50:06 +00:00
c6491b1916
Added blood to animal deaths. Muahahahahahahaha.
...
This was SVN commit r8659.
2010-11-20 09:31:14 +00:00
17e580ec42
Rate adjustment.
...
This was SVN commit r8658.
2010-11-20 07:09:20 +00:00
64bd264fc0
Attempt to fix GUI script interaction with JITs.
...
Simplify some other GUI script interface code.
This was SVN commit r8657.
2010-11-20 00:45:58 +00:00
2c8e683214
Fix toString on non-loaded sounds
...
This was SVN commit r8656.
2010-11-20 00:44:35 +00:00
ab8bb65611
Adjusting rates
...
This was SVN commit r8655.
2010-11-19 23:07:07 +00:00
a481209669
Updated the ship attacks map with the new ships.
...
This was SVN commit r8654.
2010-11-19 07:07:56 +00:00
d95a87a5c6
New islands man, work in progress.
...
This was SVN commit r8653.
2010-11-19 05:32:25 +00:00
f20a6dcfc8
Fixed bug where players would not initialize resource counts properly from scenario
...
This was SVN commit r8652.
2010-11-19 05:05:45 +00:00
f236fb7bd1
Fixed bug where gaia was not treated as attackable (fences could not be destroyed)
...
This was SVN commit r8651.
2010-11-18 23:25:42 +00:00
21acf61d69
This was SVN commit r8650.
2010-11-18 07:40:57 +00:00
ffd184fdd3
added name and description to map.
...
This was SVN commit r8649.
2010-11-18 07:09:29 +00:00
3d3720026a
Updated Saharan Oases with some more starting treasures, teams, and lower starting resources.
...
This was SVN commit r8648.
2010-11-18 07:01:35 +00:00
aa9788a40e
Fix team index bug in game setup GUI
...
This was SVN commit r8647.
2010-11-18 06:51:10 +00:00
bf295edda6
shooting fortresses
...
This was SVN commit r8646.
2010-11-18 06:16:43 +00:00
d8bc3635a2
Adjusted the desert stone.
...
Adjusted costs and other things for defensive structures.
Continued work on the Saharan Oases map.
This was SVN commit r8645.
2010-11-18 05:53:40 +00:00
12944d1fdc
removed the Corinthian trireme entity (but not the actor).
...
This was SVN commit r8644.
2010-11-18 03:00:04 +00:00
1ea07fad83
Moved basket to the female's back.
...
This was SVN commit r8643.
2010-11-18 02:27:20 +00:00
ee86e13be6
Deleted some overlapping textures. Moved Roman and Persian ships from Internal to Public.
...
This was SVN commit r8641.
2010-11-17 23:51:04 +00:00
23cb21ada4
1st of the new Greek houses. A bunch of other stuff, trying to get projectiles to work with towers. I propped a Celtic jav dude into one of the Celt towers to test propping. First graphics (borders) for a new loading screen.
...
This was SVN commit r8640.
2010-11-17 21:30:00 +00:00
f1f1a44031
Made changes to BuildingAI based on Philip's comments
...
This was SVN commit r8639.
2010-11-17 18:25:00 +00:00
f0476b61fb
Fix #476 (Use JS_New for ScriptInterface::CallConstructor)
...
This was SVN commit r8638.
2010-11-17 16:56:11 +00:00
222095fa44
Added Building AI, and some small changes to GarrisonHolder
...
This was SVN commit r8636.
2010-11-17 07:30:25 +00:00
404456ee8e
Fix int8_t redefinition errors in VC2010
...
This was SVN commit r8635.
2010-11-17 03:02:04 +00:00
f286ce0b13
Fix crash when loading zero-length config files
...
This was SVN commit r8634.
2010-11-17 01:39:14 +00:00
b13e6ae293
Fix script to rebuild SpiderMonkey properly
...
This was SVN commit r8633.
2010-11-17 00:58:10 +00:00
93861485fb
Add a script to clean up broken builds of bundled libraries
...
This was SVN commit r8632.
2010-11-17 00:50:38 +00:00
bd3bd084c0
Support new SpiderMonkey API.
...
wposix: Define int8_t compatibly with SpiderMonkey.
Remove unused camera, lightenv JS interfaces.
Remove most of vector JS interface.
Remove some of the redundant JS string conversion functions.
Remove unneeded vmem, _lodBias functions.
Clean up some formatting.
This was SVN commit r8629.
2010-11-16 23:00:52 +00:00
9c521ceb3b
Add minimum range to range queries
...
This was SVN commit r8627.
2010-11-16 20:43:15 +00:00
ccca9554c6
#Update for Saharan Oases.
...
This was SVN commit r8626.
2010-11-16 00:36:23 +00:00
b7e4b197f2
Fixed meat gathering props for the Celt spearman.
...
This was SVN commit r8625.
2010-11-15 21:28:45 +00:00
efd0b14029
Make fishing ship not gather treasure
...
This was SVN commit r8624.
2010-11-15 21:25:22 +00:00
11cf570faf
Fixed some ship problems. Edited cavalry.
...
This was SVN commit r8623.
2010-11-15 21:05:42 +00:00
13d2e44ff5
Run GC frequently in the simulation script context, to keep memory usage down
...
This was SVN commit r8622.
2010-11-15 15:03:40 +00:00
58a95ba95c
fixed meat gathering animation
...
This was SVN commit r8621.
2010-11-15 05:11:39 +00:00
70019ed81c
Made civ centres more expensive.
...
This was SVN commit r8620.
2010-11-15 04:00:55 +00:00
4328476b67
Actors variations for shuttling.
...
This was SVN commit r8619.
2010-11-15 03:48:28 +00:00
d65e47dda0
Properly center loaded resource text
...
Add attack stats to "armour" icon
This was SVN commit r8618.
2010-11-15 03:38:01 +00:00
ce085e7930
Prop point testing for the wall gate.
...
This was SVN commit r8617.
2010-11-15 02:21:27 +00:00
6a74b798ab
Support prop_ prefix in Collada files, as well as prop-
...
This was SVN commit r8616.
2010-11-15 02:18:49 +00:00
816c810791
Windows fix
...
This was SVN commit r8614.
2010-11-15 00:48:34 +00:00
4a1bc8e11a
Optimise LOS visibility updates
...
This was SVN commit r8613.
2010-11-15 00:36:15 +00:00
bfbd47ffec
Fix initial unit separation in combat demo map
...
This was SVN commit r8612.
2010-11-15 00:34:34 +00:00
e68900e5c4
New metal and stone shuttling. Test out on 'Resources Demo' map. Use spearman and cavjav.
...
This was SVN commit r8611.
2010-11-15 00:18:03 +00:00
293e5e33ec
Changed GUI mouse event handling so that button events use the mouse position at the time of the button state change. Fixed minimap message handling to respect out-of-order events. Fixes #669
...
This was SVN commit r8610.
2010-11-14 22:47:39 +00:00
6b444ea23b
Testing a wall gate to see if static prop points will work.
...
This was SVN commit r8609.
2010-11-14 22:33:02 +00:00
042972e298
Renamed "session_new" to "session"
...
This was SVN commit r8608.
2010-11-14 20:32:38 +00:00
b0e9f7197b
Once more.
...
This was SVN commit r8607.
2010-11-14 19:57:48 +00:00
577aebe467
This was SVN commit r8606.
2010-11-14 19:27:14 +00:00
51e10e185e
And again.
...
This was SVN commit r8605.
2010-11-14 19:16:37 +00:00
1fde5cd4c7
Again, with feeling.
...
This was SVN commit r8604.
2010-11-14 19:11:24 +00:00
c1c8f64f0d
Move statistics from GuiInterface.GetSimulationState to GuiInterface.GetExtendedSimulationState
...
This was SVN commit r8603.
2010-11-14 19:09:13 +00:00
15327ac40b
Added projectile dummy object to the hele Scout tower for evan.
...
This was SVN commit r8602.
2010-11-14 18:53:36 +00:00
43a4667745
Tweaking treasures. Warships no longer gather treasures. Fishing and Merchant boats have greater capacities.
...
This was SVN commit r8601.
2010-11-14 05:50:30 +00:00
90d7c0a54f
#Another prop for resource shuttling.
...
This was SVN commit r8600.
2010-11-14 04:21:39 +00:00
eab9f540af
Hacked the dock to be a dropsite. Will probably need looked at further by a programmer duder.
...
This was SVN commit r8599.
2010-11-14 02:27:54 +00:00
cbbca4d3da
Basket for shuttling grain.
...
This was SVN commit r8598.
2010-11-14 00:44:23 +00:00
62da7e1b37
The Celtic basic spearman now carries brontosaurus burgers when shuttling meat.
...
This was SVN commit r8597.
2010-11-14 00:10:23 +00:00
acc229f367
new vase food.treasure. New vase meshes. A brontoburger slab.
...
This was SVN commit r8596.
2010-11-13 23:49:50 +00:00
74ed8cf464
Adjusted size of resource icons
...
This was SVN commit r8595.
2010-11-13 22:19:17 +00:00
8798b7671c
Use separate mode when carrying meat.
...
Fix tests.
This was SVN commit r8594.
2010-11-13 21:39:39 +00:00
f4b0b72aa8
Fixed bug introduced by recent change to input.js: diplomacy is properly read to determine enemy players for attacking
...
This was SVN commit r8593.
2010-11-13 20:49:58 +00:00
58b33af168
Support X mouse buttons on Windows
...
This was SVN commit r8591.
2010-11-13 19:51:15 +00:00
10820ae3f8
Add a map for some resource testing
...
This was SVN commit r8590.
2010-11-13 19:16:16 +00:00
4100a13e0a
# Add resource shuttling.
...
Add resource-carrying animations/props to an actor for testing.
Warn more quietly about invalid cursor names.
This was SVN commit r8589.
2010-11-13 19:15:29 +00:00
6325a1eafe
Adjusting build times.
...
This was SVN commit r8588.
2010-11-13 06:27:00 +00:00
2b70b43086
Based selection groups off of a new tag which must contain a valid template name.
...
<SelectionGroupName>unit_template_name_b</SelectionGroupName>
This was SVN commit r8587.
2010-11-13 05:35:40 +00:00
af4c2c091d
Removed stone_light. Adjusted the footprint of the field entity.
...
This was SVN commit r8586.
2010-11-13 04:19:09 +00:00
6c7f9f7b8d
#Treasure objects.
...
This was SVN commit r8585.
2010-11-13 03:44:38 +00:00
513ff50926
Food treasures.
...
This was SVN commit r8584.
2010-11-13 02:57:04 +00:00
3cefbbe253
Modified UnitAI to respect diplomatic status of players, allies can no longer be attacked, and fixed some related bugs in player init
...
This was SVN commit r8583.
2010-11-13 02:36:53 +00:00
25cd781641
Support horizontal scroll wheels for camera rotation
...
This was SVN commit r8582.
2010-11-13 01:00:54 +00:00
e1aaedcc32
Alternate Persian emblems.
...
This was SVN commit r8581.
2010-11-13 00:35:18 +00:00
490574bc03
Emblems
...
This was SVN commit r8578.
2010-11-12 23:37:56 +00:00
36d7ef65a6
Treasure/Ruins tweaks and additions.
...
This was SVN commit r8577.
2010-11-12 22:31:19 +00:00
245f29b798
Summary screen. Closes #638 .
...
This was SVN commit r8576.
2010-11-12 22:24:49 +00:00
6c3368886b
Bigger Iberian emblem.
...
This was SVN commit r8575.
2010-11-12 19:05:30 +00:00
ff3c7b46f4
Added food.treasure, wood.treasure, stone.treasure, wood.ruins, stone.ruins
...
Added placeholder cursor for ruins
Added entities for testing these types
This was SVN commit r8574.
2010-11-12 18:58:33 +00:00
52ad8a836d
New idle animation for the Greek archers.
...
Some updated faction emblems.
A new Metal portrait.
This was SVN commit r8573.
2010-11-12 05:33:12 +00:00
75eb6847af
Shield tweaks.
...
This was SVN commit r8572.
2010-11-12 04:34:46 +00:00
f3c5a2383b
#Some cool new treasure objects. Lots of map tweaks as well.
...
Added treasure gathering for ships. It would be cool to have
food.treasure, wood.treasure, and stone.treasure gathering types in
addition to the current metal.treasure.
This was SVN commit r8571.
2010-11-12 03:08:23 +00:00
6cb66b7ef1
Moved from Internal
...
This was SVN commit r8570.
2010-11-12 01:08:53 +00:00
1a1f7caee1
Moved to Public.
...
This was SVN commit r8569.
2010-11-12 01:08:17 +00:00
46bde9969e
Made a "poleis" branch emblem sprite.
...
This was SVN commit r8568.
2010-11-11 19:50:06 +00:00
4dc5766273
New Celt emblem
...
This was SVN commit r8567.
2010-11-11 19:39:48 +00:00
c5f0b5d7be
Hide the lower session panel if nothing is selected
...
This was SVN commit r8566.
2010-11-11 16:00:53 +00:00
83285504cb
Disable RTTI in test project, for consistency
...
This was SVN commit r8565.
2010-11-10 15:26:29 +00:00
8494a5bc4c
Moar tweaking.
...
This was SVN commit r8564.
2010-11-10 02:58:33 +00:00
0036f1ce9c
Map tweaks.
...
This was SVN commit r8563.
2010-11-10 02:48:33 +00:00
f452c79e46
Fixed civ for Hellenic Buildings. Continued work on Belgian Bog.
...
This was SVN commit r8562.
2010-11-09 14:44:03 +00:00
7d26b8eefd
Roman civ sprite
...
This was SVN commit r8561.
2010-11-08 23:52:44 +00:00
c03c2f0168
Fixed hoplite prop switching (heads) when gathering meat.
...
Tweaked maps.
New "Bog" map, w.i.p.
Tweaked ship health.
This was SVN commit r8560.
2010-11-08 23:40:45 +00:00
dde2cd38be
Show Population Cost in unit training buttons
...
Show Population Bonus in unit construction buttons
This was SVN commit r8559.
2010-11-08 23:23:52 +00:00
6e74c53ee9
fix file/dir mode bits
...
fixes #648
also fix self-test on ICC 12
This was SVN commit r8558.
2010-11-08 15:02:05 +00:00
0517d41275
Removed extraneous cancel button from multiplayer setup dialogs
...
Adjusted the right side of the bottom panel in the session GUI
Renamed "dev console" to "dev overlay" in the chat message to be more
consistent
This was SVN commit r8557.
2010-11-08 14:49:40 +00:00
6935a03743
remove no-longer needed GLU dependency; avoids delay-load warning.
...
This was SVN commit r8555.
2010-11-08 10:42:34 +00:00
24f1a00190
avoid setting executable bit in files/dirs we create
...
thanks to fabio for reporting + a suggested fix.
fixes #648
This was SVN commit r8554.
2010-11-08 10:39:52 +00:00
6b4d5091b3
fixes from work: use ICC bswap intrinsics instead of fallbacks; update UNUSED2 to work with ICC; update mahaf for Win7
...
This was SVN commit r8553.
2010-11-08 10:01:12 +00:00
9c53fda749
Misc. art stuff.
...
This was SVN commit r8552.
2010-11-08 00:36:34 +00:00
85fc7cae52
Cleaning up the props.
...
This was SVN commit r8551.
2010-11-08 00:23:06 +00:00
323cda17c3
cleaning
...
This was SVN commit r8550.
2010-11-07 23:57:04 +00:00
ffa6c14a24
More cleaning.
...
This was SVN commit r8549.
2010-11-07 23:51:46 +00:00
a7059092cb
cleaning
...
This was SVN commit r8548.
2010-11-07 23:40:48 +00:00
dafc0e6dbd
This was SVN commit r8547.
2010-11-07 23:32:02 +00:00
e43eb0c18b
# Various hotkey fixes and cleanups.
...
Support ctrl for removing entities from selection.
Move big screenshot hotkey to shift+F2.
Increase mouse wheel rotation speed.
Fix HotkeyIsPressed when a more specific hotkey was matched instead.
Support multiple hotkeys with the same binding.
Use hotkeys instead of raw key events in GUI.
Delete some obsolete hotkey definitions.
Remove unused broken EntitySelection toggle method.
This was SVN commit r8546.
2010-11-07 20:42:52 +00:00
a13836bd68
safely handle zero-sized XMB files ensuing from a crash while loading
...
fixes #662
This was SVN commit r8545.
2010-11-07 16:14:13 +00:00
644b9aedea
# Add double-click and triple-click selection modes, based on patch by Christoph and evans.
...
Fixes #515 .
This was SVN commit r8544.
2010-11-07 00:12:55 +00:00
f45c74c368
thread-safety fixes to debug.cpp - most functions were already reentrant, just CAS-ified the assert suppression flags.
...
(NB: the debug_filter stuff remains non-reentrant because it's usually
only called from main() or at least the main thread)
closes #654
This was SVN commit r8543.
2010-11-06 19:14:16 +00:00
3407983e98
remove no-longer needed (and non-reentrant) MICROLOG as per today's meeting
...
This was SVN commit r8542.
2010-11-06 19:11:40 +00:00
b4d6ad9f0b
Template fixes and tweaks. Gave ships larger Health bars. Fixed some range things with ranged units.
...
This was SVN commit r8541.
2010-11-06 18:45:42 +00:00
43665f09c5
Fixed some template stuff.
...
This was SVN commit r8540.
2010-11-06 17:52:30 +00:00
741477926c
Make the minimap fit completely inside the border when in circular mode (to prevent units from sneaking around behind the rim)
...
This was SVN commit r8539.
2010-11-06 02:13:40 +00:00
e7b5f9eeb9
Allow up to 24 construction or training buttons
...
Add tooltip of generic name back to the unit name
Move civ name to player name tooltip
Make player name colored with the player color again
This was SVN commit r8538.
2010-11-06 01:55:29 +00:00
c1daf9a9bc
This was SVN commit r8537.
2010-11-05 13:22:06 +00:00
4f4c19be85
new portraits
...
This was SVN commit r8536.
2010-11-05 13:17:30 +00:00
c2bafa78cb
A bunch of stuff.
...
This was SVN commit r8535.
2010-11-04 23:51:42 +00:00
dbcd004844
Fix player assignments on map change (number of players may decrease, knocking assigned players out of a slot). Fixes #655
...
This was SVN commit r8534.
2010-11-04 20:34:29 +00:00
4a9ae1de17
Touched up Hellenised Egypt and Massacre of Delphi. Overhaul and completion of 'Median Oasis.' -- Check it out!
...
This was SVN commit r8533.
2010-11-04 20:30:13 +00:00
31f263d688
This was SVN commit r8532.
2010-11-04 01:07:00 +00:00
b3f2363c2d
Altered the "generic name" of the Cretan Archer from "Infantry Archer" to "Mercenary Infantry Archer" to emphasize the reason they cost only Metal.
...
This was SVN commit r8531.
2010-11-04 01:06:00 +00:00
3ebbd8a9ce
tweaks on these buildings to make them buildable under certain circumstances.
...
This was SVN commit r8530.
2010-11-04 00:53:15 +00:00
0b48fc0484
Added costs to these buildings.
...
This was SVN commit r8529.
2010-11-03 23:42:41 +00:00
818ea52c3b
Delete obsolete non-working i18n code
...
This was SVN commit r8527.
2010-11-03 17:52:07 +00:00
ec5d4a9f9e
Attempt to fix build error with intrinsics on 32-bit Linux
...
This was SVN commit r8526.
2010-11-03 02:06:38 +00:00
81f5e0ac5f
Allow continuing playing when a client leaves a multiplayer game ( fixes #620 ).
...
Fix multiplayer autostart.
Make NETTURN_LOG syntax differently ugly.
This was SVN commit r8525.
2010-11-03 00:21:52 +00:00
786279fb95
New minimap circle.
...
This was SVN commit r8524.
2010-11-02 17:08:50 +00:00
2186ac8e76
Tweaked blank giant map in Internal folder. Updated a few Mediterranean terrains. A Creative Commons object. A generic Gaia "field" object. Humpback Whale.
...
This was SVN commit r8523.
2010-11-02 16:26:06 +00:00
947ce01f68
Got rid of the whale entities giving an error.
...
This was SVN commit r8522.
2010-11-02 16:21:51 +00:00
383cf7b220
cleanup:
...
use intrinsics for cpu_AtomicAdd and cpu_CAS, get rid of the
corresponding assembly implementations. (wrapper functions are necessary
at work because mere declarations aren't enough to export the functions
from DLL)
also remove no longer needed fminf
This was SVN commit r8521.
2010-11-02 13:38:56 +00:00
540925aa32
Add a rubbish experimental FPS camera view
...
This was SVN commit r8520.
2010-11-01 21:40:29 +00:00
1b9f198520
Deleted the whale. It is an interesting experiment whose time has not come yet (needs some new attack code for units and possibly unitAI for attacking units).
...
This was SVN commit r8519.
2010-11-01 16:29:05 +00:00
6351102705
trying to create a 'whale' object that moves around and must be killed first (probably by warships). Then fishing boats can gather from it. I get an error though when I try to place it in Atlas. Can someone take a look at it for me? <3
...
This was SVN commit r8518.
2010-11-01 15:22:43 +00:00
52851faeb6
cleanup - remove old cpu_memcpy and cpu_i64FromDouble that are no longer needed
...
This was SVN commit r8517.
2010-11-01 11:09:03 +00:00
b27d6d38e3
thread-safe timer monotonicity check. fixes #653
...
(agree that DBL_EPSILON is an unnecessary hack, since division by
(t+eps)-(t) will yield a number not much more useful than infinity)
This was SVN commit r8516.
2010-11-01 10:19:22 +00:00
657ec9aa45
WIP timer thread safety:
...
CAS functions now implemented directly in external asm files (avoids
wrapper functions)
reinstated cpu_CAS64 (checking ARCH_IA32 at every call site is onerous)
(temporarily disable timer monotonicity check)
This was SVN commit r8515.
2010-11-01 09:54:03 +00:00
2b9774aa05
fix: alt+enter -> resize window -> maximize window failed to generate a resize event
...
This was SVN commit r8514.
2010-11-01 09:04:55 +00:00
aefc87f226
Windows fixes
...
This was SVN commit r8513.
2010-10-31 22:26:41 +00:00
602b99c397
Fix water rendering in "reveal map" mode.
...
This was SVN commit r8512.
2010-10-31 22:07:57 +00:00
5d764f1435
Run network server in a separate thread, to minimise latency.
...
Make some parts of logger and console thread-safe.
Simplify console: remove special commands; remove prefix for script
commands.
Remove LOG_ONCE, to simplify logger.
Change some code to use the new logger interface.
Fix OOS when revealing map.
Clean up some formatting.
This was SVN commit r8511.
2010-10-31 22:00:28 +00:00
034504f536
Remove misleading wposix declaration of unimplemented gettimeofday.
...
This was SVN commit r8510.
2010-10-31 21:58:30 +00:00
5b1f0b2b19
Tweaked the map description.
...
This was SVN commit r8509.
2010-10-31 18:47:51 +00:00
909d9d84cb
Work in progress--Acropolis 256 Radius map.
...
This was SVN commit r8508.
2010-10-31 18:33:02 +00:00
94a57d141a
This was SVN commit r8507.
2010-10-31 15:17:27 +00:00
491f4592a7
This was SVN commit r8506.
2010-10-31 15:00:28 +00:00
62c90b5dc4
Fix tests
...
This was SVN commit r8504.
2010-10-31 00:29:29 +00:00
a952767f48
Changed the disabled state messages for some menu buttons, they were a bit rough for a public release imho
...
This was SVN commit r8503.
2010-10-31 00:16:33 +00:00
8dc7eca77a
Autobuilder fixes
...
This was SVN commit r8502.
2010-10-30 20:39:23 +00:00
1840bb3507
Stop units walking outside the edges of circular maps.
...
Switch the GUI between square/circular minimap automatically.
This was SVN commit r8500.
2010-10-30 18:25:34 +00:00
21b0504ca5
Adding the missing player_defaults.json for #590
...
This was SVN commit r8499.
2010-10-30 18:07:31 +00:00
10c5dbcba4
Fix Atlas and autostart.
...
Fix non-POD in varargs.
Remove misleading max_players config variable (the engine doesn't care
about it, all the limits are hard-coded).
Remove civ-center-based player civ initialisation hack.
Add dummy player_defaults.json.
Clean up formatting a bit.
This was SVN commit r8498.
2010-10-30 13:27:23 +00:00
d6bf303740
Clean up line endings
...
This was SVN commit r8497.
2010-10-30 12:22:18 +00:00
5567727bd1
New maps get player data per #590 , and some minor bugfixes
...
This was SVN commit r8496.
2010-10-30 05:19:55 +00:00
22672e69d9
Info icons for #590
...
This was SVN commit r8495.
2010-10-30 04:17:01 +00:00
9ee44bd9b8
Game setup changes, including showing name, civ, team, and some options loaded from the scenarios. Civ data added. Civ info window to preview civs. Icon tooltips. Support for random map implementation. Fixes #590 .
...
This was SVN commit r8494.
2010-10-30 04:02:42 +00:00
0b978d5e26
hacked in the attack for Persian trireme too.
...
This was SVN commit r8493.
2010-10-29 22:20:20 +00:00
fcf9fbf10d
Hacked in some ship ranged attacks to play with.
...
This was SVN commit r8492.
2010-10-29 22:18:25 +00:00
97019c3a5a
Fix launching Atlas from the main menu
...
This was SVN commit r8491.
2010-10-29 21:04:59 +00:00
4f452eccde
This was SVN commit r8490.
2010-10-29 20:14:37 +00:00
4b8fcaa135
Garrisoning for ships. This is only temporary for play-testing until final garrisoning code is implemented.
...
This was SVN commit r8489.
2010-10-29 20:14:09 +00:00
70cfff0f05
started work on Median Oasis. Fixed the fact that the Celtic special building cost zero (!) resources. A "slight" oversight.
...
This was SVN commit r8488.
2010-10-29 16:55:14 +00:00
dd5ff36363
Fix Linux build error ( fixes #651 ).
...
This was SVN commit r8487.
2010-10-29 15:48:46 +00:00
0c3d69ae29
fixes from work: clarify that cpu_MemoryBarrier has no runtime cost by renaming to COMPILER_FENCE and moving to code_annotation.h; fix 32-bit Parallel Studio 2011 warning.
...
This was SVN commit r8486.
2010-10-29 12:54:51 +00:00
8f532b81cd
Fixed oasis map AGAIN. Fixed names of some units. Slave template.
...
This was SVN commit r8485.
2010-10-28 14:22:27 +00:00
825bbf8f51
parallel studio 2011 warning fixes
...
This was SVN commit r8484.
2010-10-28 12:22:11 +00:00
af235da6f4
#Updated Greek trading ship with cargo. Split up 3 dozen UI icons into their individual files. Began testing an idea discussed in the irc chat room.
...
This was SVN commit r8483.
2010-10-28 12:22:04 +00:00
12bea99ea1
Fixed some purple blobs.
...
This was SVN commit r8482.
2010-10-28 06:19:50 +00:00
c5b5fa8e6f
Fixed the purple blobs.
...
This was SVN commit r8481.
2010-10-27 20:21:47 +00:00
6576b64ce0
Cleaning up the field entities.
...
This was SVN commit r8480.
2010-10-27 11:10:34 +00:00
c6c1b2b549
This was SVN commit r8479.
2010-10-27 10:35:58 +00:00
93cd028616
Moar portrait stuff. Fixed the Persian Super Cavalry to align with the new Persian civ profile. Moved War Elephant to editor object.
...
This was SVN commit r8478.
2010-10-27 08:16:26 +00:00
7120014451
This was SVN commit r8477.
2010-10-27 06:22:29 +00:00
5db9465b25
A bunch of new portraits. The hero portraits are just temp until they are painted.
...
This was SVN commit r8476.
2010-10-27 05:49:04 +00:00
45a99a393d
New Greek merchant ship. Model is not final though.
...
This was SVN commit r8475.
2010-10-27 02:16:45 +00:00
7d7127a1bb
Scaled down the Roman Quinquereme.
...
This was SVN commit r8474.
2010-10-26 16:21:51 +00:00
728e03cee2
This was SVN commit r8473.
2010-10-26 11:34:34 +00:00
64b9824d5a
tweaks
...
This was SVN commit r8472.
2010-10-26 11:31:33 +00:00
f4b27e22b0
A bunch of new portraits. I fixed Waypoint Flag so that it floats on water. Edited Miletus map.
...
This was SVN commit r8471.
2010-10-26 09:46:05 +00:00
02aa8499ed
Partial experimental version of circular maps
...
This was SVN commit r8470.
2010-10-25 21:59:52 +00:00
09b2a4ade8
#Starting some work on Carthage.
...
This was SVN commit r8469.
2010-10-25 17:09:23 +00:00
b053bc846b
Fixed a stat error.
...
This was SVN commit r8468.
2010-10-25 12:18:28 +00:00
cb859d15da
This was SVN commit r8467.
2010-10-25 12:10:11 +00:00
6a024a86b9
Rudimentary ship stats.
...
This was SVN commit r8466.
2010-10-25 11:07:29 +00:00
ecf1e0556e
This was SVN commit r8465.
2010-10-25 10:26:58 +00:00
4deaa14456
added descriptions to maps.
...
This was SVN commit r8464.
2010-10-25 10:25:55 +00:00
791c4f52fa
Continued unit balancing. Edited actor projectiles animation times, etc.
...
This was SVN commit r8462.
2010-10-25 10:01:01 +00:00
504eb3b12b
This was SVN commit r8461.
2010-10-25 04:29:15 +00:00
7492f458e0
Allow garrisoning of siege weapons in the Fortress
...
Civil Center can now hold 20 units
Temple can now garrison units (15)
This was SVN commit r8460.
2010-10-25 04:21:18 +00:00
b680e95e25
New epic Greek temple, primarily for eye candy. UV mapped by Amish.
...
This was SVN commit r8459.
2010-10-25 04:10:25 +00:00
6373c2cfcb
Made GUI always visible
...
Adjusted size of icon buttons in the session GUI
Allowed support units to garrison in watch towers
This was SVN commit r8458.
2010-10-24 23:40:09 +00:00
b100ba5a08
Show a 1 when only a single unit remains garrisoned (re-fixes #610 )
...
This was SVN commit r8457.
2010-10-24 18:01:11 +00:00
2b2cac2a8d
Fix tests
...
This was SVN commit r8456.
2010-10-24 12:37:55 +00:00
dcd7211d34
Re-exported Greek Civic Centre to remove some of the vases (seemed cluttered before), and to make player color more prominent. Gave ships farther vision.
...
This was SVN commit r8455.
2010-10-24 10:05:28 +00:00
ec27e78e60
Clear out the displayed garrison quantity number if no units are garrisoned
...
This was SVN commit r8454.
2010-10-24 01:32:35 +00:00
3521c8f51e
Made garrisoning based on the quantity of units, not the population cost of those units.
...
This was SVN commit r8453.
2010-10-24 01:14:34 +00:00
7f52ca875b
Made Celtic heroes inherit from a specific type of hero, instead of a generic hero
...
This was SVN commit r8452.
2010-10-23 22:53:33 +00:00
0aaddf62aa
Garrisoning for buildings based on patch by Evans ( fixes #610 )
...
This was SVN commit r8451.
2010-10-23 22:43:15 +00:00
bcc5c87045
Fix bandbox selection of out-of-world entities
...
This was SVN commit r8450.
2010-10-23 21:48:18 +00:00
e13196e7a2
Fix serialization of most components
...
This was SVN commit r8449.
2010-10-23 19:59:40 +00:00
73286885d9
Fix race condition when enabling S3TC in Atlas
...
This was SVN commit r8448.
2010-10-23 19:58:45 +00:00
6d0e59c0a3
Fixed ownership of some trees.
...
This was SVN commit r8447.
2010-10-23 08:31:00 +00:00
a6925ded91
Moar animal portraits. Stock or CC where possible.
...
This was SVN commit r8446.
2010-10-23 07:58:33 +00:00
eb2e2c4244
Some updated portraits.
...
This was SVN commit r8445.
2010-10-23 07:49:31 +00:00
9e499cdec5
# Fix hotkey bugs.
...
Simplify hotkey system to use strings consistently.
Restrict scope of GUI hotkey bindings to the associated page.
Avoid hard-coding list of hotkeys.
Clean up the code a little bit and fix some bugs.
Remove unused "!" prefix for key negation.
Fixes #567 .
This was SVN commit r8444.
2010-10-23 02:37:00 +00:00
f6154b0d89
Temp portraits for public Roman units.
...
This was SVN commit r8443.
2010-10-23 01:28:35 +00:00
cf2ce4870e
This was SVN commit r8442.
2010-10-23 01:13:56 +00:00
9de72d1d19
Fix internal icons too
...
This was SVN commit r8441.
2010-10-22 23:28:57 +00:00
24fb9cd313
Split unit icon sheets into individual textures, for easier editing
...
This was SVN commit r8440.
2010-10-22 23:27:42 +00:00
e8000c7a90
This was SVN commit r8439.
2010-10-22 10:52:35 +00:00
9227eeb5ec
Block wall texture for giant Greek temple.
...
This was SVN commit r8438.
2010-10-22 10:10:43 +00:00
8ddb6f98a4
This was SVN commit r8437.
2010-10-22 10:06:10 +00:00
4a9292b2e3
This was SVN commit r8436.
2010-10-22 04:27:25 +00:00
c15d777762
#Editing stats for Super Cavalry and special Roman units.
...
This was SVN commit r8435.
2010-10-22 04:02:48 +00:00
eba84f32f6
Updating Super Infantry templates.
...
This was SVN commit r8434.
2010-10-22 02:32:03 +00:00
3eed24a338
Fix Mesa S3TC-enabling to work in Atlas
...
This was SVN commit r8433.
2010-10-21 23:44:54 +00:00
48121bcef6
Icon portraits at 128x128 please.
...
This was SVN commit r8432.
2010-10-21 23:09:44 +00:00
eb8ca841cd
Add special "colour:r g b a" sprite syntax to GUI. Fixes #616 , based on patch from historic_bruno.
...
This was SVN commit r8431.
2010-10-21 21:22:40 +00:00
e188683bab
Preserve cursor-grabbing across alt-tabs on Windows (probably fixes #508 ).
...
This was SVN commit r8430.
2010-10-21 21:09:41 +00:00
a596323ea6
Avoid bogus GCC warnings about uninitialised values
...
This was SVN commit r8429.
2010-10-21 20:33:27 +00:00
c0a7a36f7a
Use JSFastNative API in more places, for improved compatibility with future SpiderMonkey versions.
...
Remove some unnecessary script-exposed functions, and move some more
into the Engine namespace.
This was SVN commit r8428.
2010-10-21 19:54:59 +00:00
55741aed44
This was SVN commit r8427.
2010-10-21 15:11:26 +00:00
06b3457c5f
This was SVN commit r8426.
2010-10-21 10:24:25 +00:00
faacb80004
This was SVN commit r8425.
2010-10-21 10:20:56 +00:00
c78c16d607
two new portrait icons
...
This was SVN commit r8424.
2010-10-21 10:12:17 +00:00
d6720e00a4
Tweaked animation speeds for new Roman units.
...
This was SVN commit r8423.
2010-10-21 09:15:40 +00:00
fdb002a334
This was SVN commit r8422.
2010-10-21 09:04:06 +00:00
aade0de3b4
This was SVN commit r8420.
2010-10-21 09:00:30 +00:00
5e84f57a04
Moved 3 special Roman units from Internal to Public (hopefully this will quell the calls for more Roman material for a while). Made 2 new Super Unit templates for ease of balancing (more of these later, and more on this later).
...
This was SVN commit r8419.
2010-10-21 08:56:42 +00:00
2cd62a04d2
This was SVN commit r8418.
2010-10-21 08:24:00 +00:00
c34aa82c5d
This was SVN commit r8417.
2010-10-21 08:23:31 +00:00
a99005976d
Messing with stats. Made a roof tile texture for the giant Greek temple that will soon be coming.
...
This was SVN commit r8416.
2010-10-20 09:07:44 +00:00
ceb5dd1dfd
Wood texture looks less like chocolate cake.
...
This was SVN commit r8415.
2010-10-20 00:26:56 +00:00
4256055f58
#Brand new Celtic Market. Unit entity tweaks. Starting to re-balance units. New table and bench eyecandy objects.
...
This was SVN commit r8414.
2010-10-19 10:04:33 +00:00
Itms
