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

9367 Commits

Author SHA1 Message Date
Ted John 4b92e5e820 Merge pull request #4521 from marijnvdwerf/fix/osx-macos 
Convert more occurences of OS X to macOS
 2016-10-04 18:14:03 +01:00
OpenRCT2 git bot 89d672ba70 Merge Localisation/master into OpenRCT2/develop. 2016-10-04 04:00:21 +00:00
Ted John 3bb05e2ddd Merge pull request #4523 from IntelOrca/paint/wooden-wild-mouse 
Paint Setup: Wooden Wild Mouse
 2016-10-04 00:27:25 +01:00
Ted John 973765769d Remove unnecessary braces 2016-10-04 00:20:22 +01:00
Ted John f58cbfbb69 Revert openrct2.vcxproj.user 2016-10-04 00:11:09 +01:00
Ted John ef81919f02 Implement quarter turn 3 2016-10-04 00:10:50 +01:00
Ted John c6a1ecab91 Implement quarter turn 1 2016-10-03 23:50:48 +01:00
Ted John 475a142bf7 Implement steep to flat pieces 2016-10-03 23:50:34 +01:00
Ted John 3c43bb5522 Implement most of the slope pieces 2016-10-03 22:35:06 +01:00
Michael Steenbeek 52e5506d9a Fix crashes in ride with more than 12 cars per train 2016-10-03 21:58:52 +01:00
Ted John fc8bd70f93 Implement 25 and 60 deg up 2016-10-03 21:40:32 +01:00
Ted John e18233d71e Implement station 2016-10-03 21:40:32 +01:00
Ted John 041b286c8b Implement flat 2016-10-03 21:40:32 +01:00
Ted John 1bb09d6c62 Setup debug settings 2016-10-03 21:40:32 +01:00
Ted John 7c61b960b7 Setup paint function for wooden wild mouse coaster 2016-10-03 21:40:32 +01:00
Ted John 3cbf06c886 Fix sub_98197C_rotated 2016-10-03 21:40:13 +01:00
Ted John bf5b0e69fa Fix sub_98199C_rotated 2016-10-03 19:35:56 +01:00
Ted John 5e554ebdcb Allow loading saved games in editor 2016-10-03 19:14:26 +01:00
Ted John 9359379d29 Do not load title screen by default 
There may be crashes if something fails to load or initialise without an explicit fallback to show the title screen. These will need to be fixed when found.
 2016-10-03 19:06:13 +01:00
Ted John 862b715003 Fix #4522: Theme music doesn't stop when connected to paused server 
Refactor audio initialisation and stop all music and sounds when the screen mode changes.
 2016-10-03 18:14:34 +01:00
Marijn van der Werf a27cebd973 Convert more occurences of osx to macos 2016-10-03 16:12:04 +02:00
ThePsionic 744bc05906 Update contributors.md 
[ci skip]
 2016-10-03 14:07:31 +01:00
Marijn van der Werf 35e88dc534 Update contributors.md 
[ci skip]
 2016-10-03 13:17:58 +01:00
OpenRCT2 git bot 0aa0bec804 Merge Localisation/master into OpenRCT2/develop. 2016-10-03 04:00:19 +00:00
Ted John fe4ce101d3 Merge pull request #4515 from IntelOrca/paint/air-powered-vertical-rc 
Paint Setup: Air Powered Vertical Coaster
 2016-10-02 23:54:09 +01:00
Ted John 985e3f28bc Revert openrct2.vcxproj.user 2016-10-02 23:46:20 +01:00
Ted John 2ece5fbd64 Fix arrays, too many braces 2016-10-02 23:45:58 +01:00
Ted John 004cef2d0c Implement banked quarter turn 5 2016-10-02 23:32:15 +01:00
Ted John e7823df1e1 Implement quarter turn 5 2016-10-02 22:38:50 +01:00
Ted John 03e5f6b4f4 Implement vertical slopes 2016-10-02 21:44:07 +01:00
Ted John a77c37f680 Fix blank commit information for AppVeyor 2016-10-02 20:22:28 +01:00
Ted John 08eb1db6d3 Fix crash due to memset to 0 on std::string 2016-10-02 19:16:09 +01:00
Ted John 62296c6558 Implement vertical up, down and top 2016-10-02 19:10:27 +01:00
Ted John ab7d38bc36 Add single tile banks 2016-10-02 18:00:30 +01:00
Ted John ecb48b8332 Implement brakes 2016-10-02 17:36:20 +01:00
Ted John 5accbe33b5 Implement station 2016-10-02 17:33:15 +01:00
Ted John d770c5d7f8 Implement flat 2016-10-02 17:24:54 +01:00
Ted John cfd32f9b35 Prepare debug start info 2016-10-02 17:14:45 +01:00
Ted John 64dcc5ccb6 Begin air powered vertical coaster painting 2016-10-02 17:14:27 +01:00
Ted John d81bed5ee6 Fix resize invalidation when switching multiplayer window tabs 2016-10-02 13:47:20 +01:00
Ted John 8932707018 Don't show read groups.json error when it doesn't exist 2016-10-02 13:38:22 +01:00
Ted John e7ef1ca6e0 Fix #4502: Error messages aren't detailed 
Most likely a regression of 097c5b101d. gGameCommandErrorText is now cleared when entering a game command at nest level 0. This should ensure no previous error text is carried over to another game command but also still allow nested game commands to work properly.

Potentially fixes #4480: Inappropriate "Land not owned by park" messages.
 2016-10-02 12:49:30 +01:00
Ted John 22c7cd4179 Improve bad error messages in multiplayer window 
Set the title and text in the multiplayer commands to make sure it doesn't show an error box with the wrong text.
 2016-10-02 12:28:28 +01:00
Ted John 42580af498 Fix #4304: Improve the chat improvement/coloring 
Colour codes were being prepended to the line string but draw string was not given the start of the buffer.
 2016-10-02 11:33:16 +01:00
Michał Janiszewski 20d3b070bb Update docker image with recent lib32-sdl2_ttf changes 2016-10-02 11:35:08 +02:00
Michał Janiszewski 43eba72f66 Fix testpaint for GCC 2016-10-02 10:41:03 +02:00
Michael Steenbeek 2f2c2beb7f Merge pull request #4375 from jensj12/trains-tooltip 
Allow 31 trains per ride (cheat and tooltip), solves #3537
 2016-10-02 10:08:57 +02:00
Ted John c333b0c4df Fix #3963: Messages ignore paused game 2016-10-02 01:49:58 +01:00
Ted John 305e6184f8 Try merging free image lists if failed to allocate one 2016-10-02 01:10:43 +01:00
Ted John ff34967e9b Ensure all images are freed, fix leak 2016-10-02 00:44:07 +01:00