mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 09:14:58 +01:00
Code Issues Releases Wiki Activity
14,846 Commits 8 Branches 59 Tags
d0b8a0ec61b2b75d46d4fbe62f7c8b85ae2aa0dc
Commit Graph

3139 Commits

Author SHA1 Message Date
Hielke Morsink
d0b8a0ec61 Remove spaces from screenshot options 2018-06-01 12:53:20 +02:00
Hielke Morsink
20fb4501d0 Fix #7505: Crash when building path off map edge (#7587) 
Validate map location before looping over the tile elements.
 2018-06-01 11:30:41 +02:00
jensj12
b94f5ea9d8 Fix #7568: Demolish button causes hang 
Fixed by adding the standard infinite loop check. Also makes the save button save the entire track again. Affects cost of refurbishing.
 2018-06-01 10:34:32 +02:00
Aaron van Geffen
df1e8af737 Merge pull request #5979 from IntelOrca/refactor/gamestate 
Create new GameState class
 2018-06-01 00:05:59 +02:00
Hielke Morsink
2fed57d792 Check for ghost flag when removing track blocks (#7596) 2018-05-31 22:36:45 +02:00
Ted John
056b596124 Use reference types in TitleSequencePlayer 2018-05-31 12:49:09 +01:00
Michał Janiszewski
bda9ae13be Remove obsolete defines 
Replaced already by constexprs
 2018-05-31 00:22:37 +02:00
Michał Janiszewski
58ea1b3446 Add missing #pragma once 2018-05-31 00:22:19 +02:00
Michał Janiszewski
c419f2f50b Remove superfluous declarations 2018-05-31 00:01:43 +02:00
Ted John
58529b3726 Fix #7588: Objects are broken in multiplay servers 
Load objects when importing maps in network games.
 2018-05-30 18:21:07 +01:00
Ted John
9d617958cf Return date and park by reference from game state 2018-05-30 13:12:19 +01:00
Hielke Morsink
c5d5e639eb Update changelog and network version. 2018-05-30 14:00:32 +02:00
Hielke Morsink
9396da9b71 Fix #7571 Track design ghost generates money 
The problem was that when placing a ride ghost, some clearance checks are performed to see if nothing stands in the way, and if it does, it tries to raise the ride to a height where it's possible to place. When this happens, it removes all ghost track pieces that have already been placed, and tries at the next height. With clearance checks disabled, this check was still performed, while it should ignore clearance altogether.
 2018-05-30 13:59:52 +02:00
Ted John
1e7560e7da Do not include GameState.h in Context.h 2018-05-30 12:50:25 +01:00
Aaron van Geffen
bf44007197 Allow fine-tuning the virtual floor style (#7577) 
The virtual floor by @JeroenDStout, introduced in the v0.1.2 release, has generally been well-received. However, some players find it too intrusive in its current appearance (cf. #7221). This PR gives them the option of a toned-down version, rather than having to turn it off completely.

![screenshot_20180528_221350](https://user-images.githubusercontent.com/604665/40628292-6e71358e-62c4-11e8-9293-e166e75d0da6.png)

The clear/transparent style, introduced by this PR, looks like the virtual floor as originally introduced in #6338:
![](https://user-images.githubusercontent.com/14242454/31050274-e3f0e62e-a645-11e7-9b10-ec26b733d631.gif)

The glassy/translucent style is the virtual floor as we've come to know it since the v0.1.2 release, and remains the default setting.
 2018-05-30 13:09:50 +02:00
Aaron van Geffen
dcff6895b5 Refactor game_init_all into GameState::InitAll. 2018-05-30 11:53:32 +02:00
Ted John
eb62e26773 Use tick frequency rather than date for park size update 2018-05-30 11:53:32 +02:00
Ted John
d57867e722 Use the Date class in GameState. 2018-05-30 11:53:32 +02:00
Ted John
f1ee5cad83 Call Park from GameState. 2018-05-30 11:53:32 +02:00
Ted John
4d4e7ba4b1 Create new GameState class for updating the game 2018-05-30 11:53:30 +02:00
Ted John
d6ac74f4bd Fix loading SC6 files in editor 2018-05-29 18:39:13 +01:00
Ted John
376b6d04d8 Fix Linux builds 2018-05-29 18:39:13 +01:00
Ted John
c28a42d877 Optimise SawyerChunkReader for MSVC debug builds 
- Change std::copy_n and std::fill_n back to std::memcpy and std::memset. They do not have the overhead of checks.
- Change std::malloc to HeapAlloc as 16 MiB allocations are very slow due to it initialising all the memory to 0xCC.
 2018-05-29 18:39:13 +01:00
Ted John
3d98e1ad1d Do not reset title sequence when loading the title screen 2018-05-29 18:39:12 +01:00
Ted John
f5e77a9e15 Load objects for title editor and scenario editor 2018-05-29 18:39:12 +01:00
Ted John
f9d7ee93fc Revert changes to libopenrct2.vcxproj 2018-05-29 18:39:12 +01:00
Ted John
3a708ea112 Refactor parallelism to re-usable method 2018-05-29 18:39:12 +01:00
Ted John
1766abde91 Multi-thread object loading 2018-05-29 18:39:12 +01:00
Ted John
fbe0f5d04f Throw object load exception if unable to load any objects 2018-05-29 18:39:12 +01:00
Ted John
820fedb3df Fix loading title sequence parks 2018-05-29 18:39:12 +01:00
Ted John
6af0cb2b88 Fix import of S4 and S6 2018-05-29 18:39:12 +01:00
Ted John
96a0a22cd1 Make start on loading objects only once 2018-05-29 18:39:12 +01:00
Park Joon-Kyu
30fa405eb3 Make Twitch integration API URL configurable. (#7555) 2018-05-28 22:01:37 +02:00
Aaron van Geffen
a2f39079a7 Merge pull request #7556 from Gymnasiast/tile-element-cleanup 
Replace all occurrences of tile_element_is_last_for_tile()
 2018-05-25 13:34:28 +02:00
Aaron van Geffen
2420a16e9e Prevent peeps from spawning in the scenario editor. 
Regression from 721dc00778.
 2018-05-25 12:32:40 +02:00
Hielke Morsink
39b46d3083 Bump network version 2018-05-25 00:47:19 +02:00
Hielke Morsink
fe40005372 Automatically set the correct page 
Instead of having to set the page and setup the widgets correctly when a new elements gets selected, it now switches automatically on invalidation to the correct tab. This fixes the issue where pasted elements were selected but the page for them not shown, and removes two of the intents that were made for the tile inspector.
 2018-05-25 00:46:20 +02:00
Aaron van Geffen
85575b612e Apply formatting to string_to_money. 2018-05-24 17:17:44 +02:00
Aaron van Geffen
1d7d8a8043 Do not reallocate to prefix decimal money with '0'. 2018-05-24 17:17:44 +02:00
Aaron van Geffen
847d4e8b03 Process string_to_money's worst case in O(n) rather than O(n²). 2018-05-24 15:03:15 +02:00
Michael Steenbeek
b9186ce83d Make argument const 2018-05-24 13:44:09 +02:00
Gymnasiast
ef7b8b8da0 Return MONEY32_UNDEFINED on unsalvagable string_to_money() input 2018-05-24 13:22:25 +02:00
Michael Steenbeek
b573bd49b3 Replace all occurrences of tile_element_is_last_for_tile() 2018-05-24 11:44:53 +02:00
Aaron van Geffen
0d248dd6f4 Bump network version. 2018-05-23 16:34:01 +02:00
Aaron van Geffen
ca16fe8e62 Fix refurbishment confirmation window not closing in multiplayer mode. 2018-05-23 16:33:37 +02:00
jensj12
b6b3486a3d Fix cost being shown as 0 while paused 2018-05-23 16:33:37 +02:00
jensj12
56fcd2ec94 Use ride_get_start_of_track in TrackDesignSave 2018-05-23 16:33:37 +02:00
jensj12
ce0bf28cb5 Fix not enough cash error showing incorrectly 2018-05-23 16:33:37 +02:00
jensj12
50e3f8b4f6 Cleanup of ride_demolish 2018-05-23 16:33:37 +02:00
jensj12
23dc6bb9d3 Add button to refurbish ride 
Add a button to refurbish the selected ride. The cost for this is 35% of the
build price and may only be done if the ride is closed and empty.
 2018-05-23 16:33:37 +02:00