mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
12,468 Commits 9 Branches 41 Tags 390 MiB
Commit Graph

12468 Commits

Author SHA1 Message Date
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
Gymnasiast 3cf463b379 Name some window flag aliases 2017-07-28 13:09:32 +02:00
Hendrik v. Raven ddd50214bb drop man page compression 
It is easier to add the compression manually when desired as to remove
it in all other cases.
 2017-07-28 11:20:31 +02:00
Hendrik v. Raven 8438647705 add a project definition 
the project definition is used by cmake to fill the subfolder for
${CMAKE_INSTALL_DOCDIR}.
 2017-07-28 11:20:31 +02:00
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