Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity
13,807 Commits 1 Branch 28 Tags 13 GiB
0f0f4f7b03
Commit Graph

5533 Commits

Author SHA1 Message Date
historic_bruno
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
historic_bruno
60d92b643d Fixes some unused variables in Atlas 
This was SVN commit r15746.
 2014-09-13 19:34:04 +00:00
historic_bruno
01395ce96d Fixes clang warning about hidden overloaded virtual function 
This was SVN commit r15745.
 2014-09-13 19:06:55 +00:00
historic_bruno
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
leper
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
leper
134e3c84b0 Clean up some code. 
Fixes linker error on OSX.

This was SVN commit r15735.
 2014-09-12 21:45:30 +00:00
Itms
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
Itms
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
historic_bruno
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
historic_bruno
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
historic_bruno
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
historic_bruno
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
historic_bruno
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
mimo
7ce9097d1c small cleaning of d0472b021b 
This was SVN commit r15710.
 2014-09-07 10:28:18 +00:00
Itms
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
historic_bruno
69bd930219 Excludes debug DLLs from Windows installer, fixes #855 
This was SVN commit r15697.
 2014-09-01 01:44:10 +00:00
Itms
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
Itms
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
Itms
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
leper
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
leper
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
leper
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
leper
c5c394fd17 Fix some disabled tests. 
This was SVN commit r15673.
 2014-08-24 15:29:53 +00:00
leper
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
leper
12771edb0e Delete dynamic message subscriptions on simulation reset. 
This was SVN commit r15646.
 2014-08-16 01:23:50 +00:00
wraitii
a4df483f60 Forgot to make a variable unused. 
This was SVN commit r15631.
 2014-08-13 14:52:38 +00:00
wraitii
0b385384aa Fix terrain overlay rendering after water. 
This was SVN commit r15628.
 2014-08-12 15:58:03 +00:00
Yves
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
Yves
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
Yves
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
Yves
8ce8e6ba9a Exact stack rooting for IGUIObject. 
Refs #2415
Refs #2462

This was SVN commit r15623.
 2014-08-08 13:41:47 +00:00
Yves
9872f5741f Exact stack rooting for ScriptInterface::FreezeObject. 
Refs #2415

This was SVN commit r15622.
 2014-08-08 11:59:49 +00:00
wraitii
403b3b68af Fix some errors in WaterManager. 
This was SVN commit r15620.
 2014-08-06 15:24:38 +00:00
leper
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
leper
5ae040ea54 Fix non-PCH build. 
This was SVN commit r15618.
 2014-08-06 13:23:02 +00:00
wraitii
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
Yves
c662a4e9e9 Fixes #2713 
This was SVN commit r15615.
 2014-08-05 19:03:10 +00:00
Itms
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.

As a temporary adjustment, territories do not explore the map anymore
when their borders change. See #2709.

Fixes #599

This was SVN commit r15612.
 2014-08-04 22:49:19 +00:00
Yves
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
JoshuaJB
30fa275f9d Fixed some keys not being recognized after a719696658. Refs #195. 
This was SVN commit r15610.
 2014-08-04 16:48:54 +00:00
JoshuaJB
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
Yves
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
Yves
f4d62152e7 Exact stack rooting for GetClass and GetPrivate. 
Refs #2415

This was SVN commit r15606.
 2014-08-03 17:53:21 +00:00
Yves
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
Yves
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
Yves
c818b8e475 Exact rooting for CallConstructor. 
Refs #2415
Refs #2462

This was SVN commit r15601.
 2014-08-02 16:30:15 +00:00
Yves
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
wraitii
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
Yves
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
wraitii
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