mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 19:43:06 +01:00
Code Issues Releases Wiki Activity
12,844 Commits 8 Branches 59 Tags
d342272dda56aa509590903a5d5bc1beeb14cbef
Commit Graph

9756 Commits

Author SHA1 Message Date
Michael Steenbeek
d342272dda Fix usage of RIDE_ID_NULL 2017-10-12 13:35:04 +02:00
Michał Janiszewski
8c885c92a4 Fix MinGW release builds 2017-10-12 12:45:00 +02:00
Robert Jordan
559a4c0953 Fix #6445: set favourite ride to N/A when importing from RCT1/AA 2017-10-12 12:40:57 +02:00
Michael Steenbeek
42d6a10952 Compile management as C++ 2017-10-11 21:38:26 +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
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
LRFLEW
0868902f11 Rework OpenGL API declarations 2017-10-10 22:26:35 +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
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
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
duncanspumpkin
79f34c6fa3 Add remove park fences console command 2017-10-09 10:49:06 +02: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
Christian F. Coors
e737b3108c Add status messages to server list window 2017-10-08 11:51:22 +02:00
Aaron van Geffen
34685b07a0 Fix #6407: Load/Save window theme is not applied 2017-10-07 23:56:47 +02:00
Marijn van der Werf
d02976695d Move new ride and research windows 2017-10-07 22:24:14 +02:00
Marijn van der Werf
eef3bd9af5 Move staff and guest windows 2017-10-07 22:24:14 +02:00
Marijn van der Werf
8569a7fe2f Move map window 2017-10-07 22:24:14 +02:00
Christian F. Coors
f98a240c5a Fix Intent string retrieval 2017-10-07 21:53:00 +02:00
Christian F. Coors
84086a2465 Fix http_request_t 2017-10-07 20:15:39 +02:00
ZehMatt
6fd2eb91a2 Fix demolishing rides causing errors. 2017-10-07 20:15:01 +02:00
ZehMatt
19f9a9b755 Fix #6394: RideCreateAction not working with empty colour presets. 2017-10-07 20:13:05 +02:00
Aaron van Geffen
86031410c6 Clear IME buffer after committing composed text. 2017-10-07 20:12:05 +02:00
Christian F. Coors
72b3896fec Fix strings in Intent 2017-10-07 19:21:56 +02:00