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

10121 Commits

Author SHA1 Message Date
Michael Steenbeek 54d0624ded Skip null rides when checking for select-by-track-type, fixes #4796 2016-11-13 21:14:15 +01:00
Michał Janiszewski 3d5735c77e Rename map_get_corner_height 2016-11-13 20:10:32 +00:00
Michał Janiszewski c4f06138b8 Merge pull request #4798 from janisozaur/refactors 
A collection of minor refactors + one plug for memleak
 2016-11-13 20:49:59 +01:00
Michał Janiszewski 3f7fd56328 Remove trailing whitespace in sources 2016-11-13 20:32:55 +01:00
Michał Janiszewski 9fed68bf6f Merge OBJ_STRING_ID enums into one 2016-11-13 20:31:19 +01:00
Michał Janiszewski 0299844b13 Rename some static tables 2016-11-13 19:36:03 +01:00
Michał Janiszewski 5524979289 Add include guards to headers missing it 2016-11-13 19:36:03 +01:00
Michał Janiszewski a8b8b04dd4 Unify key modifiers definition 2016-11-13 19:36:03 +01:00
Michał Janiszewski 233ef1f735 Merge RCT2_LANGUAGE_* definitions into one 2016-11-13 19:36:03 +01:00
Michał Janiszewski 00dd35481e Remove unused enum from network.cpp 2016-11-13 19:36:03 +01:00
Michał Janiszewski dbdf4b248c Plug memleak in OpenGLDrawingEngine 2016-11-13 19:36:03 +01:00
Marijn van der Werf 1a8cb9fc57 Use more constants for text colours 2016-11-13 17:44:34 +00:00
Marijn van der Werf 022b481d66 Use constant for black strings 2016-11-13 17:20:30 +00:00
Michael Steenbeek 418c542cba Increase network version 2016-11-13 12:31:30 +01:00
Ted John c50ba73c3e Merge pull request #4782 from marijnvdwerf/clean/colour-filters 
Clean up colour filters
 2016-11-13 02:52:58 +00:00
Marijn van der Werf 3ab64a3cd5 Return after assert 2016-11-13 01:51:28 +01:00
Marijn van der Werf 1591c1d021 Add more sprite constants 2016-11-13 01:51:28 +01:00
Marijn van der Werf bb615c60ee Clean up translucent palettes 2016-11-13 01:51:28 +01:00
Marijn van der Werf 06b128bac7 Name more palettes 2016-11-13 01:51:27 +01:00
Marijn van der Werf 4f47808201 Name glass palettes 2016-11-13 01:51:26 +01:00
Marijn van der Werf 2109763267 Rename translucent palettes 2016-11-13 01:45:43 +01:00
Marijn van der Werf 1ce2242bb3 Start cleaning up filters 2016-11-13 01:45:43 +01:00
Michał Janiszewski 7b6608d0a4 Add lib32-libzip1 to 32 bit dockerfile for upcoming #4792 2016-11-12 21:57:55 +01:00
Michał Janiszewski d2b373bb47 Build 64 bit docker with libzip for upcoming #4792 2016-11-12 21:53:49 +01:00
Broxzier ebc0a81e72 Guests turn around when trying to enter a copied park entrance 2016-11-12 11:27:59 +01:00
Ted John 7a4ef4073f Merge pull request #4789 from janisozaur/server-load-new-map 
Fix #4755: Crash loading new map while running a server
 2016-11-11 19:08:34 +00:00
TELK 7718acfde8 Fix #4775: File name of screenshot that is taken at 00:xx is named wrong 
Use `GetLocalTime` instead of `GetSystemTime`
 2016-11-11 17:55:41 +00:00
Michał Janiszewski b30454366f Add note about possible improvement of object sending 
[ci skip]
 2016-11-11 18:38:23 +01:00
Michał Janiszewski 0793b3bc11 Fix #4755: Crash loading new map while running a server 2016-11-11 18:27:40 +01:00
Marijn van der Werf 0496cf6bd8 Merge colour maps 2016-11-11 08:46:14 +00:00
OpenRCT2 git bot a327fe46a2 Merge Localisation/master into OpenRCT2/develop. 2016-11-11 04:00:21 +00:00
Michał Janiszewski 65bb4977ce Fix #4769: peep renames broken 2016-11-10 22:49:18 +01:00
Marijn van der Werf 80ea7f7de5 Name `gfx_fill_rect_inset` flags 2016-11-10 17:54:33 +00:00
wolfreak99 15b3c4ca07 Changelog update 2016-11-10 10:43:21 -05:00
wolfreak99 2da3a7b830 Show td6/td4 in "track designs" file dialog 2016-11-10 10:43:19 -05:00
wolfreak99 64bbd78bb7 Show sc6/sv6/sc4/sv4 in "load landscape" file dialog 2016-11-10 10:43:18 -05:00
wolfreak99 7e0dfc9e0c Show sv6/sc6/sv4/sc4 in "load game" file dialog 2016-11-10 10:43:17 -05:00
Broxzier 9c1998320d Add tooltips to copy and paste buttons 2016-11-09 20:34:35 +01:00
Broxzier c60463c8a7 Show error message when map element limit is reached 2016-11-09 20:25:40 +01:00
duncanspumpkin 3da10b7d7d Use correct comparison for previous commit 2016-11-09 19:16:25 +00:00
Broxzier 109f1d094e [ci-skip] Function opening brackets on own line 2016-11-09 20:03:21 +01:00
Broxzier 2c334a1882 Clearing clipboard on load, and better UI feedback. 2016-11-09 20:03:20 +01:00
Broxzier ecc9637bbd Clearing tile inspector clipboard when loading a park 2016-11-09 20:03:19 +01:00
Broxzier 8c54b1208b Add copy/paste functionality to tile inspector 2016-11-09 20:03:18 +01:00
duncanspumpkin 2f6f728200 Fix #4714. Prevent invalid peep access on closed golf rides. 
When a golf ride is closed it will remove the peep from the vehicle (the ball). Due to the way vehicles leave stations the vehicle would still travel to the next hole but when it tried to update the peeps action it would crash. This skips updating the peeps action but lets the ball still continue. This will cause a phantom ball to go around the golf course until all the vehicles are back in their closed state.
 2016-11-09 19:00:09 +00:00
Ted John 4662b648d2 Merge pull request #4700 from IntelOrca/refactor/language-cpp 
Refactor language.cpp
 2016-11-09 18:38:24 +00:00
Ted John 953f479cd9 Fix #4762: Assertion in localisation (format_string_part) 
The buffer overflow protection in format_string was not working correctly for several reasons. For windows builds this just so happened to write over gMapTooltipFormatArgs causing the assertion. Extra asserts have been added to check overflows in format_string.
 2016-11-09 18:29:49 +00:00
wolfreak99 1f0b2aefb7 Fix #4771: Main Menu music not playing 
When audio_init_ride_sounds is called, it calls audio_stop_title_music, but never calls audio_start_title_music. if you do an assert for gTitleMusicChannel it shows it is null. this fixes that. i will say though this is most definitely a band-aid fix, because if run audio_start_title_music in the audio_init_ride_sounds, it still doesn't play out loud. at least on my setup it doesn't.
 2016-11-09 17:37:41 +00:00
Michał Janiszewski 33749ccfbe Lower jansson version requirement to 2.3 for CMake/Debian builds (#4778) 
We still need at least 2.3 for `json_object_foreach`
 2016-11-09 12:57:06 +01:00
Michał Janiszewski 867de18c96 Use json_is_true instead of json_boolean_value 
This should lower required version of jansson, which would
let us use 2.5 in Trusty (current version in Travis-CI)

See https://github.com/akheron/jansson/issues/146
 2016-11-09 13:19:12 +01:00