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

1293 Commits

Author SHA1 Message Date
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
Hielke Morsink b51f6a4d90 Use case-insensitive compare for soring ride and vehicle types (#9229) 2019-05-11 12:06:29 +01:00
Filip Gawin 6833da77e3 Simplify boolean expresions 2019-05-10 22:00:38 +02:00
Ted John 710da039a4 Show ghost elements as white on mini-map 
Also fixes refresh of map when using OpenGL drawing engine
 2019-05-08 21:37:33 +01:00
Mikroscopic 80a9cf8670 Fix ghost objects rendering on minimap 2019-05-08 21:36:31 +01: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
Ted John a22f0a53fb Use localised strings for guest debug tab 2019-05-04 21:48:02 +00:00
Ted John f50695fc9b Refactor guest window resize 2019-05-04 16:23:29 +00:00
Ted John a90a86562d Refactor guest widget lists 2019-05-04 15:01:51 +00:00
Ted John 7c2708746e Re-draw debug tab every tick 2019-05-04 14:53:25 +00:00
Ted John c13bd04954 Refactor invalidate methods 2019-05-04 14:40:45 +00:00
Ted John 1d296242b4 Improve text colour 2019-05-04 14:09:15 +00:00
Ted John b4a2a94520 Fix build 2019-05-04 14:08:37 +00:00
Richard Fine 480f19c0c6 Add parens to fix operator precedence issue 
I missed one... thankfully the CI did not.
 2019-05-04 14:08:37 +00:00
Richard Fine 9bb68a7151 Pull window width into temporary variable 
As suggested in review, it's a little easier to read this way.
 2019-05-04 14:08:37 +00:00
Richard Fine b714f7b0e2 Use constexpr instead of const 
For a static constant integer value, it's stylistically clearer to use constexpr instead of const. The resulting variable is implicitly const, but is also guaranteed to have a compile-time-computable value.
 2019-05-04 14:08:37 +00:00
Richard Fine 97bcc53637 Eliminate itoa and use correct format specifiers 
Use snprintf instead of _itoa as it's not available on all platforms. Also change the format specifies for unsigned variables to %u instead of %i, to be more correct...
 2019-05-04 14:08:37 +00:00
Richard Fine 397b044588 Use safe_strcat instead of strcat_s 
strcat_s is not available on all platforms, and we have a utility in the codebase that does basically the same thing already.
 2019-05-04 14:08:37 +00:00
Richard Fine cfda3fb8f7 Use sizeof(buffer) instead of hardcoded size 
Use sizeof(buffer) instead of repeating 4096 in a bunch of places. Also, 4096 was maybe a bit overkill, drop it down to 512 instead.
 2019-05-04 14:08:37 +00:00
Richard Fine 8bf72ceadb More peep pathing info 
Show more peep debug data in the Guest debug tab, mostly to help with understanding pathfinding behaviour.
 2019-05-04 14:08:37 +00:00
Richard Fine 7300a38ce6 Show peep coordinates in debug tab 
As a first debug stat to show, display a peep's current coordinates in the debug tab
 2019-05-04 14:08:37 +00:00
Richard Fine 70c61d5ac6 Fix guest window width for debugging tab 
Introduce a named constant for the width of a tab in the Guest window, and touch the places that set the window width to add it to the minimum window width when the debugging tab is enabled, so that the tab doesn't render off the side of the window.
 2019-05-04 14:08:37 +00:00
Richard Fine 5ef07ab936 Formatting 2019-05-04 14:08:37 +00:00
Richard Fine fa63691d17 Disable guest debug tab when debug tools not turned on 
Disable the debug tab in the guest window when the debugging tools are not turned on, causing it to be completely hidden from view.
 2019-05-04 14:08:37 +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
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 f1b9c71524
Merge pull request #8687 from Xkeeper0/f/multiplayer-plus 
Multiplayer dropdown additions
 2019-05-02 22:53:50 +02:00
Gymnasiast 72ca5ee3a4 Fix formatting 2019-05-02 22:44:47 +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
hokasha2016 6a6465498f Fix #7878: Scroll shortcut keys ignore SHIFT/CTRL/ALT modifiers 2019-05-02 21:42:05 +02: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 f842d8a693 Fix #5103: OpenGL: ride track preview not rendered 2019-05-02 00:07:43 +00:00
Xkeeper 4a34d2a6da Disable "Reconnect" if not desynced. 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 100ee139f5 Update code style with clang-format 2019-05-01 23:59:09 +02:00
Xkeeper a3106e4c4c Add sign tooltips to 3d signs 
For some reason, all signs report "Sign" as their text
before actually being modified. This also happens with the
tile inspector, so for now I'm not terribly worried about it
 2019-05-01 23:58:38 +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 8ac6c9e9de Tweak sign changes to match style guide 2019-05-01 23:57:07 +02:00
Xkeeper 8a674297eb Add sign tooltips that display the sign message 
re: OpenRCT2/OpenRCT2#8593

Modifies the code for tooltip displays to show the
string assigned to a banner. It also uses the
color assigned to the sign (by sheer coincidence).

As of right now I do not think that it works for
non-banner signs (such as the 3D landscapes or
scrolling signs etc), but it works for the typical
case of banners, as well as "No entry" banners.
 2019-05-01 23:57:07 +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
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
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
Hielke Morsink ac7bc97736 Expose colour scheme in the tile inspector (#6116) 2019-04-22 15:49:09 +02:00
Hielke Morsink d8f1933a5b Show dash for station index for non-station elements 2019-04-22 15:25:29 +02:00
Duncan 46844e2218
Merge branch 'develop' into issue-9053 2019-04-21 19:50:20 +01: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
Liam Parker 82c73e18c7 Fix #9067 - Prices rendering in unlimited money game state 2019-04-20 18:10:15 +02: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 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
Florian Will 0d3f287447 Add changelog entry, minor code improvements 2019-04-15 19:11:30 +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
duncanspumpkin d6522f0aee Fix formatting 2019-04-08 17:19:52 +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
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
duncanspumpkin 8ef5afe2ce Implement wall set colour action 2019-04-06 19:39:01 +01:00
duncanspumpkin 8fc1d70239 Implement small scenery set colour action 2019-04-06 19:39:00 +01:00
duncanspumpkin 787993c117 Fix #9062. Pass the correct flag for ghosts. 2019-04-06 18:16:24 +01:00
duncanspumpkin 356a0e5e91 Rework flags 2019-04-04 19:23:44 +01:00
duncanspumpkin 561ce03d18 Fix formatting 2019-04-04 19:23:44 +01:00
duncanspumpkin 30a5194085 Use a vector for map selection tiles 2019-04-04 19:23:44 +01:00
duncanspumpkin 086e60dd1d Save changes 2019-04-04 19:23:43 +01:00
hokasha2016 dc90b2873a Sort files in logical rather than dictionary order (#9012) 2019-04-03 00:16:47 +02:00
Michał Janiszewski 2fb31910ca
Merge pull request #8481 from ZehMatt/multicore-rendering 
Implement partial multicore rendering
 2019-04-02 22:08:46 +02:00
duncanspumpkin 7e6254f30c Fix function. 2019-04-02 18:36:57 +01:00
duncanspumpkin 29f5018bd1 Implement wall place game action 2019-04-02 18:36:57 +01:00
Duncan 89330703e0
Merge pull request #9011 from Gymnasiast/fix/path-preview 
Fix path preview
 2019-04-01 21:48:03 +01:00
Gymnasiast 9839bb7bba Fix path preview 
More work is needed to properly split the paths, but this will do for now.
 2019-04-01 21:58:57 +02:00
ζeh Matt 9a79ee8f14
Merge pull request #9004 from ZehMatt/fix-9000 
Fix #9000: Incomplete error message when placing track with insuffient money
 2019-03-31 13:27:25 -07:00
Michael Steenbeek b618bbdcd4
Implement GameAction for setting date 2019-03-31 19:48:51 +02:00
Matt 7ed35dea70 Fix #9000: Show correct error message if not enough money available 2019-03-31 19:04:47 +02:00
Michael Steenbeek e38efcbec4
Remove duplicate options in Cheats window 2019-03-31 16:24:18 +02:00
Matt ce9d252ce5 Use correct lock. 2019-03-31 15:50:55 +02:00
Matt 65ef018e4e Move paint_session_alloc and paint_session_free into Painter. 2019-03-31 15:50:55 +02:00
Matt 37c3809744 Implement partial multicore rendering 2019-03-31 15:50:55 +02:00
Michael Steenbeek 8d83f5a549
Merge pull request #8978 from Gymnasiast/refactor/inversions 
Close #8965: Refactor ride->inversions
 2019-03-28 20:28:35 +01:00
hokasha2016 70ae847a72 Fix #8219: Faulty folder recreation in "save" folder 2019-03-28 20:20:01 +01:00
duncanspumpkin 81307f71df Implement LandSmoothAction 2019-03-27 18:48:26 +00:00
Gymnasiast 64e51cd34b Close #8965: Refactor ride->inversions 2019-03-27 11:30:18 +01:00
Michał Janiszewski dff1ebaf21 Apply better guards for download queueing (#8864) 
Follow-up to #8821.
Use mutex to synchronize access rather than make the bool atomic to
avoid TOCTOU issues.
 2019-03-26 22:46:08 +00:00
Joshua Tucker c09f283c25 Fix #8468: Removed code incorrectly increasing tile height 2019-03-26 12:10:46 -04:00
Michael Steenbeek c841ee31e7
Remove more remains of scenario description from Object Selection window 2019-03-25 17:21:53 +01:00
Ben Hopkins c537f87fd5 Add scenery picker shortcut 2019-03-24 22:45:42 +01:00
Duncan 791c3059f6 Add ParkEntranceRemove GameAction 2019-03-24 21:41:14 +01:00