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

16138 Commits

Author SHA1 Message Date
Matt c631177877 [ci skip] Add bpb.sv6 to the replays with 7000 ticks. 2019-02-16 09:09:51 +01:00
ζeh Matt 416915c883
Merge pull request #8711 from ZehMatt/ga-toplevel 
Refactor direct calls to Query and Execute on game actions.
 2019-02-15 17:07:53 +01:00
Matt 00be865ff1 Use ExecuteNested/QueryNested instead of passing a parameter. 2019-02-15 16:32:11 +01:00
Duncan 79ccc8ca32
Merge pull request #8705 from phillipwalters/develop 
Removed dead code per issue 8677 (https://github.com/OpenRCT2/OpenRCT2/issues/8677)
 2019-02-15 13:58:57 +00:00
Matt 16e371c792 Bump up network version. 2019-02-15 09:01:38 +01:00
Matt 60ec1da0f8 Remove direct calls to Execute Query on action. 2019-02-15 08:55:01 +01:00
Matt 22811e0e85 Remove direct calls to Execute Query on action. 2019-02-15 08:50:48 +01:00
Matt 46c9bcc4bc Remove direct calls to Execute Query on action. 2019-02-15 08:47:07 +01:00
Matt caa490642c Refactor GameActions to allow non-top level actions. 2019-02-15 08:43:05 +01:00
Michael Steenbeek 2a4215a30f
Create constant for SCROLLING_MODE_NONE 2019-02-14 22:41:48 +01:00
ζeh Matt d143c7b7c6 Fix 8698 (#8709) 2019-02-14 22:09:16 +01:00
Michael Steenbeek 22ec030fd8
Merge pull request #8708 from IntelOrca/refactor/reduce-ride-index-2 
Reduce usage of ride_id_t
 2019-02-14 21:17:30 +01:00
OpenRCT2 git bot 367c3c2590 Merge Localisation/master into OpenRCT2/develop. 2019-02-14 04:00:21 +00:00
Ted John 8c2872ad1e Fix gcc 2019-02-13 22:51:10 +00:00
Ted John eaa671632f Fix formatting 2019-02-13 20:31:55 +00:00
Ted John ba445cb6ef Pass Ride* instead of ride_id_t 2019-02-13 20:16:42 +00:00
Phillip Walters b7787daa9f More formatting changes. 2019-02-12 18:02:33 -08:00
Phillip Walters 11ff0b6688 Cleaned up some formatting 2019-02-12 17:53:39 -08:00
Ted John fdf9f36fab Pass Ride* instead of ride_id_t 2019-02-12 23:58:45 +00:00
Ted John 9e461b2e34 Pass Ride* instead of ride_id_t 2019-02-12 23:29:38 +00:00
Ted John fd090f5ef3 Refactor PickRideToGoOn 2019-02-12 23:29:38 +00:00
Ted John 9706dd8675 Pass Ride* instead of ride_id_t 2019-02-12 23:29:37 +00:00
Ted John e361655b10 Pass Ride* instead of ride_id_t 2019-02-12 23:29:37 +00:00
Ted John aaacece0ea Pass Ride* instead of ride_id_t 2019-02-12 23:29:37 +00:00
OpenRCT2 git bot 795dc8e217 Merge Localisation/master into OpenRCT2/develop. 2019-02-12 04:00:22 +00:00
Phillip Walters 28d4446da4 Re-added some code that shouldn't have been removed and removed some other code that I missed last time. 2019-02-11 18:58:56 -08:00
Duncan a95a5abab8
Merge pull request #8690 from duncanspumpkin/pause_toggle_gc 
Move Pause Toggle into the GameAction framework
 2019-02-11 11:31:58 +00:00
duncanspumpkin af65bc33e7 Increment network version 2019-02-11 10:57:58 +00:00
duncanspumpkin c87430e09d Turn off clang format 2019-02-11 10:57:31 +00:00
Tom Lankhorst 2405e9a6ba Added files to xcodeproj (#17) 2019-02-11 10:46:12 +00:00
duncanspumpkin 866d143930 Move Pause Toggle into the GameAction framework 2019-02-11 10:46:12 +00:00
OpenRCT2 git bot 14eb975803 Merge Localisation/master into OpenRCT2/develop. 2019-02-11 04:00:21 +00:00
Phillip Walters 14835b9e31 Removed dead code per issue 8677 (https://github.com/OpenRCT2/OpenRCT2/issues/8677) 2019-02-10 18:17:05 -08:00
Michael Steenbeek 76603ad1b3
Fix #8696: Setting land height costs money in no-money scenarios 2019-02-10 22:14:23 +01:00
Michał Janiszewski 5e74f7487d
Merge pull request #8700 from janisozaur/icc-fixes 
Icc fixes
 2019-02-10 12:21:33 +01:00
ζeh Matt 20989ae4d8
Merge pull request #8675 from tomlankhorst/compress-replays 
.sv6r version 2: introducing compression
 2019-02-10 11:01:26 +01:00
OpenRCT2 git bot 62503296a2 Merge Localisation/master into OpenRCT2/develop. 2019-02-10 04:00:22 +00:00
Michał Janiszewski 5faf2d393b Fix ride_type_has_flag signature for testpaint 2019-02-10 00:32:46 +01:00
Michał Janiszewski 9da931d5e7 Remove offsetof for non-POD data 2019-02-10 00:20:34 +01:00
Michał Janiszewski 838289abce Mark functions as static 2019-02-10 00:20:34 +01:00
Michał Janiszewski 379fd42dc4 Fix types passed to ride_type_has_flag 2019-02-10 00:04:52 +01:00
Michał Janiszewski 70ef8151fc Fix types passed to printf-like functions 2019-02-10 00:04:52 +01:00
ζeh Matt be491d3c6f Bump network version 2019-02-09 23:27:26 +01:00
ζeh Matt 7861d64ca8
Merge pull request #8693 from ZehMatt/ga-ridesetprice 
Refactor Ride Set Price to game actions.
 2019-02-09 21:06:17 +01:00
Tom Lankhorst 405ebe3fb1 Added files to xcodeproj 2019-02-08 18:16:10 +01:00
Matt 02a14d3883 Move setting common price into RideSetCommonPrice 2019-02-08 18:03:06 +01:00
Matt 34260cb6ca Replace old game command reference. 2019-02-08 18:03:06 +01:00
Matt 9508044aa7 Add missing member to serialisation. 2019-02-08 18:03:06 +01:00
Matt d87ca57e72 Replace game command references with new game action. 2019-02-08 18:03:06 +01:00
Matt a5e48e759d Implement RideSetPriceAction. 2019-02-08 18:03:06 +01:00