1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Commit Graph

12347 Commits

Author SHA1 Message Date
Richard Jenkins
84eebb19aa Fix #6050: Crash on placing scenery clusters on water near map edge (#6053)
Guard against null map elements when placing small scenery.
2017-07-31 12:34:30 +01:00
Michael Steenbeek
9c7c553ccc Clean up vehicle flags (#6058) 2017-07-31 11:27:04 +01:00
OpenRCT2 git bot
84d273ac54 Merge Localisation/master into OpenRCT2/develop. 2017-07-31 04:00:18 +00:00
Ted John
6699d0885b Merge pull request #6065 from IntelOrca/refactor/remove-rct2.c
Move remaining functions out rct2.c
2017-07-30 18:09:26 +01:00
wolfreak99
df35ffa3cb Add to changelog 2017-07-30 19:00:30 +02:00
wolfreak99
675028d173 Bump network version 2017-07-30 19:00:30 +02:00
wolfreak99
6f7ce9300e Format game_command_demolish_ride 2017-07-30 19:00:30 +02:00
wolfreak99
ef74f56335 Fix #6071: quick demolish can delete protected ride 2017-07-30 19:00:30 +02:00
Michał Janiszewski
9eb0dc6ea9 Fix wrong mouse button being released on FingerUp event 2017-07-30 17:57:07 +02:00
Michał Janiszewski
4c6412d4fd Delete ParkLoadResult after it's been used 2017-07-30 17:41:55 +02:00
Michał Janiszewski
eb76b188ae Ensure UiContext deletes allocated resources 2017-07-30 17:34:30 +02:00
Michał Janiszewski
427009e9bb Ensure DummyUiContext deletes allocated resources 2017-07-30 17:27:45 +02:00
Michał Janiszewski
d5e6ab3111 Properly dispose of AudioMixer to plug memleak 2017-07-30 17:21:36 +02:00
Michał Janiszewski
a90dce018d Properly dispose of TitleSequencePlayer to plug memleak 2017-07-30 16:46:56 +02:00
Michał Janiszewski
1ea5a902df Initialise various fields and variables 2017-07-30 15:28:16 +02:00
Richard Jenkins
2782c49a1e Xcode fix 2017-07-30 13:16:06 +01:00
Ted John
0d52030b4e Merge pull request #6070 from jensj12/landscaping-v4
Implement #2225: Change mountain tool to ignore higher surrounding tiles
2017-07-29 23:07:29 +01:00
jensj12
b0f93a08d9 Use sint32 instead of int 2017-07-29 23:13:13 +02:00
ζeh Matt
7a5f9e8300 Refactored openrct2_assert to not rely on inlining. (#6061) 2017-07-29 20:31:54 +01:00
Ted John
8b2eb8a13e Move screen variables to OpenRCT2.h 2017-07-29 20:29:29 +01:00
Ted John
e6e503a853 Move path related functions to Context.cpp
- rct2_init_directories
- get_file_path
2017-07-29 20:29:26 +01:00
Ted John
8bc4e52ae9 Move rct2_quit to Context 2017-07-29 20:28:18 +01:00
Ted John
0d1d4960c1 Move get_file_extension_type to FileClassifier.h 2017-07-29 20:28:18 +01:00
Ted John
2ec0df1f3d Fix #6047: Scrolling in spin boxes does not work any more
Regression from #5775.
2017-07-29 16:43:19 +01:00
Ted John
e839a46c67 Fix #6069: Title screen is black when there are no title sequences
No palette was loaded, so load it in game_init_all.
2017-07-29 15:54:38 +01:00
Richard Jenkins
06d1f49d61 Display a warning dialog if user runs program elevated (#6063) 2017-07-29 15:21:33 +01:00
jensj12
353c66e19a Changelog entry 2017-07-29 12:05:03 +02:00
jensj12
7db8162a44 Bugfix 2017-07-29 12:04:17 +02:00
jensj12
0eb8f632b0 Fix cases where land would not be smoothed properly 2017-07-29 12:04:17 +02:00
jensj12
f35b0e6ace Replace mountain tool algorithm
Fixes #2225. The mountain tool will now stop at land edges. It also improves the performance of the mountain tool.
2017-07-29 12:04:17 +02:00
jensj12
208ffbba89 Put copied code in function
Saves a few lines of code
2017-07-29 12:02:47 +02:00
jensj12
f2df2c80d2 Use other game commands for error messages
Errors in game_command_raise/lower_land will now be passed on in
smooth_land. Removes need for error checking elsewhere
2017-07-29 12:02:47 +02:00
jensj12
1b69fe485f Show error if too high/low
Behaviour now matches that of the non-mountain land tool. Provide define
for min/max land height and fix a bug where the mountain tool would
incorrect raise/lower land.
2017-07-29 12:02:47 +02:00
jensj12
2736058912 Update text files and network version 2017-07-29 12:02:46 +02:00
jensj12
8075d69a68 Landscaping costs $5 per quarter cell
Change the landscaping cost to be $5 per quarter cell changed. This
normalizes the cost for the maintain tool.
2017-07-29 12:02:10 +02:00
jensj12
76f0ed3f9e Calculate cost of all affected tiles in smooth_land
This makes the mountain tool calculate the cost properly. Fixes #2229,
2017-07-29 12:02:10 +02:00
Ted John
4ed970afef Merge pull request #6057 from ZehM4tt/fix-6052
Fix #6052: Unable to place entrance/exit on certain ride types.

The issue is caused by ride types that don't automatically close the construction window which leads to execute following condition:
https://github.com/OpenRCT2/OpenRCT2/blob/develop/src/openrct2/world/map.c#L3374-L3378
Which later executes GAME_COMMAND_REMOVE_TRACK with the ghost flag set:
https://github.com/OpenRCT2/OpenRCT2/blob/develop/src/openrct2/ride/ride.c#L1416-L1424
But then ignores the ghost flag and removes the entrances. I've also refactored the flags to use the actual named flags.
2017-07-29 10:05:01 +01:00
ZehMatt
6a85c49074 Increment network version. 2017-07-29 10:04:09 +01:00
ZehMatt
c4b3742bec Refactored constants to named flags. 2017-07-29 10:03:34 +01:00
ZehMatt
3313590784 Fix #6052: Unable to place entrance/exit on certain ride types. 2017-07-29 10:03:32 +01:00
ζeh Matt
b2b808f25e Fix #5865: input being handled too early (#6020) 2017-07-29 09:48:54 +01:00
Michael Steenbeek
8c48b5a249 Fix #6026: 'Select ride to advertise' dropdown does not display all items (#6032)
Show up to 128 open rides in the New Campaign dropdown.
2017-07-29 09:44:51 +01:00
Ted John
6460f0afbb Merge pull request #6068 from duncanspumpkin/fix_5629
Fix 5629: Issue with tower ride modes approach to station
2017-07-29 09:33:46 +01:00
duncanspumpkin
12b6d48d46 Update change log and increment network 2017-07-29 09:33:24 +01:00
duncanspumpkin
6bacd4321c Fix #5629: Fix velocity sawtooth on freefall drop station movement
Mistake made during implementation.
2017-07-29 09:33:16 +01:00
ζeh Matt
d23e6fe5a9 Fix #5912: Negative queue when moving entrance in paused state. (#6060) 2017-07-29 09:30:01 +01:00
OpenRCT2 git bot
d23de89b33 Merge Localisation/master into OpenRCT2/develop. 2017-07-29 04:00:16 +00:00
Michał Janiszewski
cac9bbe481 Fix issues in install.sh 2017-07-28 20:38:30 +02:00
Michał Janiszewski
489ee9bd4f Fix issues in build scripts 2017-07-28 20:38:30 +02:00
Gymnasiast
183798b933 Remove unused includes and function declarations from rct2.c and rct2.h
Currently, rct2.c doesn't just pull in the kitchen sink, it pulls in half a hardware store.
Clean this up as a step towards reserving rct2.c/h for RCT2-specific stuff like SV6 limits.
2017-07-28 15:46:05 +02:00