mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-08-28 13:11:32 +02:00
Code Issues Projects Releases Wiki Activity
13495 commits 9 branches 41 tags 334 MiB
Commit graph

13495 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marijn van der Werf
0fe3b841e9 Update Xcode project 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
OpenRCT2 git bot
25c54165e8 Merge Localisation/master into OpenRCT2/develop. 2017-12-06 04:02:49 +00:00
Michał Janiszewski
4562ca2933 Make Travis matrix depend on event type 2017-12-05 23:48:46 +01:00
Michał Janiszewski
e5da0f4ffc Fix Android builds 2017-12-05 22:48:14 +01:00
Michael Steenbeek
4e4a1a9d49 Revert accidental use of {SMALLFONT} after {MOVE_X} 
{MOVE_X} is followed by a number. During initial import in 2014, {MOVE_X}{10} was accidentally replaced.
 2017-12-05 15:43:27 +01:00
Christian F. Coors
0b45098e05 Fix music acknowledgement 2017-12-05 10:43:17 +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
OpenRCT2 git bot
94a3d88691 Merge Localisation/master into OpenRCT2/develop. 2017-12-05 04:01:28 +00: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
Ted John
fa968824a6 Update changelog 
[ci skip]
 2017-12-04 19:15:19 +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
c30739daff Use rct2_ride 2017-12-04 19:04:07 +00:00
Ted John
ec6099f9f4 Name / define RCT2 addresses 2017-12-04 19:04:07 +00:00
Michael Steenbeek
7558ade6a1 Fix Xcode project 2017-12-04 19:04:07 +00: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
Aaron van Geffen
837b177d9d Simplify UI scaling display quality options (#6764) 
Simplify UI scaling display quality options.

This removes three options:
* 'Use NN scaling at integer scales', as NN is decidedly preferable at integer scales.
* Anisotropic scaling, as it produces results very similar (if not equal) to linear scaling.
* NN as a selectable option in the dropdown - NN is forced on integer scales and unavailable for non-integer scales.
 2017-12-03 22:35:16 +01:00
Ted John
107461bbe8 Reintroduce XDG_CONFIG_HOME 
Accidentally removed resolving the user data path by XDG_CONFIG_HOME environment variable
 2017-12-03 19:22:35 +00:00
TELK
349d19e834 Check rct_window is NULL 2017-12-03 18:08:40 +01:00
TELK
b7ca7d25ee Fix #6625: Not to try to open a ride window when it crashes 2017-12-03 18:08:40 +01:00
OpenRCT2 git bot
08893ecff9 Merge Localisation/master into OpenRCT2/develop. 2017-12-03 04:02:57 +00:00
Ted John
33d0fa9b8c
Merge pull request #6748 from IntelOrca/fix/2410 
Refactor logic for resolving base paths
 2017-12-02 19:08:43 +00:00
Michał Janiszewski
079d223663
Actually fix RCT2 builds 2017-12-02 19:46:02 +01:00