mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity
9,023 Commits 8 Branches 59 Tags
8ce693bb82580bd06d102dbeee643253c0789fbb
Commit Graph

9023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ted John
8ce693bb82 Integrate locals in screen_get_map_xy 2016-09-14 12:51:14 +01:00
Ted John
aefa481b3d Integrate locals in viewport_interaction.c 2016-09-14 12:49:20 +01:00
Michał Janiszewski
0d982f0f52 Remove stray RCT2_GLOBAL from window.c 2016-09-14 09:15:33 +02:00
Ted John
b27b781256 Merge pull request #4430 from LRFLEW/xcode8 
Update Xcode Project for Xcode 8
 2016-09-14 08:08:08 +01:00
OpenRCT2 git bot
2a184aae23 Merge Localisation/master into OpenRCT2/develop. 2016-09-14 04:00:21 +00:00
LRFLEW
e1b6319bc1 Fix Warnings in Xcode about Copy Elision 2016-09-13 18:07:40 -05:00
LRFLEW
e07c374f2d Update Xcode Project for Xcode 8 2016-09-13 18:07:40 -05:00
Ted John
b8e4f71ab1 Fix #4422: Save overwrite multiplayer 
Make sure we reset gFirstTimeSave when we join a new game or exit to title screen.
 2016-09-13 23:53:46 +01:00
Ted John
956e309409 Remove remaining addresses in window.c 2016-09-13 23:45:40 +01:00
Ted John
bb348acf57 Remove original string support 2016-09-13 23:27:29 +01:00
Ted John
de8e5b9f55 Remove unused addresses in localisation.c 2016-09-13 23:25:00 +01:00
Marijn van der Werf
d3b7a0cbb9 Integrate addresses of old paint functions 2016-09-13 20:25:06 +01:00
Ted John
c3da4f0ecc Merge pull request #4425 from IntelOrca/refactor/misc 
Remove List and refactor S4Importer
 2016-09-13 20:23:26 +01:00
Duncan
6e92df1299 Fix #4386: Wrong animation - Merry Go Round 
Issue caused by data integration. The rotation time to sprite maps had an extra 7 end bytes at the end of each array to account for the increased time increments during control failure. Without the extra end bytes the game would access invalid memory during a control failure.
Refactored code of vehicle update to remove register names.
 2016-09-13 19:47:31 +01:00
Ted John
3191c421af Merge pull request #4424 from manuelVo/fix-opengl 
Defer instantiation of TextureCache until OpenGL is initialized
 2016-09-13 19:45:24 +01:00
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
f7caa55ee1 Defer instantiation of TextureCache until OpenGL is initialized 
If TextureCache is instantiated before OpenGL is initialized and
something goes wrong during OpenGL initialization the destructor of
TextureCache calls an OpenGL function which will cause the application
to crash.
 2016-09-13 18:46:26 +02:00
Manuel Vögele
6486c4f6ea Show exception messages when initializing a drawing engine fails 2016-09-13 18:28:44 +02: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