mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 14:24:33 +01:00
Code Issues Releases Wiki Activity
19,968 Commits 8 Branches 59 Tags
088db4a7c32c687e72d6cd4e4f7f44d640bfe2fb
Commit Graph

785 Commits

Author SHA1 Message Date
Matt
ccde06ab0f Explicitly pass formatter arguments to ShowError and family 2020-09-17 22:14:36 +03:00
Michael Steenbeek
1982e8491b Merge pull request #12667 from mwnciau/json-refactor 
Migrate JSON library to JSON for Modern C++
 2020-09-17 21:11:06 +02:00
Simon Jarrett
5f17554c25 Refactor ObjectJsonHelpers 
Move functions in ObjectJsonHelpers to their relevant namespaces and classes
- Move ParseColour to Colour::FromString
- Move ParseCursor to Cursor::FromString
- Move LoadStrings to StringTable::ReadJson
- Move LoadImages to ImageTable::ReadJson
- Move ParseObjectEntry to Object::ParseObjectEntry
- Move GetString, etc. to Json::GetString, etc.
- Delete ObjectJsonHelpers .cpp and .h files
 2020-09-16 20:18:53 +01:00
frutiemax
af591c834b Part of #12097: Use ScreenRect on gfx_fill_rect_inset (1) (#12938) 
* Part of #12097: Use ScreenRect on gfx_fill_rect_inset (1)

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-09-16 00:02:22 -03:00
Michael Steenbeek
3acbb92074 Merge pull request #12922 from Gymnasiast/LetItSnow2 2020-09-15 18:11:45 +02:00
Tulio Leao
c1729c8a87 Merge pull request #12858 from ju-pinheiro/network-strong-enums 
NETWORK_PERMISSION and NETWORK_AUTH replaced by strong enums
 2020-09-15 08:07:19 -03:00
Gymnasiast
31d20cefb2 Rename rain to weather where appropriate 
Co-authored-by: Brett Penzer <brettpenzer123@live.co.uk>
 2020-09-14 21:57:54 +02:00
ju-pinheiro
214620951f Close #12421: Refactor NETWORK_AUTH to use strong enum 
Replacing enum NETWORK_AUTH with enum class NetworkAuth.
 2020-09-10 19:32:28 -03:00
Jacob Schwartz
fe71ce437d Close #12434: Refactor ENTERTAINER_COSTUME to use strong enum (#12865) 2020-09-08 16:29:18 -03:00
Michael Steenbeek
6ac23fbabb Make Arabic font easier to read 2020-09-07 19:21:32 +02:00
Nils Caspar
22f29bf192 Close #12414: Refactor GUEST_LIST_FILTER_TYPE to use strong enum (#12830) 2020-09-02 12:50:16 -03:00
Simon Ellmann
5f3fe62f83 Close #12432: Refactor STAFF_MODE to use strong enum (#12752) 
* Refactor STAFF_MODE to use strong enum

Closes #12432

* Change type of gStaffModes to StaffMode
 2020-09-02 12:48:40 -03:00
Tulio Leao
731a93dc39 Create WindowColour enum for widget definition calls (#12722) 
* Make MakeWidget* functions take enum colour

* Make windows A-D use WindowColour enum

* Make windows E-G use WindowColour enum

* Make windows I-M use WindowColour enum

* Make windows N-P use WindowColour enum

* Make windows R-S use WindowColour enum

* Make windows T use WindowColour enum

* Make windows V-W use WindowColour enum
 2020-08-28 23:31:31 -03:00
Ted John
65e3d20156 Refactor drawing 2020-08-28 01:30:15 +01:00
Ted John
a1cd02c61c Disable closer zoom levels for software rendering 2020-08-28 01:29:59 +01:00
Ted John
7f0510e444 Fix sub pixel clip issues with OpenGL 2020-08-28 01:29:59 +01:00
Ted John
f51ad862c9 Refactor window drawing 2020-08-28 01:29:59 +01:00
Ted John
2b51eaeaa1 Fix weather gloom when zoomed in 2020-08-28 01:29:59 +01:00
Ted John
cd7324262d Create ZoomLevel struct to add two new zoom levels 2020-08-28 01:29:59 +01:00
Michael Steenbeek
56c623e549 Merge pull request #12671 from AaronVanGeffen/refactor/tabs 
MakeTab wrapper for standard tab widgets
 2020-08-26 12:13:36 +02:00
Sidney
5330f7fb86 closes #12445 Refactor CLIMATE to use strong enum (#12551) 2020-08-21 09:43:57 +01: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
ryan-bello
54a33cbde8 renamed StaffType to AssignedStaffType 2020-08-17 20:16:09 -04:00
Aaron van Geffen
4a55acd71e Introduce MakeTab wrapper function 
The MakeTab function is only applied in two places, for the moment:
the Cheats and Options windows.
 2020-08-17 20:59:13 +02:00
Aaron van Geffen
72be84caf8 Remove unused fourth tab from Staff window (#12713) 2020-08-17 20:21:46 +02:00
Michał Janiszewski
6dd67296a4 Merge "new version" window back to changelog 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
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
pizza2004
d217dfa9b9 Refactor NewsItem into namespace and Pascal Case (#12511) 2020-08-02 23:14:00 -03:00
Duncan
aa11773da3 Fix #12566, #12565, #12562, #12560, #12558: Nullptr deref (#12567) 
Mistake made in refactor meant that a nullptr deref took place when the screen coords were outside of the normal play area
 2020-08-02 20:13:09 +01:00
Duncan
733bc5a981 Close #12518: Viewport Refactor (#12541) 
* Remove viewport pointer from get_map_coordinates_from_pos

* Removed viewport from get_window

* Return a InteractionInfo from get_map_coord...

* Remove viewport_interaction_info struct

* Add Entity union to simplify code

* Name the enum used for viewport interaction

* Simplify functions further by returning the info struct

* Add default switches
 2020-08-02 08:32:59 +01:00
Duncan
6d11825e1a Reduce the use of rct_sprite (#12530) 
* Reduce the use of rct_sprite

* Pass the correct types in S4 importer

* Add additional nullptr checks

* Simplify the viewport interaction

* Apply review comments

* Small cleanup of GetEntity

* Fix test paint
 2020-08-01 11:29:54 +01:00
Duncan
c6e26267a4 Reduce the use of GET_VEHICLE (#12494) 
* Start removing GET_VEHICLE macro use

* Further work

* Remove further GET_VEHICLE's

* Further removal of GET_VEHICLE

* Remove the last of GET_VEHICLE

* Fix testpaint

* Fix nullptr deref

* Make review changes

Also swapped in helper functions and used a standard patern for iterating the train cars

* Further simplify loops for train cars
 2020-07-31 07:48:27 +01:00
Michael Steenbeek
bb1d81471d Fix #12506: Cannot advertise food if there are no rides in the park 2020-07-29 10:44:38 +02:00
Tulio Leao
63f683853e Merge pull request #12479 from pizza2004/news-enum 
Refactor NewsItem to use strong enums
 2020-07-28 18:21:45 -03:00
pizza2004
cee7f8d34c Close #12397: Refactor NEWS_ITEM_* to use strong enum 2020-07-28 12:54:18 -06:00
frutiemax
af0fc89cf4 Close #12456: Refactor INPUT_STATE to use strong enum (#12484) 2020-07-27 19:51:10 -03:00
Duncan
8a378ad236 Remove uses of GET_PEEP macro and replace with GetEntity (#12467) 
* Use TryGetEntity and GetEntity instead of macro

* Use GetEntity for ui guest window

* Remove final GET_PEEP macro uses

* Fix remaining issues
 2020-07-26 17:42:02 +01:00
Michael Steenbeek
9db2aac3bf Merge pull request #12482 from frutiemax/Fix12457 
Close #12457: Refactor INTRO_STATE to use strong enum
 2020-07-26 15:40:22 +02:00
frutiemax
6598ae14aa Close #12457: Rename INTRO_STATE to use PascalCase 2020-07-26 09:32:53 -04:00
frutiemax
0f1788d273 Part of #12457: Refactor INTRO_STATE to use strong enum 2020-07-26 09:25:29 -04:00
frutiemax
96a75f8c2c Amend #12470: Make zooming at pointer take tile height into account 2020-07-26 01:28:29 +02:00
ζeh Matt
b7e469cf33 Fix #11623: Erratic zoom behavior when pointing outside of the map 2020-07-26 00:27:40 +02:00
Matt
fa2bd4cad6 Refactor PeepType to use strong enum 2020-07-25 11:54:37 +02:00
Aaron van Geffen
4d0d41dfbe Restore spinner decrease button width (#12370) 2020-07-24 19:12:11 +02:00
Aaron van Geffen
7b5087f057 Update copyright year to 2020 2020-07-21 15:04:34 +02:00
frutiemax
f49149222e Close #12245: Use coords objects for SetLocation (Window_internal.h) 2020-07-16 23:01:42 +02: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