1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 13:03:11 +01:00
Commit Graph

10094 Commits

Author SHA1 Message Date
duncanspumpkin
d09238ac0c Label known register uses 2016-11-22 18:48:32 +00:00
duncanspumpkin
b6c73f8bef Refactor place scenery 2016-11-22 18:25:56 +00:00
Michał Janiszewski
2ec1fd0378 Prevent variable underflow in path_end_with_separator 2016-11-22 17:15:03 +01:00
OpenRCT2 git bot
349ca774ca Merge Localisation/master into OpenRCT2/develop. 2016-11-22 04:00:15 +00:00
Alexander Overvoorde
18d943533a Fixes #4808: Add land rights recalculation for loading save games
The feature of disabling the land rights buying buttons depends on the
land rights being accounted for, but the function that calculates these
was not called when loading saved games. Therefore it would often make
it impossible to buy land after loading a saved game.
2016-11-21 22:54:06 +01:00
Michał Janiszewski
aef80b1a82 Validate parameters passed to game commands (#4814) 2016-11-21 10:37:10 +01:00
Michael Steenbeek
09d2f9417e Label OpenGL experimental, fixes #4716 2016-11-21 09:49:07 +01:00
OpenRCT2 git bot
118ac9b062 Merge Localisation/master into OpenRCT2/develop. 2016-11-20 04:00:26 +00:00
Marijn van der Werf
6b4def9156 Pass palette index to gfx_clear 2016-11-16 13:27:02 +00:00
Michael Steenbeek
736437aa6e Allow 3 cars per train on the Rocket cars 2016-11-16 13:25:37 +00:00
Marijn van der Werf
ec6724b4d4 Name font flags 2016-11-16 13:24:39 +00:00
OpenRCT2 git bot
516b4c645b Merge Localisation/master into OpenRCT2/develop. 2016-11-16 04:00:18 +00:00
Marijn van der Werf
7b34e71135 Fix #1238: Track placement window cannot be themed 2016-11-15 19:37:21 +01:00
Michael Steenbeek
d31923ae40 Update changelog.txt 2016-11-15 14:08:31 +01:00
Gymnasiast
e1c9b0a2c1 Fix import of RCT1 Lay-down Roller Coaster
To make matters confusing, what is called a Lay-down RC in RCT2 is called a Flying RC in RCT1. There is no relation with the Flying RC in RCT2
2016-11-14 22:25:49 +01:00
Ted John
4d7f52960d Merge pull request #4737 from Broxzier/copy_element
Copy/paste single elements
2016-11-14 21:24:40 +00:00
Gymnasiast
a626a4ada4 Fix saves having multiple extensions 2016-11-14 22:06:09 +01:00
Michael Steenbeek
bd9ab83710 Merge pull request #4779 from wolfreak99/load_game_or_sc6
Display and load sc6 files in "load game" browser
2016-11-14 21:14:49 +01:00
Gymnasiast
89f6a7eaf9 Raise Junior RC height limit to 14 units, fixes #4686 2016-11-14 19:38:04 +01:00
Michael Steenbeek
ba1225cf6e Merge cheats in console, pathfinding improvements 2016-11-14 08:54:51 +01:00
OpenRCT2 git bot
4226f39a70 Merge Localisation/master into OpenRCT2/develop. 2016-11-14 04:00:23 +00:00
Duncan
6a90f9eb40 Fix #4777: Check for enough free elements before placement
Previously multi tiled placements would only check for one free element before placing. This would cause a crash when it failed to allocate the next element on maps that were close to reaching their full capacity. Renamed sub_68B044 to map_check_free_elements_and_organise and gave it an argument value to check for enough free elements.
2016-11-13 22:44:08 +00:00
Marijn van der Werf
4039172fb7 Use more constants for drawing arguments 2016-11-13 22:29:03 +00:00
Michael Steenbeek
54d0624ded Skip null rides when checking for select-by-track-type, fixes #4796 2016-11-13 21:14:15 +01:00
Michał Janiszewski
3d5735c77e Rename map_get_corner_height 2016-11-13 20:10:32 +00:00
Michał Janiszewski
c4f06138b8 Merge pull request #4798 from janisozaur/refactors
A collection of minor refactors + one plug for memleak
2016-11-13 20:49:59 +01:00
Michał Janiszewski
3f7fd56328 Remove trailing whitespace in sources 2016-11-13 20:32:55 +01:00
Michał Janiszewski
9fed68bf6f Merge OBJ_STRING_ID enums into one 2016-11-13 20:31:19 +01:00
Michał Janiszewski
0299844b13 Rename some static tables 2016-11-13 19:36:03 +01:00
Michał Janiszewski
5524979289 Add include guards to headers missing it 2016-11-13 19:36:03 +01:00
Michał Janiszewski
a8b8b04dd4 Unify key modifiers definition 2016-11-13 19:36:03 +01:00
Michał Janiszewski
233ef1f735 Merge RCT2_LANGUAGE_* definitions into one 2016-11-13 19:36:03 +01:00
Michał Janiszewski
00dd35481e Remove unused enum from network.cpp 2016-11-13 19:36:03 +01:00
Michał Janiszewski
dbdf4b248c Plug memleak in OpenGLDrawingEngine 2016-11-13 19:36:03 +01:00
Marijn van der Werf
1a8cb9fc57 Use more constants for text colours 2016-11-13 17:44:34 +00:00
Marijn van der Werf
022b481d66 Use constant for black strings 2016-11-13 17:20:30 +00:00
Michael Steenbeek
418c542cba Increase network version 2016-11-13 12:31:30 +01:00
Ted John
c50ba73c3e Merge pull request #4782 from marijnvdwerf/clean/colour-filters
Clean up colour filters
2016-11-13 02:52:58 +00:00
Marijn van der Werf
3ab64a3cd5 Return after assert 2016-11-13 01:51:28 +01:00
Marijn van der Werf
1591c1d021 Add more sprite constants 2016-11-13 01:51:28 +01:00
Marijn van der Werf
bb615c60ee Clean up translucent palettes 2016-11-13 01:51:28 +01:00
Marijn van der Werf
06b128bac7 Name more palettes 2016-11-13 01:51:27 +01:00
Marijn van der Werf
4f47808201 Name glass palettes 2016-11-13 01:51:26 +01:00
Marijn van der Werf
2109763267 Rename translucent palettes 2016-11-13 01:45:43 +01:00
Marijn van der Werf
1ce2242bb3 Start cleaning up filters 2016-11-13 01:45:43 +01:00
Michał Janiszewski
7b6608d0a4 Add lib32-libzip1 to 32 bit dockerfile for upcoming #4792 2016-11-12 21:57:55 +01:00
Michał Janiszewski
d2b373bb47 Build 64 bit docker with libzip for upcoming #4792 2016-11-12 21:53:49 +01:00
Broxzier
ebc0a81e72 Guests turn around when trying to enter a copied park entrance 2016-11-12 11:27:59 +01:00
Ted John
7a4ef4073f Merge pull request #4789 from janisozaur/server-load-new-map
Fix #4755: Crash loading new map while running a server
2016-11-11 19:08:34 +00:00
TELK
7718acfde8 Fix #4775: File name of screenshot that is taken at 00:xx is named wrong
Use `GetLocalTime` instead of `GetSystemTime`
2016-11-11 17:55:41 +00:00