mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 20:43:04 +01:00
Code Issues Releases Wiki Activity
12,810 Commits 8 Branches 59 Tags
b05bdf28fc600129888ebec647656ed4b3d1698b
Commit Graph

12810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
2d99367159 Update Xcode project 2017-10-07 22:24:14 +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
Michael Steenbeek
31e1ad43a8 Compile finance.c as C++, clean up 2017-10-07 16:28:35 +02:00
OpenRCT2 git bot
b56ad772f4 Merge Localisation/master into OpenRCT2/develop. 2017-10-07 04:00:21 +00:00
Michael Steenbeek
25b72260d7 Compile research.cpp as C++, small refactor 2017-10-06 21:41:50 +02:00
Michał Janiszewski
10def2a31b Provide default values to fix mingw build 2017-10-06 13:42:37 +02:00
Michael Steenbeek
7cb464af6e Clean up animated object limit and import 2017-10-06 11:33:55 +02:00
Aaron van Geffen
0217734c4e Fix #6383: macOS deprecation errors when compiling. 2017-10-06 11:23:16 +02:00
Michael Steenbeek
4224193d68 Clean up ride groups 2017-10-06 10:29:24 +02:00
Christian F. Coors
ecc6bf5120 Fix scrolling with mouse wheel 2017-10-06 10:17:43 +02:00
Michał Janiszewski
07dbdfbd34 Make GameActionResult destructor virtual to ensure proper teardown 2017-10-06 07:31:40 +02:00
OpenRCT2 git bot
e5fe681793 Merge Localisation/master into OpenRCT2/develop. 2017-10-06 04:00:24 +00:00
ζeh Matt
0423397c34 Fix #6376: RideCreateAction::Query ignores valid secondary colour input 2017-10-05 20:46:50 +02:00
Michael Steenbeek
f2195b4300 Use constants and proper formatting in colour.[ch] 2017-10-05 15:55:57 +02:00
Aaron van Geffen
af3fa4b0ff Options window: fix background colour for some dropdowns 2017-10-05 14:11:37 +02:00
Michał Janiszewski
1089bd2d56 Increase network version 2017-10-05 10:42:44 +02:00
Oli414
d39c80da42 Fix code style. Fix error text 2017-10-05 10:42:44 +02:00
Oli414
59eae9defa Add missing include 2017-10-05 10:42:44 +02:00
Olivier Wervers
4bdfb31fcb Remove changes from libopenrct2.vcxproj 2017-10-05 10:42:44 +02:00
Oli414
857faec100 Tabs to spaces 2017-10-05 10:42:44 +02:00
Oli414
0760ea6aa8 Renamed duplicate region 2017-10-05 10:42:44 +02:00