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

14874 Commits

Author SHA1 Message Date
Hielke Morsink 7aada25ed2 Clarify disabling of warnings for unused function (#7617) 2018-06-02 22:30:41 +02:00
Michał Janiszewski debb6cd46c Remove declarations of unimplemented functions (#7615) 2018-06-02 13:51:23 +02:00
Aaron van Geffen 9ee1a1f4df
Fix #7613: Improve scrolling behaviour in staff list. (#7614) 2018-06-02 13:06:38 +02:00
Michał Janiszewski 58bde442dd
Fix headers to ensure they carry all their dependencies (#7610) 2018-06-02 09:46:14 +02:00
OpenRCT2 git bot d09fc19361 Merge Localisation/master into OpenRCT2/develop. 2018-06-02 04:00:26 +00:00
Aaron van Geffen 635eab3305
Merge pull request #7579 from AaronVanGeffen/widgets/spinners 
Make widget spinners horizontal
 2018-06-02 00:03:20 +02:00
Aaron van Geffen f2b0f7457e Terminology change: rename spinners to steppers. 2018-06-01 23:25:07 +02:00
Aaron van Geffen 5666ce0025 Update changelog [ci skip] 2018-06-01 23:25:07 +02:00
Aaron van Geffen 0e930287c6 Change spinners for MapGen, Editor{Objective,Scenario}Options. 2018-06-01 23:25:07 +02:00
Michał Janiszewski cb536a15fa Drop static function declarations from header 2018-06-01 22:44:14 +02:00
Ted John e40a8d2cf5
Merge pull request #7591 from OpenRCT2/performance/msbuild 
Improve msbuild performance

Ensure source file names are unique so that all object files can be written to a single directory which allows a single MSVC instance to compile all source files in parallel.
 2018-06-01 21:26:15 +01:00
Aaron van Geffen f03fe46b83
Merge pull request #7608 from AaronVanGeffen/vehicle_type_dropdown 
Order vehicle type dropdown orthographically
 2018-06-01 21:29:36 +02:00
Aaron van Geffen 44849860ab Update changelog [ci skip] 2018-06-01 21:07:05 +02:00
Aaron van Geffen 03020530ef Order vehicle type dropdown orthographically. 2018-06-01 20:35:52 +02:00
Aaron van Geffen 9806ab878d Refactor current vehicle dropdown preparation into its own function. 
Splitting the lot off to window_ride_show_vehicle_type_dropdown.
 2018-06-01 18:48:27 +02:00
Aaron van Geffen af0d8fea36 Change spinners for Cheats and Map windows. 2018-06-01 15:29:56 +02:00
Aaron van Geffen e5f184b01b Spinners for CustomCurrency, RideConstruction, ServerStart, ViewClipping. 2018-06-01 15:20:13 +02:00
Aaron van Geffen 64b04cccd1 Change spinners in Tile Inspector to new +/- buttons. 2018-06-01 15:20:13 +02:00
Aaron van Geffen 88955543d1 Spinners for Finances, NewCampaign, Park windows. 2018-06-01 15:20:13 +02:00
Aaron van Geffen 262409a8d4 Fix #7578: Clicking same price throughout park on accident. 2018-06-01 15:20:13 +02:00
Aaron van Geffen 2181e35b95 Replace spinner widgets with horizontal +/- buttons. 
Limited to Options and Ride windows so far.
 2018-06-01 15:20:13 +02:00
Michael Steenbeek e91777bd7e
Small cleanup to ride window price box 2018-06-01 14:23:46 +02:00
Michael Steenbeek ed39ce61b8
openrct2.desktop: Add French translation [ci skip] 2018-06-01 13:56:44 +02:00
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 5a0fed668b Update Xcode project. 2018-06-01 09:43:57 +02:00
Ted John 92f6ac7333 Rename header files to match renamed source files 2018-06-01 09:38:30 +02:00
Michał Janiszewski ce3b210e6b Fix testpaint build 2018-06-01 09:37:49 +02:00
Ted John 550d134146 Build libopenrct2 and libopenrct2ui simultaneously 2018-06-01 09:37:49 +02:00
Ted John b3c17b215f Use single output folder for msbuild obj files 
This requires unique named source files within a project.
 2018-06-01 09:37:49 +02:00
OpenRCT2 git bot e60b7b3716 Merge Localisation/master into OpenRCT2/develop. 2018-06-01 04:00:58 +00: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 1a9d4833ea
Fix eyedropper icon [ci skip] (#7590) 
libPNG generated this warning: `EXEC : libpng warning : iCCP: known incorrect sRGB profile`
 2018-06-01 00:00:40 +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
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