1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 00:34:46 +01:00
Commit Graph

11328 Commits

Author SHA1 Message Date
Ted John
9b958bfb47 free initial object chunk 2016-06-23 18:59:55 +01:00
Ted John
00bc8fadc4 fix loading of large scenery objects 2016-06-23 18:26:55 +01:00
Ted John
d892f6b683 Merge pull request #3937 from janisozaur/fix-3897
Fix #3897
2016-06-22 22:28:17 +01:00
Michał Janiszewski
803f334b44 Make sure all of object_type_large_scenery_load gets copied 2016-06-22 21:37:44 +02:00
Michał Janiszewski
6e35eac6f8 Update fields in rct_small_scenery_entry_32bit 2016-06-22 21:37:44 +02:00
wolfreak99
2960338268 numObjects to gInstalledObjectsCount 2016-06-21 15:15:01 -04:00
wolfreak99
08b5a1dc22 Switch from bools to filter_flags 2016-06-21 14:59:13 -04:00
wolfreak99
b587b15ddd Formatting improvements (pt 1) 2016-06-21 14:30:07 -04:00
wolfreak99
4afdf20f14 Do not show selected and non-selected in track manager mode (as track manager is a single-select interface) 2016-06-21 10:16:51 -04:00
Gymnasiast
c487e1278b Allow most steep inclines for the Junior RC 2016-06-20 20:08:11 +02:00
Michał Janiszewski
644a36a310 Fixes to -Wall compilation
By default, not all warnings are enabled. This change makes sure that
the project compiles correctly with following options turned on:

    -Wall -Wno-unused-but-set-variable -Wno-missing-braces \
    -Wno-unknown-pragmas -Wno-unused-function
2016-06-20 13:46:27 +01:00
Ted John
9f2f7c6b68 Merge pull request #3930 from janisozaur/fix-3923
Fix #3923
2016-06-20 13:45:19 +01:00
Michał Janiszewski
9b1742f309 Make config_apply_to_old_addresses empty for NO_RCT2 2016-06-20 14:11:10 +02:00
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
Marijn van der Werf
6050b1d07a Identify rct_vehicle:var_D4 2016-06-19 16:17:23 +02:00
Marijn van der Werf
2d7526cd7e Attempt to name mini golf animations 2016-06-19 16:16:35 +02:00
Marijn van der Werf
d3d48bd9af Use macro for currentViewportFlags 2016-06-19 16:16:12 +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
wolfreak99
e2ba6aa6ed Text capitalization adjustments for consistancy 2016-06-18 20:52:38 -04: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