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

13104 Commits

Author SHA1 Message Date
Michael Steenbeek 9d686db86c Fix typo in 'tolerance' 2017-11-13 16:23:19 +01:00
Michael Steenbeek 5eed8cecd4 Fix typo in 'multiplier' 2017-11-13 16:22:36 +01:00
Cody Jung 3bb9d41908 Fix #6657: Reset tracking icon status when opening guest list 
The guest tracking icon is hidden on the guest list if it's in
PAGE_SUMMARISED mode. Closing then reopening the window reset it back to
INDIVIDUAL mode but did not restore the icon state.
 2017-11-13 10:36:16 +01:00
Michał Janiszewski 7f6471e896 Collapse identical branches 2017-11-13 10:31:48 +01:00
Michael Steenbeek 263b7537d7 Fix crash when removing scenery groups 2017-11-13 10:30:34 +01:00
Ted John 3fbdf117cd
Merge pull request #6651 from IntelOrca/discord-integration 
Close #6639: Integrate Discord Rich Presence
 2017-11-12 21:09:28 +00:00
Ted John 36ffb1d3cb Use initialiser instead of memset zero 2017-11-12 20:31:29 +00:00
kitsunenokenja 04f0048430 Add missing header include for std::ceil call (#6655) 
OpenGLDrawingEngine::ConfigureCanvas calls std::ceil which is defined by
the cmath include. Adding the include directive resolves a compilation
failure to due std::ceil being otherwise undefined.
 2017-11-12 14:02:30 +00:00
Ted John 4722f0fe94 Make DiscordService final 2017-11-11 23:56:24 +00:00
Ted John a4a779d357 Update changelog 2017-11-11 23:50:34 +00:00
Ted John 324058a640 Delay presence refresh to 5s interval 2017-11-11 23:48:04 +00:00
Ted John 83e80d9658 Implement basic discord status report 2017-11-11 23:48:04 +00:00
Ted John c7b7659cd6 Update VS dependencies to v14 2017-11-11 23:48:04 +00:00
Marijn van der Werf bd0bd9e038 Move top toolbar to UI module 2017-11-11 23:57:19 +01:00
Marijn van der Werf c247bbcb82 Move ride construction window to UI module 2017-11-11 23:57:19 +01:00
Marijn van der Werf 75e5f44717 Update Xcode project 2017-11-11 23:57:19 +01:00
OpenRCT2 git bot 891de0ad3e Merge Localisation/master into OpenRCT2/develop. 2017-11-11 04:02:02 +00:00
Ted John d3692dfb7a Add Date class 
To eventually replace passing around month ticks and date.c
 2017-11-10 19:32:32 +01:00
OpenRCT2 git bot c56d5b5f81 Merge Localisation/master into OpenRCT2/develop. 2017-11-09 04:00:20 +00:00
Michał Janiszewski 2775f5f3e5 Guard title sequence in headless mode 2017-11-08 23:27:51 +01:00
Robert Jordan 4c3065619e Fix #996, #2254, #2589, #2875: Viewport scrolling getting stuck or shaking 
Shaking while at the edge of the map has been completely eliminated. In
order to do this, comparison with tile height was also removed which
fixed a few outlier cases.

The main cause was viewport axis were only being set if it's respective
isometric axis was at the boundary, instead of either isometric axis.
Viewport no longer gets stuck which was related to the shaking in the
end. (#2875)

Refactored viewport_update_position. I moved
viewport_set_underground_flag above the bounds checking function since
it had no relation to it. (#996, #2589)

Scrolling on the map edge with arrow keys or mouse edge will now go the
same speed in both directions. (#2254)

Added changelog entry.
 2017-11-08 17:43:50 +01:00
Philip Goto 27e3703fec Add openrct2 URI handling to Linux 2017-11-08 16:14:01 +01:00
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
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
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