mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 12:03:07 +01:00
Code Issues Releases Wiki Activity
9,006 Commits 8 Branches 59 Tags
bf7feefb7d7eece2a32a5e8cda27d2647d3560cb
Commit Graph

9006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ted John
bf7feefb7d Fix GCC / clang 2016-09-13 18:58:45 +01:00
Ted John
fdc0010525 Remove List.hpp 2016-09-13 18:29:38 +01:00
Ted John
5e352a9dfe Remove usage of List from Twitch.cpp 2016-09-13 18:27:57 +01:00
Ted John
97f231d945 Remove usage of List from Theme.cpp 2016-09-13 18:26:44 +01:00
Ted John
c0957efb37 Fix truncate warning message by adding missing comma 2016-09-13 18:18:58 +01:00
Ted John
774c72e1d1 Remove usage of List and refactor S4Importer 
Extending the collection classes isn't being adopted enough and adds to much maintenance. Use collection utility methods instead.
 2016-09-13 18:14:47 +01:00
Manuel Vögele
73b7f3c9f4 Fix corrupted tcp stream when pinging while sending packets 
Don't push network packets to the front of the queue if the frist packet is only partially transmitted. They are now inserted at the second
position instead.
 2016-09-12 23:59:22 +01:00
Ted John
7cecdeba3f Integrate addresses from peep.c 2016-09-12 21:12:38 +01:00
Michał Janiszewski
aa346e2bef Fix NO_RCT2 macro check in sprite.c 2016-09-12 21:59:19 +02:00
Ted John
1511143ea9 Remove commented out RCT2_GLOBALs 2016-09-12 20:57:36 +01:00
Ted John
148e6c3cd1 Remove unused global in staff.c 2016-09-12 20:53:10 +01:00
Ted John
d8a2ee47b8 Remove unused globals in track.c 2016-09-12 20:51:57 +01:00
Ted John
44214ab2b8 Integrate gCurrentFont fully 2016-09-12 20:43:43 +01:00
Ted John
8d5a553c0a Remove old config compatibility 
Note: This will stop paths from showing the correct height markers when in original drawing mode.
 2016-09-12 20:39:07 +01:00
Ted John
54612789f6 Use ifdef, not if 2016-09-12 20:38:25 +01:00
Ted John
6e562c37f9 Remove unwanted files 
Not sure how I managed to commit these...?
 2016-09-12 20:25:17 +01:00
Ted John
4225f29d94 Fix #4407: Ride construction window track preview broken 
Regression introduced in b998f5b3d5. Change 0xF1AD0C to be conditionally integrated.
 2016-09-12 20:16:27 +01:00
Duncan
b4ca0c3508 Fix #4415: Rides that change colours each train were incorrectly loaded causing all same colour 
Mistake caused by new object loader not reproducing legacy technique used to indicate that a ride is a change colour each train type.
 2016-09-12 20:11:43 +01:00
Ted John
a2bf35eee5 Remove old Junior RC paint hack 2016-09-12 19:51:30 +01:00
Ted John
788687537f Merge pull request #4419 from janisozaur/integrate 
Integrations for NO_RCT2 builds
 2016-09-12 19:10:38 +01:00
Ted John
a33e02f70a Don't compile any address constants that aren't used 2016-09-12 19:10:14 +01:00
Ted John
aa310f6544 Conditionally integrate sprite list so original drawing still works 2016-09-12 18:56:52 +01:00
Michał Janiszewski
10c2a99e92 Conditionally integrate object entries tables 2016-09-12 19:27:06 +02:00
Michał Janiszewski
5603e11d49 Remove unused 0x13CA742 2016-09-12 19:27:06 +02:00
Michał Janiszewski
305a949745 Remove unused RCT2_ADDRESS_EXPENDITURE_TABLE 2016-09-12 19:27:06 +02:00
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