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

15190 Commits

Author SHA1 Message Date
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
OpenRCT2 git bot 06e043b887 Merge Localisation/master into OpenRCT2/develop. 2018-05-31 04:02:29 +00:00
Michał Janiszewski 3137469272
Merge pull request #7593 from janisozaur/remove-extra-decls 
Remove superfluous declarations
 2018-05-31 00:53:50 +02:00
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 e545c3a0f4 Update .gitignore to ignore any bin directory 2018-05-30 18:10:31 +01:00
Michael Steenbeek 01e14e10bb
Add zh_CN and nb_NO translations to openrct2.desktop [ci skip] 2018-05-30 15:05:38 +02:00
Michael Steenbeek 714e20c346
Merge pull request #7580 from Broxzier/fix/7571-track-design-money-generation 
Fix #7571 Track design ghost generates money
 2018-05-30 14:39:27 +02: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
Michał Janiszewski bc67191925
Improve reporting of ccache stats 
Now shows pre & post build stats in form of diff.
 2018-05-30 13:50:17 +02: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
Aaron van Geffen 67f4f9e617 Add GameState classes to Xcode project. 2018-05-30 11:53:32 +02:00
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