mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,627 Commits 8 Branches 40 Tags 368 MiB
Commit Graph

7627 Commits

Author SHA1 Message Date
Marijn van der Werf 6d6bd0a129 Draw Circus Show (#3649) 2016-05-18 18:16:37 +01:00
Martin Černáč feed51de27 Add correct tooltip entry for the no. circuits (#3650) 2016-05-18 12:56:30 +01:00
OpenRCT2 git bot 1fd2c1d000 Merge Localisation/master into OpenRCT2/develop. 2016-05-18 04:00:21 +00:00
Ted John 8efe699754 integrate gMapTooltipFormatArgs 2016-05-18 00:02:26 +01:00
Ted John 8d4e4ed0e9 remove unread RCT2_GLOBALs 2016-05-17 23:39:37 +01:00
Ted John 51f01c3341 use set_format_arg instead of RCT2_GLOBAL 2016-05-17 23:29:33 +01:00
Ted John a6a2dc516a Merge pull request #3644 from marijnvdwerf/paint-setup/cleanup-5 
Cleanup/harmonisation of paint code
 2016-05-17 23:13:47 +01:00
Ted John 42c83ab982 integrate peep pathfinding goal position 2016-05-17 22:51:46 +01:00
Ted John 8499600786 integrate peep queue pathfinding variables 2016-05-17 22:37:35 +01:00
Marijn van der Werf 5a5eea6837 Add size to sprite arrays 2016-05-17 23:31:10 +02:00
Marijn van der Werf 8756f4cff0 Move data outside of headers 2016-05-17 23:04:37 +02:00
Ted John 6510de394b remove use of 0x00F1AEE0 in footpath_is_connected_to_map_edge 2016-05-17 22:03:06 +01:00
Ted John e73aeb9a42 integrate gGameCommandNestLevel 2016-05-17 21:47:14 +01:00
Ted John 4847cfe84f clean up footpath_get_coordinates_from_pos 2016-05-17 21:42:46 +01:00
Ted John 14825a8dbc integrate queue chain and refactor 2016-05-17 21:29:05 +01:00
Ted John c879638f22 integrate ground flag variables 2016-05-17 20:51:11 +01:00
Marijn van der Werf dbfca8997a Use support-setting functions in more places 2016-05-17 21:05:45 +02:00
Marijn van der Werf f0badd9e73 Clean up facility drawing 2016-05-17 21:05:04 +02:00
Ted John 52a92fa6f1 fix #3623: initialise _loadedTrackDesignIndex to UNLOADED 2016-05-17 19:55:07 +01:00
Marijn van der Werf 21254c6f51 Clean up dodgems 2016-05-17 20:50:29 +02:00
Marijn van der Werf 10a1526ca6 Clean up spiral slide 2016-05-17 20:29:45 +02:00
Marijn van der Werf defa3852db Clean up maze paint 2016-05-17 20:06:13 +02:00
Marijn van der Werf acab4d351e Clean up shop drawing 2016-05-17 20:02:30 +02:00
Marijn van der Werf ac53e8d24d Clean up 3x3 rides 2016-05-17 19:50:49 +02:00
Marijn van der Werf ed9ee3fba2 [fixup] Remove accidentally commited line 2016-05-17 19:50:30 +02:00
Marijn van der Werf ea47382e97 Clean up crooked house 2016-05-17 19:48:28 +02:00
Marijn van der Werf f3a563db8e Start cleanup/harmonisation of paint code 2016-05-17 19:10:25 +02:00
Yaroslav Tretyakov 384b58bc68 Fix #3566: Implement bugfix in GOG/Steam version of original (#3643) 2016-05-17 18:08:24 +01:00
Ted John cc0c3cc077 Merge pull request #3630 from Gymnasiast/fix-3459 
Set NO_MONEY_SCENARIO flag when importing SC4 scenarios without money, fixes #3459
 2016-05-17 08:53:35 +01:00
OpenRCT2 git bot f1c5d47705 Merge Localisation/master into OpenRCT2/develop. 2016-05-17 04:00:20 +00:00
Ted John 680c33d30f do scrolling text RCT2 hack for walls too 2016-05-16 20:32:45 +01:00
Gymnasiast af65758bd2 Create RCT1_PARK_FLAGS and use them when importing 2016-05-16 20:38:55 +02:00
Gymnasiast b72aac9fbf Set NO_MONEY_SCENARIO flag when importing SC4 scenarios without money, fixes #3459 2016-05-16 20:28:59 +02:00
Ted John eb19ca8626 integrate variable: gFootpathPrice 2016-05-16 19:05:37 +01:00
Ted John 975eacc5f9 add temp RCT2 memory copy for scrolling text paint 
Fixes #3628: assertion
Fixes #3634: wrong queue banner text

Until path_paint is implemented, this variable is used by scrolling_text_setup to use the old string arguments array. Remove when scrolling_text_setup is no longer hooked.
 2016-05-16 18:44:44 +01:00
Ted John 0293218890 fix #3633: scenery tool, CTRL does not work correctly 2016-05-16 18:24:36 +01:00
Michał Janiszewski d4394c73d3 Limit what is considered a valid tile (#3631) 
`smooth_land_tile` already calls to `map_is_location_valid`, but the
latter allows for elements that are clearly outside the range.

Fixes #3549
 2016-05-16 10:32:08 +01:00
OpenRCT2 git bot 193ae36cb4 Merge Localisation/master into OpenRCT2/develop. 2016-05-16 04:00:19 +00:00
Ted John 9ebb7f4931 Merge pull request #3621 from IntelOrca/refactor/common-format-args 2016-05-15 23:47:55 +01:00
Ted John a9e4ff98c0 fix #3572: scenario description not loaded for scenarios 2016-05-15 23:26:06 +01:00
Ted John 06aeded227 use memcpy for set_format_arg 
To get round strict aliasing problem.
 2016-05-15 23:21:37 +01:00
Ted John d424eb44ed fix #3587: convert CP1252 to UTF8 when importing highscores 2016-05-15 23:15:40 +01:00
Michał Janiszewski b7f3259779 Guard against crash with synchronised vehicles, fix typo (#3624) 2016-05-15 22:49:59 +01:00
Ted John cbf9a393f1 remove use of get_format_arg 
Because of strict aliasing, we must use memcpy in some cases.
 2016-05-15 22:40:25 +01:00
Yaroslav Tretyakov 9c9f1189c6 Fix #3619: Bobsled coaster not banking properly (#3622) 2016-05-15 22:37:59 +01:00
Ted John 1cc35dfe6e integrate common format args 2016-05-15 22:03:53 +01:00
Ted John 6df1b9ac98 stop resetting the selected footpath 
Fixes #2931 - in multiplayer when client joins
Fixes #3606 - on autosave
 2016-05-15 19:08:02 +01:00
Yaroslav Tretyakov a3469cf073 Fix #3598: Validate vehicle track movement (#3612) 2016-05-15 17:20:46 +01:00
Ted John 2fadc8d2be remove redundant global usages 2016-05-15 17:19:32 +01:00
Ted John 72957660ef integrate window scenery variables 2016-05-15 17:16:21 +01:00