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
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
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
Ted John
64f129c616
Fix RCT2 builds
2017-12-02 18:03:54 +00:00
Ted John
6ef5154b02
Fix #6761 : An assertion failed - Invalid Font index 65675
...
Special font bases were not converted in font_sprite_get_codepoint_width.
Assert converted to safe warning.
2017-12-02 11:47:24 +00:00
Michał Janiszewski
0920e58f98
Remove ADVERTISE_STATUS_ prefix
2017-12-02 09:03:59 +01:00
Michał Janiszewski
8e57c7d05d
Make ADVERTISE_STATUS enum class
2017-12-02 09:03:59 +01:00
Michał Janiszewski
053a2540f3
Fix building with HTTP disabled, but network enabled
2017-12-02 09:03:59 +01:00
Ted John
11fac1bbf5
Change back to current directory structure
2017-12-01 21:09:52 +00:00
Michael Steenbeek
8a62229a5b
Fix build on Xcode
2017-12-01 21:09:52 +00:00
Ted John
205fdaefa7
Split up Platform2 by OS
2017-12-01 21:09:52 +00:00
Ted John
bbc389d18e
Fix remaining code issues
2017-12-01 21:09:52 +00:00
Ted John
ea356cd2b9
Fix mingw
2017-12-01 21:09:52 +00:00
Ted John
679aae801d
Fix GetFolderPath for Windows
2017-12-01 21:09:52 +00:00
Ted John
66a6aa95f6
Redirect platform_get_user_directory to IPlatformEnvironment
...
- Remove old code for getting user directory, redirect to IPlatformEnvironment.
- Fix config loading so that it uses path straight from IPlatformEnvironment.
- Add more special folder implementation in Platform2.
2017-12-01 21:09:52 +00:00
Ted John
dcb92a466d
Add new base path for user data and config
...
Refactor more path resolution to Platform2.cpp
2017-12-01 21:09:45 +00:00
Ted John
f52544d607
Fix #6739 : Park name isn't displayed
...
Fix wrong type, down cast introduced by mistake in 585fc1afce
2017-12-01 20:25:41 +00:00
Ted John
1f456d3e8e
Merge pull request #6638 from janisozaur/font-guard
...
Guard access to font
2017-12-01 20:13:58 +00:00
