mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 16:24:35 +01:00
Code Issues Releases Wiki Activity
20,086 Commits 8 Branches 59 Tags
61b510db66bdce53335dec63180c3d85bb69889c
Commit Graph

801 Commits

Author SHA1 Message Date
ζeh Matt
61b510db66 Merge pull request #13073 from ZehMatt/refactor/audio-cleanup 
Minor cleanup around audio code
 2020-10-07 21:18:59 +03:00
Mike Jones
7441001c4e Close #12407: Refactor CHAT_INPUT to use strong enum (#13116) 2020-10-06 21:37:08 -03:00
Matt
091145037e Move the audio code into OpenRCT2 namespace 2020-10-07 00:34:42 +03:00
Duncan
eb3f3edc1b Use RemoveViewport helper function (#13104) 2020-10-06 10:27:56 +01:00
Aaron van Geffen
797fe48b0f Merge pull request #13068 from mwnciau/json-compilation-performance 
Fix #13055: Replace includes of Json.hpp in header files with json_fwd.hpp
 2020-10-06 01:09:41 +02:00
Aaron van Geffen
0ad7e9787e Add JsonFwd.hpp to the Xcode project 2020-10-06 00:16:21 +02:00
Julia Pinheiro
6a76547c5b Close #12412: Refactor PROMPT_MODE to use strong enum (#13076) 2020-10-02 23:04:59 -03:00
Julia Pinheiro
8800c32e52 Close #12404: Refactor DRAWING_ENGINE to use strong enum (#13070) 2020-10-02 22:41:30 -03:00
Bryan DiLaura
56e8cc77c6 Close #12409: Refactor CONSOLE_INPUT to use strong enum (#13052) 2020-10-01 10:31:03 +01:00
Matt
d6c2ec898d Fix #4617: Crash when rotating with invalid viewport open 2020-09-29 21:44:59 +03:00
Łukasz Pękalski
d1cd2e08b5 Close #12388, refactor PeepState to use strong enum (#12927) 
* Close #12388, refactor:PeepState to use strong enum

* refactor: refactored file PlayTests.cpp

* refactor: change PEEP_STATE_ to PeepState:: and camel case after merging

chore: code reformatting
 2020-09-28 15:51:49 -03:00
Aaron van Geffen
d27e14f45b Compact, statically initialized syntax for event lists (#12973) 2020-09-28 20:36:15 +02:00
ζeh Matt
54edba2272 Merge pull request #13023 from gsckoco/make_add_news_item_assoc_optional 
Make add_news_item assoc optional
 2020-09-28 20:28:45 +03:00
Łukasz Pękalski
065da23b3b Close #12437, refactor: RIDE_MODE_* to strong enums (#12833) 
* partial refactor: RIDE_MODE_* to strong enums

* Close #12437, refactor: RIDE_MODE_* to strong enums

* chore: code formatting

* refactor: RideMode, change enum names to CamelCase

and resolve casting order.

* chore: refactor due to code formatting

* Close #12437, refactor: RIDE_MODE_* to strong enums

Resolved comments

* chore: Formatting correction.

* Use EnumsToFlags constexpr

* refactor: resolved comments

added newline at the end of file

* refactor: Change case stack to default in Switch

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2020-09-28 14:09:59 +01:00
gsckoco
391dabc4f9 Made add_news_item argument assoc optional 2020-09-28 12:28:31 +01:00
Michael Steenbeek
3c07a9e49b Allow opening Objective options via console (#13000) 2020-09-27 21:53:31 -03:00
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