mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
17,113 Commits 9 Branches 41 Tags 387 MiB
Commit Graph

17113 Commits

Author SHA1 Message Date
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
Matt 951f5009ef
Refactor window storage to use std::list instead of std::vector 2019-05-29 19:32:18 +02:00
OpenRCT2 git bot 4d7c78fa3a Merge Localisation/master into OpenRCT2/develop. 2019-05-29 04:00:23 +00:00
Ted John efac635cfa Do not update ride measurements when simulating 2019-05-28 22:37:54 +01:00
Ted John 8d5e083998 Remove duplicate divisions 2019-05-28 22:31:46 +01:00
Ted John ca32357dad Use bool for isApplying 2019-05-28 22:31:46 +01:00
Ted John 63b1649666 Do not clear construction / peeps for ghost entrance / exits 2019-05-28 16:53:31 +01:00
Ted John 1dd696d453 Do not clear construction / peeps when querying ride entrance / exit 2019-05-28 16:50:38 +01:00
Aaron van Geffen d1f48fab53 Add RCT1 traffic light sprites for ride simulate status. 2019-05-28 16:50:38 +01:00
Aaron van Geffen bab7711c5b Add new simulate icon. 2019-05-28 16:50:38 +01:00
Ted John 26185b9e72 Change simulate to toggle button 2019-05-28 16:50:38 +01:00
Ted John 5ef0730008 Remove simulate from ride window 2019-05-28 16:50:38 +01:00
Ted John 5289113c95 Add simulate button to ride construction window 2019-05-28 16:50:38 +01:00
Ted John 62ff1e7534 Prevent breakdown during simulation 2019-05-28 16:50:38 +01:00
Ted John 5fa0c18455 Do not provide test results for simulate 2019-05-28 16:50:08 +01:00
Gymnasiast f0f09c7f6b Fix tests 2019-05-28 16:50:08 +01:00
Ted John 94caa46654 Allow modification of ride entrance during simulation 2019-05-28 16:50:08 +01:00
Ted John 5c8aa743f6 Implement ghost drawing for special vehicles 2019-05-28 16:50:08 +01:00
Ted John 5f1f428bce Add and use Ride::SupportsStatus 2019-05-28 16:50:08 +01:00
Ted John fec6d660c6 Remove obsolete configs: 
- no crashes
- test unfinished track
 2019-05-28 16:50:08 +01:00
Ted John c4e18e570e Add and implement simulation mode for rides 2019-05-28 16:50:08 +01:00
nexgenration 46889b5381 Implement #9231: Add sprite_index to Guest Debug Tab 2019-05-27 22:39:03 +02:00
James Warwood 1cf4f17ee6 Fix: Unable to use second skyscraper terrain edge style 
Code to check if selected edge style is valid was passing the wrong object type
(surface instead of edge) to GetLoadedObject, causing that method to warn that
the selected edge style index was out-of-range.
 2019-05-27 22:37:31 +02:00
Sijmen Schoon f26a1aee57 Fix compile error with DISABLE_HTTP (#9309) 
There are two variables, MASTER_SERVER_REGISTER_TIME and
MASTER_SERVER_HEARTBEAT_TIME, which are unused when DISABLE_HTTP is set.
This commit fixes that.
 2019-05-26 16:06:56 +02:00
Aaron van Geffen 6a8b218fd9 Rename remaining unnamed G2 images. (#9308) 2019-05-26 11:43:00 +01:00
Ted John abf72eda7f
Fix #9293: Issue with the native load/save dialog (#9294) 
Do not set OpenRCT2 as the owner of the file dialog so that it has its own taskbar button and can be independently focused.
 2019-05-24 19:31:29 +01:00
OpenRCT2 git bot a484102f61 Merge Localisation/master into OpenRCT2/develop. 2019-05-22 04:00:38 +00:00
aw20368 8c20b635bd Fix #9270: Refactor money effect 
Changed static functions to rct_money_effect member functions. GetStringId now returns std::pair.
 2019-05-21 21:22:47 +02:00
OpenRCT2 git bot 831d69083e Merge Localisation/master into OpenRCT2/develop. 2019-05-21 04:00:31 +00:00
Aaron van Geffen 74fa30a20a
Merge pull request #9282 from IntelOrca/fix/7045-opengl-theme-window 
Fix #7045: Theme window's colour pickers not drawn properly on OpenGL
 2019-05-20 21:42:46 +02:00
Ted John 7f2936b8fb Fix #7045: Theme window's colour pickers not drawn properly on OpenGL 
Remove unnecessary transparent flag when drawing colour buttons.
 2019-05-20 19:47:26 +01:00
Ted John b6ae8a758e Update changelog 
Add fix note for #7039, fixed in 710da039a4.
 2019-05-20 19:46:04 +01:00
OpenRCT2 git bot 65f110fad8 Merge Localisation/master into OpenRCT2/develop. 2019-05-20 04:00:22 +00:00
ζeh Matt ee79c11389 Fix desync when host changes map 2019-05-19 17:44:43 +02:00
Michael Steenbeek 1de25be4fb
Merge pull request #9274 from ZehMatt/fix-mp-pause-toggle 
Fix clients being behind one tick
 2019-05-19 15:09:25 +02:00