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

227 Commits

Author SHA1 Message Date
Michael Steenbeek 92e110195e Define native file dialog strings when loading heightmap, to avoid crashes 
Thanks to @wolfreak99 for the fix.
 2017-04-27 16:02:35 +02:00
Michael Steenbeek e8b5d418cd en-GB: Change another occurrence of 'normalize' 
[ci skip]
 2017-04-25 15:26:37 +02:00
Michael Steenbeek 4942b6a2df en-GB: Change 'normalize' to 'normalise' 
[ci skip]
 2017-04-25 15:23:52 +02:00
Broxzier d8253ef849 Add error for loading non 24-bit bitmaps 2017-04-24 23:19:51 +02:00
Broxzier 2cd4a686f6 Disable page widgets until a map is loaded 
A few strings have their {WINDOW_COLOUR_2} setting removed, since this
prevented strings from being market as inset. All uses of these strings
have been checked.
 2017-04-24 23:19:51 +02:00
Broxzier 702d99e1e3 Initial prototype of loading heightmaps 
Adds new strings and string ids for some future commits too.
 2017-04-24 23:19:51 +02:00
Michael Steenbeek a4b5b32839 Fix typo in ride description 2017-04-24 16:02:53 +02:00
Hugo Wallenburg 6e41508bad Make paths in STR_2743 consistent with STR_5836 2017-04-23 16:21:08 +02:00
siomy11 7cf64d0bfe Display "No mechanics are hired!" instead of "Calling mechanic..." when no mechanics are hired (#5368) 2017-04-16 22:38:02 +02:00
wolfreak99 28c61e7068 Prepare scenario options sync 2017-04-11 14:26:25 +02:00
wolfreak99 fb62ed8ae2 Add "Quick demolish mode" to the Rides List 
Taken from the "Quick fire mode" on the Staff List
 2017-04-11 10:16:44 +02:00
Martin Müller ae0c85f009 Add tooltip to the label and warn that restart is required 2017-04-10 14:10:54 +02:00
Martin Müller b1bd899fb8 Add menu option for path to RCT 1 2017-04-10 14:08:58 +02:00
Michael Steenbeek 08ccdd6bf0 Fix Top Spin description typo from #5345 
[ci skip]
 2017-04-07 08:42:11 +02:00
Tom Delebo e9c4365aa2 Add description and greeting textbox to server start menu 2017-04-06 14:31:36 +02:00
Michael Steenbeek c9c3025e2e Merge pull request #5305 from IntelOrca/feature/scenery-eyedropper-tool 
Add scenery eyedropper tool
 2017-04-02 22:45:28 +02:00
Richard Jenkins 4da7e203ca Improve clarity of scenario difficulty option text 2017-03-28 21:42:18 +02:00
Ted John 6e7c5b7031 Add scenery eyedropper button 2017-03-13 18:05:13 +00:00
wolfreak99 2fe134fd5f Make shortcut keys window bigger and resizable 2017-03-11 22:09:24 +01:00
Joël Troch 8167ff9678 Fix #1730: Add keyboard shortcuts for track construction (#5200) 2017-03-03 09:35:42 +01:00
Michael Steenbeek 8e1794b032 en-GB: Fix americanism 2017-02-28 17:07:26 +01:00
Michael Steenbeek ae978575f9 Fix spelling of 'Conger Eel', fixes #5252 2017-02-28 09:40:12 +01:00
wolfreak99 c6b5053261 Add cooldowns to help prevent mass demolishing 2017-02-28 09:31:26 +01:00
duncanspumpkin 69af723972 Remove more fences 2017-02-21 20:22:03 +00:00
wolfreak99 5bdf2cac75 Add permissions for MODIFY_TILE command 2017-02-12 23:02:59 +01:00
Broxzier 06b73d03ab Add missing string 
[ci skip]
 2017-02-12 23:02:16 +01:00
Olivier Wervers dcf0702f3c Fix #4493: - Fix tooltip order.\n - Add tooltip to price label. 2017-02-10 19:30:57 +01:00
Olivier Wervers 9c8232e735 Added tooltip to ride and entrance price when price is disabled 2017-02-10 15:03:32 +01:00
zaxcav 5424e7774c Display cut height in Units when Height Label: Units is selected in the options. (#5115) 2017-01-25 00:53:25 +01:00
zaxcav 80b0df3b74 Add formatting to tooltip texts; Fix printing of raw clip height value. 2017-01-22 21:21:00 +01:00
zaxcav 0d81835224 Correct mistakes during rebase. 2017-01-22 21:17:08 +01:00
zaxcav e8f97da2c6 Implement further changes as requested by reviewer. 
Add toggling displayed clip height value between the raw value and value in units.
 2017-01-22 21:11:42 +01:00
zaxcav 25e57ca50d Updated code as requested by reviewer. 
Removed display of raw cut height value.

Changed display of cut height in METRIC/SI from 1DP to 2DP to display odd raw heights with accurate value.

Changed display of cut height in IMPERIAL to 1DP to display odd raw heights with accurate value.
 2017-01-22 21:02:19 +01:00
zaxcav a008dcb186 Display clip height in METRIC/SI units with 1DP. 2017-01-22 20:57:17 +01:00
zaxcav 0620321fb2 Re-added initialisation of scrollbar. 
Added window theme, so window displays correctly everytime.

Changed strings.

Other minor tweaks to window.
 2017-01-22 20:50:39 +01:00
zaxcav e8d6cba5be Initial attempt at paintClip UI 
Compiles but untested.

NOT INTENDED FOR MERGING
 2017-01-22 20:45:21 +01:00
Ted John fc66f42c31 Add config option to enable / disable light FX 2017-01-21 12:01:01 +00:00
wolfreak99 8932f61a67 Add cheats to set/add money by custom amounts 2017-01-10 23:43:42 +01:00
Gymnasiast 5a82b2e0d1 Add booster elements to build window, fix implementation 2017-01-01 17:17:11 +01:00
Michael Steenbeek 09d2f9417e Label OpenGL experimental, fixes #4716 2016-11-21 09:49:07 +01:00
Broxzier 9c1998320d Add tooltips to copy and paste buttons 2016-11-09 20:34:35 +01:00
Broxzier c60463c8a7 Show error message when map element limit is reached 2016-11-09 20:25:40 +01:00
Alexander Overvoorde bb059a2741 Resolves #4559: Changes land rights buttons to be disabled if no tiles for sale remain 
This commit changes the land rights button in the park window to be
disabled if there are no more land rights and construction rights for
sale. It also disables the individual land rights and construction
rights buttons in the land rights window itself if that specific type of
tile is no longer for sale.

This is implemented by introducing two new global variables called
gLandRemainingOwnershipSales and gLandRemainingConstructionSales. These
are updated by map_count_remaining_land_rights() to contain the number
of land rights and construction rights that remain for sale. This
function is called when a scenario is loaded and whenever the game
command to buy land rights or construction rights is invoked.

It also introduces three new tooltip strings that explain why the
buttons are disabled.
 2016-10-31 20:21:10 +01:00
wolfreak99 ca19ececd6 Create folder button 
Fixed remarks

Update comments to plural usage
 2016-10-19 02:48:02 -04:00
Hielke Morsink 394e30633e Fixes typo 
`Currupt` to `Corrupt`
 2016-10-17 12:41:16 +02:00
Hielke Morsink 8434258a62 Tile inspector fixes 
1. Collision typo (sxtra s)
2. Selection area from previous window session was being used
3. Add label and value for base height spinner for entrances
 2016-10-16 21:56:44 +01:00
Broxzier e078c032dd Add banner text info. Fix rotating banners (they are never rotated, but have a position) 2016-10-11 23:27:09 +02:00
Broxzier 4243545faa Large scenery info 2016-10-11 23:27:07 +02:00
Broxzier a68dc7afb8 Add fence and banner info to tile inspector 
This commit also renamed a flag, and corrected the use of one. The
flags in question are WALL_SCENERY_BANNER, WALL_SCENERY_2_FLAG4, and
WALL_SCENERY_2_FLAG5.
 2016-10-11 23:27:04 +02:00
Broxzier 34a7ab5c63 Reordered widget defines 
These defines are used to calculate the edges of the widgets. They are
now ordered in the same way the widgets are listed for the pages.
This commit also adds some extra defines, to make it more easy to tweak
the sizes and padding of widgets.
 2016-10-11 23:27:03 +02:00
Broxzier 0de8b4f1f5 Add dropdown for changing fence slopes 2016-10-11 23:27:02 +02:00
Broxzier 545da27201 Add clamp button for corrupt elements 2016-10-11 23:27:01 +02:00
Broxzier f5423f7586 Entrance details 
@todo: For park entrances, the left and right tile do not show the entrance ID. Will solve this later.
 2016-10-11 23:26:59 +02:00
Broxzier a9654213c9 Improve corrupt element insertion, code formatting 
Corrupt elements are now placed right under the selected element
Local tile-inspector variables now all use camelCaseNames
Removed unused string, and shifted string IDs
 2016-10-11 23:24:43 +02:00
Broxzier 7eb4c72e94 Moved new strings to end of file, and formatting 
strings should be in order, and code formatted was to make it more consistant
 2016-10-11 23:21:43 +02:00
Broxzier 8707cea1b4 Add surface corner properties 2016-10-11 23:21:41 +02:00
Broxzier 5807291b30 scenery page and some changes to the other pages 2016-10-11 23:21:40 +02:00
Broxzier 40bb41d15d pinner for fence height, apply-all works for lift hill & cleanups 
- Removes old (now unused) string
- Cleans up includes in tile_inspector.c
- Properly invalidating widgets upon changes made
- Invalidates tile when lift hill is changed
- Makes 'apply to all' works for lift hills
 2016-10-11 23:21:35 +02:00
Hielke Morsink 874ccb4c6c Added sort button, cleaned up page switching. 2016-10-11 23:21:32 +02:00
Hielke Morsink 863aa236a3 Displaying track ID and sequence 2016-10-11 23:21:30 +02:00
Hielke Morsink 263c64dfba Added ride information for tracks, and some minor fixes 
- Displaying ride infoormation for track pieces (type, ID, name)
- Allowing to change height of a track piece
- Allowing to set and upset wether a track piece is a lift hill
- Consistent text colouring for all labels and widgets
- Making use of the chain flag instead of magic numbers
- Fixed 'insert corrupt element' not working (button was not enabled
  anymore)
- Formatting: ordered includes, consistent variable naming, comments for
  closing switches
 2016-10-11 23:20:18 +02:00
Hielke Morsink 8f94976409 Added land ownership status to details. 2016-10-11 23:12:08 +02:00
Hielke Morsink c19339edfe Minor improvements 
- Paths are now properly rotated, including flat ones
- Banners can not be rotated
- The X and Y coordinates can be changed with spinners
- Highligint selected tile while now hovering over viewport
- Added helper function for enabling and disabling widgets more easily
 2016-10-11 23:12:07 +02:00
Hielke Morsink 2c93b5b3e3 Replaced buttons with spinners and checkboxes 2016-10-11 23:10:15 +02:00
Hielke Morsink e449f88479 Path details and properties 2016-10-11 23:10:13 +02:00
Hielke Morsink 86cd6aea60 [WIP] Prepared group boxes for details and properties 2016-10-11 22:18:09 +02:00
jensj12 44a53dd031 Allow 31 trains per ride (cheat and tooltip) 
Changes the disable train lenght limit cheat to also disable the limit on the number of trains and renames it to 'disable vehicle limits'. Now any tracked ride can have up to 31 trains with 255 cars each. To reduce confusion, I also added a tooltip to the spinners on the vehicle tab.
 2016-10-01 20:58:46 +02:00
wolfreak99 98eb272c71 Break long lines for readability 2016-09-21 10:36:23 -04:00
wolfreak99 c60396cb53 Add option to disable weather gloom and rain effects 2016-09-21 10:35:02 -04:00
Marijn van der Werf 9275cd1cbb Add descriptions for stalls 2016-08-21 16:33:37 +02:00
Marijn van der Werf fbbc871aea Clean up double-used strings 2016-08-21 16:32:13 +02:00
Marijn van der Werf 8d1d699710 Clean up music credits window 2016-08-21 16:31:06 +02:00
Marijn van der Werf cb794ab3df Deprecate string 886 2016-08-21 16:31:06 +02:00
Marijn van der Werf bc3ec1b871 Use table for ride names 2016-08-21 16:31:06 +02:00
Wirlie 9ec3fbc39b Chat: Add colour scheme (themes) + 3d edge style. 2016-08-16 23:26:03 -06:00
wolfreak99 791733a571 See-through paths, Convert gCurrentViewportFlags to uint32 2016-08-15 00:58:15 -04:00
Michał Janiszewski 155bc054df Fix #4172: Expose ride-type changing capability in UI 
This also allows changing ride type in multiplayer games. Very crashy.
 2016-08-01 20:30:08 +02:00
Aaron van Geffen a1b8bdfa11 Make zooming to cursor optional. 
This adds a checkbox to the interface settings panel to enable zooming around the cursor.
If disabled, which it is by default, vanilla RCT2 behaviour is retained.
 2016-07-30 21:18:59 +02:00
Michael Steenbeek 19220cbbce Add a button to the map generator window in the Map window (#4098) 
Includes many fixes by @Wirlie
 2016-07-30 21:10:04 +02:00
wolfreak99 8f254702a2 Add cheat to reset date (#4188) 2016-07-29 20:49:38 +02:00
Marijn van der Werf f9670fc1d4 Add debug menu option 2016-07-26 10:55:48 +02:00
Marijn van der Werf dd756cb8be Add paint debug window 2016-07-26 10:55:47 +02:00
Matte A f6c8993da6 Fix #4080: Track list doesn't update when a track design gets deleted 
Show an error if it can't select a track design rather than silently failing. Updating the list would require a file watcher on the tracks directory, and this edge case isn't particularly important at the moment.
 2016-07-18 18:10:16 +01:00
wolfreak99 44202d0bd1 Allow setting limit on maximum windows allowed 
This provides an option to set a limit on the number of windows that can
be open. Originally, the game had somewhere around 12, but was bumped up
to 64 for OpenRCT2. While this provides some value, this is for people who
prefer less windows at a time, and also for people with older computers.
The limit can be set anywhere between 8 and 64, (8 being chosen to still
preserve in-game toolbars that are counted as windows, and 64 to not
overshoot the maximum hard-coded value). This can be set in both options
and the in-game-console.
 2016-07-15 07:07:34 -04:00
Sijmen Schoon a194c91997 Use OpenRCT2 dialog for saving tracks 2016-07-11 19:13:30 +02:00
duncanspumpkin 50c2e52b57 Use better text descriptions. Holding down rate buttons now increase/decrease 2016-07-10 09:26:23 +01:00
Sijmen Schoon 2d7cd0e719 Change string ids to be consecutive 2016-07-08 11:29:02 +02:00
Sijmen Schoon 127d94d451 Add a default button to the loadsave window 2016-07-07 11:29:22 +02:00
Daniel Trujillo cb1f9269a6 Hide useless decimals in custom currency configuration window 2016-07-01 22:02:28 +02:00
Daniel Trujillo cef8eef177 Add Pound symbol to the "equivalent" string 2016-07-01 22:02:28 +02:00
Daniel Trujillo 71a32a8750 Create custom currency configuration window 2016-07-01 22:02:28 +02:00
Daniel Trujillo 7d53b065dd Add custom currency 
Add the corresponding entry inside CurrencyDescriptors array, and made
it
non-const to let the rate and other properties to change.

Also, a language string (STR_5880, en-GB & es-ES) has been added.
 2016-07-01 22:02:28 +02:00
Duncan 5fb99b037f Merge pull request #3893 from wolfreak99/ObjectSelectionFilters 
Filter Object Selection Window by "Selected only" and "Non-selected only"
 2016-06-27 21:07:57 +02:00
gsp8181 1c8e402aed Fixed translation from en-US 'bathroom' to en-GB 'toilet' (#3914) 2016-06-20 08:47:30 +02:00
wolfreak99 e2ba6aa6ed Text capitalization adjustments for consistancy 2016-06-18 20:52:38 -04:00
wolfreak99 b66129db7b Filter Object Selection by "Selected only" and "Non-selected only" 2016-06-17 04:46:30 -04:00
LucaRed fc789011f0 "Hide" instead of "Remove" in view options (#3876) 
Use "hide" instead of "remove" for view options, given it's not actually editing the map. See OpenRCT2/Localisation#748
 2016-06-14 11:15:36 +02:00
Ted John 3b627651aa add drawing engine config 2016-06-07 22:47:31 +01:00
X123M3-256 706b3db99e Chain lift cheat (#3818) 
* Fix conflict with disable plant aging cheat

* Allow chain lift on any piece

* Keep chain toggled while building

* Ignore current chain lift state when cheat enabled

* Update string ids to one not already used

* Implement command for toggling cheat

* Allow chain on steep tracks when cheat is enabled

* Add checkbox for chain cheat

* Fix spacing

* Send cheat over network

* Change label for checkbox

* Replaced tabs with spaces
 2016-06-07 22:08:38 +01:00
Michael Steenbeek 0a4fa02a3e en-GB: drop full stop in option for consistency 2016-06-07 20:01:56 +02:00
Goddesen c004b986ae Moved new strings to uphold string ID order 2016-06-03 00:33:15 +02:00
Goddesen 809e459495 Added cheat to disable plant aging 2016-06-03 00:33:15 +02: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
Ted John 62636f39b6 move allow known keys option to new tab... 
on multiplayer window
 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
Michał Janiszewski 165ec06690 Passwordless login permission 2016-05-27 20:28:34 +02:00
Michał Janiszewski 553e1bdf0f Minor fixes to authorisation system 2016-05-27 20:28:33 +02:00
CraigCraig 3f9afb9744 Various Spellchecks (#3741) 2016-05-26 09:49:19 +02:00
Michael Steenbeek 712d97da79 Remove Intamin and Phoenix easter eggs (#3732) 2016-05-25 20:01:24 +01:00
Ted John 714baf2979 Merge pull request #3723 from Gymnasiast/remove-bmp-screenshots 
Remove support for BMP screenshots
 2016-05-25 08:01:23 +01:00
Marijn van der Werf a96ccbf21c Add shortcut for switching between paint modes (#3714) 2016-05-24 19:59:37 +01:00
Gymnasiast 476cebca53 Removed support for BMP screenshots 2016-05-24 20:05:12 +02:00
Matte A e7510262ac Add clarifications to <not used anymore> (#3693) 2016-05-22 15:31:41 +02:00
Matte A c96bd533ff Change en-GB screen language (#3668) 2016-05-19 17:04:57 +02:00
Martin Černáč feed51de27 Add correct tooltip entry for the no. circuits (#3650) 2016-05-18 12:56:30 +01:00
Harry Lam 755485f9b8 Fix inconsistency, US usage and confusion in en-GB (#3570) 
[ci skip]
- I changed 5829 because there are actually rough exchange rate (1:10/100) in the currency.c/h.
- In my opinion, 5853/54 require discussion.
 2016-05-12 07:25:59 +02:00
Matte A c7c3923556 Fix conflicting strings (#3534) 2016-05-08 21:55:04 +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 feb34660e3 fix up track manage window 2016-05-08 14:03:54 +01:00
Ted John b2cc98da91 change track list window to use new index 2016-05-08 14:02:47 +01:00
Matte A 9421cc0bd4 Add shortcut for the Multiplayer window (#3509) 2016-05-06 21:14:49 +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
Matte A 45234d1afb Add description for Disable train length limit and align the button (#3480) 2016-05-03 10:16:38 +02:00
X7123M3-256 8f6089818f Added "Disable train length limits" string 2016-05-02 21:37:05 +02:00
Patrick de Wit 7656cfdcbe Add rides amount to ride_list window. (#3461) 2016-04-30 17:12:12 +01:00
Ted John 1729061df8 use ISO 639-1 for language filenames, closes #2420 (#3431) 2016-04-26 19:52:42 +01:00
Renamed from data/language/english_uk.txt (Browse further)