Duncan
ec60781a2b
Merge pull request #8796 from duncanspumpkin/entranceexit_place_ga
...
Entranceexit place ga
2019-03-02 16:04:01 +00:00
Tom Lankhorst
8b34d3d119
Add files to xcode project
2019-03-02 15:09:11 +00:00
Matt
15838861cd
Add load and save test.
2019-03-02 13:11:08 +01:00
Duncan
46ae0934f8
Fix #8809 . Check for valid colours ignored special cases ( #8813 )
...
Due to the special cases the colour check would fail and this would mean that the ride type could not be changed. 255 and 0 are both used to indicate that the ride should use different colours for each train.
2019-03-02 12:51:27 +01:00
Tom Lankhorst
c951118eb0
Corrected order of finding and linking
2019-03-02 09:48:04 +01:00
Tom Lankhorst
68eec6bb5d
Include OpenSSL when not DISABLE_NETWORK/DISABLE_HTTP
2019-03-02 09:24:54 +01:00
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
duncanspumpkin
87a21d6cda
Increment network version
2019-03-02 07:25:28 +00:00
duncanspumpkin
e128a78b91
Fix formating and other issues
...
Refactor as per comments.
Simplified some of the code as well
Use constants
2019-03-02 07:24:42 +00:00
duncanspumpkin
c55ff1288d
Add conversion from old command
2019-03-02 07:24:42 +00:00
duncanspumpkin
f10391c98d
Remove references to old command
2019-03-02 07:24:42 +00:00
duncanspumpkin
7f586f50e1
Move all callees to the game action framework. Fix CoordXY bug
2019-03-02 07:24:41 +00:00
duncanspumpkin
27046c2468
Simplify game action by creating seperate function for track design ptd1
2019-03-02 07:24:41 +00:00
duncanspumpkin
6081aa4720
Create place game action
2019-03-02 07:24:41 +00:00
ζeh Matt
e776faee97
Merge pull request #8812 from ZehMatt/import-export-fixes
...
Fix #8811 : Import export fields not copied correctly.
2019-03-02 07:47:36 +01:00
OpenRCT2 git bot
769a345d1d
Merge Localisation/master into OpenRCT2/develop.
2019-03-02 04:00:21 +00:00
Matt
d1cb2cc738
Update changelog.txt
2019-03-02 04:51:28 +01:00
Matt
538526f075
Bump up network version.
2019-03-02 04:51:20 +01:00
Matt
8b6012a44b
Add missing field "no_of_food" to importer/exporter.
2019-03-02 04:46:31 +01:00
Matt
5f6ae6ac8c
Fix copying the wrong field.
2019-03-02 04:45:47 +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
