Michał Janiszewski
bfe1a7b58f
Drop RCT2_GLOBAL from regular pointer
2016-09-04 21:19:19 +02:00
Michał Janiszewski
cd7b8f1de9
Remove unneeded check around 0x009AC06C
2016-09-04 21:19:19 +02:00
Michał Janiszewski
ab1af70106
Integrate gCurrentAwards
2016-09-04 21:19:19 +02:00
Michał Janiszewski
0d9fa13dc9
Integrate gTotalRideValue, gSamePriceThroughoutParkA and B
2016-09-04 21:19:19 +02:00
Michał Janiszewski
b7497f6654
Reduce inclusions of addresses.h
2016-09-04 21:19:19 +02:00
Duncan
42c5c5b8dd
Merge pull request #4370 from duncanspumpkin/jr_rc_fix
...
Fix Jr RC Bound Boxes
2016-09-04 19:32:00 +01:00
duncanspumpkin
8c5395cbd1
Fix jr rc left/right half banked helix up/down small bound boxes
2016-09-04 18:07:27 +01:00
duncanspumpkin
b449ed16ec
Fix jr rc left quarter turn 5 tiles 25 deg up bound boxes
...
And right quarter turn 5 tiles 25 deg down
2016-09-04 17:41:04 +01:00
duncanspumpkin
b7e72cec36
Fix jr rc left/right quarter turn 5 tiles bound box
2016-09-04 17:28:09 +01:00
duncanspumpkin
5494dcd0e7
Fix jr rc right/left quarter turn 3 tile bank bound boxes
2016-09-04 16:58:51 +01:00
duncanspumpkin
c4a20ec6ae
Fix jr rc left/right s bend bound boxes
2016-09-04 16:58:50 +01:00
duncanspumpkin
292f7f87ef
Fix jr rc left/right diag bank bound boxes
2016-09-04 16:58:49 +01:00
duncanspumpkin
47f4722e84
Fix jr rc Right/left Eigth Bank to Diag Bound Box
2016-09-04 16:58:49 +01:00
duncanspumpkin
fbb1f740df
Fix jr rc left bank bounding boxes
2016-09-04 16:58:48 +01:00
Michał Janiszewski
279c2f15b9
Merge pull request #4368 from janisozaur/launchpad-test
...
Fixes for launchpad builds
2016-09-04 15:42:51 +00:00
Michał Janiszewski
27799bc187
Remove unnecessary compiler options
2016-09-04 17:29:43 +02:00
Michał Janiszewski
47e343a88d
Fix PIC options for mingw
2016-09-04 17:27:53 +02:00
Michał Janiszewski
cdc447e92a
Refactor compiler flags in CMakeLists.txt
2016-09-04 17:27:53 +02:00
Michał Janiszewski
f6e9216b7d
Use PIC/pie flags to satisfy Launchpad
2016-09-04 17:27:53 +02:00
Michał Janiszewski
640aaad3f8
Fix quotes
2016-09-04 17:27:53 +02:00
Michał Janiszewski
4481859898
Fix Launchpad builds
2016-09-04 17:27:53 +02:00
Ted John
6a665330c2
Integrate gCommonStringFormatBuffer
2016-09-04 15:55:37 +01:00
Ted John
b38416426f
x64: Fix game_command_set_banner_name
2016-09-04 15:51:52 +01:00
Ted John
d86153e575
Integrate gMarketingCampaignDaysLeft, gMarketingCampaignRideIndex
2016-09-04 15:47:56 +01:00
Ted John
ae0eb1804c
Integrate gParkRatingCasualtyPenalty
2016-09-04 15:44:59 +01:00
Ted John
9478e0a53e
Integrate gHistoricalProfit
2016-09-04 15:36:39 +01:00
Ted John
e47b8d906e
Integrate gLastEntranceStyle
2016-09-04 15:21:49 +01:00
Ted John
5893c6da82
Remove loan hash, but keep for S6 export
2016-09-04 15:11:15 +01:00
Ted John
3c80df07d4
Integrate gSavedAge
2016-09-04 15:11:15 +01:00
Ted John
8993328232
Integrate some scenario strings
2016-09-04 15:11:15 +01:00
Michał Janiszewski
d9274ffd82
Enable all warnings as errors for 64 bit builds (cmake)
2016-09-04 12:16:09 +00:00
Ted John
9c645e0a0f
Refactor track_design_draw_preview
2016-09-04 12:16:56 +01:00
Ted John
8bc69b549f
Set advertiser to null after deletion
2016-09-04 11:17:15 +01:00
Ted John
272ccc36f1
x64: Fix last warning and reinstate warnings as errors (msvc)
2016-09-04 00:30:17 +01:00
Ted John
d24010b1b5
Add dead code check in FillRect
2016-09-04 00:22:56 +01:00
Ted John
942c26959c
Remove unused code in widget_caption_draw
2016-09-04 00:14:56 +01:00
Ted John
73cf06d334
Merge pull request #4359 from jensj12/infinite-loop
...
Fix #2081 : Prevent infinite loop
2016-09-04 00:12:02 +01:00
Michał Janiszewski
f8145b6edc
Refactor inclusion of addresses.h
...
addresses.h is now only included when necessary, limiting scope as much
as possible.
2016-09-03 21:25:19 +01:00
Ted John
4cdc91a910
Merge pull request #4372 from janisozaur/news-items
...
Integrate news items
2016-09-03 18:40:37 +01:00
Michał Janiszewski
599b092487
Conditionally integrate some variables
2016-09-03 18:40:23 +01:00
Duncan
755aa48712
Add deadcode asserts
2016-09-03 18:35:07 +01:00
Michał Janiszewski
a5af67e481
Fix news items counts
2016-09-03 17:45:31 +02:00
Michał Janiszewski
d5eb3b9488
Integrate news items
2016-09-03 17:24:41 +02:00
jensj12
5500e9e5cd
Fix backwards loop in vehicle.c
2016-09-03 16:56:00 +02:00
jensj12
b5456f961a
Update changelog
2016-09-03 16:56:00 +02:00
jensj12
c7879d08cd
Fix #2081 : prevent infinite loop in ride_find_track_gap
...
Adds an extra iterator that steps forward at half the speed of the
normal iterator. If they ever meet, there's a loop in the track and the
track is classified as incomplete.
2016-09-03 16:56:00 +02:00
Ted John
73d453228a
Integrate gDisableErrorWindowSound
2016-09-03 14:22:03 +01:00
Ted John
f2dea1832a
Integrate gScreenshotCountdown
2016-09-03 14:15:29 +01:00
Ted John
cb235c9d56
Integrate filter arguments in guest list window
2016-09-03 13:54:59 +01:00
Ted John
2722a85ee4
Fix #4349 : x64: Crash when placing roller coaster track designs
2016-09-03 13:09:50 +01:00