mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-08-31 06:26:07 +02:00
Code Issues Projects Releases Wiki Activity
16389 commits 9 branches 41 tags 338 MiB
Commit graph

16389 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Matt
21e4c52853 Use finance_check_affordability instead of CheckActionAffordability 2019-02-18 17:19:44 +01:00
Matt
914bf3a0c6 Add finance_check_money_required and finance_check_affordability helper functions. 2019-02-18 17:19:44 +01:00
ζeh Matt
a1d1669492
Merge pull request #8713 from ZehMatt/replay-bpb 
Add bpb.sv6 to the replays with 7000 ticks.
 2019-02-18 13:38:22 +01:00
Duncan
ca0db8c3aa
Merge pull request #8717 from ZehMatt/ga-fixes3 
GameAction fixes.
 2019-02-18 08:16:08 +00:00
Matt
3f07fd6bed Bump up network version. 2019-02-17 10:12:02 +01:00
Matt
7a18fc4b96 Fix ClearAction breaking out of the loop too early. 2019-02-17 10:12:02 +01:00
Matt
597b0956fc Fix SmallSceneryRemoveAction returning no error on invalid coordinates. 2019-02-17 10:12:02 +01:00
Matt
5f02c480c2 Fix FootpathRemoveAction crashing with invalid coordinates. 2019-02-17 10:12:02 +01:00
Matt
2d78eace05 Use QueryInternal in ExecuteInternal. 2019-02-17 10:12:02 +01:00
Matt
a630c17e92 Fix ReplayManager testing checksums out of order. 2019-02-16 09:10:05 +01:00