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

16997 Commits

Author SHA1 Message Date
Duncan 17cc6a862d
Merge pull request #9264 from duncanspumpkin/tilemodify 
Tile Modify GameAction
 2019-06-12 18:59:43 +01:00
Michał Janiszewski ea0483c4a9
Add libgtest-dev to Ubuntu AMD64 image (#9405) 
See discussion in https://github.com/OpenRCT2/OpenRCT2/pull/9404#issuecomment-501012361
https://packages.ubuntu.com/bionic/libgtest-dev
 2019-06-12 19:43:46 +02:00
duncanspumpkin 9cd3119897 Increment network version 2019-06-11 18:44:23 +01:00
duncanspumpkin 96ec0123ca Refactor and clean up for CI's. 2019-06-11 18:43:23 +01:00
duncanspumpkin afca838f17 Provide a game command translation 2019-06-11 18:43:06 +01:00
duncanspumpkin 3162d4dc75 Implement TileModifyAction 
Further work moving game commands into the game action framework
 2019-06-11 18:42:52 +01:00
Duncan 99772ab3b8
Merge pull request #9400 from ZehMatt/fix-9388 
Fix #9388: Crash using set grass length cheat
 2019-06-11 18:23:27 +01:00
Matt ea7374b332
Bump up network version 2019-06-11 17:50:17 +02:00
Matt 9a23234631
Fix #9388: Crash using set grass length cheat 2019-06-11 17:49:49 +02:00
ζeh Matt 1b8096d4e1
Merge pull request #9399 from ZehMatt/fix-8859 
Fix #8859: Network gCheatsEnableAllDrawableTrackPieces
 2019-06-11 17:48:58 +02:00
OpenRCT2 git bot 288921132d Merge Localisation/master into OpenRCT2/develop. 2019-06-11 04:00:22 +00:00
Matt 92129f01d0
Bump up network version 2019-06-11 05:10:27 +02:00
Matt 82fd212834
Fix #8859: Network gCheatsEnableAllDrawableTrackPieces on initial join 2019-06-11 05:10:05 +02:00
Gymnasiast b65e243486 Fix #9398: Observation tower vehicle is coloured incorrectly 2019-06-10 22:51:23 +02:00
Michael Steenbeek 1993704e8f
Add #8553 to changelog [ci skip] 2019-06-10 22:34:29 +02:00
OpenRCT2 git bot 712c2d9b67 Merge Localisation/master into OpenRCT2/develop. 2019-06-10 04:00:22 +00:00
Duncan ba040fcd6a
Fix clang format (#9393) 2019-06-09 19:18:04 +01:00
duncanspumpkin 4fa77e1f71 Fix the build 2019-06-09 16:08:29 +01:00
Peter dd948f99c4 #9295 Refactor rct_vehcile->status to rct_vehicle::SetState() (#9329) 
Fix #9295. Refactor rct_vehicle->status to rct_vehicle::SetState()

Created rct_vehicle::SetState() and refactored all assignments to
rct_vehcile->status. SetState also includes a call to
vehicle_invalidate_window(), so it cannot be forgotten.
 2019-06-09 15:45:56 +01:00
Ted John 6f0298deb3 Refactor ride measurement storage 2019-06-09 11:55:41 +02:00
Rikard Falkeborn 7478e13e61 Add suffix constant to avoid shifting too many bits (#9389) 
Since WIDX_SCENERY_BUILD_CLUSTER_BUTTON is 31, add suffix ULL to
avoid shifting 1 (which is an int and 4 bytes on most systems) 31 bits
which is technically undefined behaviour. This is already done in the
shift at line 463.

Detected by the help of cppcheck.
 2019-06-09 11:35:42 +02:00
Michael Steenbeek 66b6a2b65c
Merge pull request #9334 from Broxzier/feature/1260-transparent-giant-screenshot 
Implement #1260: Transparent Giant Screenshots
 2019-06-09 11:34:42 +02:00
Hielke Morsink b3ed5b0cc1 Make giant screenshots transparent by default 2019-06-09 11:03:01 +02:00
Hielke Morsink e2d7b2cf03 Use new setting in screenshot command too 2019-06-09 11:03:01 +02:00
Hielke Morsink 5418eb6e34 Add transparency setting to options window 2019-06-09 11:03:01 +02:00
Hielke Morsink bffc012d16 Implement #1260: --transparent switch for screenshot command 2019-06-09 11:03:00 +02:00
Hielke Morsink f5ac98c1e2 Early out when context creation fails 2019-06-09 11:03:00 +02:00
Duncan 993709c087
Merge pull request #9321 from aw20368/fix/8723-use-rotate_map_coordinates 
Fix #8723 Use rotate_map_coordinates to rotate coordinate
 2019-06-08 07:52:52 +01:00
OpenRCT2 git bot 9bca783fff Merge Localisation/master into OpenRCT2/develop. 2019-06-08 04:00:21 +00:00
OpenRCT2 git bot 6cfe9f373f Merge Localisation/master into OpenRCT2/develop. 2019-06-07 04:00:23 +00:00
ζeh Matt c3fba7fee5
Merge pull request #9379 from ZehMatt/fix-9377 
Fix #9377: accumulate a list of windows to close before actual closing
 2019-06-06 23:54:57 +02:00
aw20368 e0cf476398 Fix #8723 Use rotate_map_coordinates to rotate coordinate 
Added Rotate to CoordsXY, TileCoordsXY and used them to replace redundant rotation code.
 2019-06-06 08:21:40 -04:00
Matt f98d027a14
Fix #9377: accumulate a list of windows to close before actual closing 2019-06-06 12:21:46 +02:00
OpenRCT2 git bot 7dc0068f6e Merge Localisation/master into OpenRCT2/develop. 2019-06-06 04:00:25 +00:00
aw20368 834d1e828a Fix #7829 Rotated information kiosk can cause 'unreachable' messages (#9337) 
Some entrance directions were lost upon rotation. Corrected rotation of entrance directions.
 2019-06-05 09:33:39 +02:00
aw20368 df263eb1f6 Fix #5896 Fences not always removed when building a tracked ride through (#9341) 
Fence removal did not account for track direction. Added the rotation for the track/fence intersection test.
 2019-06-04 23:27:36 +02:00
aw20368 3823befa10 Fix #7323 Tunnel entrances not rendering in 'highlight path issues' (#9339) 
Hiding path scenery caused function that draws tunnel to prematurely return. Changed to only skip drawing scenery.
 2019-06-04 20:34:39 +02:00
Aaron van Geffen f1ac847fce
Merge pull request #9222 from IntelOrca/implement/485-ghost-train-simulation 
Implement #485: ghost train simulation
 2019-06-04 20:24:16 +02:00
Duncan 06c666c298
Merge pull request #9358 from ZehMatt/undo-fuckup1 
Remove useless log_info
 2019-06-04 18:45:34 +01:00
Duncan f44d29f861
Merge pull request #9368 from ZehMatt/fix-9365 
Fix #9365: Crash when bringing window to front
 2019-06-04 18:45:22 +01:00
ζeh Matt 1075536d01
Merge pull request #9362 from Broxzier/bugfix/9360-window-freeze 
Fix #9360: sticky windows can be closed
 2019-06-04 07:20:35 +02:00
Matt d6975a8f23
Fix #9365: Crash when bringing window to front 2019-06-04 07:02:55 +02:00
Hielke Morsink 4dea507e50 Fix #9360: sticky windows can be closed 2019-06-03 22:49:45 +02:00
Matt af65811f50
Remove useless log_info 2019-06-03 18:59:23 +02:00
ζeh Matt dd0649dfed Add version info resource to avoid/reduce false positive virus detection (#9335) 2019-06-03 10:26:02 +02:00
ζeh Matt cf9e5e14a6
Merge pull request #9330 from ZehMatt/window-refactor 
Refactor window storage to use std::list instead of std::vector
 2019-06-01 21:22:02 +02:00
aw20368 3ee6be0dbf Fix #9288: Replace repeated 3d to 2d functions (#9301) 
Replaced duplicate 3d to 2d code with translate_3d_to_2d_with_z(...).
 2019-05-30 22:41:53 +02:00
aw20368 02ef545f1b Fix #9314: Trying to delete ride piece while paused moves the selection (#9332) 
Failed track removal was triggering a move to the next piece. Changed to move only upon successful removal.
 2019-05-30 20:51:56 +02:00
ζeh Matt bc14f427a5 Fix #9322: Peep crashing the game trying to find a ride to look at 2019-05-30 20:49:54 +02:00
James Warwood 67f1359936 Fix: Unable to change colours of scrolling wall banner sign via sign dialog (#9303) 
1. Check in SignSetStlyeAction query was accidentally inverting value of
   wallFound boolean
2. Code in action execution was not looping through the tile elements to find
   the correct wall piece like the query did (which meant just fixing 1. would
   cause a segfault)

Moved code to find relevant wall tile element into new helper function
banner_get_scrolling_wall_tile_element() in Banner; use in both query and action
to avoid any duplication of search logic.
 2019-05-30 10:33:13 +02:00