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

8842 Commits

Author SHA1 Message Date
Ted John 6a665330c2 Integrate gCommonStringFormatBuffer 2016-09-04 15:55:37 +01:00
Ted John b38416426f x64: Fix game_command_set_banner_name 2016-09-04 15:51:52 +01:00
Ted John d86153e575 Integrate gMarketingCampaignDaysLeft, gMarketingCampaignRideIndex 2016-09-04 15:47:56 +01:00
Ted John ae0eb1804c Integrate gParkRatingCasualtyPenalty 2016-09-04 15:44:59 +01:00
Ted John 9478e0a53e Integrate gHistoricalProfit 2016-09-04 15:36:39 +01:00
Ted John e47b8d906e Integrate gLastEntranceStyle 2016-09-04 15:21:49 +01:00
Ted John 5893c6da82 Remove loan hash, but keep for S6 export 2016-09-04 15:11:15 +01:00
Ted John 3c80df07d4 Integrate gSavedAge 2016-09-04 15:11:15 +01:00
Ted John 8993328232 Integrate some scenario strings 2016-09-04 15:11:15 +01:00
Michał Janiszewski d9274ffd82 Enable all warnings as errors for 64 bit builds (cmake) 2016-09-04 12:16:09 +00:00
Ted John 9c645e0a0f Refactor track_design_draw_preview 2016-09-04 12:16:56 +01:00
Ted John 8bc69b549f Set advertiser to null after deletion 2016-09-04 11:17:15 +01:00
Ted John 272ccc36f1 x64: Fix last warning and reinstate warnings as errors (msvc) 2016-09-04 00:30:17 +01:00
Ted John d24010b1b5 Add dead code check in FillRect 2016-09-04 00:22:56 +01:00
Ted John 942c26959c Remove unused code in widget_caption_draw 2016-09-04 00:14:56 +01:00
Ted John 73cf06d334 Merge pull request #4359 from jensj12/infinite-loop 
Fix #2081: Prevent infinite loop
 2016-09-04 00:12:02 +01:00
Michał Janiszewski f8145b6edc Refactor inclusion of addresses.h 
addresses.h is now only included when necessary, limiting scope as much
as possible.
 2016-09-03 21:25:19 +01:00
Ted John 4cdc91a910 Merge pull request #4372 from janisozaur/news-items 
Integrate news items
 2016-09-03 18:40:37 +01:00
Michał Janiszewski 599b092487 Conditionally integrate some variables 2016-09-03 18:40:23 +01:00
Duncan 755aa48712 Add deadcode asserts 2016-09-03 18:35:07 +01:00
Michał Janiszewski a5af67e481 Fix news items counts 2016-09-03 17:45:31 +02:00
Michał Janiszewski d5eb3b9488 Integrate news items 2016-09-03 17:24:41 +02:00
jensj12 5500e9e5cd Fix backwards loop in vehicle.c 2016-09-03 16:56:00 +02:00
jensj12 b5456f961a Update changelog 2016-09-03 16:56:00 +02:00
jensj12 c7879d08cd Fix #2081: prevent infinite loop in ride_find_track_gap 
Adds an extra iterator that steps forward at half the speed of the
normal iterator. If they ever meet, there's a loop in the track and the
track is classified as incomplete.
 2016-09-03 16:56:00 +02:00
Ted John 73d453228a Integrate gDisableErrorWindowSound 2016-09-03 14:22:03 +01:00
Ted John f2dea1832a Integrate gScreenshotCountdown 2016-09-03 14:15:29 +01:00
Ted John cb235c9d56 Integrate filter arguments in guest list window 2016-09-03 13:54:59 +01:00
Ted John 2722a85ee4 Fix #4349: x64: Crash when placing roller coaster track designs 2016-09-03 13:09:50 +01:00
Ted John 01c78bc9de Merge pull request #4361 from marijnvdwerf/integrate/window-map 
Integrate map window variables
 2016-09-03 12:52:56 +01:00
duncanspumpkin 22cec6d1f5 Fix #4296. Metal A supports correctly branch 2016-09-03 09:31:00 +01:00
duncanspumpkin c702fc51d4 Remove broken code that did nothing 2016-09-03 08:37:44 +01:00
Michael Steenbeek fe8f14be58 Fix cmake in directories with apostrophes (#4366) 2016-09-02 18:18:59 +00:00
Michael Steenbeek d6dc260f22 Add sprites for diagonal flat-to-steep slopes 2016-09-02 13:38:24 +01:00
OpenRCT2 git bot 6dfcfb4098 Merge Localisation/master into OpenRCT2/develop. 2016-09-02 04:00:27 +00:00
Michael Steenbeek 2091a30e81 Merge pull request #4365 from Gymnasiast/update-gitignore 
Update .gitignore
 2016-09-01 23:35:45 +02:00
Michał Janiszewski 1a533147d0 Initalise g_ps_EE7880 properly 
This should fix rendering problems in 64-bit mmap builds
 2016-09-01 22:57:17 +02:00
Michał Janiszewski 2257bd547b Make paint_structs static 2016-09-01 22:56:59 +02:00
Michał Janiszewski f3fe28e722 Verify sv4/sc4 sizes when loading them 2016-09-01 22:56:30 +02:00
Michael Steenbeek 355b33ba94 Fix assertion getting hit on valid path types 2016-09-01 22:56:05 +02:00
Marijn van der Werf 7766faf00d Rename _curPixel to _currentLine 2016-09-01 13:13:07 +02:00
Marijn van der Werf 74eac21162 Dynamically allocate memory for map 2016-09-01 13:07:28 +02:00
Marijn van der Werf 2431930a8e Integrate map array 2016-09-01 00:22:41 +02:00
Marijn van der Werf 4e8e664e94 Integrate 0x00F1AD61 2016-08-31 21:12:07 +02:00
Michael Steenbeek 02c1db82af Fix assertion getting hit on valid path types 2016-08-31 17:58:58 +01:00
Michael Steenbeek 2d55356e6e Update .gitignore 2016-08-30 19:36:07 +01:00
Gymnasiast bfbe85ed07 Update .gitignore 2016-08-30 19:30:53 +02:00
Michał Janiszewski dd7bfdc529 Conditionally integrate pointer at 0xEE7880 2016-08-30 15:27:08 +01:00
OpenRCT2 git bot f2687eebb2 Merge Localisation/master into OpenRCT2/develop. 2016-08-30 04:00:22 +00:00
Ted John 5e30390f4a Set user agent for HTTP requests 2016-08-29 19:25:53 +01:00