mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,937 Commits 7 Branches 39 Tags 348 MiB
Commit Graph

9937 Commits

Author SHA1 Message Date
Ted John 7ac0fa1316 Demonstrate using Windows 10 WRL API and GameBar API 2016-10-28 23:33:52 +01: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
Ted John a2efab7c45 Add unix file scanner implementation 2016-10-22 22:36:45 +01:00
Ted John cdc45a2848 When renaming, don't change extension 2016-10-22 22:36:45 +01:00
Ted John 7834afb34a Re-write FileScanner for easier cross platform and multiple patterns 2016-10-22 22:36:45 +01:00
Ted John 9118f24778 Rename FileEnumerator to FileScanner 2016-10-22 22:36:45 +01:00
Ted John 16626eabb8 Convert FileEnumerator to IFileScanner 2016-10-22 22:36:45 +01:00
Ted John a17748eb41 Fix typo 2016-10-22 22:36:45 +01:00
Ted John 42d8324997 Prevent delete or rename on RCT2 tracks 2016-10-22 22:36:45 +01:00
Ted John 29f75a71fb Use new item structure with std::string 2016-10-22 22:36:45 +01:00
Ted John e666028e02 Convert track repository to C++ 2016-10-22 22:36:45 +01:00
Michał Janiszewski 91d4058850 Merge pull request #4681 from janisozaur/cmake-update 
CMake updates
 2016-10-22 22:59:37 +02:00
Michał Janiszewski 03bd98f395 Remove special cases for Launchpad builds 2016-10-22 22:25:30 +02:00
Michał Janiszewski b1ec40f531 Use -Wno-error=date-time only when compiler supports it 2016-10-22 22:24:19 +02:00
Michał Janiszewski c70639302c Add convenience functions to CMakeLists.txt 
The helper functions allow setting compiler flags only if compiler
supports them.
 2016-10-22 22:20:37 +02:00
Michał Janiszewski 88ccfad303 Merge pull request #4615 from janisozaur/mediate-network-objects 
Mediate network objects
 2016-10-22 15:46:03 +02:00
Ted John f3b0044c8a Merge pull request #4659 from IntelOrca/refactor/painting 
Refactor some of the paint and draw functions to pass parameters instead of using globals as the first steps towards nicer paint code and multi-threaded paint code.
 2016-10-22 14:30:45 +01:00
Ted John 84e8b00900 Merge pull request #4678 from marijnvdwerf/fix/paint-4 
Track Paint fixes: segment support height
 2016-10-22 14:22:03 +01:00