mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Code Issues Releases Wiki Activity
7,971 Commits 8 Branches 59 Tags
6b848dfe3cfce8b7025f8527d659c62fac68ebfa
Commit Graph

7971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michał Janiszewski
6b848dfe3c Revert "Remove config_apply_to_old_addresses, not used anymore" 
This reverts commit 39aaf85182.

Fixes #3923
 2016-06-20 14:09:39 +02:00
Michał Janiszewski
27b74dff72 Try loading rct2 segments for x86-64 just like for i386 (#3922) 
This shifts focus away from illegal accesses to RCT2 memory to fixing up
the pointers we use
 2016-06-20 12:04:07 +02:00
Michał Janiszewski
c177cc72e9 fix #3917: no rides show in new ride window 
Make sure gTypeToRideEntryIndexMap is properly sized
 2016-06-20 10:20:22 +01:00
Ted John
301f5297ef Merge pull request #3915 from Wirlie/develop 
Improve scrollbars.
 2016-06-20 08:18:29 +01:00
gsp8181
1c8e402aed Fixed translation from en-US 'bathroom' to en-GB 'toilet' (#3914) 2016-06-20 08:47:30 +02:00
Wirlie
0209fcc9bf Improve horizontal scrollbars. 2016-06-19 19:23:46 -05:00
Ted John
22c0cc92e6 Merge pull request #3897 from janisozaur/rebase-no-rct2 
Separate g1 and object loading to prepare for x64.
 2016-06-19 23:25:29 +01:00
Michał Janiszewski
5a7bbf71fe Fix condition guarding memory checksum verification 2016-06-20 00:05:30 +02:00
Michał Janiszewski
402e5a32a0 Integrate path variables used by game 2016-06-19 23:52:20 +02:00
Michał Janiszewski
ba7008df18 Integrate some scenario variables 
gScenarioTicks is still being used in some of native code
 2016-06-19 23:52:20 +02:00
Michał Janiszewski
5a1d802a6a Integrate gTotalNoImages 2016-06-19 23:52:20 +02:00
Michał Janiszewski
cb4b9ba1c3 Integrate gTypeToRideEntryIndexMap 2016-06-19 23:52:20 +02:00
Wirlie
20fce67e9a Improve vertical scrollbars. 2016-06-19 15:52:40 -05:00
Michał Janiszewski
39aaf85182 Remove config_apply_to_old_addresses, not used anymore 2016-06-19 18:12:15 +02:00
Michał Janiszewski
4d62d79528 Remove debugging messages 2016-06-19 18:12:15 +02:00
Michał Janiszewski
58b4361e8d Pack structs for when loading from files 2016-06-19 18:12:14 +02:00
Ted John
613c7250f2 print NO_RCT2 flag in version info for binary confidence 2016-06-19 18:12:14 +02:00
Ted John
858a781347 remove RCT2 memory checksum for Win32 NO_RCT2 2016-06-19 18:12:14 +02:00
Michał Janiszewski
30d0e35b17 Rebase fixes 2016-06-19 18:12:14 +02:00
Michał Janiszewski
2273626bdd Refactor gX.dat loading, make sure g2.dat loads too 2016-06-19 18:12:14 +02:00
Michał Janiszewski
ea075fb736 Fix VS warning 2016-06-19 18:12:14 +02:00
Michał Janiszewski
580789bcf4 Fixes to object loading for x86-64 2016-06-19 18:12:14 +02:00
Michał Janiszewski
ded905a259 Fixes to object loading 2016-06-19 18:12:14 +02:00
Michał Janiszewski
340997b365 Add new function to object vtable: reset 
For use when an object has to be recreated based on already-existing
copy in memory with pointers of native length.
 2016-06-19 18:12:14 +02:00
Michał Janiszewski
8a6eec0236 Try loading objects for x86-64 2016-06-19 18:12:14 +02:00
Ted John
7b421c8052 Update readme.md 
Fix typos.
 2016-06-19 13:16:54 +01:00
Josue Acevedo
5e5ec75eea Fix #2754: Dragging scrollview fails when scaled 2016-06-19 13:15:39 +01:00
Ted John
97fedab37f Update readme.md 2016-06-19 01:55:36 +01:00
Hugo Wallenburg
fc9595d013 Freeze climate only freezes climate updates, allowing lightning to strike (#3904) 2016-06-18 17:48:17 +01:00
Josue Acevedo
425fc73979 Fix #3839: Chains can be set on stores if 'Allowing chain lifts for all pieces' is on 
Show widget if the ride has track when the cheat is enabled
This stops the chain lift button showing for shops and flat rides.
 2016-06-18 15:13:17 +01:00
duncanspumpkin
42029c031a Fix openGl zooming placement. 
Note there are still bugs with zooming
 2016-06-18 07:46:02 +01:00
OpenRCT2 git bot
5b1fbd9007 Merge Localisation/master into OpenRCT2/develop. 2016-06-18 04:00:20 +00:00
Josue Acevedo
fd13c200e6 Fix possible track configurations. Fixes #3564. (#3898) 2016-06-18 01:10:09 +01:00
Michał Janiszewski
96376255f6 Fix #3790: Guard against null ride types in peep AI 2016-06-17 21:19:25 +01:00
Yaroslav Tretyakov
9829fc13d3 Fix #3885: Scenery with 0 height bound box incorrect 2016-06-17 20:53:14 +01:00
Michał Janiszewski
0ec2b001cb Properly save objects, fixes #3886 (#3892) 2016-06-17 08:30:07 +01:00
Michał Janiszewski
4be4ed19a3 Don't tween objects when minimised (#3891) 2016-06-17 08:13:15 +01:00
Ted John
dcf0a9dad1 Merge pull request #3887 from janisozaur/rebase-no-rct2 
NO_RCT2 work
 2016-06-16 22:27:38 +01:00
Michał Janiszewski
542828b5d4 Fix wrong vehicle position, nullptr guard 2016-06-16 23:14:38 +02:00
Michał Janiszewski
78e2aec5fe Make map element arrays static 2016-06-16 22:51:28 +02:00
Michał Janiszewski
c2bf4b75e7 Integrate tile map element pointers usage (#3442) 2016-06-16 19:05:15 +02:00
janisozaur
c301f8ee14 Load g1 elements correctly into memory (#3436) 2016-06-16 15:03:36 +02:00
Ted John
935114a04c Merge pull request #3884 from janisozaur/rebase-no-rct2 
Enable x64 and NO_RCT2 configurations with some basics working.
 2016-06-16 11:12:04 +01:00
Michał Janiszewski
cdab4bc0fd Add CMake target not using RCT2, use it for linux64 job 2016-06-16 11:37:52 +02:00
Michał Janiszewski
3d4eceb5ca Fix rebase 2016-06-16 11:36:15 +02:00
Ted John
ad1b9265dc integrate variables for various drawing pointers 2016-06-16 11:36:15 +02:00
Michał Janiszewski
a5c119ba60 Load assets properly for 32 bit builds 2016-06-16 11:36:15 +02:00
Ted John
b73861be99 integrate variable: g1Elements 2016-06-16 11:36:15 +02:00
Ted John
d07b9535c2 integrate variables: object entry lists 2016-06-16 11:36:15 +02:00
OpenRCT2 git bot
7c9f59f1c5 Merge Localisation/master into OpenRCT2/develop. 2016-06-16 04:00:17 +00:00