1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 21:13:05 +01:00
Commit Graph

11652 Commits

Author SHA1 Message Date
Ted John
1d5c12d2ae Merge branch 'fix/rating-overflow' into develop 2017-06-05 22:31:44 +01:00
Ted John
528dbe115d Merge branch 'test/ride-ratings' into develop 2017-06-05 22:31:26 +01:00
Ted John
d7d54b64c1 Merge branch 'wolfreak99-tile_inspector_delete_reselect' into develop 2017-06-05 22:31:03 +01:00
Michał Janiszewski
58c2faa610 Disable RCT2 tests on Travis 2017-06-05 23:13:33 +02:00
Michał Janiszewski
105f353092 Fix symlink created for ride ratings test 2017-06-05 23:09:43 +02:00
Michał Janiszewski
eafd2ac7a7 Add option to force-disable RCT2 tests 2017-06-05 23:08:45 +02:00
Gymnasiast
c82792e9b3 Update network version 2017-06-05 23:00:17 +02:00
wolfreak99
8006bbb9d5 Select previous element after removing in tile inspector 2017-06-05 22:59:15 +02:00
Michał Janiszewski
c64076e17d Disable ride ratings test on CI 2017-06-05 22:51:57 +02:00
Michał Janiszewski
46e9978262 Create symlink for rides test 2017-06-05 22:46:49 +02:00
Ted John
4860932fa1 Update changelog
[ci skip]
2017-06-05 20:22:47 +01:00
Ted John
1ea9a61f98 Increase network version 2017-06-05 20:17:39 +01:00
Ted John
463fadbcf6 Protect ride rating names from extreme numbers 2017-06-05 20:16:28 +01:00
Ted John
f14738836a Prevent overflows for many rating operatings 2017-06-05 20:16:28 +01:00
Ted John
40fc54291a Remove STUB from platform_get_locale_date_format
It is really annoying having the stub message appear on startup.
2017-06-05 19:57:51 +01:00
wolfreak99
f2d7c0bbaa Create update_park_fences_around_tile 2017-06-05 20:19:55 +02:00
Ted John
2d00b1e8aa Use varg template for Path::Combine 2017-06-05 17:46:17 +01:00
Ted John
9a619b3e0a Clean up branch 2017-06-05 17:38:14 +01:00
wolfreak99
36ca5b30ac Mark selected save file in load/save window 2017-06-05 15:45:36 +02:00
Ted John
eb0b29bcfe Merge pull request #5531 from Gymnasiast/fix/837
Create define for top toolbar clearance and fix #837
2017-06-04 00:51:13 +01:00
Ted John
79eef1d28f Upload test results to AppVeyor 2017-06-04 00:48:45 +01:00
Ted John
38fb37c84c Enable ride ratings test for cmake 2017-06-04 00:48:45 +01:00
Ted John
0662f1630a Fix ride ratings test to work with new Context flow 2017-06-04 00:48:45 +01:00
Ted John
f2524c07b3 Add rating test data 2017-06-04 00:47:34 +01:00
Ted John
e9898ba82f Use new rating test data 2017-06-04 00:47:33 +01:00
Ted John
f5a23d77bd Add File::ReadAllLines helper 2017-06-04 00:47:33 +01:00
Ted John
7ca1173bcb Fix warning 2017-06-04 00:47:33 +01:00
Ted John
b28fde6ae7 Create test data helpers 2017-06-04 00:47:33 +01:00
Ted John
cf7f1b7335 Change location of test data 2017-06-04 00:47:33 +01:00
Ted John
d65d31f632 Fix test expectations and describe ride types 2017-06-04 00:47:33 +01:00
Ted John
443e17c8fc Force rating update on each ride before testing 2017-06-04 00:47:33 +01:00
Ted John
c5306d72f7 Add ride ratings test 2017-06-04 00:47:33 +01:00
Ted John
51e92ea8e5 Merge pull request #5431 from Leurak/listen-address-config
Add config option for the listen address of the socket
2017-06-04 00:42:33 +01:00
Ted John
41902243c7 Update man page 2017-06-04 00:42:13 +01:00
Leurak
babfa1e281 Add command line option for listen address 2017-06-04 00:42:13 +01:00
Leurak
112f7b7a0d Add address parameter in network_begin_server 2017-06-04 00:42:13 +01:00
Leurak
c002df1abf Keep address parameter in BeginServer 2017-06-04 00:42:13 +01:00
Leurak
7914484ea0 Fix indentation 2017-06-04 00:42:13 +01:00
Leurak
14c46a659c Add config option for socket listen address 2017-06-04 00:42:13 +01:00
Ted John
96b9d6434c Merge pull request #5542 from IntelOrca/fix-openrct2-cli
Fix openrct2-cli build
2017-06-04 00:41:55 +01:00
Richard Jenkins
3d459693a2 Xcode fix 2017-06-04 00:18:26 +01:00
Ted John
94e982289e Fix openrct2-cli build
By using a dummy audio context, we can now make openrct2-cli start a headless instance without any SDL2 calls. SDL2 is still a dependency until we remove out the input code to openrct2-ui.
2017-06-04 00:18:26 +01:00
Richard Jenkins
acd3b09c80 Name sub_6DFED0(), remove magic numbers, minor refactor to research 2017-06-03 23:21:47 +02:00
Ted John
f47d7f27a5 Suppress hotkey.cfg error if not found
Running the game without hotkeys.cfg existing used to show a warning message. This is unnecessary as it will not exist on first install.
2017-06-03 22:17:52 +01:00
Ted John
af91b9f4b4 Fix #5521: Infinite loop on first run if neither Zenity nor kdialog are installed (#5526) 2017-06-03 22:13:20 +01:00
Ted John
810d46055a Merge pull request #5538 from IntelOrca/fix/5537
Fix #5537: SDL_Init(SDL_INIT_VIDEO) is called even when using --headless
2017-06-03 22:09:51 +01:00
Richard Jenkins
f469beacdb Xcode fix 2017-06-03 21:59:24 +01:00
Graham Edgecombe
9bd4284733 Fix icon install destination
RENAME was included in the quotes in a previous commit, so cmake treated
it as part of the destination path.
2017-06-03 12:54:00 +02:00
Michał Janiszewski
c136dc85d2 Provide define for maximum map edge size 2017-06-03 12:52:34 +02:00
Ted John
e048f52738 Fix #5537: SDL_Init(SDL_INIT_VIDEO) is called even when using --headless option
Create a dummy UI context and use that if headless is enabled. Some extra guards added to deal with the return values from the dummy class. It may be temporary until the window and input code is moved to openrct2ui.
2017-06-02 19:08:03 +01:00