mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-09-11 20:12:51 +02:00
Code Issues Projects Releases Wiki Activity
14631 commits 9 branches 42 tags 373 MiB
Commit graph

14631 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
thyeggman
ccb1b330a5 Option for early scenario completion (#7187) 2018-03-20 12:58:59 +01:00
Michał Janiszewski
af7fd94859 Add missing includes 2018-03-20 09:34:19 +01:00
Ted John
9b604310a2 Implement game action for staff set colour 2018-03-20 09:31:39 +01:00
Ted John
6a8ea7e8d4 Create helper method to create the game action result 2018-03-20 09:31:39 +01:00
Ted John
708843b526 Implement game action for park marketing 2018-03-20 09:31:39 +01:00
Ted John
5a803d2551 Implement game action for park set research funding 2018-03-20 09:31:39 +01:00
Ted John
16a7e21ffa Implement game action for park set loan 2018-03-20 09:31:39 +01:00
Hielke Morsink
9c568105f2 Fix debug builds 
Regression from #7261.
 2018-03-20 08:19:53 +01:00
Michał Janiszewski
d0ec97bab2
Fix missing PATH_MAX on some Linux toolchains 
Some toolchains (e.g. clang 7) require explicit include of <linux/limits.h> for PATH_MAX.
 2018-03-20 08:18:56 +01:00