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

16297 Commits

Author SHA1 Message Date
duncanspumpkin 7fbf11ac79 Implement TrackSetBrakeSpeedAction 2019-03-11 19:08:07 +00:00
Ted John f4526dd2ae
Merge pull request #8837 from IntelOrca/fix/invalid-reads 
Fix more of these backtrace reports
 2019-03-11 16:31:21 +00:00
Ted John 85c1ec8fa5
Fix #8841: Catch exceptions when loading parks from title editor (#8843) 2019-03-11 16:31:02 +00:00
OpenRCT2 git bot 25eb403c78 Merge Localisation/master into OpenRCT2/develop. 2019-03-11 04:00:36 +00:00
Michael Steenbeek 1b39c97412
Update objects to version 1.0.9 (#8844) 2019-03-10 21:19:08 +01:00
Duncan 1e003fbddb
Merge pull request #8836 from duncanspumpkin/fix_error_msg 
Fix Game Actions Error Messages
 2019-03-09 19:49:44 +00:00
duncanspumpkin 0b989710b5 Increment network version 2019-03-09 18:08:20 +00:00
duncanspumpkin 904bb0b6e9 Fix formatting 2019-03-09 18:07:52 +00:00
duncanspumpkin a3703cf2c0 Fix #8736. Add error title to ride create 2019-03-09 18:07:52 +00:00
duncanspumpkin 63e7f7a990 Use correct error messages with can_construct_with_clear 
Pass correct parameters to the function
 2019-03-09 18:07:52 +00:00
ζeh Matt b5f3e96cc7
Merge pull request #8838 from ZehMatt/network-sigfail 
Fix network public key verification failure.
 2019-03-09 14:22:31 +01:00
Ted John ca023f7c5e Fix #8829: invalid read in window_guest_open 2019-03-09 13:05:12 +00:00
Matt e9523caeb4 Bump up network version. 2019-03-09 13:58:49 +01:00
Matt d7a4570a1c Fix #8802: public key signature being null terminated. 2019-03-09 13:58:23 +01:00
Ted John d708234489 Fix #8828: Invalid read in window_footpath_invalidate 2019-03-09 12:37:23 +00:00
Ted John f5904c90cb Fix #8834: Invalid read in UpdateRideApproachExitWaypoints 2019-03-09 11:36:53 +00:00
OpenRCT2 git bot 057a27ad01 Merge Localisation/master into OpenRCT2/develop. 2019-03-08 04:00:33 +00:00
OpenRCT2 git bot 70231fd2a8 Merge Localisation/master into OpenRCT2/develop. 2019-03-07 04:00:21 +00:00
Ted John 0aade935aa
Fix #8824: invalid read in footpath_chain_ride_queue (#8831) 2019-03-06 19:11:21 +00:00
Aaron van Geffen 736734c065
Fetch more of the repository history for non clang-format builds. (#8788) 
By default, Travis fetches a shallow copy of the repository with up to 50 commits, leading `git describe` to not find any tag to offset against.

This commit explicitly adds a refspec to fetch tags from, and then instructs Travis to fetch the relevant commits.
 2019-03-05 13:59:10 +01:00
Michael Steenbeek 584ea87ac5
Remove #8584 from changelog [ci skip] 
The fix has been reverted because it caused other problems and no follow-up has yet been merged.
 2019-03-04 20:24:14 +01:00
Duncan cc90c3b0e1
Merge pull request #8807 from duncanspumpkin/footpath_ga 
Footpath GameAction
 2019-03-04 17:46:36 +00:00
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