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

16878 Commits

Author SHA1 Message Date
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
Michael Steenbeek 1b11612e3c
Merge pull request #9259 from duncanspumpkin/scenario_set 
Implement ScenarioSetSetting game action
 2019-05-19 15:09:12 +02:00
Matt 8389e5119b
Bump up network version 2019-05-18 19:57:51 +02:00
Matt 83511c5c7f
Fix clients being behind one tick at all times 2019-05-18 19:56:03 +02:00
James Warwood d7074e65a2 Fix: Staff patrol areas getting clobbered when hiring new staff (#9271) 
Fixed incorrect indexing when resetting staff patrol areas during hiring
process.
 2019-05-18 11:43:06 +02:00
nexgenration 6b232f7e53 Fix#9197: Peep insert new thought (#9230) 
Improve the readability of the codebase by moving functions into the relevant structures.
- Change name of peep_insert_new_thought to InsertNewThought.
- Update InsertNewThought definition to Guest::InsertNewThought.
 2019-05-18 09:47:25 +01:00
ζeh Matt f7bd6d516a Fix #9267: Only check if a file is a directory before opening it (#9269) 2019-05-16 08:05:09 +01:00
ζeh Matt 1978372679
Merge pull request #9236 from ZehMatt/fix-ga-logging 
Improve game action logging
 2019-05-15 22:44:47 +02:00
Michael Steenbeek f39c3fdb1a
Add #8480 and #8535 to changelog [ci skip] 2019-05-15 22:33:51 +02:00
Michael Steenbeek 77d0c07d2c
Add #9067 to changelog [ci skip] 2019-05-15 22:31:25 +02:00
Michał Janiszewski bbcc69270d Ensure finances window's months don't overflow (#8686) 
Some functions (e.g. window_finances_summary_scrollpaint) will try using
the returned index, which makes it overflow.
 2019-05-15 21:09:01 +02:00
duncanspumpkin 00c4b393a3 Take care of default case 2019-05-15 19:47:18 +01:00
ζeh Matt 1a01a49002 Fix #9124: Disconnected clients can crash the server 2019-05-15 19:55:16 +02:00
Greg Hennis 1fcedae3bc Fix #9258: Rename SPRITE_LIST_NULL to ..._FREE (#9260) 2019-05-15 19:07:01 +02:00
duncanspumpkin 3ac596faf1 Implement ScenarioSetSetting game action 
Further work moving game commands into the game action framework to improve design.
 2019-05-14 21:46:27 +01:00
Michael Steenbeek c9cbe391eb
Merge pull request #8427 from Mikroscopic/minimap-fix 
Fix #8385: Ghost objects rendered in minimap
 2019-05-14 22:38:26 +02:00
Michael Steenbeek abc13422ed
Fix #9132: System file browser cannot open SV4 files 2019-05-14 22:12:23 +02:00
Michael Steenbeek c4812e08d0
Merge pull request #9244 from duncanspumpkin/modify_kick_ga 
Implement Modify Group and Kick Player Actions.
 2019-05-14 21:59:42 +02:00
Gymnasiast cb6a563e2d Bump network version [ci skip] 2019-05-14 21:59:16 +02:00
duncanspumpkin 0b7d7027e1 Fix formatting 2019-05-14 21:58:55 +02:00
duncanspumpkin e72195d16e Make suggested changes 2019-05-14 21:58:55 +02:00
duncanspumpkin 1eb7f4d8c6 Implement Modify Group and Kick Player Actions. 
Further work on the Game Actions porting
 2019-05-14 21:58:55 +02:00
Duncan 7793001f5d Implement BalloonPressAction 
Furthering reducing the number of game commands and moving them to the Game Action framework
 2019-05-14 21:54:54 +02:00
joshtucker132 4dc77bf121 Feature #8791: Improved tile element flag manipulation in Tile Inspector 2019-05-14 21:38:31 +02:00
Michael Steenbeek b67470c75b
Merge pull request #9252 from Gymnasiast/small-cleanup 
Small cleanup
 2019-05-14 21:27:30 +02:00
Gymnasiast 5e39640837 Also remove game_command_set_park_entrance_fee from new_game_command_table 2019-05-14 18:39:14 +02:00
Gymnasiast 4e23c42d38 Remove stub functions from new_game_command_table[] 2019-05-13 22:51:41 +02:00
Gymnasiast 8d9645a382 Remove comment 2019-05-13 22:22:14 +02:00
Gymnasiast 170307cd0f Remove redundant semicolons after for loops 2019-05-13 22:16:30 +02:00
Gymnasiast 2ea1fcc69d Remove unused declarations and functions 2019-05-13 22:16:14 +02:00
ζeh Matt 0ff19f071f Fix #9240: crash when passing directory instead of save file 2019-05-13 21:34:58 +02:00
OpenRCT2 git bot 058475f445 Merge Localisation/master into OpenRCT2/develop. 2019-05-13 04:00:25 +00:00
Duncan 62e188586c
Merge pull request #8914 from duncanspumpkin/buy_land_rights 
Add landset/buyrights action
 2019-05-12 19:38:39 +01:00
duncanspumpkin 4de6071fb4 Increment network version 2019-05-12 19:03:03 +01:00
duncanspumpkin b9a70d02a3 Make suggested changes 
Implement suggestions

Fix formatting
 2019-05-12 17:31:48 +01:00
Aaron van Geffen a8ae81519c Add LandBuyRightsAction.hpp to Xcode project. 2019-05-12 17:29:19 +01:00