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

9081 Commits

Author SHA1 Message Date
Ted John 9f61321308 Merge branch 'develop' of https://github.com/OpenRCT2/OpenRCT2 into develop 2016-09-12 17:53:15 +01:00
Michał Janiszewski c5cdfb924d Integrate ColourMapA and B 2016-09-12 16:59:58 +01:00
Ted John f32bab35fa Merge pull request #4416 from marijnvdwerf/integrate/paint-2 
Partially integrate more paint variables
 2016-09-12 08:36:33 -04:00
Marijn van der Werf 9b3470be3b Partially integrate data at 0x9DE574 2016-09-12 13:02:32 +02:00
Marijn van der Werf 2232f63973 Integrate leftover references to gTrackColours 2016-09-12 13:02:32 +02:00
Ted John 70d35e91fb Merge pull request #4413 from janisozaur/fixes 
* Make sure shifted value is unsigned
* Guard against passing NULL to qsort()
 2016-09-12 08:18:29 +01:00
Ted John 967130c004 Add localisation\user.h to vcxproj 2016-09-11 22:41:57 +01:00
Hielke Morsink 0ed526bb0d Fixes _scenarioFileName pointing to deleted memory 2016-09-11 22:30:13 +01:00
Michał Janiszewski f6daea7cef Guard against passing NULL to qsort() 2016-09-11 21:20:48 +02:00
Michał Janiszewski 84dc29b929 Make sure shifted value is unsigned 2016-09-11 21:20:48 +02:00
Michał Janiszewski b0a8fb0a7c Enable more warnings for CMake 2016-09-11 11:20:39 +01:00
Ted John 64df46ba16 Integrate and remove unused globals 2016-09-11 01:02:16 +01:00
Ted John 7edcd11aa7 Integrate entertainer costumes 2016-09-11 00:40:51 +01:00
Ted John 65cd3705b1 Integrate sprite list 2016-09-11 00:23:18 +01:00
Ted John 4a6b2f2ef2 Integrate gRides and gRideMeasurements 2016-09-11 00:05:32 +01:00
Ted John 4ec6b85ff7 Integrate user strings 2016-09-10 23:56:50 +01:00
Ted John 04af8fcd17 Remove unused string buffers 2016-09-10 23:50:31 +01:00
Ted John 5db4f4f2ee Remove references to 0x009C383D 2016-09-10 23:48:29 +01:00
Ted John fe7800a508 Integrate _drawScrollTextList and _characterBitmaps 2016-09-10 23:42:19 +01:00
Ted John 2f8b307ab7 Merge pull request #4405 from marijnvdwerf/integrate/various-paint 
Partially integrate various paint variables
 2016-09-10 23:02:15 +01:00
Ted John 0553ed5b95 Integrate various buffers 2016-09-10 23:01:42 +01:00
Ted John 07ce3c67ee Integrate last address in guest_list.c 2016-09-10 22:49:30 +01:00
Ted John ab12cda49d Remove unnecessary draw string and address 2016-09-10 22:49:30 +01:00
Ted John 83de03b260 Remove unused address in about.c 2016-09-10 22:49:30 +01:00
Marijn van der Werf b80377f5da Partially integrate track colours 2016-09-10 22:45:54 +01:00
Marijn van der Werf e490070a11 Partially integrate 0x009DEA58 2016-09-10 23:43:46 +02:00
Marijn van der Werf c5d947c1aa Partially integrate surface variables 2016-09-10 23:43:41 +02:00
Ted John ba453db01f Integrate vehicle globals, part 2 2016-09-10 22:32:01 +01:00
Ted John e234dcbb10 Integrate vehicle globals, part 1 2016-09-10 22:18:51 +01:00
Ted John 51277227eb Remove unused globals 2016-09-10 21:57:43 +01:00
Ted John 6af50c1135 Integrate variables in map.c 2016-09-10 21:50:21 +01:00
Ted John 08e042cb78 Merge pull request #4402 from janisozaur/non-virtual-dtor 
Non virtual dtor
 2016-09-10 21:45:39 +01:00
Michał Janiszewski 3c2569dbea Add -Wnon-virtual-dtor to CMakeLists.txt 2016-09-10 22:00:35 +02:00
Michał Janiszewski a2a067f0f1 Add missing virtual destructor to IStringReader 2016-09-10 22:00:34 +02:00
Ted John cce7d14b11 Merge pull request #4399 from janisozaur/integrate 
Integrate two paint addresses
 2016-09-10 18:35:54 +01:00
Ted John ef7cd793a4 x64: Fix game_command_modify_groups 2016-09-10 18:35:12 +01:00
Ted John 653c77c9da Remove unused globals in windows.c 2016-09-10 18:34:30 +01:00
Ted John 4350e53392 Integrate gS6Info 2016-09-10 18:30:53 +01:00
Ted John f36485557d Integrate remaining globals in ride window 2016-09-10 18:21:05 +01:00
Ted John 17198cfdb2 Integrate gTrackDesignSaveMode 2016-09-10 18:03:25 +01:00
Ted John d2b3a08739 Misc cleanup of RCT2_GLOBAL 2016-09-10 17:55:32 +01:00
Ted John 8950a03822 Integrate variables in top_toolbar.c 2016-09-10 17:52:46 +01:00
Ted John 20c35b10eb Integrate variables in park.c 2016-09-10 17:46:34 +01:00
Marijn van der Werf d1801f860b Fix CMake builds on macOS (#4398) 2016-09-10 17:30:07 +02:00
Michał Janiszewski 40370aea34 Conditionally integrate 0xF1AD10 2016-09-10 17:23:19 +02:00
Michał Janiszewski b998f5b3d5 Integrate 0xF1AD0C 2016-09-10 17:23:19 +02:00
Ted John f81c394c8b Remove unused variables 2016-09-10 15:22:14 +01:00
Ted John 2299b22cbc Integrate staff variables 2016-09-10 15:17:18 +01:00
Ted John 708efdd08c Integrate unknown game variables 2016-09-10 14:46:53 +01:00
Ted John f303642ceb Remove unused variables 2016-09-10 14:42:57 +01:00