1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Commit Graph

20614 Commits

Author SHA1 Message Date
Michael Steenbeek
4a211278b2 Fix spelling of 'theming' 2020-12-09 11:33:33 +01:00
Duncan
9cbdae2ef1 Peep::ItemFlags merging (#13511)
* Merge standard and extra item flags for peeps

* Update replays
2020-12-09 09:21:23 +00:00
Duncan
c12e1634fc Merge LitterType into the shop item descriptor (#13513)
* Merge LitterType into the shop item descriptor

* Merge ConsumptionTime into ShopItem descriptor

* Merge in DiscardContainer into ShopItemDiscriptor

* Simplify itemOrderPreference

* Simplify guest code by using 64bit flags

* Remove operators for ShopItem

* Move PeepThoughtType TooMuch GoodValue into ShopItemDescriptor

* Reorg Get Flags and Has functions to make intention clear

* Constexpr shop item descriptors

* Constexpr shop item descriptors to compile time gen constants

* Fix formatting and spelling

* Revert operator++ removal
2020-12-09 06:55:06 +00:00
Duncan
b59bf6d9cf Fix #13552: Incorrect value for highscore pointer (#13554)
This was causing an invalid pointer dereference
2020-12-08 16:23:51 -03:00
Jamie Quigley
14ed1505ad Remove unused WINDOW_EVENTS enum (#13542) 2020-12-08 15:39:38 -03:00
OpenRCT2 git bot
9cefafd117 Merge Localisation/master into OpenRCT2/develop 2020-12-08 04:06:02 +00:00
Michael Steenbeek
f4bd903ec9 Merge pull request #13533 from duncanspumpkin/serial_2
FileIndex Serialise Cleanup
2020-12-07 20:52:25 +01:00
Jamie Quigley
03a9ac9f56 Close #12387: Refactored PeepThoughtType to use strong enum. (#13541) 2020-12-07 19:48:36 +00:00
duncanspumpkin
60729113d9 Simplify Serialise for FileIndex 2020-12-07 07:52:12 +00:00
OpenRCT2 git bot
80f442c706 Merge Localisation/master into OpenRCT2/develop 2020-12-07 04:06:01 +00:00
duncanspumpkin
ee9ede6c33 Use dataserialiser to simplify object repo code 2020-12-06 16:54:29 +00:00
Ted John
05622fd9bb Merge pull request #13504 from IntelOrca/plugin/more-things
* Fix #13495: Add properties for park value, guests and company value
* Add more park attributes to plugin API
* Fix #13431: [Plugin] UI disabled widgets can still be interacted with.
* Fix #13078: [Plugin] Add colour picker widget
* Fix: #13509 [Plugin] Add ability to format strings
* Fix #13510: [Plugin] list view scroll resets when items is set.
* Fix #13512: [Plugin] Add item separators to list view
2020-12-06 16:13:07 +00:00
Tulio Leao
3a4ccfef37 Merge pull request #13523 from IntelOrca/fix/13517-date-format
Fix #13517: Bad formatting of dates
2020-12-06 10:17:59 -03:00
Duncan
a9ed5d6536 Fix ObjectEntryDescriptor (#13506) 2020-12-06 09:28:06 +00:00
Michael Steenbeek
7df4f1835f Rename incorrectly named RCT1 peep fields (#13528)
Photo2/3/4 and item extra flags are not present in RCT1, only in RCT2.
2020-12-06 01:10:25 -03:00
Ted John
6a00c78750 Fix #13527: Read access violation in format_string (#13529) 2020-12-06 01:08:43 -03:00
Ted John
687fd6d9f4 Increment plugin API version 2020-12-05 18:32:28 +00:00
Ted John
95c3a7f5dd Fix #13512: [Plugin] Add item separators to list view 2020-12-05 18:32:24 +00:00
Ted John
a7e49e41d3 Fix #13510: [Plugin] list view scroll resets when items is set. 2020-12-05 18:26:35 +00:00
Ted John
be8736ffaa Fix: #13509 [Plugin] Add ability to format strings 2020-12-05 18:26:35 +00:00
Ted John
030713e126 Fix #13078: [Plugin] Add colour picker widget 2020-12-05 18:26:35 +00:00
Ted John
a55bcff99c Fix #13431: [Plugin] UI disabled widgets can still be interacted with. 2020-12-05 18:26:35 +00:00
Ted John
acaa72cce8 Add more park attributes to plugin API 2020-12-05 18:26:34 +00:00
Ted John
b1403db509 Fix #13495: Add properties for park value, guests and company value 2020-12-05 18:26:34 +00:00
Łukasz Pękalski
4adf745237 Close #12403: Refactor FILTER_PALETTE_ID to use strong enum (#13273) 2020-12-05 15:13:59 -03:00
Adam
1b61b4b104 Fix #13489: Mechanics continue heading to inspect broken down rides (#13490)
* Fix #13489: Mechanics continue heading to inspect broken down rides
2020-12-05 15:05:55 -03:00
Adam
a71a0ccd0c Fix MacOS CI: Explicitly set macOS builds to x86_64 only (#13525) 2020-12-05 17:10:31 +00:00
Ted John
d6fd4ed64b Allow formatting in in-game console 2020-12-05 14:14:09 +00:00
Ted John
164f570aae Fix #13517: Bad formatting of dates 2020-12-05 13:56:08 +00:00
Ted John
9fda9b741c Fix #13517: Bad formatting of chat messages (#13521)
* Bump network version which was the main cause of the problem.
* Ensure each chat line starts with some format codes.
2020-12-05 13:23:21 +00:00
OpenRCT2 git bot
e8611169a5 Merge Localisation/master into OpenRCT2/develop 2020-12-05 04:05:30 +00:00
Ted John
d58d834925 Merge pull request #13212 from IntelOrca/new-format-string
Eradicate all coded format tokens. All internal strings now contain raw tokens such as `{STRINGID}` and `{RED}`. New iterators have been created to iterate the tokens and the UTF-8 codepoints.

Formatting strings has been re-written and a new template version is available.
2020-12-04 13:56:54 +00:00
Łukasz Pękalski
3de233c796 Close #12395: Refactor PeepItem to use strong enum (#13311)
* refactor: integrated PEEP_ITEM into SHOP_ITEM

* refactor: converted merged enum to flag

Only former occurrences of PEEP_ITEM

* cleanUp: code cleaned after merging

* refactor: converted ShopItem to strong enum

code reformatting

* refactor: ShopItem enum items renamed

code formatted

* refactor: new getter and setter functions for Item...Flags

* refactor: replaced all occurrences of ItemStandardFlags

with appropriate getter and setter functions.
COMPARE_FIELD macro needs to be commented out or the flag has to stay public.

* refactor: all occurrences of ItemExtraFlags replaced

with proper function calls. COMPARE_FIELD macro issue not resolved.

* refactor: introduced new variable for unified item flags

* refactor: adapted accessor functions

accessor functions were modified to accommodate both standard and extra ShopItem flags

* refactor: ItemExtraFlags accessor functions are replaced

with general functions

* refactor: reverted to original uint32_t flag variables

* refactor: implemented suggested changes

* refactor: integrate additional comments

* refactor: incorporated requested changes

* refactor: incorporated requested changes

added static_cast<PeepThoughtType> in lines 1572 and 1590
2020-12-03 21:15:59 -03:00
Ted John
8ce924bd64 Fix Docker CI, explicit copy constructor 2020-12-03 22:05:24 +00:00
OpenRCT2 git bot
6db4a4531e Merge Localisation/master into OpenRCT2/develop 2020-12-03 04:05:29 +00:00
Michael Steenbeek
7ea828db02 Merge pull request #13503 from Gymnasiast/refactor/object-entry-descriptor
Create ObjectEntryDescriptor to properly handle mixed DAT and JSON
2020-12-02 19:52:30 +01:00
Gymnasiast
a7ac82a060 Update objects to v1.0.20 2020-12-02 17:17:32 +01:00
Gymnasiast
596aa71093 Create ObjectEntryDescriptor to properly handle mixed DAT and JSON 2020-12-02 17:17:25 +01:00
ffrogman
5994e194f4 Close #13476: Unneeded colour variables in TopToolbar.cpp 2020-12-02 12:23:38 +01:00
OpenRCT2 git bot
aa8a08987f Merge Localisation/master into OpenRCT2/develop 2020-12-02 04:05:38 +00:00
Ted John
4187106303 Fix #13482: STR_6308 incorrect for en-GB 2020-12-01 22:03:30 +00:00
Margen67
f37fcad111 Add pause button to the Track Designer (#13483)
Fixes #13398
2020-11-30 13:27:36 -03:00
Ted John
8021af2c6b Fix #13477: Plug-in widget tooltips do not work (#13486) 2020-11-29 21:11:07 -03:00
OpenRCT2 git bot
a7481b40b4 Merge Localisation/master into OpenRCT2/develop 2020-11-29 04:05:34 +00:00
Ted John
17edaae02b Improve banner formatting fix 2020-11-29 01:19:51 +00:00
Ted John
699103fe86 Fix banner text formatting, import / export 2020-11-28 16:52:19 +00:00
Ted John
55dc985c57 Fix #13469: Exception thrown from plugin in context.subscribe (#13470)
Throw a JavaScript exception, not a C++ exception when invalid parameters are passed to subscribe.
2020-11-28 14:03:15 +01:00
OpenRCT2 git bot
9c27e3a9ce Merge Localisation/master into OpenRCT2/develop 2020-11-28 04:05:47 +00:00
Ted John
5a90cd4163 Apply a few more code review comments 2020-11-27 18:54:58 +00:00
Ted John
9e7504fd98 Improve RCT12 UTF-8 checks 2020-11-27 18:54:58 +00:00