mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,968 Commits 8 Branches 39 Tags 360 MiB
Commit Graph

1857 Commits

Author SHA1 Message Date
Goddesen 809e459495 Added cheat to disable plant aging 2016-06-03 00:33:15 +02:00
Ted John 27d846c2f4 fix #3786: Wrong server provider information 2016-05-31 19:24:07 +01:00
Ted John c66a755ef7 request server gameinfo for window 2016-05-31 17:16:08 +01:00
Ted John 7157199b45 add information tab to multiplayer 2016-05-31 17:16:08 +01:00
Ted John feb65ea93c add option to log chat history 2016-05-30 18:01:17 +01:00
Duncan 8e8474c400 Modify object selection to only research selected item when adding new objects during a game. (#3762) 2016-05-28 09:30:31 +01:00
Ted John 6acbfa0248 sort multiplayer servers 2016-05-27 22:17:26 +01:00
Ted John 62636f39b6 move allow known keys option to new tab... 
on multiplayer window
 2016-05-27 20:28:34 +02:00
Ted John 7b09b16255 use a different image for permissions tab 2016-05-27 20:28:34 +02:00
Michał Janiszewski 80a90624b9 Add option to only allow known keys to login 2016-05-27 20:28:34 +02:00
Yaroslav Tretyakov 8ee923f33d Fix #3735: Advertisement campaign window bug (#3745) 2016-05-26 19:43:53 +01:00
jensj12 f4690fb879 Remove duplicate check (#3743) 2016-05-26 15:56:57 +01:00
CraigCraig 3f9afb9744 Various Spellchecks (#3741) 2016-05-26 09:49:19 +02:00
Marijn van der Werf a96ccbf21c Add shortcut for switching between paint modes (#3714) 2016-05-24 19:59:37 +01:00
Hielke Morsink 15f3dcefd9 Fixes #3635 - Crash when inspecting paths (#3712) 2016-05-23 19:11:35 +01:00
Ted John 25ac99e04a add variable for gS6Info 2016-05-20 23:26:19 +01:00
Martin Černáč 4d5b9c97fd Fix #3685. Also refactor related enum value. (#3686) 2016-05-20 22:29:33 +01:00
Martin Černáč 4944fe1836 Fix a Copy-paste induced mistake (#3679) 2016-05-20 09:49:08 +01:00
Martin Černáč 6e9d1bf1ea Refactor more string & sprite hard-coded ids (#3670) 2016-05-19 18:22:24 +01:00
Martin Černáč c8b8f0f226 Refactor and add better operation-mode bound checks (#3600) 2016-05-19 18:21:36 +01:00
Martin Černáč 01edc0ff19 Fix #3661 (#3662) 2016-05-19 07:55:41 +01:00
Ted John 3fd252a8c3 integrate some staff variables 2016-05-18 23:46:46 +01:00
Duncan 163c695a13 Merge pull request #3538 from marijnvdwerf/paint-setup/submarine-ride 
Paint Submarine Ride
 2016-05-18 22:06:03 +01:00
Ted John 16dbed03b5 Merge pull request #3498 from marijnvdwerf/paint-setup/wall 
Paint walls/fences
 2016-05-18 22:04:44 +01:00
Marijn van der Werf 1bf9dc26f9 Rename entrance flags to base_image_id 2016-05-18 23:00:26 +02:00
Ted John dd03cfc36f integrate more ride entrance / exit place variables 2016-05-18 21:52:39 +01:00
Martin Černáč 3bdc06dc25 Refactor hard-coded strings to use string_ids.h constants (and couple sprites too) (#3658) 2016-05-18 21:51:37 +01:00
Marijn van der Werf 44021fdb0a Rename flag 2016-05-18 22:46:24 +02:00
Martin Černáč 2b6770bfad Fix redundat separator in ride's measurement & test data window tab (#3654) 2016-05-18 21:04:57 +01:00
Ted John d27658ca27 integrate entrance / exit place variables 2016-05-18 20:50:45 +01:00
Martin Černáč feed51de27 Add correct tooltip entry for the no. circuits (#3650) 2016-05-18 12:56:30 +01:00
Ted John 8efe699754 integrate gMapTooltipFormatArgs 2016-05-18 00:02:26 +01:00
Ted John 8d4e4ed0e9 remove unread RCT2_GLOBALs 2016-05-17 23:39:37 +01:00
Ted John 51f01c3341 use set_format_arg instead of RCT2_GLOBAL 2016-05-17 23:29:33 +01:00
Ted John c879638f22 integrate ground flag variables 2016-05-17 20:51:11 +01:00
Ted John 52a92fa6f1 fix #3623: initialise _loadedTrackDesignIndex to UNLOADED 2016-05-17 19:55:07 +01:00
Ted John eb19ca8626 integrate variable: gFootpathPrice 2016-05-16 19:05:37 +01:00
Ted John 0293218890 fix #3633: scenery tool, CTRL does not work correctly 2016-05-16 18:24:36 +01:00
Ted John cbf9a393f1 remove use of get_format_arg 
Because of strict aliasing, we must use memcpy in some cases.
 2016-05-15 22:40:25 +01:00
Ted John 1cc35dfe6e integrate common format args 2016-05-15 22:03:53 +01:00
Ted John 6df1b9ac98 stop resetting the selected footpath 
Fixes #2931 - in multiplayer when client joins
Fixes #3606 - on autosave
 2016-05-15 19:08:02 +01:00
Ted John 2fadc8d2be remove redundant global usages 2016-05-15 17:19:32 +01:00
Ted John 72957660ef integrate window scenery variables 2016-05-15 17:16:21 +01:00
Ted John 5fe612acd7 integrate scenery place variables 2016-05-15 17:10:25 +01:00
Ted John 6f7db1f9b6 rename rct_path_type to rct_footpath_entry 2016-05-15 16:11:34 +01:00
Ted John 3d47f9869f write get entry methods for scenery and path 2016-05-15 16:09:26 +01:00
Hielke Morsink 8c1395bd46 declaring local variables where needed instead of at the top (#3599) 2016-05-15 10:25:24 +01:00
Ted John 81efb92d53 integrate map selection variables 2016-05-14 00:54:13 +01:00
Ted John 3fcb337c7b integrate variable: gWindowMapFlashingFlags 2016-05-13 22:51:16 +01:00
Ted John b58766aa3f clean up the logo and make it scalable 
- fixes #1776: graphical glitches on intro
- fixes #708: screen turns white when resizing intro
 2016-05-13 21:36:07 +01:00
janisozaur ca430e1b23 Drop unused variables (#3586) 2016-05-13 18:21:58 +01:00
janisozaur feb140b84c Revert part of last commit unsuitable for older compilers (#3584) 
Also initialise all the items in gResearchedTrackTypesA and
gResearchedTrackTypesB
 2016-05-13 10:36:24 +01:00
janisozaur 87d05f8a89 Fix compiler warnings (#3583) 
Includes:
* type casting
* properly counting fields to initialise
 2016-05-13 08:05:12 +01:00
janisozaur 658e877955 Name all the typdef-ed structs (#3581) 2016-05-12 22:57:40 +01:00
Ted John 0f1028c92c add global for gResearchedSceneryItems 2016-05-11 19:41:33 +01:00
marcovmun d979e2b607 Scenery window scrolls wrongly fixes #3210 (#3215) 2016-05-10 20:58:24 +01:00
Ted John aa929e1593 add globals for researched things, cleanup 2016-05-10 00:00:59 +01:00
Ted John 5162bc5a0e add global macro for a few ride variables and expenditure table 2016-05-09 22:11:56 +01:00
Ted John 3c3a37073d add global macro for gSamePriceThroughoutPark 2016-05-09 21:18:44 +01:00
Ted John 275f7c6723 add global macro for gCurrentExpenditure, gCurrentProfit 2016-05-09 21:12:01 +01:00
Ted John 3105d62d3b add global macro for gTotalAdmissions, gTotalIncomeFromAdmissions 2016-05-09 21:05:17 +01:00
Ted John be2d1127f5 add global macro for gResearchLastItemSubject 2016-05-09 20:38:26 +01:00
Ted John d2c5501eea refactor sprite heads and counts 2016-05-09 00:08:03 +01:00
Ted John 5ccfd83dea add global macro for gScenarioTicks 2016-05-08 23:20:42 +01:00
Steven Vascellaro dbb64f8ea3 Added additional tooltips for options menu (#3394) 
Added tooltips for every selectable item in the options menu, as well as some minor variable renaming and vertical alignment
 2016-05-08 17:22:48 +01:00
Ted John 87d4a9dab9 use track rather than tracks for user directory 2016-05-08 14:04:12 +01:00
Ted John 70d613ede2 prevent crash in some place track design case 2016-05-08 14:04:10 +01:00
Ted John d4c30ea5ec fix warnings 2016-05-08 14:04:09 +01:00
Ted John 6797753e18 refactor track_place_ride 2016-05-08 14:04:04 +01:00
Ted John f9074485f9 integrate more variables 2016-05-08 14:04:04 +01:00
Ted John cbc1848db4 refactor track design save: _trackSavedMapElements 2016-05-08 14:04:00 +01:00
Ted John c0fa762fa5 integrate some unknown variables 2016-05-08 14:04:00 +01:00
Ted John 9afdd7b514 refactor track_design_draw_preview 2016-05-08 14:03:58 +01:00
Ted John 7c0d3a9077 fix install track 2016-05-08 14:03:57 +01:00
Ted John 231ea9e97c fix rename and delete track design 2016-05-08 14:03:56 +01:00
Ted John f4f8801f2b fix memory issue and add variable for scenery toggle 2016-05-08 14:03:55 +01:00
Ted John feb34660e3 fix up track manage window 2016-05-08 14:03:54 +01:00
Ted John a19e5feadf fix track design mirror and ride name 2016-05-08 14:03:53 +01:00
Ted John 02a979cad5 refactor track design functions 2016-05-08 14:03:52 +01:00
Ted John 993ef35508 reduce use of gActiveTrackDesign 2016-05-08 14:03:51 +01:00
Ted John f00d7daef5 fix track design preview, place and refactor 2016-05-08 14:03:50 +01:00
Ted John 3c95562efd fix new ride design count and track design listing 2016-05-08 14:03:49 +01:00
Ted John 1908743c71 refactor track save, move into own source 2016-05-08 14:03:49 +01:00
Ted John 77e7313540 move track design related functions to new source 2016-05-08 14:03:48 +01:00
Ted John e9935fee09 refactor some of the track design place code 2016-05-08 14:02:48 +01:00
Ted John 68520765fc attempt to pass TD6 more for preview 
Currently breaks preview.
Construction kind of works but has bad settings and crashes for some ride types
 2016-05-08 14:02:48 +01:00
Ted John b2cc98da91 change track list window to use new index 2016-05-08 14:02:47 +01:00
Ted John ae526f96d7 Merge pull request #3486 from Gymnasiast/remove-station-length-limit 
Increase station length limit to 32
 2016-05-07 10:05:23 +01:00
Matte A 9421cc0bd4 Add shortcut for the Multiplayer window (#3509) 2016-05-06 21:14:49 +01:00
Gymnasiast 17626dbb1a Increase station limit to 32, fix display of plural 2016-05-06 18:30:44 +02:00
duncanspumpkin 72ca648135 Move painter functions into paint.c. Fix mistake in paint_attach_to_previous_ps 2016-05-04 18:54:42 +01:00
janisozaur 68bad6505c Add and correct licence headers to all sources (#3108) 2016-05-04 18:24:41 +01:00
Michael Steenbeek 142c54852d Clean up some residual usages of old config (#3484) 2016-05-03 22:36:29 +01:00
Patrick de Wit 13701660c9 Implement customizable toggle windowed mode shortcut (#3462) 
Implement customizable toggle windowed mode shortcut
 2016-05-03 20:07:33 +01:00
Patrick de Wit 60579932ef Fix overflow in ride_mode_tweak (#3478) 
Fixes #2529: Time overflow when unlocking dodgems' operating limits
Fixes #3424: Max. people on ride overflows when operating limit is unlocked
 2016-05-03 14:44:54 +01:00
Matte A 45234d1afb Add description for Disable train length limit and align the button (#3480) 2016-05-03 10:16:38 +02:00
Gymnasiast 5d0b79227f Clean up some magic values and refactor a bit 2016-05-03 07:25:19 +02:00
Michał Janiszewski 1cd1144dd5 Janitorial fixes 
Mostly style fixes, includes minor change to make sure spinner's down
button gets shown, update to string IDs, network version and making sure
correct string gets selected based on car count.
 2016-05-02 22:35:08 +02:00
X7123M3-256 4089538c78 Fix inconsistent spacing 2016-05-02 21:42:14 +02:00
X7123M3-256 0efd6ca88b Remove unused local variables 2016-05-02 21:37:10 +02:00
X7123M3-256 102521d131 Replace dropdowns with spinners 2016-05-02 21:37:09 +02:00
X7123M3-256 3a4139eea0 Prevent car count being incorrectly updated 2016-05-02 21:37:09 +02:00
X7123M3-256 fd5bb09271 Remove calls to ride_entry_get_train_layout and replace with calls to ride_entry_get_vehicle_at_position 2016-05-02 21:37:08 +02:00
X7123M3-256 34a67436cd Fix spacing around operator 2016-05-02 21:37:08 +02:00
X7123M3-256 9d618231fb Add disable train length limits checkbox to cheat window 2016-05-02 21:37:08 +02:00
X7123M3-256 35ccd0b8e1 Implement disable train length limits cheat 2016-05-02 21:37:08 +02:00
Patrick de Wit 7656cfdcbe Add rides amount to ride_list window. (#3461) 2016-04-30 17:12:12 +01:00
Gymnasiast f2a3c21beb Check if peep is guest or staff, refactor 2016-04-28 21:26:58 +02:00
Nubbie 339f0aba10 Make renaming staff use staff permissions, fixes #3243 2016-04-28 19:33:50 +02:00
Kradmoa d749848ff6 Fix missing Twister coaster piece. #3361 (#3369) 
Fix missing Twister coaster piece. #3361
 2016-04-27 18:54:07 +01:00
Nubbie 54f11e66cb Normalised tooltip string IDs (#3420) 
* Moving all 'TIP' to the end

Searched for all _TIP_ strings and moved them to the end as it's more efficient to find them that way+ Gymnasiast told me '>We always put TIP at the end'

* Changed the tip strings + fixed the spacings (#23)

* Fixing the comma

* Reverting changes to cheats.c to start over

* Add Re-named strings in Cheats.c + align desc.

This is the second attempt, this time I've just changed the strings to match `src/localisation/string_ids.h`, the only thing aligned is the descriptions with newly added tips that got miss-aligned
 2016-04-26 11:28:12 +01:00
Ted John 83acafe05a add global macros for research variables 2016-04-25 23:26:26 +01:00
Ted John 489ea66cc9 add global macro for gCurrentFontSpriteBase and gCurrentFontFlags 2016-04-25 23:00:58 +01:00
Ted John b1f704dac4 add global macros for more finance variables 2016-04-25 22:38:09 +01:00
Ted John 870a8b55e5 add global macros for viewport variables 2016-04-25 21:53:21 +01:00
Ted John 652b1c83db integrate variables for lightning and toolbar dirty flags 2016-04-24 21:49:09 +01:00
Nubbie 44a92e3f6b Explain what 'Advertise' means, fixes #3382 2016-04-24 21:24:28 +02:00
Ted John cea0f30121 integrate variable: gLandToolSize 2016-04-24 18:02:37 +01:00
Ted John 1fcefcfa7e integrate variables for water tool 2016-04-24 17:58:26 +01:00
Ted John fc938892d8 integrate variables for command position and expenditure 2016-04-24 17:53:39 +01:00
Ted John b9944dd33a integrate land tool variables 2016-04-24 17:28:12 +01:00
Ted John 0f6e64ac76 add global macros for map size and tile loop 2016-04-24 14:00:26 +01:00
Ted John 5ccbf08ac9 add global macros for staff colours 2016-04-24 11:12:24 +01:00
Ted John 0ffca3a4fc use gPeepSpawns for remaining non-refactored usages 2016-04-24 11:01:19 +01:00
Ted John 6c25c85363 add variable pointers for park entrance position 2016-04-24 10:53:04 +01:00
Ted John 0a80e7a737 integrate pickup peep variables 2016-04-24 10:28:08 +01:00
Ted John 98f732aaf7 integrate screen variables (#3411) 2016-04-24 00:36:39 +01:00
Ted John a1150d31cf add global macros for more scenario variables 2016-04-23 18:07:07 +01:00
Ted John ef7dd83735 add pointer variables for scenario name and details 2016-04-23 17:53:25 +01:00
Ted John 6453bcbc46 Merge pull request #3406 from janisozaur/warnings 
Fix warnings in clang, gcc
 2016-04-23 14:08:27 +01:00
Michał Janiszewski 4f72b82ea0 Fix warnings in clang, gcc 2016-04-23 14:58:24 +02:00
Ted John ee509caf35 integrate game paused variable and refactor 2016-04-23 13:34:55 +01:00
Ted John 4cdb2df9dc integrate screen variables 2016-04-23 11:16:46 +01:00
Ted John 1950fad315 add global macros for date 2016-04-23 11:03:34 +01:00
Ted John 3bd21240ed add global macros for climate variables 2016-04-23 10:53:48 +01:00
Ted John 65d749de7b add global macro: gGuestChangeModifier 2016-04-23 02:51:38 +01:00
Ted John 467513616d add global macro: gCurrentTicks 2016-04-23 02:49:24 +01:00
Ted John 0c90c165a2 add global macro: gGuestInitialThirst 2016-04-23 02:38:51 +01:00
Ted John a819819ff4 add global macro: gGuestInitialHunger 2016-04-23 02:37:33 +01:00
Ted John 727a568e32 add global macro: gGuestInitialHappiness 2016-04-23 02:36:24 +01:00
Ted John 8509927dc7 add global macro: gGuestInitialCash 2016-04-23 02:35:03 +01:00
Ted John 66855e41e5 add global macro: gParkNameArgs 2016-04-23 02:28:11 +01:00
Ted John 463a2f4533 add global macro: gScenarioObjectiveCurrency 2016-04-23 02:23:17 +01:00
Ted John 1f6081c0d9 add global macro: gScenarioObjectiveNumGuests 2016-04-23 02:18:45 +01:00
Ted John 17f5d8cb48 add global macro: gScenarioObjectiveYear 2016-04-23 02:16:32 +01:00
Ted John 35e5c49454 add global macro: gScenarioObjectiveType 2016-04-23 02:14:14 +01:00
Ted John 5cb25c390f add global macro: gBankLoanInterestRate 2016-04-23 02:06:56 +01:00
Ted John 3c52983178 add global macro: gBankLoan 2016-04-23 02:00:44 +01:00
Ted John 11a2ba0133 add global macro: gCashEncrypted 2016-04-23 01:58:54 +01:00
Ted John 253f411075 add global macro: gCompanyValue 2016-04-23 01:53:35 +01:00
Ted John b4b3dc7dbe add global macro: gParkValue 2016-04-23 01:50:12 +01:00
Ted John 0971d8ad51 add global macro: gParkRating 2016-04-23 01:47:03 +01:00
Ted John fda4542d63 add global macro: gParkName 2016-04-23 01:40:11 +01:00
Ted John 2b702d89c6 add global macros: gLandPrice, gConstructionRightsPrice 2016-04-23 01:37:10 +01:00
Ted John 171388e9a3 integrate park entrance ghost variables 2016-04-23 01:21:00 +01:00
Ted John b59f5c17ca add global macros for park... 
- gParkSize
- gParkEntranceFee
- gNumGuestsInPark
 2016-04-23 01:00:00 +01:00
Ted John 307cb9e08b add global macro: gParkFlags 2016-04-23 00:51:22 +01:00
Ted John ddd0f07127 fix #3321: can't rotate pre-built rides 2016-04-22 23:59:16 +01:00
Ted John 25958b0d30 remove old RCT1 import code 2016-04-22 19:26:15 +01:00
Michał Janiszewski b7f9af41a8 Only initialize structs with compile-time consts 
See https://stackoverflow.com/a/32584666
 2016-04-21 22:20:24 +02:00
janisozaur 7eb3a90cea Fixes for values being shifted (#3362) 2016-04-20 23:57:54 +01:00
Gymnasiast 548bee8325 Fix formatting and rebase 2016-04-20 20:14:07 +02:00
Rune Laenen e0c103031e Add shortcut to mute sound 2016-04-20 19:56:57 +02:00
zsilencer e742e96461 Fix bug that gave error when trying to join saved server 2016-04-20 01:49:15 -06:00
zsilencer b257e431d9 Get rid of using user_strings for interface 2016-04-20 01:49:15 -06:00
Michał Janiszewski fb8646e66f Fix typo in variable name 2016-04-19 21:15:48 +02:00
Michał Janiszewski b2a3b82d08 Show network version to client if mismatched 
This will let players know which version should they be using to connect
to server. Also prevents users from even trying to join servers running
versions we already know are incompatible.
 2016-04-19 21:15:23 +02:00
Ted John cec7e54dd8 Merge pull request #3325 from Broxzier/rotate_map_elements 
Rotate map elements
 2016-04-19 19:37:19 +01:00
Michael Steenbeek b13d0aa2d3 Fix ride window height definition, fixes #3347 (#3348) 2016-04-19 19:08:24 +01:00
Hielke Morsink 2713c999c5 Cleaning up and updated changelog 2016-04-19 19:25:31 +02:00
Hielke Morsink d08dd70406 Static functions. 2016-04-19 19:25:29 +02:00
Hielke Morsink fd7fe4ed5a Fix redraw issue when clicking on a list item. 2016-04-19 19:25:28 +02:00
Hielke Morsink 6fbdb46d37 Enabling and disabling the rotation button based on selected element type. 2016-04-19 19:25:27 +02:00
Hielke Morsink 992a830622 Fix: Invalidating tiles correctly from the tile inspector. 2016-04-19 19:25:25 +02:00
Hielke Morsink 048b7ff30c Added button to reotate map elements in tile inspector - closes #3106 2016-04-19 19:25:24 +02:00
Derek Lee c4226235e3 Add cheat to disable littering 
Add cheat and increment NETWORK_STREAM_VERSION
 2016-04-18 23:34:10 -07:00
Yaroslav Tretyakov c3ba519a6e Integrate audio related variables (#3322) 2016-04-17 14:20:26 +01:00
Ted John e5666f214b Merge pull request #3313 from IntelOrca/integrate-ride-session-vars 
Integrate ride construction session variables
 2016-04-16 14:10:05 +01:00
Ted John 63f008566c Merge branch 'master' into develop 2016-04-15 23:25:45 +01:00
Ted John 7b248f0079 integrate ride construction variables 
- _currentTrackPrice
- _numCurrentPossibleRideConfigurations
- _numCurrentPossibleSpecialTrackPieces
- _currentTrackCurve
- _currentTrackEndX
- _currentTrackEndY
- _rideConstructionState
- _currentRideIndex
- _currentTrackBeginX
- _currentTrackBeginY
- _currentTrackBeginZ
- _currentTrackPieceDirection
- _currentTrackPieceType
- _currentTrackSelectionFlags
- _rideConstructionArrowPulseTime
- _currentTrackSlopeEnd
- _currentTrackBankEnd
- _currentTrackLiftHill
- _currentTrackCovered
- _previousTrackBankEnd
- _previousTrackSlopeEnd
- _previousTrackPieceX
- _previousTrackPieceY
- _previousTrackPieceZ
- _currentSeatRotationAngle
 2016-04-15 20:56:48 +01:00
Ted John 681961eaec change ride construction addresses to defines 2016-04-15 20:35:27 +01:00
Ted John f73e3ab0e1 integrate footpath construction variables 
- uint8 gFootpathProvisionalFlags
- rct_xyz16 gFootpathProvisionalPosition
- uint8 gFootpathConstructionMode
- uint16 gFootpathSelectedId
- uint8 gFootpathSelectedType
- rct_xyz16 gFootpathConstructFromPosition
- uint8 gFootpathConstructDirection
- uint8 gFootpathConstructSlope
- uint8 gFootpathConstructValidDirections

Also fix some previous variable integrations that had been forgotten to change.
 2016-04-15 19:16:48 +01:00
Ted John 84edd049d9 integrate current tool variables: 
- gCurrentToolId
- gCurrentToolWidget
 2016-04-15 18:26:47 +01:00
Ted John 1b3f46f960 integrate game command error string variables 
- gGameCommandErrorTitle
- gGameCommandErrorText
 2016-04-15 17:54:46 +01:00
duncanspumpkin 51ba0b2e1d Fix #3302. Max ride mode tweak has been broken since a refactor. 2016-04-14 20:27:09 +01:00
Duncan 9edd48c4b8 Merge pull request #3231 from marijnvdwerf/use-structs 
Clean up data use
 2016-04-13 12:38:58 +01:00
wolfreak99 1947b1dd30 require special permission for cluster building, closes #3045 2016-04-10 11:52:34 +01:00
IntelOrca 8494eb9ff3 fix ride list dropdown, re-regression of #2080 2016-04-09 14:04:09 +01:00
Nubbie 3017607521 Add 3 MORE descriptions for cheats 2016-04-06 18:08:14 +01:00
Nubbie 68d21e22a1 Improve descriptions for cheats 
Note: Language IDs have changed slightly
 2016-04-04 17:35:05 +01:00
Michał Janiszewski 83a543c86f Make sure shifted value can fit in uint32 2016-04-03 17:49:50 +02:00
Michał Janiszewski f5f2f62507 Cap dropdown items count to 64 2016-04-03 17:38:57 +02:00
Marijn van der Werf 0fd42f408a Extract new struct 2016-04-03 14:53:17 +02:00
Marijn van der Werf e4fadc5a66 Include struct at `0x0097DD78` 2016-04-03 13:56:06 +02:00
Ted John f02238e0a2 Merge pull request #3203 from marcovmun/Fix-3198 
Fix vehicles appearing separate in the research tree, fixes #3198
 2016-04-02 00:02:42 +01:00
Michał Janiszewski 888f485690 Allocate enough memory for server entries, fix #3144 2016-04-01 19:57:18 +02:00
IntelOrca 16527e749a remove network type from loadsave 
Fixes a crash that happened when loading a saved game from the start server window.
 2016-03-31 20:42:21 +01:00
IntelOrca 40fcfbb405 use localised strings for native file dialogs 2016-03-31 20:41:49 +01:00
IntelOrca d865e4d453 pass better data in struct to file dialog function 2016-03-31 20:41:47 +01:00
Marco van Munster 8db1f27534 Fix bug 3198 different vehicles research tree 2016-03-30 22:33:26 +02:00
IntelOrca 966291eda2 fix #3186: stop auto opening shops causing problems (once and for all) 2016-03-27 19:34:35 +01:00
IntelOrca d690ee6423 fix #3183: opening ride with construction window open 
Issue caused with boat hire rides as there is usually a ghost station present when the construction window is open. This causes vehicles to be created in the ghost station. Fixed by closing the construction window before the vehicles are created for the ride.
 2016-03-27 14:18:20 +01:00
IntelOrca 74d96d86c0 fix #3158: close network status window doesn't abort 2016-03-22 23:27:49 +00:00
IntelOrca 304fd4b84e validate all the other ride operation settings 2016-03-22 21:59:16 +00:00
IntelOrca 16e8609da3 add constants for ride setting id 2016-03-22 21:32:37 +00:00
duncanspumpkin 8c7dfd3097 Revert #3147 and fix construction issue. Revert most of c7c1f86 and rework to prevent issues 2016-03-21 21:21:43 +00:00
IntelOrca 1daa657657 fix #3091: Korean words corrupted if over byte limit 2016-03-10 18:48:00 +00:00
IntelOrca d03c4de327 fix #3120: negative cash in finance window is not red 2016-03-09 23:31:49 +00:00
Ted John 09f0caf8c1 Merge pull request #3111 from janisozaur/ride-type 
Be more careful when dealing with hacked rides. Fix #3109
 2016-03-08 18:33:29 +00:00
Michał Janiszewski 02c5ece7b7 Be more careful when dealing with hacked rides. Fix #3109 2016-03-07 23:03:35 +01:00
IntelOrca b8edcd50e1 fix #3107: Number of sold items is reset after some time 
Number of sold items was being overwritten by a memmove on the field before it.
Queue time changed to only be drawn for rides.
 2016-03-07 21:34:26 +00:00
IntelOrca e7d88416f4 fix #2850: Theme window is glitchy 2016-03-07 19:15:49 +00:00
IntelOrca 45db398257 invalidate tile after modification in tile inspector 2016-03-05 23:39:49 +00:00
IntelOrca bb7765fedf fix #2935: Construction window doesn't close automatically in multiplayer 2016-03-05 13:11:06 +00:00
danidoedel 57b7934b83 Add ability to disable lightning effect, resolves #1299 2016-03-04 23:13:20 +01:00
IntelOrca 4c6c354093 fix unable to place entrance / exit as a client 2016-03-03 21:53:07 +00:00
IntelOrca 6ec5fc8cec fix #3075: default inspection Interval does not work when building track designs 2016-03-03 17:39:11 +00:00
IntelOrca c60e05fc99 add default ride inspection interval option, closes #1455 2016-03-02 19:27:54 +00:00
IntelOrca 646deebd3a re-order misc options 2016-03-02 19:00:33 +00:00
IntelOrca 669c15cbaf fix case mistake in refactor of server_list.c 2016-03-01 21:25:21 +00:00
IntelOrca d26ee19782 refactor server_list.c, use British English for names 2016-03-01 18:51:01 +00:00
IntelOrca dcf09c5d4b show total number of players online on server list 2016-03-01 18:45:30 +00:00
zsilencer e652177a31 fix player window auto_pos 2016-02-29 21:43:24 -07:00
zsilencer 66e406ab75 Fix #3048: Remove format codes in player names and chat 2016-02-29 21:33:46 -07:00
zsilencer f253acbea1 Fix #3056: Clip last action string 2016-02-29 21:12:00 -07:00
IntelOrca 781d84dfa4 fix warning 2016-02-29 22:54:01 +00:00
IntelOrca e57f27e1a1 improve group renaming 2016-02-29 22:34:37 +00:00
IntelOrca 4769e89b07 fix #3053: Long multiplayer group names overflow the dropdown 2016-02-29 22:34:36 +00:00
duncanspumpkin 957d5a9735 Fix #2324. Inventions list changes no longer break scenery window. 
Issue was caused by the invention list flags being passed into the finish research function and interpreting always researched scenery sets as rides. This could also cause crashes if there were more scenery sets than rides researched.
 2016-02-29 22:02:03 +00:00
IntelOrca a634aacfab show information about locked scenarios, closes #2660 2016-02-29 21:28:01 +00:00
duncanspumpkin e2073d22c4 Fix #3002. Fix ride construction on water breaking with shift. 
Issue caused by a mistake during refactoring.
 2016-02-29 20:53:22 +00:00
IntelOrca 1d99c233f6 fix #3008: construct ride that isn't placed yet causes side effects 2016-02-29 20:24:00 +00:00
Duncan 433caa2f84 Merge pull request #3036 from marijnvdwerf/finish-6CA2DF 
Remove asserts and original call from sub_6CA2DF
 2016-02-29 17:16:09 +00:00
Gymnasiast ddf3d7a03d Consistently use 'colour' rather than 'color' 2016-02-28 20:32:02 +01:00
Marijn van der Werf 3311e4f3e8 Remove asserts and original call from sub_6CA2DF 2016-02-28 09:04:41 +01:00
IntelOrca 22a194ffa6 clamp ride overview viewport zoom level to allowed range 2016-02-27 13:30:00 +00:00
IntelOrca d27c9c0ec4 fix #3026: can construct maze when its open 2016-02-27 13:14:26 +00:00
IntelOrca c7c1f862cc fix #2878: Shops and stalls doesn't open on the server with auto open 
Use the set status game command instead of setting the status of the ride directly. In order to stop stack overflow, closing the ride construction window is now done in the update event for that window.
 2016-02-27 01:20:21 +00:00
Michał Janiszewski 4a24aa6cf3 Don't crash if mapElement is null 
This allows for loading parks such as "Cocopa Bay"
 2016-02-26 23:05:01 +01:00
Michał Janiszewski aa8437cb9d Minor fixes 2016-02-26 20:49:01 +01:00
Michał Janiszewski 6b514d1e3a Fix possible issues highlighted at higher warn levels 
Mostly possibly uninitialized values and signedness
 2016-02-26 12:54:00 +01:00
Ted John ecb4dd2a09 Merge pull request #3007 from Overv/implement-2123 
Hide the entrance/exit construction buttons if there is no station (resolves #2123)
 2016-02-25 20:50:33 +00:00
Alexander Overvoorde f0c47ba292 Hide the entrance/exit construction buttons if there is no station (resolves #2123) 2016-02-25 21:30:46 +01:00
Ted John 6ec2e1724c Merge pull request #2943 from Overv/fix-ride-viewport-z 
Fix overall view position using z coordinate of arbitrary element in same column (fixes #2636)
 2016-02-25 18:44:59 +00:00
Duncan 5f2e158a55 Merge pull request #3004 from janisozaur/new-compilers 
Fixes for upcoming GCC6 & Clang 3.8
 2016-02-25 18:37:27 +00:00
Michał Janiszewski fc2bba3047 Fixes for upcoming GCC6 & Clang 3.8 2016-02-25 19:35:18 +01:00
Alexander Overvoorde 6311b5588d Fix ride overall views being recalculated constantly 2016-02-25 19:31:46 +01:00
Alexander Overvoorde 4a42b09bb3 Add new overall view logic 2016-02-25 19:31:46 +01:00
Alexander Overvoorde fe6d50f942 Fix overall view position using z coordinate of arbitrary element in same column (fixes #2636) 2016-02-25 19:28:43 +01:00
IntelOrca 6484326892 use built ago label for ride list instead of age 2016-02-25 17:59:32 +00:00
Jacob Wallraff 37de903831 Ride option additions 2016-02-25 17:43:29 +00:00
Ted John 74973a4a97 Merge pull request #2950 from janisozaur/ride-names 
Rename ride_entry functions and provide better logging
 2016-02-25 12:43:19 +00:00
Michał Janiszewski 14bff0c66f Rename rct_ride_type to rct_ride_entry 2016-02-25 13:33:19 +01:00
IntelOrca b0887f174b split sound and music mixing correctly, closes #1270 2016-02-24 22:42:50 +00:00
Michał Janiszewski d19fe0e334 Make sure null ride type gets handled properly 2016-02-24 23:16:25 +01:00
Michał Janiszewski eb645cd4f3 Rename ride_entry functions and provide better logging 
For hacked rides, provide the name of offender in the log.
 2016-02-24 22:23:33 +01:00
duncanspumpkin 53df541a39 Relabelled sprite_flags to flags. Relabelled peep/fountain flags 2016-02-23 17:22:19 +00:00
duncanspumpkin 5340af4a12 Refactor sprite_flags 2016-02-23 17:09:53 +00:00
Duncan baffb37b34 Merge pull request #2967 from marijnvdwerf/decompile-6CA2DF 
Decompile sub_6CA2DF
 2016-02-22 17:27:26 +00:00
Marijn van der Werf a744f84292 Clean up property calculation 2016-02-20 21:55:12 +01:00
Marijn van der Werf 88d0f8c60b Clean up track retrieval 2016-02-20 17:54:26 +01:00
IntelOrca 3583d601ad name flag: RIDE_TYPE_FLAG_15 2016-02-20 16:37:09 +00:00
IntelOrca bd040918a1 use helper functions instead of direct access to 0x00982164 2016-02-20 16:30:08 +00:00
IntelOrca caf8b45dc3 remove usages of 0x00F441D2 2016-02-20 15:52:38 +00:00
IntelOrca edbca479e3 remove old usages of 0x00993CCC and 0x00F441D3 2016-02-20 15:50:05 +00:00
Marijn van der Werf 9b8b90964e Use TRACK_SLOPE_NONE for comparing with bl 2016-02-19 17:19:34 +01:00
Marijn van der Werf a157a7945c Fix structure of diagonal curves 2016-02-19 16:30:56 +01:00
Marijn van der Werf 7b2c3f5b88 Refactor known input/output combinations to use table 2016-02-19 13:31:00 +01:00
Marijn van der Werf a5ee1ddb56 More fixes 2016-02-19 01:29:30 +01:00
Marijn van der Werf 0b792cb927 Fix conditional 2016-02-19 00:16:03 +01:00
Marijn van der Werf 2b879cd586 [temp] log tracktype conditions 2016-02-18 22:01:54 +01:00
Marijn van der Werf e20f487629 Fix mistakes 2016-02-18 21:44:09 +01:00
Marijn van der Werf 1f2afd6bac Process feedback 2016-02-18 14:24:09 +01:00
Marijn van der Werf b88ac9f26e Apply suggested fixes 2016-02-18 13:55:56 +01:00
Marijn van der Werf 76f0ca9afb Clean logic 2016-02-18 13:31:42 +01:00
Marijn van der Werf 235cc69b88 Decompile function 2016-02-18 13:02:59 +01:00
Martin Černáč aff8cec48c Refactor freeze climate cheat 2016-02-17 17:39:33 +01:00
Ted John 9c5196e9dc Merge pull request #2952 from octaroot/cheat_neverending_marketing 
Add "neverending marketing" cheat
 2016-02-17 12:28:37 +00:00
Martin Černáč fdfb4f7bd3 Add "neverending marketing" cheat 
This cheat allows the player to have never-ending marketing campaigns
 2016-02-17 09:35:56 +01:00
IntelOrca c31941c6dc fix #2958: import sc4, sv4 into editor using load landscape dialog 2016-02-16 18:15:26 +00:00
Ted John d42f8c5499 Merge pull request #2946 from Gymnasiast/debugging-tools-dropdown 
Leave the debugging tools dropdown open after click, closes #2768
 2016-02-15 13:45:53 +00:00
Gymnasiast 6cdab73cdf Don't say there are track designs available in multiplayer 2016-02-15 11:20:07 +01:00
Gymnasiast 32ff10ec4d Leave the debugging tools dropdown open after click, closes #2768 2016-02-15 10:00:14 +01:00
Michał Janiszewski 2ebb691e71 minor fixes 
* initialize variables properly
* fixes to handling of zenity/kdialog on Linux
* remove unnecessary call
 2016-02-14 21:06:44 +01:00
duncanspumpkin 667d38754f Start implementing handyman pathfinding 2016-02-13 14:13:33 +00:00
Ted John 703e9c3153 Merge pull request #2839 from anyc/develop 
Linux: use zenity or kdialog to show user dialogs
 2016-02-13 12:15:41 +00:00
Chad Anderson 4658e80deb allow starting server with new scenario 2016-02-13 11:42:51 +00:00
IntelOrca 934bf28cc1 change scenario select to callback mechanism 2016-02-13 11:32:34 +00:00
Ted John 6d384fa2e5 Merge pull request #2911 from Overv/show-peeps-in-closed-ride 
Show amount of peeps still on ride in tooltip when ride is closed (resolves #2708)
 2016-02-13 11:19:40 +00:00
Alexander Overvoorde d07b7159c8 Add amount of customers currently on ride to customers tab 2016-02-13 04:23:59 +01:00
IntelOrca 08dc095028 add viewport to player window, closes #2817 2016-02-11 00:09:10 +00:00
Ted John 113631f7d2 Merge pull request #2883 from danidoedel/fix 
Fix two ride construction bugs
 2016-02-10 18:49:46 +00:00
Alexander Overvoorde 06304799b6 Fix staff lacking tile rectangle when picked up (fixes #2877) 2016-02-09 22:06:49 +01:00
duncanspumpkin 2077c51e0b Fix #2902. Banner flags now correctly passed when re-colouring 2016-02-09 17:18:25 +00:00
Jacob Wallraff dbdf76649e Moving total admissions from park finance tab to stats tab 2016-02-05 19:32:07 -08:00
danidoedel 217047c1a6 Fix #2881 Disable banking for steep to flat track 2016-02-04 21:07:45 +01:00
danidoedel 55aa203aa7 Fix #2882 Helix up didn't work properly 2016-02-04 15:02:40 +01:00
IntelOrca c99ec93295 add theme entries for new windows 2016-02-03 18:23:47 +00:00
IntelOrca 7e1ce4fcc6 reinstate theme editor and fix bugs 2016-02-03 18:23:45 +00:00
IntelOrca caf9bd9939 get game working with new theme manager 
Theme editor currently unavailable.
 2016-02-03 18:23:44 +00:00
zsilencer b2083deed0 implement cheats over multiplayer 2016-02-02 14:08:59 -07:00
Ted John 21faeaeba1 Merge pull request #2867 from flk92/fix-scenario-dialog-text-overflow 
Fix scenario path overflowing dialog on RCT1 font
 2016-02-02 14:25:21 +00:00
Fabio K 976e0a53e0 Fix #2855: scenario path overflowing dialog on RCT1 font 
Changes the global variable defining the current font in use before
calculating whether the path should be shortened.

Fixes OpenRCT2/OpenRCT2#2855
 2016-02-02 11:36:25 -02:00
Michał Janiszewski f352fb7d47 Better options window design for scaling 2016-02-01 21:23:20 +01:00
Michał Janiszewski b3ed293bb3 Add another page to options 
All 32 available widgets on "Display" page were taken, this adds another
page, "Rendering", to the options window, so it can hold remaining widgets.
 2016-02-01 21:19:28 +01:00
Michał Janiszewski 80ad302087 Allow user to use NN scaling at integer scales 
While linear/anisotropic filtering introduces in previous commit looks
good at non-integer scales, using it at integer scales may make screen
look unnecessarily blurry. This commit introduces an option to use NN
scaling at integer values of scale.
 2016-02-01 21:19:26 +01:00
Michał Janiszewski 18ec2238a2 Allow runtime selection of render quality hint 
This change allows to pass render quality hint to SDL in runtime. While
using hardware display, SDL can hint the renderer to use linear or
anisotropic filtering, which can deliver a better experience when using
non-integer scale value.
 2016-02-01 21:18:15 +01:00
Martin Černáč 85b6effd0f Refactor the weather cheat UI 
I removed the two buttons that were used previously to change the park's weather with a proper dropdown, which allows the player to select any of the available weather, not being limited to just two options. This change is (currently) listed on the project's wiki page 'Features to implement'.
 2016-02-01 18:46:19 +01:00
Martin Černáč 52a42126f3 Fix a gap in the financial cheat UI 2016-02-01 18:46:08 +01:00
Michał Janiszewski e814cdd271 Decouple network version from OpenRCT2 version 
This allows to present a different version of network stream than just
OpenRCT2 version, as we can possibly have breaking changes to network in
one release cycle.

This commit also adds easy way of identification which hosts are running
which versions, by showing a tooltip when hovering mouse cursor over the
network compatibility icon. Client's own version is displayed as well.
 2016-01-30 22:44:43 +01:00
anyc ffafd07c90 use enum to specify file dialog type 2016-01-29 19:03:09 +01:00
Michał Janiszewski ec2387082c Remove cheats from config 2016-01-25 21:44:13 +01:00
Michał Janiszewski dd37ca05c3 Disable opening cheats window in MP 
When connecting to a server, also reset cheats.

This should fix #2811
 2016-01-25 21:44:09 +01:00
Chad Anderson bc92446d32 New Game Option 
I added a menu option to bring up the Scenario Selector from within
game, so that you can easily choose a new level without needing to load
the Title Screen.
 2016-01-25 13:15:26 -07:00
duncanspumpkin ba314c6fc8 Fix dropdown default highlight regression 2016-01-25 17:11:56 +00:00
Ted John 0e96c259b9 Merge pull request #2807 from LRFLEW/disabled 
Improved Rendering of Disabled Scenario Names
 2016-01-25 13:13:37 +00:00
zsilencer d315e9e075 fix bug caused by using id as index 2016-01-24 21:02:15 -07:00
zsilencer 32f1aa064d more accurate last player action location 2016-01-24 21:00:31 -07:00
LRFLEW a842e3a650 Improved Rendering of Disabled Scenario Names 2016-01-24 17:06:05 -07:00
Ted John 80550ca365 Merge pull request #2752 from Broxzier/fix_money_invalidation 
Fix #2750 invalidate top toolbar when toggling the use of money.
 2016-01-24 16:10:50 +00:00
Aaron van Geffen 2d90bc8354 Allow assigning a shortcut to the options window. 2016-01-25 00:45:24 +09:00
Ted John 6eaa93c9bc Merge pull request #2783 from zsilencer/multiplayer 
MP groups and permissions
 2016-01-24 12:29:27 +00:00
zsilencer 8c608b6f6c fix issues with a few game commands 2016-01-23 17:33:08 -07:00
zsilencer 85d77bb838 show last action in player window 2016-01-23 16:46:52 -07:00
zsilencer 845c7ad067 disallow peep pickup if group does not have permission 2016-01-23 16:36:16 -07:00
zsilencer db90477cae add locate player's most recent action button 2016-01-23 14:16:26 -07:00
zsilencer de1fa24e7b add last player action to player list 2016-01-23 12:32:02 -07:00
Aaron van Geffen 18a8ef0924 Repopulate ride list when invalidating the ride construction window. 
When toggling the 'select by track type' option with the ride construction window open,
the ride list would not be repopulated until the player switched tabs. This commit
adds repopulation on window invalidation, too.
 2016-01-23 23:43:13 +09:00
Michał Janiszewski 6d6f9f3c23 Refactor rides to be only accessible with getters 
This changes how rides are accessed from macros to getter functions.
 2016-01-23 01:13:36 +01:00
zsilencer 62c1780d65 fix couple other issues mentioned in pull request 2016-01-22 17:08:06 -07:00
zsilencer 1277c1a0d2 MP permissions update 2 2016-01-22 11:12:35 -07:00
zsilencer 7a249c6457 Add ability to toggle individual action permissions 2016-01-21 20:32:51 -07:00
zsilencer 6e3068cd0a MP groups and permissions 2016-01-20 21:42:31 -07:00
zsilencer 30d57916c2 fix dropdown menu position in scrolled list 2016-01-19 13:11:16 -07:00
zsilencer 7b280adf8d Fix #2760: Server join click 2016-01-19 12:46:55 -07:00
IntelOrca 162710d86a remove strange random game command call from loadsave 2016-01-19 18:04:15 +00:00
Hielke Morsink 0b445ab1a5 Fix #2747 map sprite issue. 2016-01-19 00:05:14 +01:00
Michał Janiszewski 3bf1e0e06d Rename `safe_strncpy` to `safe_strcpy` 2016-01-18 20:49:52 +01:00
IntelOrca 1ffee2435a fix #2363: show default item highlight, refactor 2016-01-17 23:37:14 +00:00
Hielke Morsink 4e5b8295c8 fix #2750 invalidate top toolbar when toggling the use of money. 2016-01-17 14:53:59 +01:00
IntelOrca 7c8245a63f fix #2749: inverse logic for removing colour tab on rides 2016-01-17 12:27:43 +00:00
Hielke Morsink 711afebf50 Hiding debug button while playing over a network. 2016-01-16 17:24:44 +01:00
Ted John e69e384d43 Merge pull request #2692 from marijnvdwerf/use-named-addresses 
Replace known addresses with constants, globals and wrapper functions
 2016-01-15 22:59:13 +00:00
IntelOrca 666bb03cc3 fix #2734: forgot to correct signature arguments for clip_drawpixelinfo 2016-01-15 20:20:29 +00:00
Marijn van der Werf 94e47be3e3 Use `ride_type_has_flag` for checking ride type flags 2016-01-15 21:02:39 +01:00
Marijn van der Werf 6568798af7 Use globals instead of addresses where applicable 2016-01-15 21:01:49 +01:00
Marijn van der Werf 98b5ad1bf4 Replace known addresses with constants 2016-01-15 21:01:34 +01:00
duncanspumpkin 10f85322ae Fix incorrect rct2 address comments 2016-01-15 19:17:00 +00:00
IntelOrca 730463dbbb remove rct2_malloc, rct2_realloc and rct2_free 2016-01-14 20:18:55 +00:00
IntelOrca b7484db239 refactor clip_drawpixelinfo to not allocate memory 2016-01-14 20:12:44 +00:00
IntelOrca cdee534eb1 use SDL2's platform defines to normalise platform guards 2016-01-14 20:12:43 +00:00
duncanspumpkin f2b70b74aa Fix incorrect common format offset causing issues when changing colour scheme 2016-01-14 17:47:06 +00:00
Duncan e2e749d644 Merge pull request #2697 from marijnvdwerf/get-ride-entry 
Minimise direct usage of `RCT2_ADDRESS_RIDE_ENTRIES`
 2016-01-11 23:09:43 +00:00
Ted John c6ab870404 Merge pull request #2698 from janisozaur/audio-device 
Skip "Default sound device" on Linux
 2016-01-11 14:09:44 +00:00
Michał Janiszewski ac8aec63bc Skip "Default sound device" on Linux 
Sound on Linux is handled by PulseAudio, which creates a sink and offers
a central place to control which sources are distributed how and where.

Applications in general are expected to only offer volume controls.

Tested with 0 A.D., SuperTuxKart and a few media players, none of which
offers selecting sink directly.

As per https://en.wikipedia.org/wiki/PulseAudio#Adoption it should
covert vast majority of uses.
 2016-01-11 13:59:41 +01:00
Marijn van der Werf ddab3a1b74 Use `GET_RIDE_ENTRY` macro to get ride entry 2016-01-11 13:34:08 +01:00
Marijn van der Werf 6eadf824ea Replace raw addresses of `RIDE_ENTRIES` 2016-01-11 13:34:08 +01:00
Marijn van der Werf 64646a501a Add missing brackets 2016-01-11 13:00:40 +01:00
Marijn van der Werf e961cc885a Use RCT2_ADDRESS_COMMON_FORMAT_ARGS instead of raw address 2016-01-11 12:55:33 +01:00
duncanspumpkin 2bd6dac20f Merge branch 'develop' into vehicle-update 
Conflicts:
 openrct2.vcxproj
 2016-01-10 08:57:41 +00:00
Hielke Morsink 39ae12eeb1 Using window width and height to define locations 2016-01-09 19:27:04 +01:00
Hielke Morsink e4d3c546ad Moving staff costs along with the hire button 2016-01-09 19:26:13 +01:00
Hielke Morsink 19ddbaa84f Buttons on the right move when scaling the window. 2016-01-09 19:26:12 +01:00
Hielke Morsink f9dc3f3454 replace FOR_ALL_PEEPS with FOR_ALL_STAFF 2016-01-09 19:26:11 +01:00
duncanspumpkin 268e2d34ce Merge branch 'develop' into vehicle-update 
Conflicts:
 object.c
 2016-01-09 16:51:23 +00:00
IntelOrca f84c659010 fix #2670: title was not being loaded when a scenario failed to load 2016-01-09 15:11:12 +00:00
IntelOrca 3073bc64fd remove rct2_endupdate 2016-01-09 00:25:30 +00:00
IntelOrca 43a5cc92cc define STR_NONE as a rct_string_id 2016-01-07 22:14:53 +00:00
IntelOrca 48ad1314a9 refactor object_desc 2016-01-07 19:12:59 +00:00
IntelOrca 40a4bd1fa8 remove old object_paint calls, replace with new 2016-01-07 19:01:19 +00:00
IntelOrca ab38828e03 integrate object list variables: 
- gInstalledObjectsCount
- gInstalledObjects
- gNumInstalledRCT2Objects
- gNumInstalledCustomObjects
- gLastLoadedObjectChunkData
 2016-01-06 20:41:21 +00:00
IntelOrca 29397ebcc5 fix #2658: fix dragging on land and water tools 2016-01-06 18:31:25 +00:00
IntelOrca f4f07ae5bb integrate variable: gInputPlaceObjectModifier 2016-01-05 22:33:47 +00:00
IntelOrca 94ae72f228 integrate variable: gHoverWidget 2016-01-05 22:05:00 +00:00
IntelOrca 586e5ef9cd integrate variable: gPressedWidget 2016-01-05 21:46:38 +00:00
IntelOrca ee9c695902 fix #2651: remove ride when multiplayer client aborts ride construction 
also fix ride construction window closing immediately after placing first track piece of a ride for clients
 2016-01-05 20:37:21 +00:00
Ted John f4a25bd55e Merge pull request #2641 from Broxzier/fix_saving 
Prevent extension from showing when "saving as"
 2016-01-05 10:14:20 +00:00
Michał Janiszewski 133096cd64 Merge branch 'develop' into vehicle-update 2016-01-05 09:59:53 +01:00
IntelOrca 88c391120a integrate tooltip variables 2016-01-05 00:02:23 +00:00
Hielke Morsink 3641634aad Prevent extension from showing when saving a park for the first time. 2016-01-05 00:23:51 +01:00
IntelOrca 0c933234e0 remove all tutorial code 2016-01-04 23:21:23 +00:00
IntelOrca f0adf90660 integrate variable: gInputFlags 2016-01-04 22:53:03 +00:00
IntelOrca b5069d3809 integrate variable: gInputState 2016-01-04 22:45:51 +00:00
IntelOrca b94cd7499d add config for hide mega park and set locking as default 2016-01-03 21:06:10 +00:00
IntelOrca 9b833e5f93 shorten path for scenario select debug 2016-01-02 23:14:41 +00:00
IntelOrca 9eacd3532b use correct window variable for highlighted scenario 2016-01-02 21:13:24 +00:00
IntelOrca ededc82cba add DLC and Build your own scenario classification 2016-01-02 21:06:46 +00:00
IntelOrca d147f516db fix default selected tab on scenario select 2016-01-02 21:05:57 +00:00
IntelOrca aeda8d68f9 add logic for unlocking mega park and making it invisible 2016-01-02 21:05:37 +00:00
IntelOrca 82b05950ff add RCT1 title sequence 2016-01-02 21:05:33 +00:00
IntelOrca f2c5ce32f2 improve options window for scenario options 2016-01-02 21:05:33 +00:00
IntelOrca 950722292c use user path for default scenario save location 2016-01-02 21:05:31 +00:00
IntelOrca 95ee0be3c5 handle scenario conflicts 2016-01-02 21:05:08 +00:00
IntelOrca af67cf5703 refactor scenario sources and improve scenario select window 2016-01-02 21:04:44 +00:00
IntelOrca 72e820dead add horizontal rule headings to scenario list 2016-01-02 21:04:44 +00:00
IntelOrca 6a768c4a3c redo entire scenario highscore load / saving 
- load and save highscores to new file format (highscores.dat)
- scan scenarios from RCT2 data and user data
- load highscores from legacy file (scores.dat)
- fix various issues with new scenario select window
 2016-01-02 21:04:10 +00:00
IntelOrca 63529a5213 fix option widgets for scenario grouping 2016-01-02 21:03:39 +00:00
Aaron van Geffen f7d33f3cab Rename constants et al per code reviewer's request. 2016-01-02 21:03:38 +00:00
Aaron van Geffen f49e3eea1c WIP: misery: adding scenario options to options screen. 2016-01-02 21:01:53 +00:00
Aaron van Geffen 15782b88c4 Experimental: optional unlocking of scenarios ("campaign mode") in scenario select screen. 2016-01-02 21:01:53 +00:00