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

6916 Commits

Author SHA1 Message Date
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
IntelOrca 89ad0cc769 store windows in openrct2 memory and increase max 
Allocate a bigger window list and viewport list in OpenRCT2 static memory and move over all references from RCT2.
This also removes the 'active' viewport pointer list and instead changes everything to just enumerate the whole viewport list
 2016-04-14 23:00:35 +01:00
duncanspumpkin 6e4b93a011 Fix #3301. Refactor set_ride_price to prevent pointing at invalid memory. 2016-04-14 20:36:25 +01:00
duncanspumpkin 51ba0b2e1d Fix #3302. Max ride mode tweak has been broken since a refactor. 2016-04-14 20:27:09 +01:00
IntelOrca a35b774004 tweak AppVeyor version and push condition 
- Omit appending the tag on to the version string if the tag is a version, e.g. v0.0.4.
- Only push tags, develop branch or specific push branches to OpenRCT2.org
 2016-04-14 19:56:40 +01:00
IntelOrca de79bd4599 fix #3294: crash when closing a window being dragged 2016-04-14 17:41:06 +01:00
Marijn van der Werf cb9b31f873 Remove leading whitespace 2016-04-14 11:53:20 +02:00
Marijn van der Werf 0e5b32bd56 Inline variables 2016-04-14 11:17:39 +02:00
Marijn van der Werf 3bb2214235 Pass 0x009DEA52-0x009DEA56 as parameters 2016-04-14 11:07:41 +02:00
Marijn van der Werf a6cbd392c6 Add parameter to 9c 2016-04-14 10:08:40 +02:00
Marijn van der Werf e529532ddd Add parameters to sub_98198C 2016-04-14 10:02:17 +02:00
Marijn van der Werf 001dd3bcf6 Fix wrong function call 2016-04-14 09:59:01 +02:00
OpenRCT2 git bot 1237bcab26 Merge Localisation/master into OpenRCT2/develop. 2016-04-14 04:00:18 +00:00
Duncan 6b72e5c536 Merge pull request #3295 from janisozaur/0.0.5 
Start 0.0.5
 2016-04-13 18:04:25 +01:00
Michał Janiszewski da80a691bc Start 0.0.5 
changelog.txt not updated yet
 2016-04-13 14:20:40 +02:00
Duncan 9edd48c4b8 Merge pull request #3231 from marijnvdwerf/use-structs 
Clean up data use
 2016-04-13 12:38:58 +01:00
Duncan 945f9ddc8e Merge pull request #2994 from marijnvdwerf/decompile-679074 
Decompile sub_679074
 2016-04-13 12:37:57 +01:00
duncanspumpkin 2df58747e5 Update version.h to rc1 2016-04-12 20:49:35 +01:00
duncanspumpkin 67265729c7 Update distribution documentation for 0.0.4-rc1 2016-04-12 20:41:02 +01:00
OpenRCT2 git bot a4283cff03 Merge Localisation/master into OpenRCT2/develop. 2016-04-12 19:25:41 +00:00
duncanspumpkin b0fb2451b4 Fix #3286. Top Spin front support draws correctly now. 
Issue caused by mistake when changing the parameter orders of the drawing functions
 2016-04-12 20:14:12 +01:00
duncanspumpkin 08de41bdd5 Fix #2710. Chairlifts no longer crash at large y value stations. 2016-04-12 19:28:27 +01:00
OpenRCT2 git bot 8e247c3b06 Merge Localisation/master into OpenRCT2/develop. 2016-04-12 04:00:29 +00:00
janisozaur ed01d10653 Force older version of nsis for appveyor (#3287) 2016-04-12 00:08:55 +01:00
xzbobzx cbfd48ef7d Update contributors.md (#3284) 
Added my real name. Instead of "xzbobzx" it now says "Yannic Geurts (xzbobzx)". :P
[ci skip]
 2016-04-11 21:08:11 +01:00
duncanspumpkin be8c84f1c1 Fix grass growth mistake 
Nibbles are only 4 bits not 8
 2016-04-11 20:04:03 +01:00
OpenRCT2 git bot 2090c4aad2 Merge Localisation/master into OpenRCT2/develop. 2016-04-11 04:00:17 +00:00
IntelOrca 547837f208 fix warnings in crash.cpp 2016-04-10 19:51:44 +01:00