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

18984 Commits

Author SHA1 Message Date
Tulio Leao fd71b1b009 Rename Peep::voucher_type to VoucherType 2020-05-30 20:35:04 -03:00
Tulio Leao bf228abf55 Rename Peep::voucher_arguments to VoucherArguments 2020-05-30 20:35:03 -03:00
Tulio Leao 99bbfc9034
Merge pull request #11715 from hdpoliveira/newsitem_queue_split 
Create NewsItemQueue class
 2020-05-30 18:53:38 -03:00
Michiel 03b2456bc7
Fixed clearance checks hotkey (#11833) 2020-05-30 23:42:42 +02:00
Michael Steenbeek 654dde4436
Merge pull request #11806 from michielbos/develop 
Fix #11422 Add a shortcut key for disabling/enabling clearance checks
 2020-05-30 21:21:39 +02:00
hdpoliveira a94fc10c77 Add const version of NewsItemQueue::operator[] 2020-05-30 14:46:05 -03:00
hdpoliveira b519247bad Rename FirstOpenOrCreateSlot to FirstOpenOrNewSlot 2020-05-30 14:31:54 -03:00
hdpoliveira b30c76eee9 Renaming 'old' to 'archived' in NewsItem 2020-05-30 14:29:51 -03:00
hdpoliveira 502f11400e Add const version of NewsItemQueue::At 2020-05-30 14:11:14 -03:00
hdpoliveira b6d3868c9d Rename FirstOpenSlot to FirstOpenOrCreateSlot 2020-05-30 13:56:12 -03:00
hdpoliveira 4f698387f6 Move NewsItemQueue methods implementation to .cpp 2020-05-30 13:56:12 -03:00
hdpoliveira efa92a28fa Merge NEWS_ITEM_HISTORY_START variable 2020-05-30 13:56:12 -03:00
hdpoliveira ecdd35e334 Use MAX_RECENT_NEWS_ITEMS where feasible 2020-05-30 13:56:12 -03:00
hdpoliveira a88f02fdb2 Create operator[] in NewsItemQueue 2020-05-30 13:56:11 -03:00
hdpoliveira d64b3bb152 Format NewsItem.h 2020-05-30 13:56:11 -03:00
hdpoliveira c9574c1070 Create class NewsItemQueue 2020-05-30 13:56:11 -03:00
hdpoliveira f7ec58d53f Use for-range and std::find_if 2020-05-30 13:56:11 -03:00
hdpoliveira c40dd3d3d0 Access news queues directly or with iterators 2020-05-30 13:56:10 -03:00
hdpoliveira f4778a8c01 Split gNewsItems into two 2020-05-30 13:56:10 -03:00
hdpoliveira 230162534b Create constants for sizes of NewsItem queues 2020-05-30 13:56:10 -03:00
hdpoliveira a4d010415b Encapsulate gNewsItems 2020-05-30 13:56:10 -03:00
Ted John 8f77125cdb
Fix #11298: Unable to advertise server (500): Retry with ipv4 only (#11824) 
Add new config option to allow any address to be advertised. This then
doesn't rely on the master server retrieving the server IP address via
the HTTP request which can often be IPv6 by default.
 2020-05-30 18:21:22 +02:00
Michael Steenbeek 6d13f7ba68 Apply suggestions from code review 
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
 2020-05-30 17:10:08 +02:00
Michiel ac8dce44fd Apply suggestions from code review 
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2020-05-30 17:10:08 +02:00
Michiel Bos 3fdab8e7d9 Added icon to Cheats button to indicate clearance checks are disabled 2020-05-30 17:10:08 +02:00
Michiel Bos 31e4029a22 Moved 'Open cheat menu' and 'Toggle clearance checks' to new category 2020-05-30 17:10:08 +02:00
Michiel Bos 67ffc5642b Fixed the include order in KeyboardShortcut.cpp to match with clang. 2020-05-30 17:10:08 +02:00
Michiel Bos 670b879235 Added a shortcut key for disabling/enabling clearance checks. 2020-05-30 17:10:08 +02:00
Tulio Leao 7b8257c692
Fix #11816: Text overflowing boundary box (#11830) 2020-05-30 17:07:58 +02:00
Michael Steenbeek da54f19a34
Fix compilation on Docker CI (#11826) 2020-05-30 15:23:48 +02:00
Michael Steenbeek 2bd92527fd
Merge pull request #11818 from IntelOrca/refactor/palettes 
Create new PaletteMap type to replace byte pointers
 2020-05-29 23:09:32 +02:00
Michael Steenbeek c3921d9d4c
Merge pull request #11712 from IntelOrca/plugin/ride-fields 
[Plugin] Add more ride fields to API
 2020-05-29 21:10:51 +02:00
OpenRCT2 git bot 28941c6559 Merge Localisation/master into OpenRCT2/develop. 2020-05-29 04:02:33 +00:00
Ted John 626178a70e Add constants for palette indexes 2020-05-28 22:37:50 +01:00
Ted John 28e4b6ba07 Add blend helper and strict param checking 2020-05-28 21:44:24 +01:00
Michael Steenbeek 6808b8b734
Fix JSON object walls with only remap colours 2 and 3 (#11821) 
This fixes the hack, allowing JSON files laid out in the described manner to actually work properly.
The objects themselves will also need to be updated, but that can be done separately.
 2020-05-28 22:03:50 +02:00
Ted John d3f7ec4844 Create new PaletteMap type to replace byte pointers 2020-05-28 20:00:23 +01:00
Duncan 97e985521e
Merge pull request #11819 from IntelOrca/refactor/game-palette 
Refactor rct_palette to GamePalette
 2020-05-28 11:41:04 +01:00
Michael Steenbeek b7606d52fa
Merge pull request #11820 from Gymnasiast/remove/twitch-2 
Remove (almost) non-functional Twitch integration
 2020-05-28 10:27:39 +02:00
Gymnasiast 0f76ae8005
Add Twitch removal to changelog 2020-05-28 09:30:32 +02:00
Gymnasiast 60d54a6c9b
Remove Twitch icon from g2.dat 2020-05-28 09:28:32 +02:00
Gymnasiast 9a9ab47856
Remove Twitch from the rest of the code 2020-05-28 09:28:32 +02:00
Gymnasiast aaece7a435
Remove Twitch from Options window 2020-05-28 09:28:32 +02:00
Ted John 46bb30f8a1 Refactor rct_palette to GamePalette 2020-05-27 20:52:51 +01:00
Michael Steenbeek 10209690c2
Fix documentation of `sprite exportalldat` command (#11799) 2020-05-23 18:32:41 +02:00
Ted John 82371fb003
Fix #11796: Unable to use sharedStorage (#11798) 
isUserConfig must only be true for configuration not sharedStorage
 2020-05-23 18:22:09 +02:00
Michael Steenbeek 3859689595
Merge pull request #11797 from Gymnasiast/feature/extract-from-dat 
Create command to export images from .DAT file
 2020-05-23 17:47:09 +02:00
Ted John a683f2250f Register missing ride classification 2020-05-23 15:28:03 +01:00
Ted John da8f21fb70 Add ride age and improve documentation 2020-05-23 15:28:03 +01:00
Ted John f4fb456c50 Add ride value to ScRide 2020-05-23 15:28:03 +01:00