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

14290 Commits

Author SHA1 Message Date
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
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
Michał Janiszewski 8624a1d28a Default in-game console to closed 2018-03-22 20:16:58 +00:00
Ted John ee8d72ea8d Replace magic numbers with CONSOLE_INPUT_SIZE 2018-03-22 20:16:58 +00:00
Ted John aba142f99c Update changelog 2018-03-22 20:16:58 +00:00
Michał Janiszewski 24c2fcbb6c Add threading library to CLI 2018-03-22 20:16:58 +00:00
Michał Janiszewski af0967e95e Add missing headers 2018-03-22 20:16:58 +00:00
Michael Steenbeek 0137eaab34 Update Xcode project 2018-03-22 20:16:58 +00:00
Ted John e3eff999a7 Fix building for mingw 2018-03-22 20:16:58 +00:00
Ted John 2c627b43ba Optionally use terminal colour codes 2018-03-22 20:16:58 +00:00
Ted John 6d526d020c Fix for MSVC 2018-03-22 20:16:58 +00:00
Michael Steenbeek dbf41a1e47 Add linenoise.hpp to Xcode project 2018-03-22 20:16:58 +00:00
Ted John f7dafa9bbb Only enable interactive console for headless 2018-03-22 20:16:58 +00:00
Ted John dd0573b235 Move in game console to UI library 2018-03-22 20:16:58 +00:00
Ted John 395f124a0b Fix console exit for stdin/out 2018-03-22 20:16:58 +00:00
Ted John ec9e812ea7 Replace gConsoleOpen with function 2018-03-22 20:16:58 +00:00
Ted John 5188c3612a Move in game console variables to class 2018-03-22 20:16:58 +00:00
Ted John c29efc7573 Separate consoles to different sources 2018-03-22 20:16:58 +00:00
Ted John 65eb908025 Create new in-game console class 2018-03-22 20:16:58 +00:00
Ted John d18f416370 Add basic interactive console using linenoise 2018-03-22 20:16:58 +00:00
Michael Steenbeek 61ddbd918b Add option to freeze all staff to Cheats window 2018-03-22 09:32:20 +01:00
OpenRCT2 git bot d4b1b4eead Merge Localisation/master into OpenRCT2/develop. 2018-03-22 04:01:53 +00:00
Michał Janiszewski fbe99a1631 Update Debian rules with GCC version [ci skip] 2018-03-21 22:40:45 +01:00
Michał Janiszewski 7d67291910 Synchronise definition guards with declarations for str utils 2018-03-21 22:39:19 +01:00
Michael Steenbeek 9219f0b851 Update Xcode project 2018-03-21 22:39:19 +01:00
Michał Janiszewski 06e97ab6e2 Fix linkage on macOS 2018-03-21 22:39:19 +01:00
Michał Janiszewski fc97c8c5db Reduce inclusion of <string> header 2018-03-21 22:39:19 +01:00
Michał Janiszewski aec120a3f5 Update Ubuntu docker image to use clang 5 
Even though clang 6 is available already, Android NDK ships with clang
5, so use that to reduce possible issues
 2018-03-21 22:35:19 +01:00
Michał Janiszewski 64be4e76e9 Link libstdc++ and libgcc statically on Travis 
In preparation for GCC7 images, ship with static libstdc++ and libgcc.
 2018-03-21 22:29:23 +01:00
Michał Janiszewski 084589d9e0 Install GCC 7 for Ubuntu docker images 
This only installs g++.
 2018-03-21 22:26:56 +01:00
Michael Steenbeek 919533d7c2 Show ride and vehicle names in research list 2018-03-21 22:04:10 +01:00
Michał Janiszewski 2545d01db4 Use libc++-provided strndup on Android 2018-03-21 16:05:00 +01:00
pkubaj 7adde37f56 Fix build with FreeBSD 2018-03-21 14:26:38 +01:00
OpenRCT2 git bot 2ea62fe6cf Merge Localisation/master into OpenRCT2/develop. 2018-03-21 04:01:14 +00:00
pkubaj 38cdf5e8c9 Corrected fix to use AVX on FreeBSD>10 2018-03-20 23:15:28 +01:00
pkubaj 1191f64091 Fix build on FreeBSD 10 
NOTE: This can be reverted once FreeBSD 10.4-RELEASE goes EoL.
 2018-03-20 23:15:28 +01:00
zaxcav 9d3e1fbedf Fix #7176 pending breakdown interfering with mechanic heading to inspection (#7201) 
* Fix pending breakdown interfering with mechanic heading to inspection

* Rename peep_fixing sub states per suggestions.

Reset ride->mechanic_status to UNDEFINED in sub-state finish fix/inspect (previously sub_state_13).

* Increment network version. Fix tabs/spaces
 2018-03-20 21:55:30 +00:00
Ted John 5245b35a90
Merge pull request #7286 from IntelOrca/refactor/gameaction-parksetloan 
Implement some more basic game actions:
- ParkMarketingAction
- ParkSetLoanAction
- ParkSetResearchFundingAction
- StaffSetColourAction
 2018-03-20 13:38:56 +00:00