mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00
Code Issues Releases Wiki Activity
19,514 Commits 8 Branches 59 Tags
f567da04ebbe2bb069f804c75ca0769270f4e2fa
Commit Graph

19514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Steenbeek
f567da04eb Fix #12353: Research window shows wrong ride type 2020-07-22 23:21:08 +02:00
Duncan
4a235e3bb6 Refactor ResearchItem Type to an enum class (#12346) 
* Change type of ResearchItem.type to enum class

This is to prevent any future issues caused by confusion as to what the type is and further improves the codebase.

* Specifiy a size for the type

Also remove the static cast where not required

* Apply review comments
 2020-07-22 14:25:05 +01:00
0ro8lu
4416565e47 Close #12269: remove goto from x8_drawing_engine (#12274) 
Refactored the function into a separate get dirty rows function.
 2020-07-22 11:51:41 +01:00
Duncan
2d1a6bd13b Fix research import/export (#12345) 
Old version incorrectly tried to convert the research type not the base ride type causing crashes when new saves were used on older versions of OpenRCT2 or vanilla.
 2020-07-22 09:42:16 +01:00
Aaron van Geffen
205fc3332b Refactor more widget definitions 
* Increase height for changelog button in about window
* Tackle banner window
* Tackle changelog window
* Tackle custom currency window
* Tackle finance summary
* Tackle quit prompt widgets
* Tackle debug paint widgets
* Tackle demolish and refurbish prompt widgets
 2020-07-21 17:38:57 +02:00
Aaron van Geffen
7b5087f057 Update copyright year to 2020 2020-07-21 15:04:34 +02:00
Aaron van Geffen
8f57c22bfe Refactor options window widget definitions into new format (#12316) 2020-07-21 14:14:44 +02:00
Michael Steenbeek
b510729372 Merge pull request #12339 from Gymnasiast/fix/consistent-ride-naming 
Fix/consistent ride naming
 2020-07-21 14:12:48 +02:00
Gymnasiast
bc3ad044f8 Consistently use 'Circus' 2020-07-21 13:55:48 +02:00
Gymnasiast
c2153ae797 Consistenly use 'Swinging Ship' 2020-07-21 13:55:48 +02:00
Michael Steenbeek
09ece01096 Merge pull request #12303 from AaronVanGeffen/refactor/cheats 
Refactor cheats window
 2020-07-21 11:36:24 +02:00
Tulio Leao
d10b615eb3 Remove assert on ScreenLine (#12333) 
Code is not always constructing a valid line
 2020-07-20 18:49:15 -03:00
0ro8lu
6e077c42ea Close #12270: Remove goto track_remove_station_element (#12323) 
Refactored the goto statement
 2020-07-20 20:55:50 +01:00
Aaron van Geffen
3d7c0a567e Introduce local constants per review suggestion 2020-07-20 00:12:04 +02:00
Aaron van Geffen
0a5b75e882 Refactor more windows into new-style widget format 
* Ride Construction
* Ride List
* Save Prompt
* Scenery
* Scenery Scatter
* Server List
* Server Start
* Shortcut Keys
 2020-07-19 19:36:54 +02:00
Michael Steenbeek
5b065912d8 Merge pull request #12318 from Gymnasiast/fix/12314 
Fix #12314: Swinging Ship colour tab shows Suspended Sw.c. track preview
 2020-07-19 19:32:11 +02:00
Umdlye
84c0ee42bd Fix #12314: Swinging Ship colour tab shows Suspended Sw.c. track preview 2020-07-19 14:38:30 +02:00
ζeh Matt
2d81e9c51c Fix #12229, fix #12312: No error message when loading a save fails 2020-07-19 14:33:32 +02:00
Aaron van Geffen
b966173550 Fix #12315: Re-introduce titles in Finances and Research windows. (#12317) 2020-07-19 14:31:24 +02:00
Aaron van Geffen
d303f0b1ef Add constants for common cheat widget sizes. 2020-07-19 11:54:41 +02:00
OpenRCT2 git bot
ee39bff1b4 Merge Localisation/master into OpenRCT2/develop. 2020-07-19 04:03:11 +00:00
Michael Steenbeek
5c411390bd Fix #12226: Crash in FindVehicleToEnter (#12310) 2020-07-18 23:54:55 +02:00
Michael Steenbeek
90129f669c Fix #12305: Can no longer build boosters on Hyper-Twister 2020-07-18 21:43:36 +02:00
Aaron van Geffen
15704d6d33 Refactor cheat window widget definitions into new format 2020-07-17 22:46:50 +02:00
Aaron van Geffen
6375d79c27 Cheats window: unfold existing window-specific macros 2020-07-17 22:46:48 +02:00
Michael Steenbeek
33898936b0 Merge pull request #12007 from Gymnasiast/refactor/remove-ride-groups 
Close #11971: Replace ride groups with new ride types
 2020-07-17 12:35:30 +02:00
frutiemax
77d02c5e2b Close #12290: Refactor of object_manager_unload_objects (#12291) 2020-07-17 05:25:35 +01:00
rdbaris
8aa8d77ca1 Fix for smart pointer bug (#12293) 
Don't allocate a ton of memory on load.
 2020-07-17 05:23:05 +01:00
Gymnasiast
742ae947c7 Add null checks throughout 2020-07-17 00:32:47 +02:00
Gymnasiast
d703768d5d Use old ride types in RideTypesBeenOn 2020-07-17 00:19:49 +02:00
Gymnasiast
470497d868 Limit S6 Importer object lookup to ride types that need conversion 2020-07-17 00:19:49 +02:00
Gymnasiast
f596d8de58 Limit track design object lookup to ride types where it's needed 2020-07-17 00:19:49 +02:00
Gymnasiast
c6f0bb92a8 Add mutex during track design cache creation 2020-07-17 00:19:49 +02:00
Gymnasiast
cf664c8340 Close #11971: Replace ride groups with new ride types 2020-07-17 00:19:49 +02:00
rdbaris
a2493af9ce Part of #11159 (purge malloc() & free()) (#11893) 
* Used smart pointers

* Changed functions to take vector as input
 2020-07-16 22:35:30 +01:00
frutiemax
f49149222e Close #12245: Use coords objects for SetLocation (Window_internal.h) 2020-07-16 23:01:42 +02:00
Helio Nunes Santos
2812be8c9a Close #12252: remove of goto in function wall_remove_at (#12279) 
* Removed use of goto in function wall_remove_at
* Implemented overload of function map_get_wall_element_at
 2020-07-16 17:52:45 -03:00
Aaron van Geffen
79ae0786c0 Refactor more widgets definitions into new format 
* About
* Editor Bottom Toolbar
* Editor Inventions List
* Editor Object Selection
* Error
* Finances
* Footpath
* Game Bottom Toolbar
* Guest List
* Network Status
* News
* News Options
* Player
* Research
* Staff List
* Title Options
* About window.

And fix MakeSpinnerWidgets declaration order.
 2020-07-16 20:48:25 +02:00
frutiemax
31efe32ade Related to #12160: Refactor viewport_coord_to_map_coord using Rotate (#12247) 2020-07-16 06:55:48 +01:00
frutiemax
a961d9784f Part of #12243: Use coords for MazeRemoveTrack (#12251) 2020-07-15 23:34:26 -03:00
frutiemax
0fa0ca451e Part of #12245: Use coords for window_scroll_to_location (#12282) 2020-07-15 23:26:27 -03:00
frutiemax
c474f2ddc0 Close #12096: Use only ScreenRect on gfx_fill_rect (#12280) 2020-07-15 22:34:57 -03:00
Tulio Leao
289dc96f25 Remove goto from window_create_auto_pos (#12256) 
* Reduce code duplication on window_create_auto_pos

* Remove deadcode from window_create_auto_pos

Cascadin window offset deadcode

* Extract ClampWindowToScreen from window_create_auto_pos

* Remove goto usage from window_create_auto_pos
 2020-07-15 22:59:35 +01:00
frutiemax
cd92597ec4 Part of #12096: Use ScreenRect on gfx_fill_rect in Tile*.cpp (#12248) 2020-07-15 16:19:49 -03:00
Tulio Leao
f36a86e9e6 Use MakeWidget for most Title windows and the ToolTip (#12264) 
* Use MakeWidget for windows/Tooltip.cpp

* Use MakeWidget for windows/TitleScenarioSelect.cpp

* Use MakeWidget for windows/TitleMenu.cpp

* Use MakeWidget for windows/TitleExit.cpp

* Use MakeWidget for windows/TitleLogo.cpp

* Clarify initial size of TitleMenu buttons
 2020-07-15 15:48:41 +02:00
Michael Steenbeek
d80f9b511f Merge pull request #12255 from Gymnasiast/refactor/more-constants-in-track-curve 
Refactor/more constants in track curve
 2020-07-15 15:36:42 +02:00
frutiemax
31bea18ad6 Part of #12166: remove switch-case in bolliger_mabillard_track_flat 2020-07-15 13:34:36 +02:00
Tulio Leao
0951c0c5cc Remove goto from input_state_widget_pressed (#12265) 2020-07-15 07:50:01 -03:00
michael coates
01d0287ee2 Close #12253: Refactor Vehicle sound to remove goto (#12267) 
* Refactor Vehicle Scream Sound goto

* updated contributors
 2020-07-15 07:48:47 +01:00
OpenRCT2 git bot
60ff09fce6 Merge Localisation/master into OpenRCT2/develop. 2020-07-15 04:03:20 +00:00