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

19176 Commits

Author SHA1 Message Date
Michael Steenbeek 0ba02dd91c
Fix suggestion 2020-06-04 12:41:03 +02:00
Gymnasiast 231b704fa7
en-GB: Fix speed display 2020-06-04 11:45:43 +02:00
Michael Steenbeek f9417cc5de
Apply suggestion from code review 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-06-04 10:16:23 +02:00
OpenRCT2 git bot 1a5b81027f Merge Localisation/master into OpenRCT2/develop. 2020-06-04 04:02:26 +00:00
Gymnasiast 66a71e009d
Create Rewind method on Formatter 2020-06-03 14:49:04 +02:00
Gymnasiast 09cc95f536
Move remaining calls to set_format_arg() 2020-06-03 14:49:04 +02:00
Gymnasiast 02338ffc5c
Migrate 50 more calls to set_format_arg() 2020-06-03 14:49:04 +02:00
Gymnasiast f640446d58
Migrate 40 calls to set_format_arg() 2020-06-03 14:49:04 +02:00
OpenRCT2 git bot 2a8ab374d3 Merge Localisation/master into OpenRCT2/develop. 2020-06-03 04:02:33 +00:00
Duncan 0f92c3b017
Switch vcxproj files to remove wildcards (#11843) 
Unfortunately MS has removed the wild card feature from vcxproj files. This will mean all file deletions and creations will need to modify these files to be included in the VS builds.
 2020-06-02 13:37:58 +02:00
Michael Steenbeek 424a17eecd
Merge pull request #11847 from IntelOrca/refactor/drawing-args 
Refactor BMP and RLE drawing routines to use a single argument block
 2020-06-02 13:37:34 +02:00
Ted John 0ca42f453c
Add plugin API for setting button isPressed (#11851) 2020-06-01 23:05:24 -03:00
Ted John 58f32a0afd Make use of gfx_sprite_to_buffer 2020-06-01 21:15:25 +01:00
Ted John 21a9d8f934 Refactor RLE drawing, one arg struct 2020-06-01 20:46:21 +01:00
Ted John d0b1bfbe87 Refactor bitmap drawing, one arg struct 2020-06-01 20:46:21 +01:00
Ted John 1b6899a954
Fix #11845: Disabled icons are not shown as disabled (#11857) 2020-06-01 20:01:37 +01:00
hdpoliveira a1be45d0b7
#9473: Create Vehicle::UpdateFlag (#11850) 2020-06-01 08:35:30 -03:00
Tulio Leao e1d0d21b5e
Merge pull request #11849 from hdpoliveira/swing_vars 
Rename swing-related variables in Vehicle
 2020-06-01 08:27:57 -03:00
hdpoliveira 04664d3a77 Rename swing-related variables in RCT vehicles 2020-05-31 17:46:01 -03:00
Tulio Leao 87a52f773c
Merge pull request #11834 from tupaschoal/prevent-shadow-peep-2 
Renames some Peep member variables to prevent shadowing
 2020-05-31 16:47:53 -03:00
hdpoliveira 86550dad20 Rename swing-related variables in Vehicle 2020-05-31 16:37:09 -03:00
Tulio Leao e18abc7e3d Rename NoOf... to AmountOf... on Peep 2020-05-31 09:13:56 -03:00
hdpoliveira bc5aac402a
Part of #9473: UpdateSwingingCar/UpdateSpinningCar (#11836) 2020-05-31 00:16:06 -03:00
Tulio Leao e7625835c8
Merge pull request #11837 from hdpoliveira/vehicle_update_9473_a 
Create Vehicle::CableLiftUpdateTrackMotion
 2020-05-30 22:33:31 -03:00
hdpoliveira 7cc9f5a46d
Part of #9473: Create Apply(Non)StopBlockBrake (#11835) 2020-05-30 22:15:23 -03:00
Tulio Leao 0c502988ef Rename Peep::disgusting_count to DisgustingCount 2020-05-30 20:35:06 -03:00
Tulio Leao a987a9ee5e Rename Peep::paid_to_enter to PaidToEnter 2020-05-30 20:35:06 -03:00
Tulio Leao 07f36a93de Rename Peep::staff_lawns_mown to StaffLawnsMown 2020-05-30 20:35:05 -03:00
Tulio Leao 133ff992b6 Rename Peep::staff_rides_fixed to StaffRidesFixed 2020-05-30 20:35:05 -03:00
Tulio Leao 3f091d33e2 Rename Peep::paid_on_rides to PaidOnRides 2020-05-30 20:35:05 -03:00
Tulio Leao 719607f876 Rename Peep::staff_gardens_watered to StaffGardensWatered 2020-05-30 20:35:05 -03:00
Tulio Leao 6b56a353f9 Rename Peep::staff_rides_inspected to StaffRidesInspected 2020-05-30 20:35:05 -03:00
Tulio Leao 414cff9b91 Rename Peep::paid_on_food to PaidOnFood 2020-05-30 20:35:05 -03:00
Tulio Leao 5bd3e88972 Rename Peep::staff_litter_swept to StaffLitterSwept 2020-05-30 20:35:05 -03:00
Tulio Leao c2f7efa328 Rename Peep::paid_on_souvenirs to PaidOnSouvenirs 2020-05-30 20:35:05 -03:00
Tulio Leao 7d581e6978 Rename Peep::staff_bins_emptied to StaffBinsEmptied 2020-05-30 20:35:04 -03:00
Tulio Leao a729ac1589 Rename Peep::no_of_food to NoOfFood 2020-05-30 20:35:04 -03:00
Tulio Leao bc7ea40c4b Rename Peep::no_of_drinks to NoOfDrinks 2020-05-30 20:35:04 -03:00
Tulio Leao 625f7859a4 Rename Peep::no_of_souvenirs to NoOfSouvenirs 2020-05-30 20:35:04 -03:00
Tulio Leao fc1ba40dc8 Rename Peep::vandalism_seen to VandalismSeen 2020-05-30 20:35:04 -03:00
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
hdpoliveira 60b54bdd04 #9473: Create CableLiftUpdateTrackMotion functions 2020-05-30 20:23:02 -03:00
hdpoliveira c5e0489a48 #9473: Create Vehicle::CableLiftUpdateTrackMotion 2020-05-30 20:23:02 -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