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

12294 Commits

Author SHA1 Message Date
Hendrik v. Raven
c81f41c843 convert install destinations to GNUInstallDirs
at least on Linux this makes the build system easily adaptable to the
different distributions. GNUInstallDirs was added in cmake 2.8 so the
version is increades as well.
Testing on all other platforms is necessary, I have only a Linux system
at hand right now.
2017-07-28 11:20:31 +02:00
rwjuk
f6aef817e1 Fix #5943: Track preview for mazes not drawn when paused 2017-07-28 10:34:30 +02:00
Oliver Freyermuth
d42b9fc6df X8DrawingEngine: Only disable warnings which the compiler supports.
This fixes compilation with gcc 4.9.4.
2017-07-28 09:56:49 +02:00
Oliver Freyermuth
0ec78052d6 Guard: Mark openrct2_assert as static explicitly.
Fixes compilation errors with gcc 4.9.4,
which otherwise requires an explicit declaration before
the definition.
2017-07-28 09:56:49 +02:00
Michał Janiszewski
70793f65a5 Verify queried renderer information 2017-07-28 08:06:11 +02:00
rwjuk
315ee6b3b5 Fix applying palette colours; SPRITE_ID_PALETTE_COLOUR_3 to _2 2017-07-28 07:52:35 +02:00
Richard Jenkins
222782b228 Fix #6007: 'Felicity Anderson' can affect peeps entering rides 2017-07-28 07:50:35 +02:00
OpenRCT2 git bot
bb57e3aa45 Merge Localisation/master into OpenRCT2/develop. 2017-07-28 04:00:18 +00:00
duncanspumpkin
c595d24ebd Fix #6009. Actually check for the correct map element when deleteing.
Mistake made during refactor. The old code passed the map element type and quadrant in the same parameter. I refactored it so that it only checked the quadrant.
2017-07-27 21:49:15 +02:00
Gymnasiast
38c504685e Define constants for max energy and happiness, cap energy to 128 instead of 255 2017-07-27 21:44:46 +02:00
Gymnasiast
2b540b9da1 Remove direct access to small scenery's colour_1 and _2 fields 2017-07-27 21:37:34 +02:00
Gymnasiast
db438a27b7 Use map_element_get_direction in more places, create map_element_get_direction_with_offset() 2017-07-27 21:23:26 +02:00
rwjuk
3bd45397aa Fix #6021: Unable to colour vehicles individually 2017-07-27 21:21:09 +02:00
Michael Steenbeek
434325ea22 Move vehicle preference to RideGroupManager 2017-07-27 21:03:26 +02:00
Michael Steenbeek
4158a46fa1 Add #6037 to changelog 2017-07-27 19:17:43 +02:00
Keatzee
6e068d893d Move autosaves to a subfolder of /save, closes #3209 2017-07-27 19:16:31 +02:00
Ted John
6f2020e7f4 Fix #5998: Staff not getting paid / no loan interest
Ensure gDateMonthTicks is always a multiple of 4 so that it does not skip weekly checks.
2017-07-27 17:33:23 +01:00
Michael Steenbeek
ad6f725d37 Fix refactor error 2017-07-27 17:50:01 +02:00
Michael Steenbeek
46de90df86 Create map_get_water_height() 2017-07-27 17:15:56 +02:00
Michael Steenbeek
41b5e8bbca Remove direct usage of map element track sequence field 2017-07-27 16:19:01 +02:00
Richard Jenkins
7e8aa5f655 Merge pull request #6031 from ZehM4tt/assert-refactor
Refactored asserts always calling the function regardless of expression.
2017-07-27 14:47:30 +01:00
Gymnasiast
d936b23072 Get and set map element station index via helper functions 2017-07-27 14:13:16 +02:00
wolfreak99
5eb09ae039 Add name to LTC 2017-07-27 09:58:58 +02:00
OpenRCT2 git bot
6f626f0997 Merge Localisation/master into OpenRCT2/develop. 2017-07-27 04:00:29 +00:00
ZehMatt
f7b7b18b4a Refactored asserts always calling the function regardless of expression. 2017-07-27 05:12:50 +02:00
wolfreak99
30b907f0e8 Fix #6017: ride type spinner not working in multiplayer 2017-07-26 23:15:33 +02:00
Ted John
4af64bb020 Merge pull request #5857 from Kuriibo/Fix-5835
Resolve #5835: Add keyboard shortcut for scenery remover
2017-07-26 18:05:33 +01:00
Ted John
ce3573c319 Update changelog 2017-07-26 17:25:32 +01:00
Kuriibo
59fabad37c Added new string for shortcut, validate_global_widx 2017-07-26 17:23:47 +01:00
Kuriibo
d0db59e196 Keyboard Shortcut for Scenery Remover - #5835
Added a hotkey for the "clear scenery" window. By default, the hotkey is the "b" key (b/c bulldozer).
2017-07-26 17:23:47 +01:00
Gymnasiast
0092fee1ce Fix what was likely a refactoring error 2017-07-26 16:49:42 +02:00
Gymnasiast
db56c7e3b3 Change growth_rate to target, fix cheats to use them 2017-07-26 16:49:42 +02:00
Gymnasiast
3f345c60c6 Fix underflow in sub_68F41A() 2017-07-26 14:51:43 +02:00
Gymnasiast
603735f86d Make doors work with every vehicle, closes #5951 2017-07-26 14:41:44 +02:00
Gymnasiast
e9e8068dff Change MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT_MASK to MAP_ELEM_TRACK_SEQUENCE_GREEN_LIGHT 2017-07-26 14:41:04 +02:00
Gymnasiast
894d010439 Name map element track sequence flags and use them 2017-07-26 14:41:04 +02:00
Gymnasiast
a67b248956 Update references to sub_688217() 2017-07-26 14:40:28 +02:00
Hendrik v. Raven
75275d64b7 add a warning when using system gtest
gtest upstream advices against using a globally installed gtest. Make
sure the user is aware of this.
2017-07-26 11:44:06 +02:00
Hendrik v. Raven
5b3f0454dd reformatting to match if clause
reformat the existing code to match the newly introduced indention level
2017-07-26 11:44:06 +02:00
Hendrik v. Raven
0f111de224 add SYSTEM_GTEST option to use gtest of the system
This adds a new configure option forcing the system to use googletest
installed on the system instead of downloading a version. The default
is still to download googletest.
2017-07-26 11:44:06 +02:00
Hendrik v. Raven
cfa20d2117 rename GTEST_INCLUDE_DIR to GTEST_INCLUDE_DIRS
GTEST_INCLUDE_DIRS is the name used by the CMake GTest package. This
is a preparation for the optional usage of a system installed gtest.
2017-07-26 11:44:06 +02:00
Richard Jenkins
a2f8720143 Fix #5981: Ride list doesn't update after using quick demolish 2017-07-26 11:07:12 +02:00
rwjuk
11711fe4c4 Fix #6010: Assert triggered when loading SC6 via file assoc 2017-07-26 11:03:46 +02:00
Gymnasiast
271e6837e9 Refactor byte_F4414E into separate local bools 2017-07-26 09:17:43 +02:00
OpenRCT2 git bot
efdc52662d Merge Localisation/master into OpenRCT2/develop. 2017-07-26 04:00:19 +00:00
Duncan
9a49490a0a Refactor of scenery elements (#5308)
Label scenery flags, vars and refactor small scenery into cpp file.
2017-07-25 22:26:43 +01:00
Christian F. Coors
32da66aa79 Fix build errors 2017-07-25 22:50:19 +02:00
wolfreak99
6ec89fa78b Implement dropdown/spinner combo for changing ride type 2017-07-25 13:25:31 +02:00
Michael Steenbeek
ef6aea98e4 Implement #4135: Rename RC Designer to Track designer and allow more ride types 2017-07-25 12:16:37 +02:00
Gymnasiast
274abcb071 Clean up track designs a bit 2017-07-25 11:04:40 +02:00