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
