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

14905 Commits

Author SHA1 Message Date
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
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
Hielke Morsink 4c1097d5b1 Minor code cleanups 2018-05-25 00:46:19 +02:00
Umdlye 86b9546005 Use default colour for currency in demolish/refurbish prompts [ci skip] 2018-05-24 21:32:45 +02:00
Aaron van Geffen c89ebb0510
Merge pull request #7516 from Gymnasiast/string-to-money-imrpov 
Return MONEY32_UNDEFINED on unsalvagable string_to_money() input
 2018-05-24 17:52:37 +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
Aaron van Geffen 48359cc02d Clean up the contributors file [ci skip] 
* Project team -> Development team
* Clarify contributions for RCT2 implemenation.
* Clarify contributions in additional implementation section.
* List contributors under their most appropriate sections.
 2018-05-24 13:41:08 +02:00
Gymnasiast ef7b8b8da0 Return MONEY32_UNDEFINED on unsalvagable string_to_money() input 2018-05-24 13:22:25 +02:00
Michael Steenbeek 8d8820016c Fix Testpaint 2018-05-24 13:13:51 +02:00
Michael Steenbeek b573bd49b3 Replace all occurrences of tile_element_is_last_for_tile() 2018-05-24 11:44:53 +02:00