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

16177 Commits

Author SHA1 Message Date
duncanspumpkin c1546a92b7 Implement RideSetVehicleAction 
Move all callees to the new action.
Required rework on how the ride type change worked.
 2019-02-26 08:14:57 +00:00
Ted John cf1a4c9d66 Fix #8754: Crash when downloading objects due to race condition 
Use stack allocated buffer for string format arguments instead of the
global argument buffer as this is performed on a background thread.
 2019-02-26 09:06:02 +01:00
Michał Janiszewski b957ad5e9e
Remove redundant move (#8778) 2019-02-26 06:41:01 +01:00
ζeh Matt facb95da73
Merge pull request #8776 from ZehMatt/fix-rideshopconnected 
Fix ride_shop_connected dereferencing null.
 2019-02-25 21:47:16 +01:00
Matt f0366b84e4 Fix ride_shop_connected dereferencing null. 2019-02-25 20:58:41 +01:00
Duncan f769779f0d
Merge pull request #8722 from duncanspumpkin/quarter_tile 
Quarter tile refactor
 2019-02-25 14:37:22 +00:00
duncanspumpkin 6890f4f756 Use quarter tile for map can construct at 
Make callees of map_can_construct_with_clear use QuarterTile

Use quarter tile for small scenery rotation

Fix clang format

Further clang format
 2019-02-25 13:51:08 +00:00
duncanspumpkin f9fe09634c Move quarter tile class to the tile element header. 
Refactor flags slightly
 2019-02-25 13:51:07 +00:00
duncanspumpkin 921062d073 Start transferring trackdata to use the seperate values 
Finish the conversion
 2019-02-25 13:51:04 +00:00
duncanspumpkin dffa56aca2 Create a class for the quarter tile 
Finish implementing TrackQuarterTile

Rename class
 2019-02-25 13:51:00 +00:00
Ted John 08e560da28
Merge pull request #8735 from IntelOrca/refactor/sprite-import-export 
Refactor sprite import / export
 2019-02-25 12:25:59 +00:00
Duncan 94b5133388
Merge pull request #8737 from duncanspumpkin/load_or_quit_ga 
Add LoadOrQuitAction
 2019-02-25 11:28:57 +00:00
Michael Steenbeek 336e2cafce
Fix #4094: Long flat-to-steep pieces are offered in diagonal building mode 2019-02-25 12:02:27 +01:00
Michael Steenbeek ec2d609200
Merge pull request #8734 from Broxzier/feature/multiplayer-tweaks 
Disable kick button when unable to use it + slight refactor
 2019-02-25 10:34:56 +01:00
OpenRCT2 git bot 68730b30b2 Merge Localisation/master into OpenRCT2/develop. 2019-02-25 04:00:38 +00:00
Ted John 08508cc638
Fix #8739: savegame from original game crashes when cruising through map (#8746) 2019-02-24 23:23:41 +00:00
Ted John a6e7041f49 Fix #8769: Segmentation fault on host 2019-02-24 23:22:43 +00:00
Duncan da03305242
Merge pull request #8768 from duncanspumpkin/fix_console 
Fix interactive console staff set costume command.
 2019-02-24 18:40:10 +00:00
Michael Steenbeek d7ec0b2ecc
en-GB: Correct name of 'Deutsche mark' [ci skip] 2019-02-24 19:27:27 +01:00
duncanspumpkin 2d1ed8ce05 Fix interactive console staff set costume command. 
After the refactor to GameActions, forgot to actually issue the command after generating it.
 2019-02-24 18:10:07 +00:00
Ted John 8def463360 Fix #8513: invalid read access in window_footpath_set_provisional_path_at_point 2019-02-24 17:39:22 +01:00
ζeh Matt 92b6ed5a94
Merge pull request #8751 from ZehMatt/fix-8741 
utf8* string refactor.
 2019-02-24 17:33:37 +01:00
Duncan 6a0cff2676 Fix being unable to refund when in negative money 2019-02-24 17:31:43 +01:00
Ted John d31e92e652 Fix #8742: access violation in vehicle_update_sound_params 2019-02-24 16:49:03 +01:00
Ted John 81d41895d2 Fix divide by zero in ride_prepare_breakdown 2019-02-24 11:57:05 +00:00
Nathaniel Ngo 300fd3a589 Fix for Issue#8725: refactoring _currentTrackBegin and _previousTrackPiece to use CoordsXYZ struct (#8759) 
* Refactored _currentTrackBeginX, _currentTrackBeginY, _currentTrackBeginZ to use a CoordsXYZ struct

* Refactored _previousTracPieceX, _previousTrackPieceY, _previousTrackPieceZ to use a CoordsXYZ struct

* Refactored _currentTrackBegin and _previousTrackPiece in source files

* Fixed clang formatting
 2019-02-24 09:15:31 +00:00
Matt a7f8c8aa36 Refactor utf8* use over std::string 2019-02-24 00:08:05 +01:00
Tom Lankhorst a883a46af1 Update Xcode project to use Xcode 10 (#8669) 2019-02-22 11:51:50 +01:00
duncanspumpkin b60d97ef55 Use enum values for the savePromptMode 2019-02-22 09:08:04 +00:00
duncanspumpkin dac1b9ab4a Fix ci issues 2019-02-22 09:01:40 +00:00
duncanspumpkin c24c6bdf0a Remove references to old game command 2019-02-22 09:01:39 +00:00
duncanspumpkin eadef45ffd Add LoadOrQuiteAction 2019-02-22 09:00:38 +00:00
Hielke Morsink 5f77abba89 Add changelog entry 2019-02-21 19:50:07 +01:00
Hielke Morsink d460443305 Introduce network permission enum 
This enum needs to match the vector. To make sure their sizes are equal,
the vector has been changed to an std::array.
 2019-02-21 19:50:07 +01:00
Hielke Morsink 0adbd1f43a Enable kick button only when able to use it 
Now it's disabled:
 - When lacking the kick permission
 - The player is the host
 - You are the player
 2019-02-21 19:50:05 +01:00
Duncan b7db6cb03b
Merge pull request #8730 from duncanspumpkin/track_remove_ga 
Add TrackRemoveAction
 2019-02-21 17:56:36 +00:00
Tom Lankhorst a490f00f3a Add files to xcode project 2019-02-21 16:10:10 +00:00
duncanspumpkin a8cf6381da Make changes for set last network position change 2019-02-21 16:04:26 +00:00
duncanspumpkin 71bdd28022 Increment network version 2019-02-21 16:00:31 +00:00
duncanspumpkin 7cbed69816 Make changes from review 2019-02-21 16:00:31 +00:00
duncanspumpkin 1227bc09fc Remove references to game command 2019-02-21 16:00:31 +00:00
duncanspumpkin 3a615c2126 Use new game action for callees 2019-02-21 16:00:31 +00:00
duncanspumpkin e8b2c0f16f Add TrackRemoveAction 2019-02-21 16:00:31 +00:00
Duncan 60f2773b70
Merge pull request #8704 from ZehMatt/ga-cleanups2 
GameAction cleanup part 2
 2019-02-21 15:59:44 +00:00
Matt 92d73e2fab Set last player position based on game action result. 2019-02-21 15:51:00 +01:00
Michael Steenbeek de8c2f8a38
Add #8139 to changelog [ci skip] 2019-02-21 09:27:00 +01:00
Ted John 3b7b46706c Export sprites field by field 2019-02-20 23:51:43 +00:00
Ted John b77bc56a52 Copy vehicle structure for S6 2019-02-20 23:31:14 +00:00
Ted John c0e4eff9f1 Start copying sprite structures for RCT1 and RCT2 2019-02-20 23:31:14 +00:00
Ted John ddaddf59c6 Import misc sprites field by field 2019-02-20 23:31:14 +00:00