mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,244 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

13244 Commits

Author SHA1 Message Date
duncanspumpkin 55aea7188b Fix #6617. Maze deletion no longer costs 0x800000 for certain mazes. 
When a maze does not have a completely hollowed out hedge the game command would return 0x8000000 as it tries to remove an element that has already been deleted. As game actions no longer use 0x80000000 to indicate a failure this would get interpreted as the refund price and cause the issue.

Fix was to introduce checks when adding up the refund price. This was done rather than changing the game action so that it can be properly fixed when get_refund_price is converted into a game action
 2017-11-08 16:03:41 +01:00
Michał Janiszewski 49dbdefe0f Format shared.c 2017-11-08 08:45:05 +01:00
Michał Janiszewski b69b0be610 Move strndup implementation to shared.c 2017-11-08 08:45:05 +01:00
Richard Jenkins d6bd26cd83 Fix #5836, #6301: Track list freezes after deletion in Track Manager 2017-11-08 07:51:59 +01:00
Michał Janiszewski cabed0cef5 Remove unused field 2017-11-08 06:53:17 +01:00
OpenRCT2 git bot 0e4d9a2518 Merge Localisation/master into OpenRCT2/develop. 2017-11-08 04:00:35 +00:00
Robert Jordan 9ae4f7d1bc Fix #6500: Fail to load resources when no config 
A simple fix of setting the environment paths before the repositories
are loaded.

Added a changelog entry
 2017-11-07 21:03:58 +00:00
Paul bf87489da8
make changes suggested in review 2017-11-07 00:15:22 -08:00
Paul 9325fffd9c
Update posix.c 2017-11-06 20:19:43 -08:00
Paul f202f19897
Update posix.c 2017-11-06 19:49:02 -08:00
Paul 62383f7cb5
fix indentation 2017-11-06 14:58:06 -08:00
Paul 8093b6369b
replace flock with fnctl for better compatibility 2017-11-06 14:53:59 -08:00
Philip Goto 8be9e156dd Modify explanation tooltip of scaling quality option 2017-11-06 23:05:21 +01:00
Philip Goto ad3f23162a Add explanation tooltip to scaling quality option 2017-11-06 23:05:21 +01:00
Philip Goto 19abb62586 Add Smooth NN scaling to OpenGL renderer 2017-11-06 23:05:21 +01:00
Philip Goto 360cd813b7 include cmath in HardwareDisplayDrawingEngine 2017-11-06 23:05:21 +01:00
Philip Goto 4dfcb32d85 Fix spelling errors in neighbour 2017-11-06 23:05:21 +01:00
Philip Goto 36bece4cf1 Destroy _scaledScreenTexture on destroying hardware engine 2017-11-06 23:05:21 +01:00
Philip Goto 6377ac7bfb Create enum for scale quality 2017-11-06 23:05:21 +01:00
Philip Goto b66df2d6db Add smooth nearest neighbor scaling 
This commit implements smooth nearest neighbor scaling, this scaling method looks sharper than linear scaling and not deformed like NN scaling.
 2017-11-06 23:05:21 +01:00
Michał Janiszewski 9bc9e20778 Stub interop for NO_RCT2 builds 2017-11-06 22:05:36 +01:00
ceeac a2ca87bde0 Fix failing link on Ubuntu due to missing libiconv 2017-11-06 21:53:36 +01:00
duncanspumpkin 7a099d90ce Rename ratings bonuses and name unknown bonuses 2017-11-06 12:19:34 +01:00
OpenRCT2 git bot 46f898e992 Merge Localisation/master into OpenRCT2/develop. 2017-11-06 04:00:28 +00:00
Michał Janiszewski 6bb4bdeda2 Minor formatting changes 2017-11-05 23:19:25 +01:00
Michał Janiszewski ce9e6e0d85 Allow for bit depth inspection when reading PNGs 2017-11-05 23:19:25 +01:00
Jeroen D Stout c7b829029c Correctly treat 1st index as transparent 2017-11-05 23:19:25 +01:00
Jeroen D Stout b1792658c8 Add "palette": "keep" option to import with an already correct palette 2017-11-05 23:19:25 +01:00
Jeroen D Stout 71cfe112f1 Make map generation automatically import expanded pngs 2017-11-05 23:19:25 +01:00
Jeroen D Stout 25015fb15d Add expand option to PngRead 2017-11-05 23:19:25 +01:00
Ted John eb98bfaa31 Log invalid g2 access 2017-11-05 21:17:35 +00:00
Ted John 48d1930a6c NULL -> nullptr 2017-11-05 21:12:46 +00:00
Ted John 498857a95d Do not bother backing up SPR_TEMP 2017-11-05 21:10:27 +00:00
Martin Müller 7089ec80fc Fix highscores for savegames 
When loading a savegame, its filename gets stored as gScenarioFileName.
However, that isn't necessarily the same name as the filename of the
corresponding scenario (or any, for that matter, due to the different
file extension). This broke highscores, so for savegames we have to
take the scenario filename stored in the file.
 2017-11-05 12:25:40 +01:00
Ted John 4a66e98bb5 Add more null checks to get element functions 2017-11-04 18:06:59 +00:00
Ted John 6341a1679c Fix #6618: Crash when loading Covey Cove 
Add null check for map_get_first_element_at in map_get_park_entrance_element_at
 2017-11-04 18:04:16 +00:00
OpenRCT2 git bot ce6ae6d07a Merge Localisation/master into OpenRCT2/develop. 2017-11-04 04:00:41 +00:00
Ted John 446f57e43b Fix NO-RCT2 builds 2017-11-03 22:24:04 +00:00
Ted John 4232be9fc2 Remove remaining external uses of g1element 2017-11-03 22:18:10 +00:00
Ted John 444a8c1602 Const protect get_g1_element 2017-11-03 22:18:10 +00:00
Ted John 5a05bd51e5 Use get_g1_element and add null checks 2017-11-03 22:18:10 +00:00
Robert Jordan 8da1cad3ab Enhance: Change title editor default selection 
Title editor sequence selection now defaults to current preset. This is
only after the first time the window is opened. Afterwards it keeps the
last selection.
 2017-11-03 21:34:37 +01:00
Robert Jordan a01471b535 Enhance #6530: Don't block land rights tool 
Land rights tool no longer cares if part of the available land is
unavailable for purchase. It will not even through an error when none of
the tiles are available. Just like other tools.

Added a changelog entry.

This increments the network version.
 2017-11-03 19:21:58 +01:00
Robert Jordan f4538c6557 Fix: Realign Park Viewport 
The viewport had a 1x1 spacing before the bottom right border was
reached.
 2017-11-03 07:53:25 +01:00
OpenRCT2 git bot a8374af240 Merge Localisation/master into OpenRCT2/develop. 2017-11-03 04:00:32 +00:00
Marijn van der Werf 45b75692d9 Fix code style 2017-11-03 01:54:37 +01:00
Marijn van der Werf ee2f04864f Update Xcode project 2017-11-03 01:54:37 +01:00
Marijn van der Werf bbe46cb583 Sort affected includes 2017-11-03 01:54:37 +01:00
Marijn van der Werf 666809fb8b Move object load error window to UI module 2017-11-03 01:54:37 +01:00
Marijn van der Werf 59df233669 Move text input window to UI module 2017-11-03 01:54:37 +01:00