mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 01:35:06 +01:00
Code Issues Releases Wiki Activity
19,807 Commits 8 Branches 59 Tags
4e58eae43d0757f441d008c19f016dcea2cb3fb5
Commit Graph

15345 Commits

Author SHA1 Message Date
Hielke Morsink
f805c8db1a Fix #7589: Error in ride window's hold_down_widgets 2018-05-31 00:24:48 +02: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
Aaron van Geffen
2127a0170e Merge pull request #7567 from IntelOrca/performance/park-loading 
Improve performance of park loading
 2018-05-30 11:51:16 +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
Aaron van Geffen
6eadf00a33 Order ride type dropdown orthographically. 2018-05-29 19:09:56 +02:00
Aaron van Geffen
8a1de9d8fd Turn ride type selection into a normal dropdown. 
This removes the spinner aspect that previously worked around dropdown item limits.
 2018-05-29 19:09:56 +02:00
Park Joon-Kyu
30fa405eb3 Make Twitch integration API URL configurable. (#7555) 2018-05-28 22:01:37 +02:00
Hielke Morsink
617372fd38 Check for page correctly 2018-05-27 18:07:05 +02:00
Hielke Morsink
15ae358946 Fix #7569: Assertion hit when using the XY spinners (#7570) 
The X/Y spinners change the currently tile selected, and reset the element selection index. Previously this would also set the page to default immediately, but since that's now done on invalidation instead, the page would not be correct. This is fixed by checking the index of the selected element too, instead of only the selected page, in the mouse_up event.
 2018-05-27 18:03:34 +02:00
Hielke Morsink
f5c8ad2189 Merge pull request #7562 from AaronVanGeffen/windows/inventions-resize 
Resizeable invention list window
 2018-05-27 15:28:18 +02:00
Ted John
cce37698e8 Fix #7454: Rides list windows has weird strings... 
The ride list assumed the ride structure had 0 packing. Format the name by explicitly setting format arguments to the ride's name arguments.
 2018-05-27 13:27:43 +01:00
Aaron van Geffen
1a2958df84 Make text painting adapt to scrollview width as well. 2018-05-27 00:45:50 +02:00
Aaron van Geffen
248585281c Fix #6221: Make invention list resizeable. 2018-05-27 00:37:45 +02:00
Aaron van Geffen
7a107264df Tile inspector: clip overly long object name strings. 2018-05-26 01:20:46 +02:00
Aaron van Geffen
146235931f Tile inspector: use SCROLLABLE_ROW_HEIGHT constant. 
The tile inspector window was using its own LIST_ITEM_HEIGHT constant,
instead of the SCROLLABLE_ROW_HEIGHT constant commonly used in other windows.

This fixes CJK text overlapping.
 2018-05-26 01:20:29 +02:00
Hielke Morsink
1a9dc7beee Fix #7564 Some buttons are not greyed out when they should (#7565) 2018-05-25 23:09:52 +02:00
Aaron van Geffen
8a724c3983 Hide speed and length statistics for flat ride TD6 files (#7563) 
This hides the speed and length statistics in the track design list when viewing designs for non-tracked rides.

Fixes #7507.
 2018-05-25 23:01:27 +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
c50011aa3e Re-add zebra stripes and light text 2018-05-25 00:46:21 +02:00
Hielke Morsink
59c7b097ee Add Ctrl + Click to select tile elements 
Co-authored-by: wolfreak99 <jbminor1991@gmail.com>
 2018-05-25 00:46:20 +02:00
Hielke Morsink
0d77c279aa Fix: buttons sometimes stay pressed 
In the invalidate function of the tile inspector, the checkboxes get checked to match the selected tile element. Some of those checkboxes share their widget index with buttons from other pages. When a checkbox is checked, the it's set to be "pressed", which causes the butons in the other tabs so appear that way. This behaviour is fixed by unpressing widgets when switching to another page.
 2018-05-25 00:46:20 +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
Hielke Morsink
4b25a71924 #5832 Resize tile inspector automatically when selecting a tile element 2018-05-25 00:46:19 +02:00
Hielke Morsink
f79589527d Adjust list style to match other lists 
- No odd/even checked colours
- Black text (white on hover)
- Darker background
- Solid fill background for hovered and selected element
 2018-05-25 00:46:19 +02:00