mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Code Issues Releases Wiki Activity
16,171 Commits 8 Branches 59 Tags
a3af56f28584827c8447766649fe60735fdafed3
Commit Graph

12327 Commits

Author SHA1 Message Date
Ted John
a3af56f285 Fix formatting 2019-02-25 22:31:14 +00:00
Ted John
bac3168a23 Refactor IsChild to IsHead 2019-02-25 17:58:22 +00:00
Ted John
ca807c5ed4 Refactor some IsChild references to GetHead 2019-02-25 17:51:25 +00:00
Ted John
520b1b4819 Try out changed sprite structs for main game 2019-02-25 12:29:31 +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
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
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
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
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
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
Matt
92d73e2fab Set last player position based on game action result. 2019-02-21 15:51: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
Ted John
67ae973ac8 Import peep field by field 2019-02-20 23:31:14 +00:00
Ted John
1b83b9881b Import vehicle field by field 2019-02-20 23:31:14 +00:00
Ted John
9960397f2c Import litter field by field 2019-02-20 23:31:14 +00: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
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
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