Ted John
bca55e1e32
Only use CI compile options if BUILD_SERVER is set
...
This now means that building openrct2.sln after openrct2.proj does not trigger a rebuild as the compile options will be the same. They are now only different if the BUILD_SERVER environment variable / msbuild property is set.
2016-10-31 12:41:48 +00:00
Yaroslav Tretyakov
12bd31bc52
Fix #4726 : Checking wrong x value
2016-10-31 08:20:52 +00:00
OpenRCT2 git bot
0f8cec0df8
Merge Localisation/master into OpenRCT2/develop.
2016-10-31 04:00:34 +00:00
Michał Janiszewski
b266d6c2d5
Merge pull request #4727 from janisozaur/clang-3.9
...
Fix #4722 : warnings with clang 3.9
2016-10-30 22:27:26 +01:00
Michał Janiszewski
593230b19c
Rename 65DDD1 to turns_ratings
2016-10-30 22:09:59 +01:00
Michał Janiszewski
ccc3297424
Rename 65E1C2 to sheltered_ratings
2016-10-30 22:08:51 +01:00
Michał Janiszewski
ff8fa26eab
Fix argument values to ride_ratings_apply_65E1C2
2016-10-30 22:06:35 +01:00
Michał Janiszewski
5585a3e67d
Fix #4722 : warnings with clang 3.9
2016-10-30 21:57:14 +01:00
Ted John
66cd816922
Refactor and fix stex disabling tab 1 on objective options
2016-10-30 01:12:41 +00:00
Ted John
33a07f86be
Fix #4724 : Not all rides show up in preserved rides tab
2016-10-30 01:03:26 +00:00
Daniel Kamil Kozar
2894bea5dd
fix realpath() return value in platform_resolve_openrct_data_path
...
realpath() returns NULL on error, so the existing code treated its success as a
critical error. this commit fixes this.
2016-10-29 20:06:05 +02:00
Ted John
43ec7febff
Fix #4711 : Cannot open System Dialogue Window when saving game
...
Another regression from e5ff7412e4
2016-10-29 14:55:14 +01:00
Ted John
09c37d6465
Fix #4713 : preserved rides tab in the wrong tool?
...
Ride check for showing the preserved rides tab was the wrong way round.
2016-10-29 14:48:28 +01:00
Ted John
aabee64cec
Suppress command for execs with secrets
2016-10-29 13:59:48 +01:00
OpenRCT2 git bot
6c801cf8c3
Merge Localisation/master into OpenRCT2/develop.
2016-10-29 04:00:22 +00:00
Michael Steenbeek
1960ef1b6a
Merge pull request #4718 from zsilencer/bugfixes
...
Fix #4704 , #4708 : Crash when painting money effect
2016-10-28 23:01:22 +02:00
zsilencer
eb187db49b
Fix #4704 , #4708 : Crash when painting money effect
2016-10-28 12:34:53 -06:00
Max Sandholm
a29bf9912b
Install desktop entry and icons
2016-10-28 12:33:37 +02:00
Ted John
b32e2eaac9
Merge pull request #4712 from zsilencer/multiplayer
...
Fix more sources of desyncs
2016-10-27 08:41:56 +01:00
zsilencer
3d712ddc58
Give names to _currentTrackSelectionFlags flags
2016-10-26 16:19:56 -06:00
zsilencer
1b47bdd180
Fix desync caused by provisional track piece peep interaction
2016-10-26 15:38:54 -06:00
zsilencer
24bd56af02
Fix desync caused by provisional ride entrance/exit peep interaction
2016-10-26 15:01:50 -06:00
Ted John
5699b9e4ed
Merge pull request #4685 from marijnvdwerf/fix/paint-5
...
Combine Junior RC and Water RC drawing
2016-10-25 12:14:03 +01:00
Ted John
aef32c0fba
Merge pull request #4696 from IntelOrca/render/night-lights
...
The light effects mod branch #3798 by @JeroenDStout has become quite out of date. I plan to properly implement it, but first I want to merge in what we have already, so that I can branch off develop again and rebase (currently rebasing this branch is too difficult, far too many commits).
Most code that this is merging is protected by the __ENABLE_LIGHTFX__ directive, so it should not make any difference until its time to enable it via a new pull request.
I have isolated it as much as possible to lightfx.c.
2016-10-25 12:12:48 +01:00
Ted John
07f5682392
Remove lightfx debug stuff
2016-10-24 18:52:42 +01:00
Ted John
ebe4ca4df4
Rename lightfx guard
2016-10-24 13:06:44 +01:00
Ted John
ca47770825
Move rendering to lightfx.c and protect all areas with guard
2016-10-24 13:05:44 +01:00
Ted John
3d529ff6b8
Fix more memory leaks in FileScanner
2016-10-24 12:23:27 +01:00
LRFLEW
f349fbf195
Update Readme's macOS Instructions
2016-10-24 09:58:10 +01:00
Ted John
adb2ae616c
Windows: Call FreeConsole if one was attached.
2016-10-23 23:10:30 +01:00
Ted John
e47035d4e9
Merge pull request #4692 from janisozaur/fixes
...
Memory handling fixes
2016-10-23 22:55:30 +01:00
Michał Janiszewski
6c4ff285b4
Fix memory leak in FileScanner
2016-10-23 22:58:18 +02:00
Michał Janiszewski
73aede6052
Fix memory leak in TrackDesignRepository
2016-10-23 22:46:59 +02:00
Michał Janiszewski
a75c1f1bc4
Fix memory leak in FileScanner
2016-10-23 22:28:35 +02:00
Michał Janiszewski
8894be6a6d
Tie _tooltipText size to that of gCommonStringFormatBuffer
2016-10-23 22:28:35 +02:00
Ted John
315c0e91ad
Fix #4574 : Changing the game language makes the scenery window wonky
2016-10-23 17:49:21 +01:00
Ted John
94a9c94c1f
Fix saving in editor mode
...
Fixes #4572 : Don't create .sv6 autosaves in track designs manager, roller coaster designer and scenario editor
Fixes #4573 : "Save this before quitting?" in scenario editor saves to .sv6, not .sc6
2016-10-23 17:42:11 +01:00
Ted John
9ee865a8da
Fix #873 : Unable to save track with colon symbol in name of ride
...
Add protection for saving any file with invalid path characters in save dialog.
2016-10-23 17:12:55 +01:00
Ted John
7611b04ad1
Add --console switch for Windows
...
Windows subsystem does not work like console subsystem which makes it almost impossible to obtain `stdout` until the application has finished. This adds a `--console` switch to make the game either attach to an existing console or show a new one and redirect the C streams to it.
2016-10-23 16:16:20 +01:00
Ted John
667dd526e9
Merge pull request #4679 from IntelOrca/refactor/track-repository
...
Convert track repository to C++
2016-10-23 13:56:43 +01:00
Marijn van der Werf
e8e2039832
Fix GCC
2016-10-23 14:52:32 +02:00
Marijn van der Werf
b868cccea2
Remove pragma mark
2016-10-23 14:41:47 +02:00
Marijn van der Werf
551962123a
Reorganise file to minimise diffs
2016-10-23 14:40:11 +02:00
Marijn van der Werf
50bb158ee0
Update Xcode project
2016-10-23 14:16:56 +02:00
Marijn van der Werf
7d3cd99c0c
Combine Junior RC and Water RC drawing
2016-10-23 14:13:11 +02:00
Ted John
712e062bcc
Only load tracks if cache is invalid
2016-10-23 01:12:17 +01:00
Ted John
9eaf887546
Fix track manager issues
2016-10-23 00:42:22 +01:00
LRFLEW
f489bba4f0
Update Xcode Project
2016-10-23 00:15:33 +01:00
Ted John
25a7b98be0
Omit . and .. from linix file scanning too
2016-10-22 23:09:45 +01:00
Ted John
a9db9528ae
Fix bitwise and expression
2016-10-22 22:36:45 +01:00
