mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
17,158 Commits 8 Branches 40 Tags 362 MiB
Commit Graph

4677 Commits

Author SHA1 Message Date
Jim Armstrong f80695d0eb Fix #9485: Staff cannot be hired in pause mode (#9489) 
Set ALLOW_WHILE_PAUSED flag for staff hire GA
 2019-06-27 17:42:18 +02:00
Ted John f9101a2d7a Fix #9476: Running `simulate` command on park yields `Completed: (null)` 2019-06-24 23:17:48 +01:00
Jim Armstrong cc62e41feb Refactor #9291: Move easter egg code to Guest 
Refactored static Peep functions related to easter egg names into member
functions in the Guest struct.
 2019-06-24 15:17:59 -04:00
Gymnasiast 063b87e0a0 Remove more unused code; fix compilation on GCC 2019-06-23 23:10:34 +02:00
duncanspumpkin 759db552f4 Remove game command for non network builds 2019-06-23 18:50:35 +01:00
duncanspumpkin 2d75c01882 Unnetwork game commands 
Only track designs still use game commands and they cannot be networked so remove dead code
 2019-06-23 18:50:35 +01:00
duncanspumpkin e99c51d23c Remove game command callback 2019-06-23 18:50:35 +01:00
Matt fc3afb3349
Remove unnecessary multiplication and division for sprite lists 2019-06-22 17:38:28 +02:00
Spongeloaf 5777074a3e #9285 Add feature to remember scernario tab 2019-06-21 12:54:49 -04:00
duncanspumpkin 2de9430bd3 Remove incorrect code that resets picked peep 
The game command owner is never set for game actions so this would be incorrect
 2019-06-20 20:13:23 +01:00
duncanspumpkin 27e958fe2b Increment network version 2019-06-20 19:34:02 +01:00
ζeh Matt 6bd09f6b98 Cancel concurrent peep pickups on placement (#29) 2019-06-20 19:34:02 +01:00
duncanspumpkin b896f07687 Add PeepPickupAction 
Move Guest and Staff pickup to the new game action. Rework the game
action so that only one game action is required for the two game
commands. Remove the final game command with a callback.
 2019-06-20 19:34:02 +01:00
duncanspumpkin 65c0b0591d Fix build for gcc 
Invalid cast to int32_t that had been left in after refactoring months ago. Latest version of gcc flags this as the cast made this a comparison between a signed and unsigned value.
 2019-06-20 19:27:56 +01:00
Duncan cc82975090
Merge pull request #9448 from ZehMatt/fix-9287 
Fix marketing/money effect bugs
 2019-06-20 19:18:03 +01:00
nhair eb13c5a776 Fix #9245: Headless servers apply Discord Rich Presence 2019-06-19 23:02:57 +02:00
Matt 881b7012ac
Bump up network version 2019-06-19 03:29:46 +02:00
Matt df30d5d9bc
Fix MarketingCampaignFlags::FIRST_WEEK not being imported/exported with sv6 2019-06-19 03:20:19 +02:00
Matt 0a4fa68138
Fix money effect having random position in multiplayer 2019-06-19 03:18:58 +02:00
Michael Steenbeek bbd93f93cc
Increase maximum height of Hypercoaster to RCT1 limits 2019-06-18 21:44:06 +02:00
ζeh Matt 7c0f04903e Fix crash with truetype fonts and multi threading (#9424) 2019-06-16 17:43:53 +02:00
Hielke Morsink 6b7fee86bb Don't clear the screen to black for giant screenshots 
When certain viewport flags were set (underground view, hide base land,
hide vetical faces, clip view), the viewport would always be cleared,
including for giant screenshots.
 2019-06-16 16:42:21 +02:00
ζeh Matt 2044dbcad5 Fix #9324: crash trying to remove invalid footpath scenery 2019-06-16 13:40:15 +02:00
Hielke Morsink 84e7376aac
Merge pull request #9403 from duncanspumpkin/fix_9396 
Fix #9396. Pass the ghost flag to banner remove to prevent invalid removal
 2019-06-14 23:55:12 +02:00
Hielke Morsink b94cd2b30a
Fix campaign bugs (#9402 and #9411) (#9413) 
Fix campaign bugs (#9402 and #9411)
 2019-06-14 23:54:59 +02:00
duncanspumpkin a0b77c4bff return the value 2019-06-13 19:33:37 +01:00
duncanspumpkin 357273fe7d Refund the removal cost of banners on paths. 
Found a small bug in the banner removal on paths code
 2019-06-13 19:31:49 +01:00
aw20368 9effe21dd0 Fix #8602: Wall piece collision detection deviates from vanilla (#9414) 
Wall piece collision used the base height of the wall. Changed to use the clearance height.
 2019-06-13 20:03:53 +02:00
Gymnasiast 72c4baebda Fix #9411: Ad campaigns end too soon 2019-06-12 22:31:16 +02:00
Gymnasiast 3933e2ffc6 Fix #9402: Ad campaigns disappear when you save and load the game 2019-06-12 22:20:00 +02:00
Duncan e5972f8a67
Fix #9401, Fix #9387. Check for tile element before deref. (#9409) 
This fixes two crashes that can occur when surface elements are deleted. For normal play you should never delete a surface element as the game expects there to be a surface element on all usable terrain.
 2019-06-12 21:16:40 +01:00
duncanspumpkin 501e4ba3f9 Increment network version 2019-06-12 19:18:07 +01:00
duncanspumpkin 082f969fab Fix #9396. Pass the ghost flag to banner remove to prevent invalid removal. 
Previously this would never have happened because the old code would do a scenery ghost removal before calling anything else. I think this is a better way of handling it though and don't want to revert to the old method
 2019-06-12 19:17:29 +01: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
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
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
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
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
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
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
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 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
ζ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
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 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
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
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
ζ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
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
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
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
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
duncanspumpkin e9e445837f Add landset/buyrights action 2019-05-12 17:29:19 +01:00
Michael Steenbeek e5eea9d1fa
Merge pull request #9235 from ZehMatt/fix-util-rand 
Improve util_rand
 2019-05-12 13:50:19 +02:00
Ted John 15cb3e1889 Remove unnecessary new line characters from log calls (#9237) 2019-05-12 13:48:56 +02:00
Ted John 616fdfd96e
Merge pull request #9212 from IntelOrca/fix/2339-broadcast-lan 
Implement searching of local servers by broadcasting UDP packets.
 2019-05-12 12:07:56 +01:00
Matt eb3018b6a9
Fix warnings 2019-05-12 11:32:41 +02:00
Matt c6ea47c631
Make util_rand thread safe 2019-05-12 11:32:33 +02:00
Matt 5198df5c25
Improve generation of random advertisment key 2019-05-12 11:27:48 +02:00
Duncan 5da95e963d
Fix GameAction use during pause (#9242) 
* Use correct flag to allow action while paused.

Mistake made during implementing on GameActions

* Increment network version
 2019-05-12 09:54:21 +01:00
Ted John dd20ebad49 Make more methods const 2019-05-12 00:57:56 +01:00
Ted John 5e94f6385d Initialise hostname 2019-05-12 00:51:33 +01:00
Ted John 73b8310e8e Refactor creation of UDP socket 2019-05-12 00:51:33 +01:00
Ted John f8e3abcf4e Remove by-reference string_view 2019-05-12 00:51:33 +01:00
Ted John f0d1e9c320 Apply some of the code review comments 2019-05-12 00:51:33 +01:00
Ted John 3334d40da4 Explicitly use std::launch::async 2019-05-12 00:51:33 +01:00
Gymnasiast 6e6fe3c3c1 Replace optional.value() with *optional (fix Xcode compilation) 
Xcode cannot handle the optional.value() notation, but *optional
should mean the same.

Also see https://en.cppreference.com/w/cpp/utility/optional/operator*
 2019-05-12 00:51:33 +01:00
Gymnasiast 9b1321067b Use opt:: namespace 2019-05-12 00:51:33 +01:00
Ted John 52afcb795f Fix windows build 2019-05-12 00:51:33 +01:00
Ted John 47f48721e8 Fix clang build 2019-05-12 00:51:33 +01:00
Ted John 4b0f2bbceb Fix disable network / disable http builds 2019-05-12 00:51:33 +01:00
Ted John 20f52a8cbe Refactor TcpSocket and UdpSocket 2019-05-12 00:51:33 +01:00
Ted John 6a4791e39e Only reply to broadcasts with correct message 2019-05-12 00:51:33 +01:00
Ted John 59ddd7e1ea Get and broadcast to all broadcast address 2019-05-12 00:51:33 +01:00
Ted John 51117432f0 Improve status messages and prevent duplicates 2019-05-12 00:51:33 +01:00
Ted John 04c04d197e Refactor broadcasting code and logging 2019-05-12 00:51:33 +01:00
Ted John 4f0a733496 Sort by LAN servers 2019-05-12 00:51:33 +01:00
Ted John 3a400a2471 Refactor server list 2019-05-12 00:51:33 +01:00
Ted John 4437113805 Fix server list LAN address and port 2019-05-12 00:51:33 +01:00
Ted John 7a20874366 Fix Windows build 2019-05-12 00:51:33 +01:00
Ted John 123a8eacad Get the server list showing LAN servers 2019-05-12 00:51:33 +01:00
Ted John 694cb7eb3f Implement UDP socket and broadcasting 2019-05-12 00:50:13 +01:00
Ted John 5992b9f76e Add UDP socket class 2019-05-12 00:49:37 +01:00
Matt 2ea15ac146
Write server log as binary 2019-05-11 23:42:23 +02:00
Matt c1d6337e3b
Increase buffer size to avoid truncating text 2019-05-11 23:40:59 +02:00
Matt 6aa0e74d3e
Fix util_rand only returning 15 bit values. 2019-05-11 22:37:19 +02:00
Matt 9561567b6c
Bump up network version 2019-05-11 21:39:01 +02:00
Matt 7c7909fb45
Fix #2294: Clients crashing the server with invalid object selection 2019-05-11 21:39:01 +02:00
ζeh Matt c8f822ea70
Gamestate snapshots (#8819) 
* Add initial interface.

* Implement move operator in MemoryStream

* Add pod array serialisation traits.

* Add push_back with move semantics to CircularBuffer

* Initial implementation of GameStateSnapshots

* Add GameStateSnapshots to Context.

* Add mp_desync console command.

* Compare sprite data and fill change list.

* Minor changes.

* Proof of concept.

* Calculate offset instead of using offsetof

* Implement game state difference detection

* Update mp_desync console command.

* Fix identification of sprite remove/add.

* Fix crash when only one peep in park when using mp_desync

* Output state differences into user directory desync folder.

* Add desync debugging as an option.

* Add information to network status when a desync report was created.

* Cast to proper type for %llu.

* Update xcode project

* Add more information to the diffed data.

* Remove client-only relevant fields.

* Cleanup.

* Add better name output for misc sprites

* Add srand0 and tick information to the output

* Bump up network version

* Cleanup

* Set desync_debugging to false as default

* Apply suggestions
 2019-05-11 21:31:34 +02:00
ζeh Matt 1f6c7c9942 Fix false positive desync when changing map during network play 2019-05-11 18:27:09 +02:00
Ted John 7074d6f3ae Apply review suggestions 2019-05-11 13:57:18 +01:00
Tom Lankhorst ed353faccf Implement replace_if condition lambda 
Fix include typo and CS
 2019-05-11 13:54:16 +01:00
Tom Lankhorst 744f2225ed Write platform tests 2019-05-11 13:54:16 +01:00
Tom Lankhorst bbd69496b4 Sanitize screenshot path 2019-05-11 13:54:16 +01:00
nexgenration ebefe5721b Fix #9198: Move vehicle invalidate to member function 
To further improve the readability of the codebase the vehicle_invalidate function is now a member function of rct_vehicle.
 2019-05-11 13:20:34 +01:00
Filip Gawin 6833da77e3 Simplify boolean expresions 2019-05-10 22:00:38 +02:00
Michał Janiszewski 7b71fe8acd Fix error value checked from ride_get_smallest_station_length (#8719) 
ride_get_smallest_station_length returns the int32_t::max instead of -1
on error.
 2019-05-08 22:34:41 +01:00
Michael Steenbeek da6794ad9e
Refactor second argument to move_sprite_to_list() 2019-05-08 22:11:51 +02:00
Gymnasiast 7f5c9622c0 Fix guests eating popcorn being drawn eating pizza 2019-05-08 20:57:20 +02:00
Gymnasiast 17ddd451db Fix tests, fix formatting 2019-05-07 20:04:07 +02:00
Gymnasiast 916b8c2705 Use more constants 2019-05-07 19:46:58 +02:00
Gymnasiast 212f425ff0 Rename variables, change signature 2019-05-07 19:34:50 +02:00
NexGenration 846011e21b another message here 2019-05-07 19:34:50 +02:00
NexGenration e6c88a05db Make peep generate a static member function 2019-05-07 19:34:50 +02:00
Ted John 0d0479f9b1
Merge pull request #8558 from richard-fine/feature/peep-inspector 
Peep debug tab
 2019-05-06 20:29:29 +01:00
Gymnasiast 2368fea91e Bump network version 2019-05-06 19:15:32 +02:00
Ted John a22f0a53fb Use localised strings for guest debug tab 2019-05-04 21:48:02 +00:00
Ted John 1d296242b4 Improve text colour 2019-05-04 14:09:15 +00:00
Richard Fine c4a449f47d Add new debugging tab to the Guest window 
Add a new tab to the Guest window which we can use to display debug information and tools for guests. At the moment it's blank and always visible; next step is to make it only show up when debugging tools are enabled.
 2019-05-04 14:08:37 +00:00
ζeh Matt cd8c67ddac
Implement SetCheatAction. (#8990) 
* Implement SetCheatAction.

* Bump up network version
 2019-05-04 15:28:38 +02:00
Ted John e84631c273
Fix #9204: Making screenshots from command-line is broken (#9206) 2019-05-04 13:22:01 +00:00
Hielke Morsink 5e9e7bcbe5 Fix: artifacts when changing ride type as client or using the in-game console (#9202) 2019-05-04 10:31:10 +00:00
Aaron van Geffen 0da35a599d
Merge pull request #9193 from Gymnasiast/optional-header 
Add `optional` header
 2019-05-03 10:45:50 +02:00
Aaron van Geffen f1b9c71524
Merge pull request #8687 from Xkeeper0/f/multiplayer-plus 
Multiplayer dropdown additions
 2019-05-02 22:53:50 +02:00
Tom Lankhorst 63a38412aa Add `optional` header 2019-05-02 22:53:19 +02:00
Duncan a6c2aed26d
Merge pull request #9059 from duncanspumpkin/banner_ga 
Implement Banner Place/Remove Actions
 2019-05-02 21:32:51 +01:00
Florian Will 8c109307cf Fix #8507: Incorrect change in vehicle rolling direction 
In OpenRCT2, when vehicles roll backward on a long, flat track piece,
they would eventually change their direction of movement and move
forward instead, after their velocity reached -4095. The acceleration
due to rolling resistance and drag changes to 0 at that point, which
caused the "implicit boost" up to a velocity of ~+32k (close to 2km/h)
to trigger.

The behavior is different in vanilla RCT2, where vehicles just keep on
very slowly rolling backwards.

This commit disables the "implicit forward boost" for vehicles rolling
backward to mimic vanilla RCT2 behavior.
 2019-05-02 22:22:59 +02:00
Ted John 4746051d1b
Merge pull request #8814 from tomlankhorst/link-threads 
Always link threads, fix linking cURL
 2019-05-02 19:40:04 +00:00
Duncan 48bf5e10f3
Increment network version 2019-05-02 20:20:20 +01:00
duncanspumpkin f0df14bb0f Use BannerIndex type 2019-05-02 17:50:04 +01:00
duncanspumpkin 7f42824642 Update game.h 2019-05-02 17:47:01 +01:00
duncanspumpkin d14637e1ca Fix narrowing and formatting 2019-05-02 17:47:01 +01:00
duncanspumpkin f6b610c325 Implement Banner Place/Remove Actions 2019-05-02 17:47:01 +01:00
Aaron van Geffen 57040c392c Change multiplayer toolbar image to framed globe, with pressed state. 2019-05-02 12:32:45 +02:00
Ted John 39123f68eb Fix #5889: Giant screenshot does not work while using OpenGL renderer 2019-05-02 00:07:43 +00:00
Ted John f842d8a693 Fix #5103: OpenGL: ride track preview not rendered 2019-05-02 00:07:43 +00:00
Xkeeper 7e6bed39d4 Fix z->s and DISABLE_NETWORK support 2019-05-02 00:30:30 +02:00
Xkeeper c075eec224 Update sync icons, new multiplayer toolbar button 
The multiplayer toolbar button is the same globe used for the
multiplayer option on the title screen, since it seems like
a nicer (and better?) looking option than the two riders.

Also conflicts less with the new sync icons.
 2019-05-02 00:30:30 +02:00
Xkeeper 8c4de40239 Add graphics for desync notice 2019-05-02 00:29:25 +02:00
Xkeeper bc8ecd8e67 Add "Reconnect" option under the multiplayer button 2019-05-02 00:26:37 +02:00
Xkeeper d614fb4035 add network indicators for desync/player count 2019-05-02 00:22:03 +02:00
Aaron van Geffen 6098c1c3cc
Merge pull request #8659 from Xkeeper0/f/better-sign-tooltips 
Better tooltips for banners and signs
 2019-05-02 00:21:26 +02:00
Aaron van Geffen df42cfe1e1
Change map toolbar icon with current rotation (#9154) 2019-05-02 00:07:20 +02:00
Xkeeper 51593c540a Fix ride entrance hut banner issue 
This fixes the problem where the ride entrance hut
banner would show a nonsense number after auto-named
rides based on the amount the text had scrolled.
 2019-05-01 23:59:09 +02:00
Xkeeper 100ee139f5 Update code style with clang-format 2019-05-01 23:59:09 +02:00
Xkeeper 877ce58f0b Update sign tooltip to use STR_NO_ENTRY 
Changes the number of the sign tooltip string
and removes the now-duplicate "no entry" string
 2019-05-01 23:58:38 +02:00
Xkeeper c6a4316bd4 Update banner formatting code/strings 
Changes some things to use STR_BANNER_TEXT_FORMAT and removes
instances of " - - " attached to other strings in the
localization files.

This can be used in the future to show the messages on
a sign or banner via a tooltip without having to
duplicate those messages without " - - ".
 2019-05-01 23:57:07 +02:00
Xkeeper a1454be336 Add new localizable strings for sign tooltips 
re: OpenRCT2/OpenRCT2#8593

These strings use high IDs right now and are probably
not entirely suited for direct inclusion. There is also
some duplication in that "No entry" had to be unique,
as the actual no entry string is "No entry - -".
 2019-05-01 23:57:07 +02:00
ζeh Matt 181a722c3b Fix game action errors not showing if no round trip was done (#9175) 2019-05-01 22:53:10 +02:00
Duncan 1e1d263dae
PlayerSetGroupAction (#9072) 
* First pass at action.

* Version 2. Do all the work in Network.cpp

* Mark game command as complete

* Make requested changes

* Increment of network version
 2019-05-01 16:54:12 +01:00
ζeh Matt c5b66c0294 Fix #9152: Spectators can modify ride colours 2019-04-29 20:08:09 +02:00
Michael Steenbeek c8df801e66
Create ShopItemDescriptor 2019-04-26 20:25:11 +02:00
Michael Steenbeek 57201c12db
Merge pull request #9128 from Broxzier/feature/6116-tile-inspector-colour-scheme 
Expose colour scheme in the tile inspector (#6116)
 2019-04-24 19:42:12 +02:00
Michael Steenbeek b2535ba35a
Merge pull request #9117 from Gymnasiast/fix/7729 
Fix #7729: Money Input Prompt breaks on certain values
 2019-04-24 19:41:24 +02:00
boucks b052c4ac61 Fix #9054: remove gSceneryTileElement by returning it within GameActi… (#9127) 
* Fix #9054: remove gSceneryTileElement by returning it within GameActionResult

* fixing Clang-format issues

* fixing clang-format

lets try this again...

* fixing clang-format

alright should be good this time

* fixing clang-format issues

using automatic clang-formatting

* initializing tileElement
 2019-04-24 09:42:00 +01:00
Duncan 3f4acd7e69
Merge pull request #9120 from Gymnasiast/fix/8079 
Fix #8079: Crash when unloading buggy custom rides
 2019-04-23 18:28:34 +01:00
Nicole d38fb6a7a2 Fix #8800: ensure tile_element_height is used correctly (#9087) 
* Changed calls to tile_element_height to tile_element_water_height

* Changes to calls to tile_element_height

* Removed tile element_height, map_get_highest_land_height, and map_get lowest_land_height

3 functions removed due to relocation.

* Added function tile_element_height back to map.cpp

Added tile_element height back to map.cpp. Was unnecessarily deleted.

* Update Map.h

* water_height changes

* Update Scenario.cpp

* Update Scenario.cpp

* Fix 8800: applied clang format

* Removed unnecessary ANDs
 2019-04-23 18:26:48 +01:00
Gymnasiast 6d3eca31fd Add log_verbose for vehicle entries with broken peep loading positions 2019-04-22 23:27:25 +02:00
Hielke Morsink ac7bc97736 Expose colour scheme in the tile inspector (#6116) 2019-04-22 15:49:09 +02:00
Trevor Harkness 700ebe646f Add new class in SmallSceneryPlaceAction def 
Change to definition to refer to created SmallSceneryPlaceAction subclass instead of GameActionResult
 2019-04-22 02:33:46 -04:00
duncanspumpkin cc2da47271 Fix parameters 2019-04-21 20:06:55 +01:00
duncanspumpkin 228628b702 Undo 2nd mistake 2019-04-21 19:59:37 +01:00
duncanspumpkin 90a04e2758 Undo mistake. Remove pointless parameter 2019-04-21 19:56:18 +01:00
Duncan 46844e2218
Merge branch 'develop' into issue-9053 2019-04-21 19:50:20 +01:00
Gymnasiast ec6b738317 Fix #8079: Crash when unloading buggy custom rides 2019-04-21 12:13:04 +02:00
Hielke Morsink bcaa856911
Merge pull request #9089 from Broxzier/bugfix/9083-ghost-banner-index 
Fix #9083: Wrong sign index is set for clients
 2019-04-21 10:26:05 +02:00
Michael Steenbeek 5a906b2378
Port more functions to Ride struct (#9119) 2019-04-20 22:22:39 +02:00
Michael Steenbeek 42a1a8704d
Use empty() for vectors; clean up bool comparisons (#9118) 2019-04-20 20:39:47 +02:00
Gymnasiast 61a402b913 Fix formatting 2019-04-20 19:19:33 +02:00
hokasha2016 6022521118 Fix #7871: String::StartsWith() returns true if source is shorter than match 2019-04-20 18:55:27 +02:00
Gymnasiast 28ad78f204 Allow entry of numbers up to 10 million in string_to_money 2019-04-20 18:42:06 +02:00
Gymnasiast abf416a5a9 Fix string_to_money rounding errors in 4.10, 5.10... 2019-04-20 18:37:50 +02:00
Hielke Morsink 71af88fc5c Bump network version 2019-04-20 14:47:45 +02:00
duncanspumpkin 8035127acd Allocate banner index in the constructor. 
Note this does not fix the issue as ghosts still break placement
 2019-04-20 00:05:04 +02:00
Trevor Harkness 0dfa079002 Fix remaining formatting issue 
Remaining formatting error adjusted in SmallSceneryPlaceAction for CI tests
 2019-04-19 02:38:38 -04:00
Trevor Harkness 844a28f3f5 Fix formatting and added to contributors.md 
Adjusted formatting for CI tests
 2019-04-19 02:18:55 -04:00
Trevor Harkness 6df19daa02 Remove comments from subclass 2019-04-17 23:03:37 -04:00
Trevor Harkness 8cb50432de Fix #9053. Remove instances of gSceneryGroundFlags 
Created subclass of GameActionResult in LargeSceneryPlaceAction and SmallSceneryPlaceAction. Removed references to global variable in other files.
 2019-04-17 22:55:37 -04:00
Hielke Morsink 70fc620ebe Fix #9083: Wrong sign index is set for clients 
This issue was caused by the ghost for banners, which already create an entry on the banner. The game command is then received while the ghost still exists, giving the placed banner another ID.
This fix is basically a copy of the fix that is also `game_do_command_p` that tackles this same issue.
 2019-04-16 20:26:42 +02:00
Florian Will 6e9a9448a2 Fix format issue, second attempt 
Let's see if I can get this right.
 2019-04-15 16:10:57 +02:00
Florian Will 35ff10e480 Fix format issue and add myself to contributors.md 2019-04-15 15:51:01 +02:00
Florian Will eb6ea8e81d Fix #5893: Invalidate widget only if it's visible 
Remove the widget_invalidate() call after changing a guest's
guest_heading_to_ride_id, because that call fails a debug assertion if
the guest window is open and the currently active tab is not the
"overview" tab. In Release builds (if assertion is disabled),
widget_invalidate() might access the widgets array out of bounds.

Instead, introduce a new flag PEEP_INVALIDATE_PEEP_ACTION for
window_invalidate_flags in the peep struct and set that flag. The guest
window update function then makes sure to invalidate the label if the
flag is set.

The flag could be used in other places to reduce libopenrct2 dependency
on window_*() calls (see #6808), but this commit only cares about cases
where the assertion would fail.
 2019-04-15 14:26:33 +02:00
Duncan 2515f8d6d2
Merge pull request #9082 from duncanspumpkin/fix_9079 
Fix 9079
 2019-04-09 20:05:38 +01:00
Duncan e01b5f908a
Merge pull request #9070 from ZehMatt/fix-9068 
Fix #9068: Unable to place staff or peeps during multiplayer
 2019-04-09 20:05:21 +01:00
duncanspumpkin 0ffa6d1ae5 Increment network version 2019-04-09 18:46:31 +01:00
duncanspumpkin e2e4c1d942 Fix #9079. Null derference checked for when getting banner element. 
Unsure how the save managed to get in this state
 2019-04-09 18:39:33 +01:00
duncanspumpkin 2e104a00c8 Increment network version 2019-04-08 17:19:58 +01:00
duncanspumpkin d6522f0aee Fix formatting 2019-04-08 17:19:52 +01:00
duncanspumpkin d40a22e32b Make suggested changes 2019-04-07 15:11:03 +01:00
duncanspumpkin b7c3324bae Include missing include 2019-04-07 14:55:08 +01:00
duncanspumpkin baad532c17 Fix formatting 2019-04-07 14:55:08 +01:00
duncanspumpkin 00cbd75641 Return more useful error messages. 
Fix clearance checks always being on for underground placement
 2019-04-07 14:55:08 +01:00
duncanspumpkin d63919c0cc Implement LargeSceneryPlaceAction 2019-04-07 14:55:07 +01:00
Matt 7c901addc6 Fix #9068: Unable to place staff or peeps during multiplayer 2019-04-07 14:12:23 +02:00
duncanspumpkin 57efe286cf Increment network version 2019-04-07 12:24:02 +01:00
duncanspumpkin 008ed86bca Make requested fixes 2019-04-07 12:02:04 +01:00
duncanspumpkin aa65e25c6b Implement banner set style action 2019-04-07 10:10:36 +01:00
duncanspumpkin 3593366e95 Implement banner set colour action 2019-04-07 09:22:39 +01:00
duncanspumpkin 5ab42488a9 Implement large scenery set colour action 2019-04-07 09:22:33 +01:00