Commit Graph

13886 Commits

Author SHA1 Message Date
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
cd5de73f3a.

Patch by dan@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