Steven Vascellaro
aee9a34511
readme.md: Minor formatting ( #3397 )
...
[ci skip]
2016-04-23 10:29:14 +01:00
Duncan
ffcb01da91
Merge pull request #3381 from Wirlie/develop
...
Revert uint assignment from 7eb3a90
, Fixes #3367
2016-04-23 07:47:51 +01:00
Duncan
377bef726c
Merge pull request #3402 from PeteyPii/3401_vs_app_start_fail
...
Fix Visual Studio "Start Debugging" failing immediately
2016-04-23 06:14:43 +01:00
Patrick Wrobel
05b8180014
revert user specific changes in openrct2.vcxproj.user from convert command-line feature addition
2016-04-23 01:00:15 -04:00
OpenRCT2 git bot
b0da767747
Merge Localisation/master into OpenRCT2/develop.
2016-04-23 04:00:19 +00:00
Ted John
c40a4c3805
Merge pull request #3398 from IntelOrca/refactor/vars
...
Add global macros for many variables
2016-04-23 03:06:48 +01:00
Ted John
c9adf50716
add global macro: gNumGuestsHeadingForPark
2016-04-23 02:56:55 +01:00
Ted John
7905757923
add global macro: gNumGuestsInParkLastWeek
2016-04-23 02:55:14 +01:00
Ted John
65d749de7b
add global macro: gGuestChangeModifier
2016-04-23 02:51:38 +01:00
Ted John
467513616d
add global macro: gCurrentTicks
2016-04-23 02:49:24 +01:00
Ted John
0c90c165a2
add global macro: gGuestInitialThirst
2016-04-23 02:38:51 +01:00
Ted John
a819819ff4
add global macro: gGuestInitialHunger
2016-04-23 02:37:33 +01:00
Ted John
727a568e32
add global macro: gGuestInitialHappiness
2016-04-23 02:36:24 +01:00
Ted John
8509927dc7
add global macro: gGuestInitialCash
2016-04-23 02:35:03 +01:00
Ted John
66855e41e5
add global macro: gParkNameArgs
2016-04-23 02:28:11 +01:00
Ted John
463a2f4533
add global macro: gScenarioObjectiveCurrency
2016-04-23 02:23:17 +01:00
Ted John
1f6081c0d9
add global macro: gScenarioObjectiveNumGuests
2016-04-23 02:18:45 +01:00
Ted John
17f5d8cb48
add global macro: gScenarioObjectiveYear
2016-04-23 02:16:32 +01:00
Ted John
35e5c49454
add global macro: gScenarioObjectiveType
2016-04-23 02:14:14 +01:00
Ted John
5cb25c390f
add global macro: gBankLoanInterestRate
2016-04-23 02:06:56 +01:00
Ted John
3c52983178
add global macro: gBankLoan
2016-04-23 02:00:44 +01:00
Ted John
11a2ba0133
add global macro: gCashEncrypted
2016-04-23 01:58:54 +01:00
Ted John
253f411075
add global macro: gCompanyValue
2016-04-23 01:53:35 +01:00
Ted John
b4b3dc7dbe
add global macro: gParkValue
2016-04-23 01:50:12 +01:00
Ted John
0971d8ad51
add global macro: gParkRating
2016-04-23 01:47:03 +01:00
Ted John
fda4542d63
add global macro: gParkName
2016-04-23 01:40:11 +01:00
Ted John
2b702d89c6
add global macros: gLandPrice, gConstructionRightsPrice
2016-04-23 01:37:10 +01:00
Ted John
52804297a6
Merge pull request #3396 from IntelOrca/refactor/park-vars
...
Refactor park variables
2016-04-23 01:28:57 +01:00
Ted John
171388e9a3
integrate park entrance ghost variables
2016-04-23 01:21:00 +01:00
Ted John
b59f5c17ca
add global macros for park...
...
- gParkSize
- gParkEntranceFee
- gNumGuestsInPark
2016-04-23 01:00:00 +01:00
Ted John
307cb9e08b
add global macro: gParkFlags
2016-04-23 00:51:22 +01:00
Ted John
ddd0f07127
fix #3321 : can't rotate pre-built rides
2016-04-22 23:59:16 +01:00
Ted John
85c553dc72
fix #3393 : prevent crash when title music can't load
2016-04-22 23:46:58 +01:00
Ted John
6a1500a1af
Merge pull request #3320 from OpenRCT2/rct1-import
...
Import RCT1 saved games / scenarios
2016-04-22 22:14:14 +01:00
Wirlie
1112112157
Revert uint assignment from 7eb3a90
.
...
For solve the another problem (the reason of that this code has been modified at 7eb3a90
), I replaced the left shift operator with a multiply (suggested by zsilencer) to prevent a 'undefined behaviour', Fixes #3367 .
2016-04-22 16:00:05 -05:00
Ted John
e9f755c947
Merge pull request #3385 from janisozaur/highscores
...
Don't parse invalid names from highscores fixes #3333
2016-04-22 21:16:00 +01:00
Marijn van der Werf
54f2262fb2
Add files to Xcode project ( #3392 )
2016-04-22 21:12:56 +01:00
Michał Janiszewski
65ca8b9cb1
Test for object validity
...
Apparently it can fail for some:
https://openrct2.org/forums/topic/1175-wont-open-on-mac/#comment-5742
2016-04-22 22:07:42 +02:00
Michał Janiszewski
9956b804d2
Don't parse invalid names from highscores fixes #3333
2016-04-22 22:07:42 +02:00
Steven Vascellaro
f60f53dcc6
readme.md: Minor formatting ( #3378 )
...
Formatted sections with code blocks and minor formatting changes
2016-04-22 20:58:43 +01:00
Ted John
a6ca76813d
rename import.h and remove includes
2016-04-22 20:14:29 +01:00
Ted John
25958b0d30
remove old RCT1 import code
2016-04-22 19:26:15 +01:00
Ted John
67da464e08
use correct logic for function name
2016-04-22 18:39:00 +01:00
Ted John
bed916e4aa
use correct constant
2016-04-22 18:37:04 +01:00
Ted John
3992ca22e4
import lots of game variables
2016-04-22 18:26:29 +01:00
Ted John
6a48bed4ad
organise order of preset scenery groups and paths
2016-04-22 18:26:28 +01:00
Ted John
ff1de46ca6
improve List::AddRange performance
2016-04-22 18:26:28 +01:00
Ted John
f3356caa39
add a CLI command for converting saved games <-> scenarios
2016-04-22 18:26:27 +01:00
Ted John
f1b41bf51d
rename tables.cpp and update filters
2016-04-22 18:26:26 +01:00
Ted John
a438e7be24
fix queue colours
2016-04-22 18:25:29 +01:00