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

1599 Commits

Author SHA1 Message Date
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