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

10189 Commits

Author SHA1 Message Date
Michał Janiszewski b47a0f7cb5 Don't place trees when impossible 2017-12-12 23:30:50 +01:00
Christian F. Coors 0aa515355a Add cursor scaling 2017-12-12 22:11:40 +01:00
Michael Steenbeek 2b2e617086 Use OpenRCT2 language ID in SetString, avoid mixups 2017-12-12 13:23:42 +01:00
Michał Janiszewski e9c429e9ee Don't try placing null scenery entries in RMG 2017-12-11 22:19:09 +01:00
Hielke Morsink 3f685b4213 Add more options for visual changes 2017-12-11 17:45:23 +00:00
Hielke Morsink 59df0a9941 Add no-peeps and no-sprites options 2017-12-11 17:45:23 +00:00
Hielke Morsink 9b874f8abe Refactor screenshot options 2017-12-11 17:45:23 +00:00
Michael Steenbeek 8951d1b332 Fix box and pole support naming 2017-12-10 13:59:02 +01:00
Hielke Morsink 40cea0e7e7 Fix #2607: Rain rendered incorrectly in additional viewport 2017-12-08 11:24:45 +01:00
Hielke Morsink e307d22bf9 Replace loop with std::fill 2017-12-08 11:06:43 +01:00
Hielke Morsink 79aa4a99cf Use range-based for loops 2017-12-08 11:06:43 +01:00
Michael Steenbeek e3c52360db Remove most usages of separate flag 
This removes most usages of the separate flag, instead relying on ride groups to do its job.
Research is more complicated and will follow in another commit.
 2017-12-08 10:28:29 +01:00
Michael Steenbeek 171271215e Change some ride type names for clarity, fix Americanism 2017-12-08 07:59:44 +01:00
Michael Steenbeek 3868b100df Stop encrypting money 
It serves no purpose any more. Of course, we still need the ENCRYPT_MONEY() and DECRYPT_MONEY() functions for importing and exporting S6 files.
 2017-12-07 23:22:24 +01:00
Ethan Smith 76434c0eb6 Reword comment 2017-12-07 22:04:33 +00:00
Ethan Smith 64f2778c10 Refactor MAX_PATH to be in common.h 2017-12-07 22:04:33 +00:00
Marijn van der Werf 34e27a2408 Sort includes 2017-12-07 17:52:03 +01:00
Marijn van der Werf 2d776de772 Extract functions from EditorObjectSelection 2017-12-07 17:52:03 +01:00
Marijn van der Werf 862ab26cc1 Move object selection window to UI module 2017-12-07 17:52:03 +01:00
Michał Janiszewski 0a28b6eb56 Fix MSVC builds 2017-12-06 13:33:02 +01:00
Michał Janiszewski 7116d88e98 Refactor CPUID 2017-12-06 13:33:02 +01:00
Michał Janiszewski e5da0f4ffc Fix Android builds 2017-12-05 22:48:14 +01:00
Michael Steenbeek 0ffa2b541a Use more consistent terminology and remove some Americanisms 2017-12-05 10:23:36 +01:00
Michael Steenbeek 10a4dd06b0
Merge pull request #6754 from Gymnasiast/game-as-cpp 
Compile game.c and game.h as C++
 2017-12-05 09:23:01 +01:00
Hielke Morsink 884bc0c9a4 Trim object names when copying the missing objects list 
Before adding a name to the clipboard buffer, it checks for spaces at
the end of the name, to prevent copying those.

It also moves some logic from the "mouseup" function, and moved memory
deallocation within the same function where it got allocated.
 2017-12-05 09:22:07 +01:00
Michael Steenbeek fb3b9ccdd2 Clean up for loop 2017-12-05 09:10:28 +01:00
Michael Steenbeek e1eadff208 Formatting fixes 2017-12-05 09:10:28 +01:00
Michael Steenbeek c9354a2c83 Fix alignment and loop variable declaration 2017-12-05 09:10:28 +01:00
Michael Steenbeek ce0147b536 Fix signed/unsigned comparisons 2017-12-05 09:10:28 +01:00
Michael Steenbeek 00eb9bb949 Remove unused functions and undefined symbols from Game.cpp/h 2017-12-05 09:10:27 +01:00
Michael Steenbeek 67f64c35c5 Style fixes 2017-12-05 09:10:27 +01:00
Michael Steenbeek 4d1fc38f8d Replace NULL with nullptr 2017-12-05 09:10:27 +01:00
Michael Steenbeek e23bb8c243 Update formatting of Game.cpp and Game.h 2017-12-05 09:10:27 +01:00
Michael Steenbeek 60d8865efb Compile game.c and game.h as C++ 2017-12-05 09:10:27 +01:00
Ted John 3de8e0d37e
Merge pull request #6772 from IntelOrca/remove-rct2-interop-2 
Remove RCT2 interop
 2017-12-04 20:10:35 +00:00
Ted John e879df31e8 Fix testpaint code issues 2017-12-04 19:49:12 +00:00
Michael Steenbeek 078c2d22c1 Make use of ride preview images clearer and more future-proof 2017-12-04 20:11:38 +01:00
Aaron van Geffen db5b72c360 Fix #6782: Steam overlay checkbox widget not displayed correctly. 2017-12-04 20:10:29 +01:00
Michael Steenbeek 407f1ad148
Create scenery_small_entry_has_flag() 2017-12-04 20:09:38 +01:00
Ted John ebf43c2529 Fix testpaint 2017-12-04 19:04:07 +00:00
Ted John 99d7aaa2d6 Remove RCT2 interop 2017-12-04 19:04:06 +00:00
Michael Steenbeek caab169968 Allow building on-ride photo segments on Splash Boats 2017-12-04 19:04:14 +01:00
Ted John 9b5b671673 Fix #6776: Screenshots do not get stored in screenshot folder 2017-12-04 17:46:56 +00:00
Michael Steenbeek b9a6382557 Remove unused tutorial and guest number strings 2017-12-04 11:27:37 +01:00
Michael Steenbeek 273edee634 Turn construction marker into a define 2017-12-04 11:26:53 +01:00
Aaron van Geffen 1ef73997b5 Removed interface to window limit setting. 2017-12-04 11:26:53 +01:00
Aaron van Geffen c000263bbb Remove construction marker colour option. 2017-12-04 11:26:53 +01:00
Aaron van Geffen 38d45a102b Remove interface to option for handymen mowing by default. 2017-12-04 11:26:53 +01:00
Michael Steenbeek c83b2e31cc Replace magic number check for food and drink items with a function call 2017-12-04 10:40:41 +01:00
Michael Steenbeek b0c784ed71 Fix # 6775: New Campaign window only shows 40 rides 2017-12-04 08:35:33 +01:00