Commit graph

1492 commits

Author SHA1 Message Date
elexis
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
elexis
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
elexis
ca9d06d6ad Correct handling of replays with no turns or only turn 0.
Add a comment for 3ec3f0b160.
Some style fixes.

This was SVN commit r17746.
2016-02-09 12:09:17 +00:00
mimo
ca19d42a68 fix typos in renderer's initialization, refs #3737
This was SVN commit r17744.
2016-02-08 18:27:56 +00:00
mimo
a9de2bf397 cleanup of 971d70fa99
This was SVN commit r17741.
2016-02-07 19:06:15 +00:00
mimo
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
mimo
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
mimo
26f7a3df96 init configDB with renderer initial values, refs #3737
This was SVN commit r17737.
2016-02-07 11:24:09 +00:00
mimo
bb8ceba632 completes f34dc412b6 for non visual replays, refs #3751
This was SVN commit r17711.
2016-01-25 20:37:26 +00:00
elexis
e683751b4f Delete code which became obsolete with 56bb858802.
This was SVN commit r17708.
2016-01-25 09:57:33 +00:00
Yves
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
historic_bruno
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
elexis
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
leper
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
mimo
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
Yves
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
Yves
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
elexis
9f65e90b60 Fix wrong errormessage in case of encountering a broken replay.
This was SVN commit r17567.
2015-12-29 14:00:30 +00:00
fabio
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
fabio
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
fabio
9a2d0f803e Remove disabled by default SDL1 support.
Refs #2041.

This was SVN commit r17470.
2015-12-14 10:52:21 +00:00
wraitii
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
fabio
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
fabio
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
elexis
780a1de136 Don't comment out code. Refs #3486.
This was SVN commit r17400.
2015-12-07 12:27:52 +00:00
elexis
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
elexis
2e69872b11 Remove debug parser from replay menu. Refs #3440
This was SVN commit r17367.
2015-12-03 03:12:43 +00:00
elexis
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
fabio
418318ea88 Properly read preferglsl in user config files.
This was SVN commit r17347.
2015-12-01 09:00:12 +00:00
fabio
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
elexis
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
leper
9a40d1284e Update version numbers. Switch lobby room.
This was SVN commit r17299.
2015-11-28 08:27:33 +00:00
wraitii
05547bf36f Fix an oversight.
This was SVN commit r17182.
2015-11-05 16:52:19 +00:00
JoshuaJB
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
wraitii
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
wraitii
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
mimo
9db4fb5ddb fix typo in Game.cpp
This was SVN commit r17126.
2015-10-11 11:12:27 +00:00
historic_bruno
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
leper
061c7f6058 Const ref.
This was SVN commit r17090.
2015-09-30 20:28:23 +00:00
Itms
b830233498 Fix previous commit, some new files didn't pass through.
This was SVN commit r17055.
2015-09-21 17:14:26 +00:00
Itms
d64b95b28c An awesome Visual Replay menu, made by elexis. Fixes #3258.
This was SVN commit r17054.
2015-09-21 17:00:21 +00:00
mimo
3317e6c68b rename autostart visualreplay, refs #3258, patch by elexis
This was SVN commit r17050.
2015-09-20 12:29:59 +00:00
leper
a65a8472f9 Mark some const functions as such.
This was SVN commit r17021.
2015-09-13 20:59:10 +00:00
mimo
ae3aad704d fix previous commit
This was SVN commit r17018.
2015-09-13 19:06:14 +00:00
mimo
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
leper
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
leper
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
leper
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
Itms
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
leper
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