1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 19:43:06 +01:00
Commit Graph

7951 Commits

Author SHA1 Message Date
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
duncanspumpkin
31812a08a5 Remove hooks. All string code now implemented 2016-06-15 19:11:51 +01:00
Ted John
19cd56b9c2 Add Shader Palette Lookup 2016-06-15 17:53:26 +01:00
Ted John
d0dead085a Merge pull request #3873 from marijnvdwerf/macos
Clean up Xcode project
2016-06-15 12:17:05 +01:00
Duncan
f339bd6e7a Merge pull request #3465 from marijnvdwerf/paint-setup/path
Path paint
2016-06-15 07:10:55 +01:00
Marijn van der Werf
1b2de3676b Merge pull request #4 from duncanspumpkin/path
Refactor
2016-06-15 07:33:55 +02:00
OpenRCT2 git bot
a9f950c6c8 Merge Localisation/master into OpenRCT2/develop. 2016-06-15 04:00:19 +00:00
duncanspumpkin
0bdff0af63 Refactor 2016-06-14 20:33:56 +01:00
Marijn van der Werf
0424e88d9d Update distribution readme 2016-06-14 13:10:13 +02:00
LucaRed
fc789011f0 "Hide" instead of "Remove" in view options (#3876)
Use "hide" instead of "remove" for view options, given it's not actually editing the map. See OpenRCT2/Localisation#748
2016-06-14 11:15:36 +02:00
Yaroslav Tretyakov
a5bf11ce86 Fix #3859: Scenery bounding box incorrect (#3874) 2016-06-14 08:02:59 +01:00
OpenRCT2 git bot
bd038c63b2 Merge Localisation/master into OpenRCT2/develop. 2016-06-14 04:00:17 +00:00
Marijn van der Werf
bd8f89bedb Make readme more generic regarding Macs 2016-06-14 02:09:33 +02:00
Ted John
3d76480808 fix #1433: Peep spawn point does not get set using sandbox mode
Now show peep spawns if in editor OR in sandbox mode.
2016-06-13 21:23:30 +01:00
Marijn van der Werf
93480693e1 Sort files 2016-06-13 22:17:22 +02:00
Ted John
602d84156c fix #3856: Save Game causes Crash 2016-06-13 19:39:11 +01:00
Marijn van der Werf
1773fa1a19 Make build status more generic 2016-06-13 20:27:40 +02:00
Marijn van der Werf
f568903eb2 Fix file properties and text settings 2016-06-13 20:26:50 +02:00
Ted John
4b2f0b4119 fix #3825: Multiplayer crashes with UI buttons
Window was measuring number of lines of user's config server description rather than the connected server's description
2016-06-13 19:02:37 +01:00
Marijn van der Werf
e7e9cbd337 Fix group paths 2016-06-13 19:55:17 +02:00
Marijn van der Werf
42ee299f65 Replace references to OS X 2016-06-13 19:49:06 +02:00