Commit graph

13495 commits

Author SHA1 Message Date
Aaron van Geffen
02abdb3709 Change failing test to expect nullptr rather than "". (#6832) 2017-12-16 12:06:22 +00:00
Ted John
14490ad45b Refactor, use .empty() in LanguagePack.cpp 2017-12-16 12:06:00 +00:00
OpenRCT2 git bot
e9ecd63eae Merge Localisation/master into OpenRCT2/develop. 2017-12-16 04:00:20 +00:00
Michael Steenbeek
2a509c2c02 Return null pointer if an override is not specified, rather than an empty string 2017-12-15 12:43:50 +01:00
Michael Steenbeek
65fc7f914f Fix US English missing almost every string 2017-12-15 12:35:40 +01:00
OpenRCT2 git bot
7816b11d70 Merge Localisation/master into OpenRCT2/develop. 2017-12-15 04:00:28 +00:00
Ted John
fc6fd9a444 Fix inline sprites 2017-12-14 14:38:14 +01:00
Ted John
2ea20552c4 Fix strings by std::string-ing LanguagePack 2017-12-14 14:38:14 +01:00
Ted John
31e112cf3b Use std::string for objects 2017-12-14 14:38:14 +01:00
LRFLEW
eed00ea363 Add Vsync Toggle to Options 2017-12-14 11:18:28 +01:00
Michael Steenbeek
90446d06ed Try to fix compilation on MSVC 2017-12-14 10:03:21 +01:00
Michael Steenbeek
4a9ef5bd12 Explicitly cast to size_t 2017-12-14 10:03:21 +01:00
Michael Steenbeek
717d71eb24 Make const char-char conversions explicit 2017-12-14 10:03:21 +01:00
Michael Steenbeek
1a9975d683 Compile util and cheats as C++ 2017-12-14 10:03:21 +01:00
ζeh Matt
c84fd8edd2 Fix #6821: Edge sprites drawing is corrupted 2017-12-14 09:46:22 +01:00
Michael Steenbeek
cc27beef73 Remove unnecessary strdup 2017-12-13 19:46:29 +01:00
ζeh Matt
8772d746ce Use index instead of memmove 2017-12-13 17:57:39 +01:00
Hielke Morsink
5fa292207f Replace character \U3000 with simple space 2017-12-13 17:53:06 +01:00
Michael Steenbeek
eec1829081 Add missing declarations 2017-12-13 13:51:38 +01:00
Michael Steenbeek
9ea5302a2a Refactor access to some footpath stuff 2017-12-13 13:51:38 +01:00
ZehMatt
02128131e2 Refactor access to tile descriptor via reference. 2017-12-13 12:00:45 +01:00
ZehMatt
1d0750b2dd Refactor more variables to const type. 2017-12-13 12:00:45 +01:00
ZehMatt
07bd4f13be Unify some surface drawing functions. 2017-12-13 12:00:45 +01:00
ZehMatt
05137355fd Format Surface.cpp 2017-12-13 12:00:45 +01:00
ZehMatt
594c32b537 Refactor park boundary fences to use data tables. 2017-12-13 12:00:45 +01:00
ZehMatt
8814b15a85 Add sprite definitions for park boundary fences. 2017-12-13 12:00:45 +01:00
ZehMatt
6787e6ca04 Rename surface.c to Surface.cpp. 2017-12-13 12:00:45 +01:00
Michael Steenbeek
8095c970aa Fix memory leak in New Ride window
The way the window handles strings might need to be updated at some point
to be a little bit cleaner, but this at least plugs the leak.
2017-12-13 11:59:03 +01:00
Michael Steenbeek
e9dff344e4 Fix comparison between signed and unsigned integer 2017-12-13 08:03:48 +01:00
Michael Steenbeek
a5d4e96aae Remove unused sprite_file_load_palette() 2017-12-13 08:03:48 +01:00
Michael Steenbeek
6dc49d643a Compile files in base dir as C++ 2017-12-13 08:03:48 +01:00
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
OpenRCT2 git bot
68fac3b30a Merge Localisation/master into OpenRCT2/develop. 2017-12-11 04:00:33 +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
6c5ff424ae Missed occurrence 2017-12-08 09:29:47 +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