mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
14,261 Commits 8 Branches 40 Tags 362 MiB
Commit Graph

14261 Commits

Author SHA1 Message Date
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 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
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