mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,793 Commits 8 Branches 39 Tags 360 MiB
Commit Graph

6793 Commits

Author SHA1 Message Date
Ted John cf628ea7cf Merge pull request #3152 from dlee13/cheat-disable-littering 
Add cheat to disable littering and refactor peep thought code.
 2016-04-19 17:31:58 +01:00
Derek Lee 4d1153669e Refactor peep code 
Use constants rather than magic numbers and make identifiers consistent
 2016-04-18 23:34:11 -07:00
Derek Lee c4226235e3 Add cheat to disable littering 
Add cheat and increment NETWORK_STREAM_VERSION
 2016-04-18 23:34:10 -07:00
Duncan 385b03ec79 Merge pull request #3170 from marijnvdwerf/maze-paint-setup 
Maze paint setup
 2016-04-19 06:27:08 +01:00
OpenRCT2 git bot 6c505025f5 Merge Localisation/master into OpenRCT2/develop. 2016-04-19 04:00:18 +00:00
janisozaur 0b9b976dd6 Cast peep's arguments properly (#3341) 
Left-hand side of shift operator determines what's the resultant size of
whole expression. Consider this:

    uint16 p = 65535;
    uint32 q = p << 16;

`q` will be an undefined result, as it will not fit in `uint16` type
anymore, and compiler can optimise it away, unless you cast `p` to be
something which can hold such value, in this case `uint32`.
 2016-04-18 23:02:08 +01:00
Ted John ec50198fa4 Merge pull request #2535 from Gymnasiast/allow-ownership-map-edges 
Allow setting ownership of map edges
 2016-04-18 22:59:58 +01:00
Duncan 1187b0c534 Merge pull request #3334 from marijnvdwerf/fix-3326 
Fix #3326
 2016-04-18 22:08:49 +01:00
Marijn van der Werf 6e3375a3d4 Small fixes 2016-04-18 21:18:48 +02:00
Hielke Morsink 1dbd313fb4 Moved logic from window to map, inside loops that already existed. 2016-04-18 20:28:34 +02:00
Hielke Morsink 15727b68a9 Recalculating the fences when resizing the map 2016-04-18 20:28:34 +02:00
Gymnasiast ed9334f944 Rename sub_68AE2A to clear_elements_at 2016-04-18 20:28:34 +02:00
Gymnasiast 01c4c0adc5 Allow setting ownership of map edges 2016-04-18 20:28:34 +02:00
Marijn van der Werf c1572f4f58 Update method signature 2016-04-18 20:20:41 +02:00
Marijn van der Werf d8c952d503 Clean up code 2016-04-18 20:20:41 +02:00
Marijn van der Werf db302b89a1 Fix wrong value 2016-04-18 20:20:40 +02:00
Marijn van der Werf 85087f8a86 Draw maze tracks 2016-04-18 20:20:40 +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
Marijn van der Werf 6b951400a5 Fix #3326: Match original implementation of sub_67933B 2016-04-18 12:59:53 +02: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) 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
Ted John f73e3ab0e1 integrate footpath construction variables 
- uint8 gFootpathProvisionalFlags
- rct_xyz16 gFootpathProvisionalPosition
- uint8 gFootpathConstructionMode
- uint16 gFootpathSelectedId
- uint8 gFootpathSelectedType
- rct_xyz16 gFootpathConstructFromPosition
- uint8 gFootpathConstructDirection
- uint8 gFootpathConstructSlope
- uint8 gFootpathConstructValidDirections

Also fix some previous variable integrations that had been forgotten to change.
 2016-04-15 19:16:48 +01:00
Michał Janiszewski 7007e04162 Fix name of symbols to push to openrct2.org 2016-04-15 19:56:37 +02:00
Ted John 84edd049d9 integrate current tool variables: 
- gCurrentToolId
- gCurrentToolWidget
 2016-04-15 18:26:47 +01:00
janisozaur fb5d281eaf Check return value from realpath(). Fixes #2483 (#3309) 2016-04-15 18:17:45 +01:00
Ted John 1b3f46f960 integrate game command error string variables 
- gGameCommandErrorTitle
- gGameCommandErrorText
 2016-04-15 17:54:46 +01:00
Ted John fbbefcabc9 Merge pull request #3308 from janisozaur/pre-release 
buildsys fixes for pre-release
 2016-04-15 17:40:59 +01:00
Ted John b1901ffbe6 Merge pull request #3303 from IntelOrca/increase-window-count 
Store windows in OpenRCT2 memory and increase maximum number of windows
 2016-04-15 17:37:57 +01:00
Michał Janiszewski 72854eb12c Include the .dll in appveyor-built debug artifact 
Including the build artifact alleviates the need to also copy the
portable ZIP over to github issues, in case the build artifacts ever
get lost.
 2016-04-15 17:14:56 +02:00
Michał Janiszewski 8fadf1cb3a Only push develop, explicit pushes or tags 2016-04-15 17:13:32 +02:00
Michael Steenbeek 3a3823e0d1 Update contributors.md with missing translators (#3306) 2016-04-15 15:33:37 +01:00