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

16476 Commits

Author SHA1 Message Date
duncanspumpkin cfeeeab9b9 Increment network version 2019-03-04 16:58:57 +00:00
duncanspumpkin da24ea53b8 Fix formating add missing include 2019-03-04 16:58:22 +00:00
Tom Lankhorst 2290d9de78 Add files to xcode project 2019-03-04 16:57:21 +00:00
duncanspumpkin 540be7c7be Provide a conversion from old game command. 
Note doesn't handle footpath scenery or clear direction mode
 2019-03-04 16:57:21 +00:00
duncanspumpkin 29de97f5b1 Remove references to old game command 2019-03-04 16:57:21 +00:00
duncanspumpkin bcced4016f Use new action 2019-03-04 16:57:21 +00:00
duncanspumpkin c8fd5174ae Implement footpathplace 2019-03-04 16:57:21 +00:00
duncanspumpkin 510d71ab68 Add FootpathSceneryPlaceAction 2019-03-04 16:57:21 +00:00
duncanspumpkin ef69c01da5 Create FootpathSceneryRemoveAction to split up footpath place 2019-03-04 16:57:21 +00:00
Ted John c479ada2ca Fix #8795: Downloading objects interacts with UI on background thread (#8821) 
Queue downloads so that they are invoked on UI thread.
 2019-03-03 22:08:13 +01:00
Duncan 473ce29cb3
Merge pull request #8803 from ZehMatt/test-loadsave 
Add network load and save test.
 2019-03-03 17:13:19 +00:00
Michał Janiszewski 1fa5606509
Simplify some code in Vehicle.cpp (#8595) 
* Simplify some code in Vehicle.cpp

This reduces amount of code that depends on registers struct

* Simplify code in Vehicle.cpp

This removes one goto.
 2019-03-03 15:25:47 +01:00
Duncan a2e45b56c0
Merge pull request #8820 from AaronVanGeffen/fix/8804 
Fix #8804: Raising water shows money effect at the bottom
 2019-03-03 14:23:58 +00:00
Michael Steenbeek 2a53f1150b
Add #7991 to changelog [ci skip] 2019-03-03 12:51:38 +01:00
Aaron van Geffen a6773584b0 Amend changelog; increase network version. 2019-03-03 12:09:19 +01:00
duncanspumpkin e4ab16acc1 Fix #8804: Raising water shows money effect at the bottom rather than new height 2019-03-03 11:17:21 +01:00
Michał Janiszewski 01c7429a5c
Merge pull request #8817 from janisozaur/fixes-201903 
minor cleanups
 2019-03-03 08:42:33 +01:00
Michał Janiszewski a2bfb77b4a Make sure the header-only function `direction_valid` is `static` 2019-03-03 08:18:15 +01:00
Michał Janiszewski f83fa88512 Fix printing of non-POD NetworkRideId_t 
The underlying type is using int32_t rather than uint32_t, so reflect
that as well
 2019-03-03 08:18:15 +01:00
Duncan f198ef5919
Merge pull request #8799 from duncanspumpkin/set_water_height_ga 
Set Water Height Action
 2019-03-02 17:42:04 +00:00
duncanspumpkin 47de289ca2 Increment network version 2019-03-02 16:06:44 +00:00
Tom Lankhorst 10aaf7816e Add files to xcode project 2019-03-02 16:06:04 +00:00
duncanspumpkin 7484b3f00e Fix formating. Add correct includes 2019-03-02 16:06:03 +00:00
duncanspumpkin aef3f24178 Remove reference to game command 2019-03-02 16:06:03 +00:00
duncanspumpkin 61cb84e0ca Add WaterSetHeightAction 2019-03-02 16:06:03 +00:00
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
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