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

8819 Commits

Author SHA1 Message Date
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
Michał Janiszewski 344c480a0f Push Linux builds to Bintray 
Seeing how Travis CI is unable to resolve their issue with connectivity,
I have added Bintray as alternative download location.
 2016-08-29 18:39:11 +01:00
Gert-Jan Vercauteren 66eed2b9a1 Added network code to xCode project 2016-08-29 17:13:20 +01:00
Ted John 7e5c22145e Merge branch 'refactor/network-advertise' into develop 2016-08-29 15:40:28 +01:00
Ted John d73c2ba13c Wire up new advertiser class 2016-08-29 15:35:46 +01:00
Ted John a346d8a048 Add NetworkServerAdvertiser class 2016-08-29 15:35:46 +01:00
Ted John 6266e77fd5 Add tag to http request / response 2016-08-29 15:35:45 +01:00
Michael Steenbeek 8cb212dbf9 Properly fix #4348 
PREMT1 obviously belongs to the LIM Launched RC, not to the non-existing ride 59.
 2016-08-29 13:55:33 +02:00
Ted John d07102ecf9 Fix #4348: Crash upon opening rollercoaster tab 
GetPreferedRideEntryOrder(...) did not define all 90 ride types. This caused said issue to happen when 'Select ride by track type (like in RCT1)' was enabled.
 2016-08-29 11:53:34 +01:00
Ted John 4ee9c2c76f Fix count-rct-globals script for Windows 2016-08-28 21:19:55 +01:00
Marijn van der Werf 51137b1fb6 Add script to count globals in use 2016-08-28 17:34:06 +01:00
Ted John 89c9cc26c0 Fix #4342: x64 version crashes on ride window, station view 2016-08-28 17:24:51 +01:00
Ted John c586b887fd Fix warnings in crash.cpp 2016-08-28 17:19:13 +01:00
Ted John 12ef20ef31 Re-enable crash dumping 2016-08-28 17:17:20 +01:00
Michał Janiszewski 7b1c018f53 Improve architecture detection macros 2016-08-28 16:57:54 +02:00
Ted John 831936d134 Draw platform information on title screen 2016-08-28 15:15:07 +01:00
Ted John 17b69d257b Merge pull request #4097 from marijnvdwerf/clean/string-ids-2 
Continue string ID cleanup
 2016-08-28 14:05:13 +01:00
Michał Janiszewski f73794e093 Fix NO_RCT2 evaluation in hook.c 2016-08-28 10:31:53 +01:00
Ted John 76043d4050 Fix peep thoughts crashing on x64 2016-08-28 00:37:10 +01:00
Michael Steenbeek 7ebdec7e8f Implement flat-to-steep pieces and 25-to-60-degree lifts on the Junior rc 2016-08-27 23:36:36 +01:00
Ted John 8cf7e87b5c Fix many warnings for x64 2016-08-27 23:32:15 +01:00
Ted John 1f398a69ff Add platform to upload filename 2016-08-27 15:14:34 +01:00
Ted John 75dde0467f Add static modifier 2016-08-27 14:40:05 +01:00
Ted John 10ef3fdcc3 Fix use of uninitialised GIT_COMMIT_SHA1_SHORT in msbuild 2016-08-27 14:08:31 +01:00