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

20361 Commits

Author SHA1 Message Date
Michael Steenbeek 59d785ef64
Merge pull request #13224 from Broxzier/feature/refactor-autosave 
Small autosave refactor
 2020-10-18 20:20:41 +02:00
Michael Steenbeek ac87dd5952
Add #7280 to changelog 2020-10-18 19:57:15 +02:00
Keith Stellyes 41c0395adb
Fix #13226: No error is shown when attempting to load a corrupted save 2020-10-18 19:54:26 +02:00
Michael Steenbeek 6c687f576d
Merge pull request #13230 from Gymnasiast/refactor/get-source-game-to-method 
Refactor legacy GetSourceGame() to method
 2020-10-18 17:48:31 +02:00
Aaron van Geffen 1c1b7c8d28
Merge pull request #13209 from X123M3-256/hybrid_fix 
Fix hybrid coaster
 2020-10-18 17:16:31 +02:00
OpenRCT2 git bot e2d3b1d3bc Merge Localisation/master into OpenRCT2/develop 2020-10-18 04:05:30 +00:00
Haven Kim be824e941f
Fix #7518: Water isn't cut down by view clipping tool (#13205) 
By comparing water level and clipping height, we just remove water from
rendering but keep the surface tiles at the bottom
 2020-10-17 23:13:40 +02:00
Gymnasiast b47163c06c
Remove orphaned declaration of object_entry_get_type() 2020-10-17 22:46:52 +02:00
Gymnasiast 13fb0b43da
Refactor legacy GetSourceGame() to method 2020-10-17 22:45:12 +02:00
Haven Kim 8a4df108ba
Close #12428: Refactor OBJECT_SOURCE_GAME to use strong enum 2020-10-17 22:27:02 +02:00
Aaron van Geffen a9316869fc
Fix #13158: Cursors are drawn incorrectly in text input fields (#13228) 2020-10-17 22:24:24 +02:00
Łukasz Pękalski 384e0ee718
Close #12418: Refactor RESEARCH_CATEGORY_* to use strong enum (#13216) 2020-10-17 22:15:46 +02:00
duncanspumpkin 54a33674d3 Introduce tables to group information 2020-10-17 20:44:26 +01:00
Hielke Morsink 0cf049c2f7 Replace deprecated function call 2020-10-17 20:00:38 +02:00
Hielke Morsink 085a0e9452 Reduce branching and duplicated lines in limit_autosave_count 2020-10-17 20:00:38 +02:00
Aidan Waite d287653cb5
Fix #4022: Mac cursor offset on launch (#13095) 
Update config when forcing windowed mode
 2020-10-17 11:57:03 +02:00
Duncan cd39c30989
Tooltip 2 (#13159) 
* Use ScreenCoords for tooltip

* Remove temporary variables

* Small refactor

* Fix #13151. Not passing tooltip arguments correctly for ride window

* Fix Server List window version tooltip

* Fix cheats tooltip event

* Add static to function decl

* Remove unreachable break statements in Ride.cpp

* Apply review suggestions

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-10-17 09:10:08 +01:00
OpenRCT2 git bot 803bbfeeb0 Merge Localisation/master into OpenRCT2/develop 2020-10-17 04:05:49 +00:00
Aaron van Geffen af26a2cef0
Improve park cheats tab layout (#13186) 
* Remove 'Park parameters…' button
  The scenario options are already accessible through the cheats menu

* Split off Objective group from General group
* Split off new Maintenance group from Staff group

* Shrink 'Force park rating' spinner to make room for label
* Change label 'Force weather' to 'Change weather to'
* Change label "Plants don't age" to 'Disable plants withering'
* Change some strings for consistent capitalisation
 2020-10-16 21:52:27 +02:00
OpenRCT2 git bot cbfbaddb92 Merge Localisation/master into OpenRCT2/develop 2020-10-16 04:05:55 +00:00
Tulio Leao 5ec5ecee48
Merge pull request #13097 from mwnciau/fix-arrow-pulse 
Construction arrow pulse improvements
 2020-10-15 19:54:50 -03:00
X7123M3-256 11f2199476 Fix formatting 2020-10-15 20:45:39 +01:00
X7123M3-256 5c81d7deb9 Use block brake sprite for last station tile 2020-10-15 20:27:33 +01:00
X7123M3-256 dd8dcc6136 Fix incorrect bounding boxes 2020-10-15 20:27:33 +01:00
X7123M3-256 15aca5fbb5 Remove unnecessary comments 2020-10-15 20:27:33 +01:00
X7123M3-256 6ca16e0a06 Make JSON objects able to use hybrid track 2020-10-15 20:27:33 +01:00
Simon Jarrett 65a8c58af7 Fix missing direction arrow for stations 2020-10-15 19:44:36 +01:00
Simon Jarrett 25ce8b3f6e Fix #7443: Construction arrows pulse at irregular intervals. 2020-10-15 19:44:10 +01:00
Łukasz Pękalski 26720eb345
Fix #5178: Lighting effects cannot be disabled in software mode (#13206) 
Lighting effect are now automatically turned off when software renderer is selected.
 2020-10-15 17:05:39 +02:00
ζeh Matt 645289f4ec
Rename GameActionResult and use GameActions namespace instead (#13184) 2020-10-14 22:04:39 -03:00
ζeh Matt 92e7b6244b
Fix #13192: Crash because of objects not properly loading (#13197) 2020-10-14 21:54:22 -03:00
Vinicius Sa 711dd00cde
Close #13000: Refactor ObjectFactory to use unique_ptr 
Employs the smart pointer unique_ptr for safer memory management.

Classes involved:
 - ObjectRepository
 - ObjectManager
 2020-10-14 21:56:48 +02:00
Aaron van Geffen 0c283ba3e7
Ride window: position graph buttons properly 2020-10-14 17:51:58 +02:00
OpenRCT2 git bot 01d57872fe Merge Localisation/master into OpenRCT2/develop 2020-10-14 04:05:25 +00:00
OpenRCT2 git bot bd96d312a7 Merge Localisation/master into OpenRCT2/develop 2020-10-13 04:05:23 +00:00
Duncan 250586cb45
Port some OpenLoco helper functions (#13113) 
* Port some OpenLoco helper functions

Added a few helper functions from OpenLoco to make viewport code a bit simpler
 2020-10-12 22:25:11 -03:00
aw20368 0c195d14b9
Close #8848 Refactor TimeInPark (#13146) 
Split TimeInPark into a union: ParkEntryTime for guests, HireDate for staff
 2020-10-12 21:36:38 -03:00
Duncan feb188ecb2
Remove incorrect variable from interval names (#13175) 
Not sure why this has ended up in the interval names as it is not a rct_string_id. Luckily nothing at present was accessing this.
 2020-10-12 21:35:08 -03:00
OpenRCT2 git bot 9e84fda814 Merge Localisation/master into OpenRCT2/develop 2020-10-12 04:05:30 +00:00
Aaron van Geffen a5a65fe974
Fix #13167: Broken dropdown menu in rendering engine options (#13169) 2020-10-11 23:06:35 +02:00
Michael Steenbeek 0bf851cfb2
Merge pull request #13164 from Gymnasiast/feature/objective-options-in-cheats 
Add Objective Options to Cheats menu
 2020-10-11 19:28:50 +02:00
Gymnasiast eb2f40f35c
Fix typo in WC_EDITOR_OBJECTIVE_OPTIONS 2020-10-11 19:28:25 +02:00
Gymnasiast 16ca892449
Add Objective Options to Cheats menu 2020-10-11 19:28:25 +02:00
Keith Stellyes 2265938e9b
Fix old-style-cast build errors on BenchSpriteSort.cpp (#13148) (#13150) 2020-10-11 17:43:22 +01:00
Julia Pinheiro cba1d48226
Close #12408: Refactor CURSOR_ID to use strong enum 2020-10-11 18:01:14 +02:00
Tulio Leao f56039abfd
Close #5520: Use std::filesystem over fts.h for recursive deletion 2020-10-11 17:15:05 +02:00
Simon J d7b9a99a0f
Entrance/exit construction state fixes in ride and maze construction (#13098) 
* Fix #1324: track selection visible when placing entrance or exit

* Improve maze construction window UX in entrance/exit mode

- Arrows are disabled when entrance and exit are being placed
- Clicking a construction mode will disable the entrance and exit mode
- Previous state restored when leaving entrance/exit construction mode
- Fix entrance/exit buttons not changing when the mode switches after placing the first entrance/exit

Co-authored-by: Simon Jarrett <simonjjarrett@gmail.com>
 2020-10-11 12:22:41 +01:00
Aaron van Geffen 8414fa24b5 Add X7123M3-256 to contributor list 2020-10-11 12:26:39 +02:00
OpenRCT2 git bot ec2eae75e2 Merge Localisation/master into OpenRCT2/develop 2020-10-11 04:05:16 +00:00
Aidan Waite 9af70247ed
Update supported Xcode version in readme (#13155) 2020-10-10 21:21:49 -03:00