mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 04:53:12 +01:00
Code Issues Releases Wiki Activity
19,728 Commits 8 Branches 59 Tags
b51e98215a7477adf47a24eb32f2fca0ff5dca30
Commit Graph

19728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon J
b51e98215a Fix #12728: Paths made in scenario editor don't connect to the map edge (#12730) 
Co-authored-by: Simon Jarrett <simonjjarrett@gmail.com>
 2020-08-19 19:51:13 -03:00
OpenRCT2 git bot
8d141faac2 Merge Localisation/master into OpenRCT2/develop 2020-08-19 04:06:03 +00:00
Tulio Leao
a8691bab45 Merge pull request #12707 from mwnciau/Fix-loop-collision-box 
Fix: Incomplete loop collision box allowed overlap (original bug)
 2020-08-18 13:39:23 -03:00
Simon Jarrett
e66aff5116 Adding mwnciau to contributors.md 2020-08-18 17:03:36 +01:00
Simon Jarrett
9fb51c18d4 Fix: Incomplete loop collision box allowed overlap (original bug) 2020-08-18 17:03:35 +01:00
Lastorder
3dbee5edca Fix #12701: Disable upgrade pop-up at slient install (#12709) 2020-08-18 14:58:01 +01:00
frutiemax
33f3f5cc3b Use CoordsXYZ for sub_98199C in RiverRapids.cpp (#12289) 2020-08-18 09:27:23 -03:00
Simon J
4c2ce0f892 Remove duplicate TRACK_ELEMENT_LOCATION_IS_UNDERGROUND flag (#12714) 
Renamed all instances to ELEMENT_IS_UNDERGROUND

Co-authored-by: Simon Jarrett <simonjjarrett@gmail.com>
 2020-08-18 09:26:03 -03:00
Tulio Leao
f2af98b3e8 Merge pull request #12690 from ryan-bello/develop 
Fix #12433 Refactor STAFF_TYPE to use strong enum
 2020-08-18 00:46:49 -03:00
ryan-bello
c2efa230dd Added ryan-bello to contributors.md 2020-08-17 23:04:53 -04:00
ryan-bello
cc2bb33892 changed enum STAFF_TYPE to strong enum StaffType, moved it to Peep.h 2020-08-17 22:59:02 -04:00
frutiemax
9ab1f3b5fe Close #12336: Remove goto from loc_6A6D7E (#12366) 2020-08-17 23:28:26 -03:00
ryan-bello
54a33cbde8 renamed StaffType to AssignedStaffType 2020-08-17 20:16:09 -04:00
Aaron van Geffen
72be84caf8 Remove unused fourth tab from Staff window (#12713) 2020-08-17 20:21:46 +02:00
OpenRCT2 git bot
40814c46d9 Merge Localisation/master into OpenRCT2/develop 2020-08-17 04:04:03 +00:00
Duncan
55ba164dee Fix crash when switching ride types with construct window open (#12694) 2020-08-16 18:48:21 +01:00
OpenRCT2 git bot
c53efa6ae4 Merge Localisation/master into OpenRCT2/develop 2020-08-16 04:03:50 +00:00
pizza2004
647730fcfa Fix #12691: Tooltip at ride's graph tab is not using a proper string 2020-08-15 23:17:38 +02:00
Aaron van Geffen
9484f90911 Remove full stop from localisation workflow commit message 2020-08-15 23:14:07 +02:00
Aaron van Geffen
e2536118aa Start v0.3.0+ 2020-08-15 22:17:12 +02:00
Aaron van Geffen
e0a6823701 Merge branch 'master' into develop 2020-08-15 22:16:12 +02:00
Aaron van Geffen
135cc10b47 Release v0.3.0 v0.3.0 2020-08-15 21:13:50 +02:00
Aaron van Geffen
e758490b7e Merge branch 'develop' into master 2020-08-15 21:13:18 +02:00
OpenRCT2 git bot
d857a5e6cf Merge Localisation/master into OpenRCT2/develop 2020-08-15 21:00:46 +02:00
OpenRCT2 git bot
e7eac33c82 Merge Localisation/master into OpenRCT2/develop. 2020-08-15 04:03:43 +00:00
Aaron van Geffen
cffa11b131 Merge pull request #12347 from janisozaur/pesterer 
Pester users to update every so often
 2020-08-14 21:22:20 +02:00
ceeac
d98838430c Fix wrong CCache version string (#12679) 
Use CMAKE_MATCH_1 instead of CMAKE_MATCH_0 which holds the entire match.
 2020-08-14 17:03:08 +02:00
Aaron van Geffen
0fa41b3543 Update changelog for version check and Discord button 2020-08-14 10:20:37 +02:00
Aaron van Geffen
f95da1c99a Fix alignment for widget definitions 2020-08-14 10:18:17 +02:00
Michał Janiszewski
6dd67296a4 Merge "new version" window back to changelog 2020-08-14 10:18:17 +02:00
Michał Janiszewski
ddee3c0e46 Postpone update check until the context gets fully initialised 2020-08-14 10:18:17 +02:00
Michał Janiszewski
6ae5645686 Show update information on main screen & in floppy menu 2020-08-14 10:18:17 +02:00
Michał Janiszewski
55835456a0 Pester users to update to latest release 2020-08-14 10:18:17 +02:00
ceeac
6282335873 Add CMake option to build with CCache (#12604) 
This speeds up CMake recompilation significantly.
The default behaviour is to search for CCache and use it if
available; this can be disabled explicitly by setting
OPENRCT2_USE_CCACHE=OFF in CMake.
 2020-08-14 09:18:52 +02:00
Aaron van Geffen
eda8e31055 Refactor widget defs in EditorObjectiveOptions window (#12672) 2020-08-13 23:07:19 -03:00
Michał Janiszewski
c8fbffa0e2 Update backtrace token for upcoming release 2020-08-13 23:28:31 +02:00
Matt Thomson
a8f8f06e2d Fix #12402: Refactor MEASUREMENT_FORMAT to use strong enum (#12642) 
* Fix #12402: Refactor MEASUREMENT_FORMAT to use strong enum

* Remove redundant default branches

Co-authored-by: Matt Thomson <matt-thomson@users.noreply.github.com>
 2020-08-13 21:51:28 +01:00
Michael Steenbeek
5e09ecc904 Fix #12308: Cannot use cheats in editor modes (#12661) 
This allows opening the cheats window while in editor mode. Some tabs and options are disabled because they are not relevant to these modes.
 2020-08-13 13:03:56 +02:00
OpenRCT2 git bot
6d5a4a7f7d Merge Localisation/master into OpenRCT2/develop. 2020-08-13 04:03:57 +00:00
Michael Steenbeek
33d9fc2b75 Fix #10549: 'Build the best ride you can' objective missing ride name 
This is implemented in a way that is compatible with RCT2 (as long as the ride type was not split).
 2020-08-13 00:23:08 +02:00
Michael Steenbeek
68ce06e833 Refactor objective handling in Scenario Editor 
This moves some knowledge out of the window and into the main code and also cleans up the window a bit.

This also allows setting the "x guests by the end of year y" goal for no money scenarios, which was not the case previously.
 2020-08-12 22:10:47 +02:00
TELK
ea5aebe08c Update telk5093's name (#12660) 2020-08-12 19:01:46 +02:00
ζeh Matt
c1076658fc Merge pull request #12658 from ZehMatt/fix-network-hang 
Fix freezes on incomplete packet transmission
 2020-08-12 19:00:27 +02:00
Matt
08af1e9be6 Increase network buffer to maximum packet size of 64 KiB 2020-08-12 18:36:12 +02:00
Michael Steenbeek
d1b193c06d Fix #11968: Maze height is higher than it should be 2020-08-12 18:33:15 +02:00
Matt
ebc2be4cd0 Fix freezes on incomplete packet transmission 2020-08-12 18:11:09 +02:00
ζeh Matt
e464c9e522 Invert the condition (#12645) 2020-08-11 19:29:18 +01:00
Michael Steenbeek
2d56c8d2de Merge pull request #12636 from Gymnasiast/refactor/to-member-function 
Use a 16-bit integer for track type in more places
 2020-08-11 17:53:20 +02:00
ζeh Matt
ae25af291b Merge pull request #12631 from ZehMatt/12474-part1 
Add more guards in network code
 2020-08-11 17:25:22 +02:00
Matt
2a9796f2cc Add more guards in network code 2020-08-11 15:56:09 +02:00