mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
16,470 Commits 9 Branches 40 Tags 377 MiB
Commit Graph

16470 Commits

Author SHA1 Message Date
duncanspumpkin f4791f9d96 Remove allow while paused 2019-02-28 08:21:58 +00:00
duncanspumpkin 705fe17362 Implement RideEntranceExitRemoveAction 
Move all calls to the game action framework
 2019-02-28 08:21:58 +00:00
Duncan 8ed824f285
Merge pull request #8773 from duncanspumpkin/scenery_place_ga 
Implement SmallSceneryPlaceAction
Fix #8793, Fix #8787
 2019-02-28 08:21:02 +00:00
duncanspumpkin de1ec264b0 Increment network version 2019-02-28 08:03:00 +00:00
Duncan f0092b7aae
Merge pull request #8781 from duncanspumpkin/flag_refactor 
Flag refactor
 2019-02-27 19:18:02 +00:00
duncanspumpkin cbb02ec98a Use game action for track design. Fix error titles. 
Add files to xcode project (#20)

Finally get the placement code working

Use game action for ghosts. Fix basequarter

Remove references to old command

Fix formating remove unused var

Fix clang format
 2019-02-27 18:51:54 +00:00
duncanspumpkin 4714350216 Implement SmallSceneryPlaceAction 2019-02-27 18:46:51 +00:00
jensj12 89066759eb Fix #8264: Rides and scenery placeable outside of map with ZC and Sandbox mode enabled (#8715) 
* Fix #8264: Rides and scenery placeable outside of map with ZC and Sandbox mode enabled

map_can_construct_with_clear_at first checks whether it is inside the map, and then checks gCheatsDisableClearanceChecks, making earlier checks for gCheatsDisableClearanceChecks unnecessary.

* Increase network version
 2019-02-27 18:46:18 +00:00
Michael Steenbeek 6d3200aacc
Merge pull request #8772 from IntelOrca/refactor/sprite-import-export-2 
Refactor in-game sprite structs
 2019-02-27 13:29:13 +01:00
duncanspumpkin 9d78bb0d4e Fix compile and formating 2019-02-27 10:54:08 +00:00
duncanspumpkin 584c4d5134 Prevent a dereference of nullptr 2019-02-27 10:49:48 +00:00
duncanspumpkin d3c0a76259 Use correct functions where defined 2019-02-27 10:49:48 +00:00
duncanspumpkin 47b0c779de Use correct function call. 
SMALL_SCENERY_FLAG_ANIMATED is for SmallScenery not for SmallSceneryElements
 2019-02-27 10:49:48 +00:00
duncanspumpkin 83f7547bf2 Use Is/Set BlockBrakeClosed 2019-02-27 10:49:48 +00:00
duncanspumpkin 92cdbfb0a8 Use Is/Set Indestructible 2019-02-27 10:49:48 +00:00
duncanspumpkin 411e5c47a2 Use Is/Set Accounted 2019-02-27 10:49:48 +00:00
duncanspumpkin fae15fceca Use IsBroken 2019-02-27 10:49:48 +00:00
duncanspumpkin 7840f6a7f7 Use SetIsBroken 2019-02-27 10:49:48 +00:00
duncanspumpkin 6495ffdb34 Use IsBlockedByVehicle 2019-02-27 10:49:48 +00:00
duncanspumpkin 354cce71eb Introduce new functions to stop direct access 2019-02-27 10:49:48 +00:00
duncanspumpkin c68af628c2 Increment network version 2019-02-27 10:18:52 +00:00
Duncan 170568d802
Merge pull request #8740 from duncanspumpkin/ride_set_setting_ga 
Ride Set Setting GameAction
 2019-02-27 10:18:03 +00:00
Tom Lankhorst 60dcd402a7 Drop xc-pretty due to Travis formatting issues 2019-02-27 10:05:20 +01:00
Tom Lankhorst dfcc4b57c3 Add files to xcode project (#22) 2019-02-27 08:54:50 +00:00
duncanspumpkin 93873c5e74 Make review changes. Fix formating 
Reorder includes
 2019-02-27 08:15:11 +00:00
duncanspumpkin 9d76c609f3 Provide conversion from gamecommand in replay manager 2019-02-27 08:15:11 +00:00
duncanspumpkin e1977d1a2f Remove references to game command 2019-02-27 08:15:11 +00:00
duncanspumpkin d01dfe44d5 Add RideSetSettingAction 
Use game action for calling

Use correct error titles for operation mode changes
 2019-02-27 08:15:07 +00:00
Ted John aa7d181070 Define constants for vehicle type 2019-02-26 16:49:29 +00:00
duncanspumpkin d5ad6b7b0f Move game command calls to a single call site 2019-02-26 12:47:44 +00:00
Michael Steenbeek 5b0367ea0e
Merge pull request #8774 from duncanspumpkin/ghost_refactor 
Use IsGhost() to access ghost state
 2019-02-26 12:46:16 +01:00
Duncan 921568edd3
Merge pull request #8738 from duncanspumpkin/ride_set_vehicles_ga 
Implement RideSetVehicleAction
 2019-02-26 09:03:06 +00:00
duncanspumpkin eb9ecea92e Add IsGhost to the testpaint calls 2019-02-26 08:50:04 +00:00
duncanspumpkin 5facc32100 Increment network version 2019-02-26 08:15:32 +00:00
duncanspumpkin 07b372f4c6 Make review changes fix clang format 2019-02-26 08:14:57 +00:00
duncanspumpkin c1546a92b7 Implement RideSetVehicleAction 
Move all callees to the new action.
Required rework on how the ride type change worked.
 2019-02-26 08:14:57 +00:00
duncanspumpkin ab058fe659 Remove unnecessary compare with zero 2019-02-26 08:13:21 +00:00
Ted John cf1a4c9d66 Fix #8754: Crash when downloading objects due to race condition 
Use stack allocated buffer for string format arguments instead of the
global argument buffer as this is performed on a background thread.
 2019-02-26 09:06:02 +01:00
Michał Janiszewski b957ad5e9e
Remove redundant move (#8778) 2019-02-26 06:41:01 +01:00
Ted John a3af56f285 Fix formatting 2019-02-25 22:31:14 +00:00
ζeh Matt facb95da73
Merge pull request #8776 from ZehMatt/fix-rideshopconnected 
Fix ride_shop_connected dereferencing null.
 2019-02-25 21:47:16 +01:00
duncanspumpkin 112b40910b Pass a bool to the set function. Make review changes 2019-02-25 20:44:12 +00:00
Matt f0366b84e4 Fix ride_shop_connected dereferencing null. 2019-02-25 20:58:41 +01:00
Ted John bac3168a23 Refactor IsChild to IsHead 2019-02-25 17:58:22 +00:00
Ted John ca807c5ed4 Refactor some IsChild references to GetHead 2019-02-25 17:51:25 +00:00
duncanspumpkin 737c308e4e Use IsGhost() to access ghost state 
Added set and clear ghost to further prevent direct access to flags
 2019-02-25 15:12:35 +00:00
Duncan f769779f0d
Merge pull request #8722 from duncanspumpkin/quarter_tile 
Quarter tile refactor
 2019-02-25 14:37:22 +00:00
duncanspumpkin 6890f4f756 Use quarter tile for map can construct at 
Make callees of map_can_construct_with_clear use QuarterTile

Use quarter tile for small scenery rotation

Fix clang format

Further clang format
 2019-02-25 13:51:08 +00:00
duncanspumpkin f9fe09634c Move quarter tile class to the tile element header. 
Refactor flags slightly
 2019-02-25 13:51:07 +00:00
duncanspumpkin 921062d073 Start transferring trackdata to use the seperate values 
Finish the conversion
 2019-02-25 13:51:04 +00:00