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

10992 Commits

Author SHA1 Message Date
Ted John 7c05e22cd0 Refactor large scenery tile flags field 2018-03-26 21:37:23 +02:00
Ted John f11973f692 Fix typo, hasGrass -> hasGlass 2018-03-26 21:37:23 +02:00
Ted John 971e2dcaa2 Add JSON loading for walls 2018-03-26 21:37:23 +02:00
Ted John f6a6169ca2 Don't report object conflicts 2018-03-26 21:37:23 +02:00
Ted John ede51ded86 Add JSON loading for scenery groups 2018-03-26 21:37:23 +02:00
Ted John 3ead0f4289 Finish loading water JSON objects 2018-03-26 21:37:23 +02:00
Ted John 40f775c39a Add JSON loading for water 2018-03-26 21:37:23 +02:00
Ted John 12d2523752 Add JSON loading for footpath banners 2018-03-26 21:37:23 +02:00
Ted John ec446ac9d6 Return image and string table by reference 2018-03-26 21:37:23 +02:00
Ted John c3f075d18c Write helper method for parsing flags 2018-03-26 21:37:23 +02:00
Ted John 900bc48efa Write common JSON string loader 2018-03-26 21:37:22 +02:00
Ted John d56f1445f8 Add JSON loading for footpath items 2018-03-26 21:35:44 +02:00
Michael Steenbeek e8b28965cc Fix extracting ranges from object .DATs 2018-03-26 21:35:44 +02:00
Ted John d27a90f068 Implement footpath JSON reading 2018-03-26 21:35:44 +02:00
Michael Steenbeek 27a055653c Fix rebase errors 2018-03-26 21:35:44 +02:00
Ted John 2d037fb3ae Read JSON for park entrance objects 2018-03-26 21:35:44 +02:00
Ted John 1e4a8c0da7 Refactor common JSON methods to new helper namespace 2018-03-26 21:35:44 +02:00
Ted John 4fdbf1ca93 Parse category and shop item 2018-03-26 21:35:44 +02:00
Ted John a7a7b2f1b4 Fix memory corruption in ImageTable::AddImage 2018-03-26 21:35:44 +02:00
Ted John ddd0df4a60 Parse ride type with lookup table 2018-03-26 21:35:44 +02:00
Ted John 5eba067aba Load images from OBJDATA DATs 2018-03-26 21:35:44 +02:00
Ted John 773ab868fe Parse new form of original id 2018-03-26 21:35:44 +02:00
Ted John bf7c3931e7 Parse images from JSON 2018-03-26 21:35:44 +02:00
Ted John f6fd79eca4 Move length calculation to ImageTable.cpp 2018-03-26 21:35:44 +02:00
Ted John 32d588d765 Fix toilets image loading 2018-03-26 21:35:44 +02:00
Michael Steenbeek ad21e962ee Allow import of RCT1 Ice Cream Stall 2018-03-26 21:35:44 +02:00
Michael Steenbeek 7d3489a151 Avoid toilets selling balloons 2018-03-26 21:35:44 +02:00
Michael Steenbeek e3b202989f Read more from JSON, attempt at supporting more types of stalls 2018-03-26 21:35:44 +02:00
Michael Steenbeek 3ffdfd1e5d Draw the building 2018-03-26 21:35:43 +02:00
Michael Steenbeek 9ab0164b6f Fix compiling and loading on macOS, load description 2018-03-26 21:35:43 +02:00
Ted John a1f360ab7d Spike 1: Add RCT1 toilets JSON 2018-03-26 21:35:43 +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 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
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
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
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
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
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
Michał Janiszewski 7d67291910 Synchronise definition guards with declarations for str utils 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
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
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
Michał Janiszewski 67f74119cf Fix missing headers 2018-03-20 00:27:58 +01:00
Michał Janiszewski cd065d4f41 Reduce includes in common header 2018-03-20 00:27:58 +01:00
Michał Janiszewski 3303246b09 Reduce header inclusions 2018-03-20 00:27:58 +01:00
Hielke Morsink 2d1d60294c Improved raising land near edge map 
Rather than showing the user an 'off edge map!' error, this simply makes the affected area smaller.
 2018-03-19 14:08:37 +01:00
Aaron van Geffen 7bc63dc30a Themes window: use header widgets; minor code clean up. 2018-03-19 10:36:39 +01:00
Aaron van Geffen 8ab568a6a9 Multiplayer: use table header widgets for column headers. 2018-03-19 10:36:39 +01:00
Aaron van Geffen f6933aea4e Multiplayer information: take font line height into account. 2018-03-19 08:34:16 +01:00
Aaron van Geffen a61c84d3b0 Increase button height in server list window. 2018-03-19 08:34:16 +01:00
Aaron van Geffen ca4e1a36fb Fix widget dimensions for 'Start server' window. 2018-03-19 08:34:16 +01:00
Aaron van Geffen 686fedc671 Player window: use LIST_ROW_HEIGHT. 2018-03-19 08:34:16 +01:00
Aaron van Geffen 32e0f12f5b Multiplayer window: use SCROLLABLE_ROW_HEIGHT in scrollpaint. 2018-03-19 08:34:16 +01:00
Aaron van Geffen c0bc2da529 Increase button height in save prompt window. 2018-03-19 08:34:16 +01:00
xp4xbox 463cb7ab26 Fix #5339: Change scenery eyedropper to use a relevant icon. 2018-03-19 08:33:59 +01:00
Michał Janiszewski f1ab13f56e Fix sorting and missed floor() usage 2018-03-18 23:29:13 +01:00
LRFLEW d4cfad8ab2 Fix 'different language linkage' error with Xcode 2018-03-18 23:29:13 +01:00
Michał Janiszewski 4dd0995efb Move cmath out of common.h 2018-03-18 23:29:13 +01:00