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

15086 Commits

Author SHA1 Message Date
Michael Steenbeek 9e559d577a
Fix Steam path for Linux and macOS 
While OpenRCT2 already had code to look up the Steam path on macOS and Linux, it didn't look in the correct directory. This meant that it wouldn't detect the presence of RCT2, even if the user had downloaded it via the Steam Console.
 2018-07-05 09:42:52 +02:00
muemart 6365eaba66 Fix #3177: Wrong keys displayed in shortcut menu 
SDL_GetScancodeName doesn't actually translate the scancode to the physical key, so first we need to convert the scancode to a keycode and then turn the keycode into a string.
 2018-07-03 20:48:28 +02:00
Michał Janiszewski f370d3f0e9 Update debian control file for jansson 2.5 (#7754) 2018-07-03 12:07:29 +01:00
Michał Janiszewski 1135cbb5d0 Use C++17 explicitly in MSVC project (#7751) 
Use C++17 explicitly instead of relying on the moving target of
"latest" to match all other compiler settings.
 2018-07-03 12:07:14 +01:00
Michał Janiszewski ffc285497a
Merge pull request #7750 from TheAssassin/patch-1 
Make CMake require C++17
 2018-06-30 21:55:55 +02:00
TheAssassin 3ffc3fa6d8
Remove redundant VS C++ flag 2018-06-30 21:31:05 +02:00
TheAssassin c01a669ca4
Replace more custom flags with CMake options 2018-06-30 21:25:23 +02:00
TheAssassin 73c158fc63
Remove redundant and unnecessary CMake CXX flag 2018-06-30 21:24:48 +02:00
TheAssassin 843f3a61ae
Make CMake require C++17 
Requires CMake 3.8+ which is the first version to support C++17 (see https://cmake.org/cmake/help/v3.8/prop_tgt/CXX_STANDARD.html).

Fixes #7749.
 2018-06-30 15:13:25 +02:00
Michał Janiszewski 13224104e4
Ensure HTTP request variables lives till it is used (#7744) 
Solves https://www.reddit.com/r/openrct2/comments/8uftdh/
 2018-06-28 22:23:21 +02:00
Ted John fe76c807aa Fix #7707: Opening scenario editor closes game 
Ensure w is updated after closing the dropdown window.
 2018-06-27 11:11:50 +02:00
Aaron van Geffen 84e973fa55
Xcode: revert title sequence version number change (#7735) 2018-06-26 20:54:05 +02:00
Aaron van Geffen f963f969c1
Fix compilation on Linux, macOS. (#7732) 2018-06-26 11:16:03 +02:00
Ted John 0f2ccebfe7 Fix #7533: Screenshot is incorrectly named in CJK 
For Windows, convert path to UTF-16 before passing to fstream constructor.
 2018-06-25 18:14:55 +01:00
Michael Steenbeek 9e052c752b
Merge pull request #7722 from spacek531/patch-4 
Update ride flags 7, 16, 18
 2018-06-25 12:41:09 +02:00
Gymnasiast 2172902b47 Update required objects version 2018-06-23 17:39:38 +02:00
Gymnasiast 5128737666 Rename some flags, move FLAG_16 to ride groups 2018-06-23 17:39:38 +02:00
spacek531 0861481cb6 First iteration 2018-06-23 16:24:01 +02:00
OpenRCT2 git bot 2e36253074 Merge Localisation/master into OpenRCT2/develop. 2018-06-23 04:01:46 +00:00
Ted John c640427d89 Add missing change from b80913d 2018-06-20 22:00:11 +01:00
Michał Janiszewski 3067534ef1
Merge pull request #6752 from janisozaur/android-cli 
Fix #6751: Android CLI client is missing
 2018-06-20 22:55:24 +02:00
Ted John b80913df08 Revert unintended changes in 1b08fb4 
Change `FORMAT_uint16_t` back to `FORMAT_UINT16`
 2018-06-20 21:42:52 +01:00
Ted John f79954bde3 Refactor map element organisation 
Committing some changes that were originally for #7637.
- Refactor map_check_free_elements_and_reorganise
- Refactor map_strip_ghost_flag_from_elements
- Remove sub_68B089

I have removed sub_68B089 because this function was run every game tick
and 1000 times when trying to request some spare elements. It was a
lighter function which tried to stretch out the tile element pointers
behind any spare elements. In this day and age, doing a full tile
element defrag is very fast (even in debug mode it takes no more than
10ms), so I don't think keeping sub_68B089 is necessary.
 2018-06-20 21:35:27 +01:00
Michał Janiszewski 5eda335b12 Link Android libopenrct2 with SDL2 for SDL_AndroidGetJNIEnv 2018-06-20 21:29:14 +02:00
Michał Janiszewski 0029fca38f Fix libraries linked to Android builds 2018-06-20 21:29:14 +02:00
Michał Janiszewski 362852f12e Fix #6751: Android CLI client is missing 2018-06-20 21:29:14 +02:00
Michael Steenbeek 085cb7f3b1
Merge pull request #7716 from Gymnasiast/integer-types 
Replace our own integer types with standard ones
 2018-06-20 21:04:05 +02:00
Michael Steenbeek fae7c61f05 Fix config read/write 2018-06-20 17:56:57 +02:00
Michael Steenbeek 16f5c92bde Fix copy-paste error 2018-06-20 17:55:34 +02:00
Michael Steenbeek 57ab1bb2e9 Fix failing test 2018-06-20 17:55:17 +02:00
Michael Steenbeek 1b08fb4e69 Replace our own integer types with standard ones 2018-06-20 17:30:40 +02:00
Michael Steenbeek ec3a1e575e
Replace Math::Min and Max with std variants 2018-06-20 17:11:35 +02:00
Michael Steenbeek 323162cfe8
Fix #7711: Inverted Hairpin RC allows building invisible banked pieces 2018-06-20 11:32:29 +02:00
Michał Janiszewski 5f6f65f138
Merge pull request #6771 from janisozaur/android-multiplayer 
Compile Android builds with network support
 2018-06-19 23:10:50 +02:00
Michał Janiszewski 41b2168824 Fix namespace unused with HTTP disabled 2018-06-19 22:41:33 +02:00
Michał Janiszewski e1c5fda28d Compile Android builds with network support 2018-06-19 22:03:31 +02:00
Michał Janiszewski 6c4f714ecc
Update Android builds to use libs v0.9, link with ICU (#7712) 2018-06-19 21:57:44 +02:00
OpenRCT2 git bot 0ec3ccdaf4 Merge Localisation/master into OpenRCT2/develop. 2018-06-18 04:00:56 +00:00
Michał Janiszewski 65d1c7f490
Fix and enable -Wtautological-unsigned-zero-compare (#7706) 2018-06-17 22:48:45 +02:00
Aaron van Geffen d5eb1c504d Fix #7685: Disable warning due to problems compiling OpenSSL on macOS. (#7704) 2018-06-17 09:29:05 +02:00
OpenRCT2 git bot 05fa04a8d6 Merge Localisation/master into OpenRCT2/develop. 2018-06-17 04:00:26 +00:00
Ted John 182bc1afe6 Fix #7696: Servers do not get registered on master server list 
Correct the HTTP method used for the heartbeat request.
 2018-06-16 22:37:23 +01:00
Ted John ee50895d81
Merge pull request #7703 from IntelOrca/refactor/window-2 
Allocate the windows on the heap
 2018-06-16 21:41:05 +01:00
Ted John 98905fdbc3 Change g_window_list to use the heap for windows 2018-06-16 16:04:01 +01:00
Ted John 0f6138f8b6 Convert g_window_list to a std::vector 2018-06-16 16:04:01 +01:00
Ted John a716b4aa28 Remove use of window list in Viewport.cpp 2018-06-16 16:04:01 +01:00
Aaron van Geffen 1f5572fe28 Fix #7701: Strings overflow in drawing debug windows. (#7702) 
The last widget was not taken into account.
 2018-06-16 14:41:18 +01:00
Ted John 26666b1da9 Remove empty function: viewport_update_pointers 2018-06-15 23:15:52 +01:00
Michael Steenbeek c4cae83335
Fix AddRange to avoid duplicates in EntryList 2018-06-15 23:36:13 +02:00
devnoname120 4dea7f7971 Make related projects icons clickable (#7699) [ci skip] 2018-06-15 21:27:44 +02:00