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

12680 Commits

Author SHA1 Message Date
OpenRCT2 git bot 396793739a Merge Localisation/master into OpenRCT2/develop. 2017-10-03 04:00:38 +00:00
ZehMatt 5f076e8103 Compile paint code as cpp. 
Style fixes.
 2017-10-02 21:42:11 +02:00
Michael Steenbeek 0fb5f186ee Do not hardcode music length 2017-10-02 21:40:49 +02:00
Olivier Wervers 45944cb037 Fix #6202: Avoid breaking occupied benches 2017-10-02 17:18:51 +02:00
Michael Steenbeek ccefc98491 RCT1 theme: make Options and Shortcut windows brown 2017-10-02 11:45:28 +02:00
OpenRCT2 git bot 606130c2bb Merge Localisation/master into OpenRCT2/develop. 2017-10-02 04:00:27 +00:00
LRFLEW 11cdcea72b Fix RCTC g1.dat rendering issues 2017-09-30 19:18:31 -05:00
OpenRCT2 git bot 58b980d6ba Merge Localisation/master into OpenRCT2/develop. 2017-09-30 04:00:30 +00:00
Olivier Wervers 1de4b2650b Fix #6229: Scenery costs nothing in track designs 2017-09-30 00:11:14 +02:00
Michael Steenbeek 0c4d184a9a Use constants for map elements and the scenery window 2017-09-29 20:25:17 +02:00
Olivier Wervers f2c9fc58d5 Implement #1329: Add remove-unused-objects command (#6324) 2017-09-29 16:32:30 +02:00
Michael Steenbeek 0260633953 Add RCTC compatibility features to changelog 
[ci skip]
 2017-09-29 10:49:46 +02:00
LRFLEW e177811115 Add RCTC g1.dat support 2017-09-29 10:44:23 +02:00
Michael Steenbeek b2968ce8b0 Fix #6320: Crash when CSS1.DAT is absent 2017-09-29 10:43:47 +02:00
Michael Steenbeek eea40edf0a Use more constants 2017-09-29 10:06:05 +02:00
OpenRCT2 git bot 43e1e711b7 Merge Localisation/master into OpenRCT2/develop. 2017-09-29 04:00:29 +00:00
Michał Janiszewski 5ab9f938a7 Update files missed in the great extern "C" cleanup of 2017 2017-09-28 23:29:16 +02:00
Gymnasiast 6c9e73bff2 Allow loading objects from RCTC 
These are technically same as those from RCT2, but with a .POB extension, rather than .DAT
 2017-09-28 21:42:58 +02:00
Michael Steenbeek ffaa3403d0 Merge pull request #6319 from OpenRCT2/network-version 
Network version
 2017-09-28 17:38:56 +02:00
Jeroen D Stout 71317c5f7a Adapt to coding convention 2017-09-28 17:37:48 +02:00
Jeroen D Stout 35b9038807 Refactor adjacency distance constant + loop fix 2017-09-28 17:37:48 +02:00
Jeroen D Stout 3b7ec7daa1 Alllow check_for_adjacent_station to check farther 2017-09-28 17:37:48 +02:00
Jeroen D Stout a6993bdb9f Introduce constant for max adjacency distance 2017-09-28 17:37:48 +02:00
Jeroen D Stout 202bea59c8 Increased network stream version 2017-09-28 17:37:48 +02:00
Jeroen D Stout b032aaacac Deal with map size / multiple stations 2017-09-28 17:37:48 +02:00
Jeroen D Stout 015d95749c Increase ride synchronisation range 2017-09-28 17:37:48 +02:00
Michael Steenbeek 950ab0062f Unify "separate ride" and "separate ride name" flags 
They're always set together, and only setting one will probably cause undefined behaviour. Deprecate the "separate ride name" flag and instead check the "separate ride" flag in all places.
 2017-09-28 17:37:07 +02:00
Michael Steenbeek 289e154fe4 Fix #6315: Not all researched items in S4 are available 2017-09-28 16:24:44 +02:00
ZehMatt 5187946bc9 Fix #6309: Lightfx being enabled with incompatible drawing engine. 2017-09-28 08:01:25 +02:00
TELK 40b026a4f1 Switch to utf8_remove_formatting() in Twitch integration to support non-latin characters 2017-09-26 15:54:24 +02:00
Martin Müller e38a77da2a Set gScenarioFileName when loading an RCT1 park 
This fixes bugs when completing an RCT1 scenario, where the highscore
would be saved for the wrong park because gScenarioFileName hasn't been updated on load.
 2017-09-26 15:53:06 +02:00
ZehMatt c238265834 Minor performance improvements 2017-09-26 15:52:04 +02:00
Marijn van der Werf 09517caa88 Fix #6300: Saving track triggers assertion 2017-09-25 22:14:50 +02:00
Michael Steenbeek 18db4a5274 Implement #6292: Allow building queue lines in the the Scenario Editor 
Also format the file properly and do a bit of clean up.
It's now also possible to build queue lines for editor-only paths.
 2017-09-25 22:09:40 +02:00
Michał Janiszewski 4e3a38b25d Use ctest for running tests 2017-09-24 23:02:26 +02:00
Michał Janiszewski 34fab632e6 Use ninja for building on Travis 2017-09-24 23:02:26 +02:00
Marijn van der Werf 8a47308786 Check whether intent data is set before accessing 2017-09-24 22:41:49 +02:00
Marijn van der Werf efa87bf931 Try different opaque pointer 2017-09-24 22:41:49 +02:00
Marijn van der Werf 9d80f7efed Apply recommended fixes 2017-09-24 22:41:49 +02:00
Marijn van der Werf 7795ec35dd Add assertions to Intent 2017-09-24 22:41:49 +02:00
Marijn van der Werf 11787d4ce4 Allow opening guest list 2017-09-24 22:41:49 +02:00
Marijn van der Werf 34ee3df318 Refactor intent 2017-09-24 22:41:49 +02:00
Marijn van der Werf 47e65d1ab1 Finish rebase 2017-09-24 22:41:49 +02:00
Marijn van der Werf 227ee1f914 Add logging for missing window handling 2017-09-24 22:41:49 +02:00
Marijn van der Werf 6df955dd27 Add missing window initializers 2017-09-24 22:41:49 +02:00
Marijn van der Werf 162eea0924 [fixup] Cast pointer 2017-09-24 22:41:49 +02:00
Marijn van der Werf 9ae887bf97 Update Xcode project 2017-09-24 22:41:49 +02:00
Marijn van der Werf 7ede9a3f58 Add extra casts 2017-09-24 22:41:49 +02:00
Marijn van der Werf 9d93d28efb Change method argument type 2017-09-24 22:41:49 +02:00
Marijn van der Werf 257c9d60d5 Fix imports 2017-09-24 22:41:49 +02:00