Commit Graph

12705 Commits

Author SHA1 Message Date
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 4b1297b328 and will have to be updated for
the new SpiderMonkey API.
I only uncomment it at the moment because I plan to fix/reimplement it
soon after the upgrade.

Closes #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.

Refs #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.

Refs #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