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

14276 Commits

Author SHA1 Message Date
Ted John 06da0b2fb5 Update vscode cpp properties [ci skip] 2018-04-05 21:24:52 +01:00
OpenRCT2 git bot 57b8ea4a89 Merge Localisation/master into OpenRCT2/develop. 2018-04-05 04:00:41 +00:00
OpenRCT2 git bot 7d16d65283 Merge Localisation/master into OpenRCT2/develop. 2018-04-02 04:00:41 +00:00
OpenRCT2 git bot 738b256895 Merge Localisation/master into OpenRCT2/develop. 2018-04-01 04:00:34 +00:00
Michał Janiszewski 66d1fa2bc8 Fix MinGW header checks 2018-03-31 23:48:15 +02:00
Michał Janiszewski b26d484726 Fix remaining headers 2018-03-31 23:48:15 +02:00
Hielke Morsink b62017657b Fix header dependencies for openrct2-ui 2018-03-31 23:07:14 +02:00
Hielke Morsink a51462b0fd Include necessary files for compiling headers 
This commits works towards #7289. It includes files that it depends on, or forward declares types when possible. It may seem like this only increases compilation time, but before this commit they depended on the other includes of the source files that use them.
 2018-03-31 23:07:14 +02:00
Fusxfaranto 69bb1cdf82 Use STR_NONE over magic number, and conform to style guide 2018-03-31 10:54:41 +02:00
Fusxfaranto 74361dcf87 Add different titles for multiplayer window tabs (#2989) 2018-03-31 10:54:41 +02:00
Hielke Morsink aa7fb35839 Remove use of 'using namespace' from headers 2018-03-30 17:14:10 +02:00
Michał Janiszewski 3b7864957a Cleanly shutdown in case of invalid g1.dat (#7361) 2018-03-30 15:38:22 +01:00
deurklink e960b3f150 Increment network version (#7359) 
Both PRs #7343 and #7347 changed the network version from '1' to '2'.
 2018-03-29 21:20:26 +02:00
Ted John 025827809e Add more include paths to .vscode config [ci skip] 2018-03-28 13:10:40 +01:00
Ted John 21d9ea53db Add .vscode cpp config [ci skip] 2018-03-28 12:30:32 +01:00
Hielke Morsink a2fe309be0
Merge pull request #7355 from Broxzier/fix/virtual-floor-zero-height 
Fix #7303 Visual glitch with virtual floor near map edges
 2018-03-28 12:48:39 +02:00
Hielke Morsink 8c23f16502
Merge pull request #7354 from Broxzier/fix/clip-height-assumes-order 
Fix clipheight assuming tile order
 2018-03-28 12:48:03 +02:00
Ted John a4fe3962f0 Add libopenrct2 as a dependency of openrct2-cli in VS solution 2018-03-27 22:16:13 +01:00
Hielke Morsink 8adfd9a87c Fix #7303 Visual glitch with virtual floor near map edges 2018-03-27 23:09:41 +02:00
Hielke Morsink 9f7d4f1bc4 Fix clipheight assuming tile order 
Instead of breaking the loop when running into an element that's above the clip height, only skip it - the next element may still be below the clip height.
The check for the first tile could be removed entirely. The screen gets cleared every frame when the clip height flag is set already.
 2018-03-27 22:17:58 +02:00
Duncan 1b2b020246
Merge pull request #7343 from ZehMatt/ga-stringbased 
Implement some game actions for naming things
 2018-03-27 18:55:28 +01:00
ZehMatt bcbe6ecbff Remove unnecessary include 2018-03-27 16:29:56 +02:00
ZehMatt adbe35b11c Increment network version. 2018-03-27 16:29:55 +02:00
ZehMatt 417a2586b6 Implement game action for banner naming. 2018-03-27 16:29:53 +02:00
ZehMatt b45609a278 Implement game action for park naming. 2018-03-27 16:29:52 +02:00
Michael Steenbeek 515bc5aedd
Add some missing entries to changelog [ci skip] 2018-03-27 14:08:53 +02:00
Michał Janiszewski ad588218f0
Explicitly require libzip>=1.0.0 for debian 2018-03-27 11:42:26 +02:00
Michał Janiszewski d9576e05c8
Drop libsdl2-ttf from debian libraries 
Not required as of https://github.com/OpenRCT2/OpenRCT2/pull/5702
 2018-03-27 11:39:18 +02:00
Michael Steenbeek beb352d97a Increase network version 2018-03-26 20:36:16 +02:00
Michael Steenbeek 695d3762e5 Remove last usages of SEPARATE_RIDE flag 2018-03-26 20:36:16 +02:00
Michael Steenbeek 3d86ec2bc0 Remove dead code from research 2018-03-26 20:36:16 +02:00
Hielke Morsink d7c198388e Fix #7327: Draw transparent images see-through too 
This removes the check for transparent images before applying the hardcoded colours. It sets the transparency flag anyway.
 2018-03-26 10:28:10 +02:00
Gymnasiast ca17f03ff2 Add large half loops to the Vertical Drop Roller Coaster 2018-03-25 16:32:06 +02:00
Hielke Morsink aefb2adc05
Merge pull request #7273 from Broxzier/fix/5210-no-system-dialog 
Refactor browse function in LoadSave.cpp - fixes #3596 and #5210
 2018-03-24 13:59:36 +01:00
Hielke Morsink 9ddda9ac77 Move comment 2018-03-24 13:34:05 +01:00
Hielke Morsink 3b697c071d Only append default extension when none is provided 
This should give Linux the same behaviour as Windows. It requires testing, I don't have access to a Linux machine.
 2018-03-24 13:25:41 +01:00
Hielke Morsink 6528a2fe37 Invalidate window when populating list 
The new comment is there for clarity, because this confused me for a sec.
 2018-03-24 13:25:40 +01:00
Hielke Morsink 45a92a7356 Fix #5210 Unable to open system dialog for saving 
The reason the file dialog failed to open (on Windows at least) is that the dialog would be used to save a file, yet a folder was provided as the default path. This commit attempts to append a logical filename to the path, including an extension.
 2018-03-24 13:25:40 +01:00
Hielke Morsink c5aececcb1 Set scenario save path upon successfully loading a park 
Instead of setting the path when clicking on a file in the loadsave dialog, it's now set when the park gets actually loaded.

This fixes the System Dialog not showing when saving a park loaded from command.
 2018-03-24 13:24:39 +01:00
ZehMatt 199a3e33f4 Implement game action for sign naming. 2018-03-24 05:19:19 +01:00
OpenRCT2 git bot 2c7e7123f7 Merge Localisation/master into OpenRCT2/develop. 2018-03-24 04:00:48 +00:00
Ted John a913fd2d4a
Merge pull request #7266 from IntelOrca/feature/interactive-stdinout 
Make stdin / stdout a game console
 2018-03-23 22:19:08 +00:00
Ted John a6d03b3b0f Fix segfault when exiting a network game 
Separate out closing of connection into a new method so only that is called when closing the game which then means gfx_invalidate_screen is not called.
 2018-03-23 21:54:45 +00:00
xp4xbox 674e094b3a Add shortcut definition for 'View Path Issues' and 'Cutaway View' 2018-03-23 10:37:13 +01:00
Hielke Morsink 44e893ab53 Fix issue in 'GetExtension' (#7337) 
`Path::GetExtension` would iterate over the full path instead of just the filename, meaning a path like `C:\My.docs\file` (note the missing extension in the filename) would return `.docs\file` as the extension.
 2018-03-23 07:48:13 +00:00
OpenRCT2 git bot 13f7d3b6de Merge Localisation/master into OpenRCT2/develop. 2018-03-23 04:00:46 +00:00
Michał Janiszewski 478b787c79
Default-initialise _consoleCurrentLine 2018-03-22 23:03:35 +01:00
Ted John 3a341816bf Require double CTRL+C to exit 2018-03-22 20:44:58 +00:00
Ted John 85031f2b9a Fix executed statement not written to in game console 2018-03-22 20:35:52 +00:00
Ted John 4babfa2479 Do not make hide close the game 2018-03-22 20:29:41 +00:00