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

16237 Commits

Author SHA1 Message Date
Tom Lankhorst 44d4783309
Split linking cURL and SSL 2019-03-02 09:23:13 +01:00
Tom Lankhorst 49d36926b4
Move find_package benchmark to appropriate place 2019-03-02 09:21:19 +01:00
Tom Lankhorst 73c8a0a4a8
Require curl include when not DISABLE_HTTP 2019-03-02 09:20:25 +01:00
Tom Lankhorst e7d875dd04
Always link threads, fix linking cURL 
Threads are currently used throughout the codebase so they need to be
required. CURL is required when using HTTP, not when using Networking.
 2019-03-02 09:00:49 +01:00
ζeh Matt dcf750f004
Merge pull request #8805 from ZehMatt/ga-toplevel-pause 
Fix nested query not working in paused game state.
 2019-03-01 10:56:57 +01:00
Matt df5dfa6863 Bump up network version. 2019-03-01 10:21:09 +01:00
Matt 6350a3b0b4 Fix nested query not working in paused game state. 2019-03-01 08:26:03 +01:00
ζeh Matt 4805c1c082
Merge pull request #8801 from ZehMatt/mp-playerinfo 
Synchronize player info
 2019-02-28 20:41:00 +01:00
Ted John cdec457abd Refactor peep struct 2019-02-28 20:28:58 +01:00
Matt d14b07a748 Bump up network version. 2019-02-28 20:15:32 +01:00
Matt 0000e9741f Fix #8798: Player info not being synchronized over network. 2019-02-28 20:15:11 +01:00
Duncan 453855993d
Merge pull request #8762 from duncanspumpkin/entranceexit_remove_ga 
Entrance Exit Remove GameAction
 2019-02-28 09:43:25 +00:00
duncanspumpkin 6c91d54255 Increment network version 2019-02-28 09:13:11 +00:00
duncanspumpkin 5d82760cf0 Use more sensible flags 2019-02-28 08:22:52 +00:00
duncanspumpkin 1565982f18 Fix formating 2019-02-28 08:22:52 +00:00
Tom Lankhorst c86c99f0cd Add files to xcode project (#21) 2019-02-28 08:21:59 +00:00
duncanspumpkin 7fdc482e7d Make review changes. Fix formating 2019-02-28 08:21:58 +00:00
duncanspumpkin 245a7fe64d Remove old game command 2019-02-28 08:21:58 +00:00
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