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

12841 Commits

Author SHA1 Message Date
Robert Jordan 559a4c0953 Fix #6445: set favourite ride to N/A when importing from RCT1/AA 2017-10-12 12:40:57 +02:00
OpenRCT2 git bot a27adb5df0 Merge Localisation/master into OpenRCT2/develop. 2017-10-12 06:38:35 +00:00
Michael Steenbeek 42d6a10952 Compile management as C++ 2017-10-11 21:38:26 +02:00
Michael Steenbeek ddcff09640 Merge pull request #6432 from janisozaur/ui-cpp 
openrct2-ui C++
 2017-10-11 11:31:02 +02:00
Michał Janiszewski 07f7928382 Indent namespace contents in KeyboardShortcut.cpp 2017-10-11 11:30:40 +02:00
Michael Steenbeek 34200848a9 Fix Xcode project; rename input.h 2017-10-11 11:30:38 +02:00
Michał Janiszewski 992721bdb7 Remove C sources from libopenrct2ui.vcxproj globs 2017-10-11 11:30:37 +02:00
Michał Janiszewski bc1d3c0cb2 Remove C sources from glob patterns for openrct2-ui 2017-10-11 11:30:37 +02:00
Michał Janiszewski 50fa761fa0 Apply C++ formatting to Input.cpp 2017-10-11 11:30:36 +02:00
Michał Janiszewski f04c871515 Compile input.c as C++ 2017-10-11 11:30:35 +02:00
Michał Janiszewski 83bb8721f8 Apply C++ formatting 2017-10-11 11:30:34 +02:00
Michał Janiszewski b55f966a87 Compile keyboard_shortcut as C++ 2017-10-11 11:30:33 +02:00
Michael Steenbeek fe97215013 Add #6433 to changelog 2017-10-11 10:35:43 +02:00
Daniel Trujillo Viedma 39ecd37d27 Fix fault in #6401: append extensions only when saving 2017-10-11 09:43:49 +02:00
Michael Steenbeek 17557569d0 Turn 'unlock all prices' into a regular option 
This uses a previously unused S6 flag to save this option persistently.
This should not make S6 import much harder, but should reduce the amount of questions about S4 import.

Also refactor the checks whether the user can ask money for rides or entry. This should make it a lot easier
when our own save format comes around.
 2017-10-11 08:33:17 +02:00
Duncan f97068d0b6 Fix #6420: Demolishing rides refunds twice as much as the ride costs to build 2017-10-11 07:58:49 +02:00
Michał Janiszewski e01cd0fd40 Use googletest with google/googletest#1045 2017-10-10 22:26:35 +02:00
LRFLEW 0868902f11 Rework OpenGL API declarations 2017-10-10 22:26:35 +02:00
Michał Janiszewski a4c8d402ad Add missing variable declarations warning for C++ 2017-10-10 22:26:35 +02:00
Michael Steenbeek 9caf34824b Add #3510, #6223, #6290, #6414, #6423 to changelog 
[ci skip]
 2017-10-10 17:14:22 +02:00
Michael Steenbeek 64da0e8f8d Fix some formatting in peep.c 
JENKINS!!
 2017-10-10 15:17:39 +02:00
Michał Janiszewski 89fb6b2144 Fix android builds 
[ci skip]
 2017-10-10 14:53:33 +02:00
Michał Janiszewski 16bd2c6439 Fix #6430: endless vomiting 
Mistake during refactor
 2017-10-10 14:02:50 +02:00
duncanspumpkin f5d0924520 Update changelog 2017-10-10 12:43:54 +02:00
duncanspumpkin 665aac7394 Fix #6413: Draw Maze previews correctly. 
Mistake made during refactoring. Apply flag was not being passed to the game command and this meant that only the query to check if a maze element could be placed was called.
 2017-10-10 12:43:54 +02:00
Michael Steenbeek 6621faf27a Fix #6196: Guest's energy underflows and never decreases 
Issue caused by using max where min was intended.
This also reverts an earlier change in capping the energy target, since it seems to max out at 255, unlike energy itself.
 2017-10-10 10:06:56 +02:00
Daniel Trujillo Viedma 9dc04ed07a Fix #3510: Auto append file extension when not specified on save 2017-10-10 09:55:40 +02:00
Michael Steenbeek 5cc5761a25 Fix #6414: raise maximum launch speed of the Corkscrew to 96 km/h 2017-10-10 09:53:36 +02:00
Michael Steenbeek 3c8184dfa1 Handle Polish in the RCT2-to-Unicode conversion 
Also removed the misidentified A_MINUSCULE and CENT.
 2017-10-10 09:22:38 +02:00
Michael Steenbeek 71686e88b5 Render Polish with the sprite font 
Fixes the sprite lookup table for the Polish characters.
Switches the font settings for Polish from TTF to sprite.
 2017-10-10 09:22:38 +02:00
Michał Janiszewski c4538496c5 Make sure variables are either static or declared externally 2017-10-09 22:59:40 +02:00
Michał Janiszewski b05bdf28fc Fix compilation with older clang 
Older clang would expand the macros and spot that clamping unsigned
values to [0, MAX] is a tautological operation and produce an error.

As these are tautological operations, no network version change should
be needed.
 2017-10-09 17:34:37 +02:00
Duncan 6e1521caec Reintroduce error messages when trying to open invalid rides (#6381) 
* Reintroduce error messages when trying to open invalid rides

Mistake made during action refactor. I've added the ability to specify the error title and error args as well in the result constructor. In addition the set status will now perform a query to check if it is valid preventing error messages hitting the server.

* Bring error message setting into the function

This prevents any other function corrupting the message args. Looking at you update ride window.

* Increment network version for error message fix on set status

* Reintroduce the error title to set ride name

* Try not to introduce bugs due to inverting logic
 2017-10-09 15:50:49 +01:00
Michael Steenbeek 9effe3a599 Merge pull request #6417 from janisozaur/rides-as-cpp 
Compile rides as C++
 2017-10-09 15:56:38 +02:00
Michael Steenbeek e25d6b807d Fix refactor error in MiniGolf.cpp 2017-10-09 15:33:34 +02:00
Michael Steenbeek 2fd4d39456 Fix compilation in Visual Studio 2017-10-09 15:24:51 +02:00
Michael Steenbeek f9c2d16eb0 Rename ride paint header files 2017-10-09 15:24:24 +02:00
Michael Steenbeek 868eb16060 Fix Xcode project 2017-10-09 15:24:23 +02:00
Michał Janiszewski 0c92619350 Fix testpaint CMakeLists.txt 2017-10-09 15:24:22 +02:00
Michał Janiszewski 7bdcc3345f Rename files to C++ convention 2017-10-09 15:24:22 +02:00
Michał Janiszewski a9dafef0f4 Apply C++ formatting 2017-10-09 15:24:21 +02:00
Michał Janiszewski a8c8f726ee Compile ride drawing code as C++ 2017-10-09 15:24:20 +02:00
Aaron van Geffen bfc999aac9 Order language list by native name 2017-10-09 10:53:09 +02:00
Michael Steenbeek cf61bdb824 Add #6411 to changelog 
[ci skip]
 2017-10-09 10:50:47 +02:00
duncanspumpkin 79f34c6fa3 Add remove park fences console command 2017-10-09 10:49:06 +02:00
OpenRCT2 git bot c724074ff4 Merge Localisation/master into OpenRCT2/develop. 2017-10-09 04:00:26 +00:00
Marijn van der Werf ebb4bbe5d5 Move ride list window to UI module (#6412) 2017-10-08 22:15:41 +02:00
vector-of-bool 57a8bbac23 Respect POSIX path separators on Windows (#6356) 2017-10-08 21:28:38 +02:00
Michał Janiszewski 26cb4adb9b Make sure curl and certificates are installed before using them 2017-10-08 21:24:16 +02:00
Michał Janiszewski 90a5d592f1 Install CMake 3.9 for upcoming refactor in #6409 2017-10-08 20:27:52 +02:00