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

15020 Commits

Author SHA1 Message Date
Michał Janiszewski afdcd35fb9 Fix MultiLaunch test. 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
Aaron van Geffen cf3ed748a7
Merge pull request #7581 from AaronVanGeffen/ride_type_dropdown 
Make ride type selection widget an ordered dropdown
 2018-05-30 10:11:55 +02:00
Aaron van Geffen 859bd4ad7a Update changelog [ci skip] 2018-05-30 10:11:31 +02:00
OpenRCT2 git bot fb61b8ee08 Merge Localisation/master into OpenRCT2/develop. 2018-05-30 04:01:22 +00:00
Michał Janiszewski 8dcbe51682
Merge pull request #7582 from janisozaur/ccache 
Use ccache on travis
 2018-05-30 00:48:48 +02:00
Michał Janiszewski 545e3c1f85 Reduce verbosity of unpacking (pre)cached downloads 2018-05-30 00:03:53 +02:00
Michał Janiszewski aa8322e03a Use ccache in Travis Linux builds 2018-05-30 00:03:38 +02:00
Michał Janiszewski 35b72b7594 Add ccache to dockerfiles 
[ci skip]
 2018-05-30 00:00:34 +02:00
Ted John 281d917fb4 Update changelog 2018-05-29 18:39:58 +01: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
Michael Steenbeek 633b3e5b92
Rephrase Twitch integration strings [ci skip] 
Thanks to @Umdlye for providing most of the rephrasings (and reporting the errors)
 2018-05-29 15:56:22 +02:00
OpenRCT2 git bot 60c438d9e9 Merge Localisation/master into OpenRCT2/develop. 2018-05-29 04:00:29 +00: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
Hielke Morsink 9d14e74520
Merge pull request #7566 from AaronVanGeffen/windows/tileinsp-misc 
Tile inspector: row height and text overlap
 2018-05-26 19:59:25 +02:00
Ted John 2c64bbf3e3 Change msvc projects to use winssl triplet from vcpkg 2018-05-26 18:57:37 +01: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 7be4072eef
Merge pull request #7548 from Broxzier/improve/tile-inspector 
Tile Inspector UX Improvements
 2018-05-25 12:22:26 +02:00
OpenRCT2 git bot 06105c3155 Merge Localisation/master into OpenRCT2/develop. 2018-05-25 04:01:49 +00: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