Commit Graph

6778 Commits

Author SHA1 Message Date
Marijn van der Werf
90a7abbbdb Update code 2016-04-18 21:09:59 +02:00
Marijn van der Werf
7a409371c8 Implement sub_88ABA4 2016-04-18 20:39:15 +02:00
Marijn van der Werf
14caf2c1ca Paint crooked house base 2016-04-18 20:39:14 +02:00
Duncan
0860cf4540 Merge pull request #3299 from marijnvdwerf/paint-setup/cleanup
WIP Paint setup/cleanup
2016-04-18 18:48:53 +01:00
Marijn van der Werf
e49abad3ff Rename local variables 2016-04-18 15:36:15 +02:00
Marijn van der Werf
a610b372fd Name addresses 2016-04-18 15:35:33 +02:00
Marijn van der Werf
d78077ce22 Convert method call to sub_98197C 2016-04-18 15:34:06 +02:00
janisozaur
e7eae9aff2 Fix clang optimized builds (#3336)
This apparently applies to non-Apple clang only.

When passed any optimization level other than 0, clang took liberty and
re-organised arguments passed to `RCT2_CALL*`, even in presence of
attributes put in place to prevent that: optnone,noinline.

This change allows easier project setup. It was previously possible to
produce a clang optimized build by manually recompiling and relinking
addresses.c.o.
2016-04-18 14:31:38 +01:00
janisozaur
24eaa0a56d Show units used when streaming the map over network. Fix #3328 (#3331) 2016-04-17 21:27:23 +01:00
Yaroslav Tretyakov
c3ba519a6e Integrate audio related variables (#3322) 2016-04-17 14:20:26 +01:00
Marijn van der Werf
eabbdb7e30 Identify structure members 2016-04-17 10:31:50 +02:00
Marijn van der Werf
18a36298b4 Update method signature 2016-04-17 09:42:34 +02:00
Ted John
e5666f214b Merge pull request #3313 from IntelOrca/integrate-ride-session-vars
Integrate ride construction session variables
2016-04-16 14:10:05 +01:00
Yaroslav Tretyakov
90a4cafc87 Fix #3307, ride music discrepancy with original (#3319) 2016-04-16 14:09:22 +01:00
OpenRCT2 git bot
ea19684d94 Merge Localisation/master into OpenRCT2/develop. 2016-04-16 04:00:14 +00:00
Ted John
63f008566c Merge branch 'master' into develop 2016-04-15 23:25:45 +01:00
Ted John
1eb91cb210 OpenRCT2 0.0.4 (stable) v0.0.4 2016-04-15 22:42:57 +01:00
Ted John
d6943cc066 Merge branch 'pre-release' 2016-04-15 22:39:13 +01:00
Ted John
964ffdb0be add late localisation changes 2016-04-15 22:25:43 +01:00
Ted John
e906ab5e95 enable quick save when loading save by command line 2016-04-15 21:52:15 +01:00
Michael Steenbeek
7aaa7bb0ca New title sequence (#3310) 2016-04-15 21:29:53 +01:00
Harry Lam
0a65c13e7e Change Japanese Font from msgothic_02.ttf to ms...
gothic.ttc, Fix #3118

In Chinese, there is also a newer MingLiu called "PMingLiu", but it was embedded as a large text pack as ttc. (ttc is a collection file for TrueType Font) And, Windows has **bad** support on TTC, so changing into "msgothic.ttc" should fix the issue.
2016-04-15 21:25:11 +01:00
Ted John
faa2fb4fa1 fix #3314: save custom objects when quick-saving 2016-04-15 21:22:23 +01:00
Ted John
7b248f0079 integrate ride construction variables
- _currentTrackPrice
- _numCurrentPossibleRideConfigurations
- _numCurrentPossibleSpecialTrackPieces
- _currentTrackCurve
- _currentTrackEndX
- _currentTrackEndY
- _rideConstructionState
- _currentRideIndex
- _currentTrackBeginX
- _currentTrackBeginY
- _currentTrackBeginZ
- _currentTrackPieceDirection
- _currentTrackPieceType
- _currentTrackSelectionFlags
- _rideConstructionArrowPulseTime
- _currentTrackSlopeEnd
- _currentTrackBankEnd
- _currentTrackLiftHill
- _currentTrackCovered
- _previousTrackBankEnd
- _previousTrackSlopeEnd
- _previousTrackPieceX
- _previousTrackPieceY
- _previousTrackPieceZ
- _currentSeatRotationAngle
2016-04-15 20:56:48 +01:00
Ted John
681961eaec change ride construction addresses to defines 2016-04-15 20:35:27 +01:00