Commit graph

16148 commits

Author SHA1 Message Date
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
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
Duncan
9a746c4fc1
Merge pull request #8733 from duncanspumpkin/fix_pause
Fix pause
2019-02-20 19:41:56 +00:00
duncanspumpkin
768321c517 Increment network version 2019-02-20 19:14:24 +00:00
duncanspumpkin
3467941310 Fix #8732 GameActions not working when in negative money.
Related to the simplification to the finance code
2019-02-20 19:14:10 +00:00
Ted John
857db39f9a
Merge pull request #8716 from IntelOrca/refactor/marketing
Refactor marketing to be a single vector
2019-02-20 18:28:13 +00:00
Ted John
440511afc5 Use uint16_t for marketing probability 2019-02-20 16:51:19 +00:00
Michael Steenbeek
dfa0c528c2 Rename command to forbid_marketing_campaigns
Co-Authored-By: IntelOrca <ted@brambles.org>
2019-02-20 16:49:03 +00:00
Ted John
4013479094 Refactor marketing to be a single vector 2019-02-20 16:49:02 +00:00
Ted John
261dd32697
Refactor peep_interact_with_path to prevent null ride warnings (#8728) 2019-02-20 16:47:38 +00:00
Aaron van Geffen
971480b305
Change OpenLoco repository link and add new logo. 2019-02-19 22:12:41 +01:00
Duncan
a6ec939096
Merge pull request #8694 from duncanspumpkin/track_place_ga
Start moving track place into GameAction framework
2019-02-19 17:22:03 +00:00
duncanspumpkin
d959657346 Increment network version 2019-02-19 15:22:29 +00:00
duncanspumpkin
9b6fdd41aa Remove redundant code. Rename to standard style 2019-02-19 15:20:55 +00:00
duncanspumpkin
1418975d84 Fix shop construction on client 2019-02-19 15:20:55 +00:00
duncanspumpkin
6375d2537a Move and refactor shop interact with path code to prevent possible desync 2019-02-19 15:20:49 +00:00
duncanspumpkin
09bb99d9e8 Fix clang format and travis errors
Minor refactor

Move key callback code into callbacks. Fixes shop placement

Use rotate_map_coordinates
2019-02-19 12:31:22 +00:00
duncanspumpkin
4d3c594e47 Provide a translation for the replay manager 2019-02-19 12:31:22 +00:00
duncanspumpkin
8bf3689d42 Introduce flag to prevent ghosts in multiplayer
Fix error message arguments

Remove dead code. Fix clang format
2019-02-19 12:31:11 +00:00
duncanspumpkin
77b25714ff Move callbacks into GameActionCallbacks
Remove remaining references to game command
2019-02-19 12:30:42 +00:00
Tom Lankhorst
eb6852f8bf Added files to xcodeproj (#18) 2019-02-19 12:30:41 +00:00
duncanspumpkin
650e8291d0 Start moving track place into GameAction framework 2019-02-19 12:30:33 +00:00
Ted John
a6df41d122
Update changelog.txt 2019-02-19 11:59:40 +00:00
Ted John
cce979f96b
Remove logic for required objects (#8718)
This allows TARMAC to be removed when `remove_unused_objects` is called.
2019-02-19 11:55:43 +00:00
ζeh Matt
8a6dd5c4dd Fix #8720: Desync due to boats colliding with ghost pieces 2019-02-19 11:39:48 +01:00
Duncan
671016c24e
Merge pull request #8703 from ZehMatt/ga-cleanups
GameAction cleanup part 1
2019-02-18 17:08:28 +00:00
Matt
d7ff3854a9 Bump up network version. 2019-02-18 17:20:18 +01:00
Matt
a6c6d6ddc3 Update checks for when money is required. 2019-02-18 17:19:44 +01:00