OpenRCT2 git bot
a327fe46a2
Merge Localisation/master into OpenRCT2/develop.
2016-11-11 04:00:21 +00: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
OpenRCT2 git bot
a934590826
Merge Localisation/master into OpenRCT2/develop.
2016-11-08 04:00:14 +00:00
OpenRCT2 git bot
780194d487
Merge Localisation/master into OpenRCT2/develop.
2016-11-07 04:00:18 +00:00
OpenRCT2 git bot
c94a009860
Merge Localisation/master into OpenRCT2/develop.
2016-11-06 04:00:18 +00:00
OpenRCT2 git bot
98981b691d
Merge Localisation/master into OpenRCT2/develop.
2016-11-05 04:00:21 +00:00
Michael Steenbeek
b5630a5a5e
Merge pull request #4701 from Overv/implement-disabled-land-rights
...
Resolves #4559 : Changes land rights buttons to be disabled if no tiles for sale remain
2016-11-03 19:42:08 +01:00
OpenRCT2 git bot
e3f76a1140
Merge Localisation/master into OpenRCT2/develop.
2016-11-03 04:00:20 +00:00
OpenRCT2 git bot
1fa99885d1
Merge Localisation/master into OpenRCT2/develop.
2016-11-02 04:00:24 +00: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
OpenRCT2 git bot
0f8cec0df8
Merge Localisation/master into OpenRCT2/develop.
2016-10-31 04:00:34 +00:00
OpenRCT2 git bot
6c801cf8c3
Merge Localisation/master into OpenRCT2/develop.
2016-10-29 04:00:22 +00:00
OpenRCT2 git bot
f241ae2181
Merge Localisation/master into OpenRCT2/develop.
2016-10-21 04:00:17 +00:00
OpenRCT2 git bot
04783e8905
Merge Localisation/master into OpenRCT2/develop.
2016-10-20 04:00:17 +00:00
Michael Steenbeek
0abb53f6ae
Merge pull request #4582 from wolfreak99/create_folder
...
"Create folder" button for save dialog
2016-10-19 11:06:45 +02:00
wolfreak99
ca19ececd6
Create folder button
...
Fixed remarks
Update comments to plural usage
2016-10-19 02:48:02 -04:00
OpenRCT2 git bot
29a277edb2
Merge Localisation/master into OpenRCT2/develop.
2016-10-19 04:00:20 +00:00
OpenRCT2 git bot
3df88895f7
Merge Localisation/master into OpenRCT2/develop.
2016-10-18 04:00:21 +00: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
Ted John
00e907d007
Merge pull request #4414 from Broxzier/extended_tile_inspector
...
Extended tile inspector
2016-10-16 21:12:21 +01:00
OpenRCT2 git bot
2e35073ee7
Merge Localisation/master into OpenRCT2/develop.
2016-10-12 04:00:23 +00: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
OpenRCT2 git bot
c648335548
Merge Localisation/master into OpenRCT2/develop.
2016-10-10 04:00:23 +00:00
OpenRCT2 git bot
89d672ba70
Merge Localisation/master into OpenRCT2/develop.
2016-10-04 04:00:21 +00:00
OpenRCT2 git bot
0aa0bec804
Merge Localisation/master into OpenRCT2/develop.
2016-10-03 04:00:19 +00: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
OpenRCT2 git bot
a80db73a2a
Merge Localisation/master into OpenRCT2/develop.
2016-09-26 04:00:22 +00:00
Michael Steenbeek
a170eeb367
Merge pull request #4302 from wolfreak99/render_rain_toggle
...
Add option to disable weather gloom and rain effects
2016-09-24 13:17:49 +02:00
Ted John
4a0a93d003
Merge pull request #4449 from duncanspumpkin/gl2
...
OpenGL Palettes
2016-09-23 21:41:09 +01: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
OpenRCT2 git bot
6496895e40
Merge Localisation/master into OpenRCT2/develop.
2016-09-20 04:00:21 +00:00
OpenRCT2 git bot
4b5e6f01cb
Merge Localisation/master into OpenRCT2/develop.
2016-09-19 04:00:22 +00:00
duncanspumpkin
5f7a6fb369
Fixed OpenGL palette drawing
...
Added palettes to the texture atlas and now correctly use them to generate
images. Transparency semi supported but the colours are not quite
correct.
2016-09-18 20:28:46 +01:00
OpenRCT2 git bot
b3ef319dc9
Merge Localisation/master into OpenRCT2/develop.
2016-09-18 04:00:21 +00:00
OpenRCT2 git bot
d24680ad2a
Merge Localisation/master into OpenRCT2/develop.
2016-09-16 04:00:21 +00:00
OpenRCT2 git bot
d8f2da4ec4
Merge Localisation/master into OpenRCT2/develop.
2016-09-15 04:00:23 +00:00
OpenRCT2 git bot
2a184aae23
Merge Localisation/master into OpenRCT2/develop.
2016-09-14 04:00:21 +00:00
OpenRCT2 git bot
6dfcfb4098
Merge Localisation/master into OpenRCT2/develop.
2016-09-02 04:00:27 +00:00
OpenRCT2 git bot
f2687eebb2
Merge Localisation/master into OpenRCT2/develop.
2016-08-30 04:00:22 +00:00
Ted John
17b69d257b
Merge pull request #4097 from marijnvdwerf/clean/string-ids-2
...
Continue string ID cleanup
2016-08-28 14:05:13 +01:00
OpenRCT2 git bot
65beeeece5
Merge Localisation/master into OpenRCT2/develop.
2016-08-25 04:00:20 +00: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
OpenRCT2 git bot
676c734f4c
Merge Localisation/master into OpenRCT2/develop.
2016-08-21 04:00:18 +00:00
OpenRCT2 git bot
394eb94be3
Merge Localisation/master into OpenRCT2/develop.
2016-08-20 04:00:22 +00:00
Ted John
4a234a0f86
Merge pull request #3946 from pizza2004/chat_background
...
Improve chat and background, fixes #3849
2016-08-18 22:10:19 +01:00
OpenRCT2 git bot
a874756fcc
Merge Localisation/master into OpenRCT2/develop.
2016-08-18 04:00:19 +00:00
Wirlie
9ec3fbc39b
Chat: Add colour scheme (themes) + 3d edge style.
2016-08-16 23:26:03 -06:00
OpenRCT2 git bot
ae05e0f847
Merge Localisation/master into OpenRCT2/develop.
2016-08-17 04:00:22 +00:00
wolfreak99
791733a571
See-through paths, Convert gCurrentViewportFlags to uint32
2016-08-15 00:58:15 -04:00
OpenRCT2 git bot
85210322ae
Merge Localisation/master into OpenRCT2/develop.
2016-08-12 04:00:24 +00:00
OpenRCT2 git bot
bb07785e96
Merge Localisation/master into OpenRCT2/develop.
2016-08-10 04:00:26 +00:00
OpenRCT2 git bot
a7454d6d88
Merge Localisation/master into OpenRCT2/develop.
2016-08-09 04:00:19 +00:00
OpenRCT2 git bot
42501c66fe
Merge Localisation/master into OpenRCT2/develop.
2016-08-05 04:00:24 +00:00
OpenRCT2 git bot
0be54fbac3
Merge Localisation/master into OpenRCT2/develop.
2016-08-04 04:00:20 +00:00
OpenRCT2 git bot
3f07e5929d
Merge Localisation/master into OpenRCT2/develop.
2016-08-03 04:00:19 +00:00
OpenRCT2 git bot
63c74b40de
Merge Localisation/master into OpenRCT2/develop.
2016-08-02 04:00:18 +00: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
OpenRCT2 git bot
9cf341940a
Merge Localisation/master into OpenRCT2/develop.
2016-08-01 04:00:20 +00:00
Ted John
349684b7ce
Merge pull request #4146 from AaronVanGeffen/reposition-mouse
...
Change mouse scroll zooming behaviour to zoom towards the cursor keeping the map position under the cursor consistent. This new behaviour is opt-out.
2016-07-31 12:38:06 +01:00
OpenRCT2 git bot
e4b8e13ee4
Merge Localisation/master into OpenRCT2/develop.
2016-07-31 04:00:36 +00: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
OpenRCT2 git bot
b8a3e18271
Merge Localisation/master into OpenRCT2/develop.
2016-07-30 04:00:17 +00:00
wolfreak99
8f254702a2
Add cheat to reset date ( #4188 )
2016-07-29 20:49:38 +02:00
OpenRCT2 git bot
9136fa2a97
Merge Localisation/master into OpenRCT2/develop.
2016-07-29 04:00:22 +00:00
OpenRCT2 git bot
b115de861d
Merge Localisation/master into OpenRCT2/develop.
2016-07-28 04:00:21 +00:00
Alexander Overvoorde
6acbbcfb6b
Fix assumption that colour texture and mask texture originate from same atlas
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
bb3fe8b804
Implement multiple texture atlas system to handle small and large images
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
d8ce023170
Change TextureCache to use atlas instead of array
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
99a41ee828
Fix implicit boolean in GLSL code
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
360a92e906
Merge draw image and draw masked image shaders
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
fbb7029de4
Implement sprite batch drawing using instancing
2016-07-27 04:01:25 +02:00
Alexander Overvoorde
84f2a8c17c
Rewrite texture cache to use array texture
2016-07-27 04:01:25 +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
OpenRCT2 git bot
b95452cde0
Merge Localisation/master into OpenRCT2/develop.
2016-07-26 04:00:20 +00:00
OpenRCT2 git bot
5b66f87031
Merge Localisation/master into OpenRCT2/develop.
2016-07-24 04:00:19 +00:00
OpenRCT2 git bot
c3f3667619
Merge Localisation/master into OpenRCT2/develop.
2016-07-23 04:00:22 +00:00
OpenRCT2 git bot
bc3ec7a463
Merge Localisation/master into OpenRCT2/develop.
2016-07-21 04:00:40 +00: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
OpenRCT2 git bot
ca06bbe6e5
Merge Localisation/master into OpenRCT2/develop.
2016-07-18 04:00:19 +00: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
OpenRCT2 git bot
6428e3e42d
Merge Localisation/master into OpenRCT2/develop.
2016-07-15 04:00:20 +00:00
OpenRCT2 git bot
7c16ad3d82
Merge Localisation/master into OpenRCT2/develop.
2016-07-14 04:00:23 +00:00
OpenRCT2 git bot
b63dae51c4
Merge Localisation/master into OpenRCT2/develop.
2016-07-13 04:00:21 +00:00
OpenRCT2 git bot
a4223d995f
Merge Localisation/master into OpenRCT2/develop.
2016-07-12 04:00:23 +00:00
Sijmen Schoon
a194c91997
Use OpenRCT2 dialog for saving tracks
2016-07-11 19:13:30 +02:00
Ted John
7ae7c4f498
Merge pull request #4020 from duncanspumpkin/rate_input
...
Allow rate input by text box
2016-07-11 17:58:38 +01:00
OpenRCT2 git bot
a5a0e0fc0e
Merge Localisation/master into OpenRCT2/develop.
2016-07-11 04:00:20 +00:00
duncanspumpkin
50c2e52b57
Use better text descriptions. Holding down rate buttons now increase/decrease
2016-07-10 09:26:23 +01:00
OpenRCT2 git bot
b09e678fa9
Merge Localisation/master into OpenRCT2/develop.
2016-07-10 04:00:20 +00:00
OpenRCT2 git bot
05540cfef0
Merge Localisation/master into OpenRCT2/develop.
2016-07-09 04:00:22 +00:00
Ted John
76b2621a51
Merge pull request #4000 from SijmenSchoon/develop
...
Add a "default" button to the loadsave window
2016-07-08 22:58:07 +01:00
Sijmen Schoon
2d7cd0e719
Change string ids to be consecutive
2016-07-08 11:29:02 +02:00
OpenRCT2 git bot
9efc0cab6a
Merge Localisation/master into OpenRCT2/develop.
2016-07-08 04:00:20 +00:00
Sijmen Schoon
127d94d451
Add a default button to the loadsave window
2016-07-07 11:29:22 +02:00
OpenRCT2 git bot
52ed90ed95
Merge Localisation/master into OpenRCT2/develop.
2016-07-07 04:00:19 +00:00
OpenRCT2 git bot
f4ca5870db
Merge Localisation/master into OpenRCT2/develop.
2016-07-06 04:00:21 +00:00
OpenRCT2 git bot
b4886d5088
Merge Localisation/master into OpenRCT2/develop.
2016-07-04 04:00:21 +00:00
OpenRCT2 git bot
13ecd3532c
Merge Localisation/master into OpenRCT2/develop.
2016-07-03 04:00:21 +00:00
Ted John
c06296178a
Merge pull request #3952 from gDanix/custom-currency
...
Implement custom currencies.
2016-07-02 13:46:08 +01:00
OpenRCT2 git bot
ebf876c8a8
Merge Localisation/master into OpenRCT2/develop.
2016-07-02 04:00:21 +00: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
d69ab15557
Revert changes in es-ES.txt
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
OpenRCT2 git bot
d77a198f7c
Merge Localisation/master into OpenRCT2/develop.
2016-06-30 04:00:21 +00:00
OpenRCT2 git bot
f70d1f4dd7
Merge Localisation/master into OpenRCT2/develop.
2016-06-29 04:00:18 +00:00
OpenRCT2 git bot
0272af2fb2
Merge Localisation/master into OpenRCT2/develop.
2016-06-28 04:00:19 +00: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
OpenRCT2 git bot
be9d2c10b3
Merge Localisation/master into OpenRCT2/develop.
2016-06-27 04:00:19 +00:00
OpenRCT2 git bot
89db25eea0
Merge Localisation/master into OpenRCT2/develop.
2016-06-26 04:00:32 +00: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
OpenRCT2 git bot
5b1fbd9007
Merge Localisation/master into OpenRCT2/develop.
2016-06-18 04:00:20 +00:00
wolfreak99
b66129db7b
Filter Object Selection by "Selected only" and "Non-selected only"
2016-06-17 04:46:30 -04:00
OpenRCT2 git bot
7c9f59f1c5
Merge Localisation/master into OpenRCT2/develop.
2016-06-16 04:00:17 +00:00
Ted John
19cd56b9c2
Add Shader Palette Lookup
2016-06-15 17:53:26 +01:00
OpenRCT2 git bot
a9f950c6c8
Merge Localisation/master into OpenRCT2/develop.
2016-06-15 04:00:19 +00: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
OpenRCT2 git bot
bd038c63b2
Merge Localisation/master into OpenRCT2/develop.
2016-06-14 04:00:17 +00:00
OpenRCT2 git bot
a91f12dd6b
Merge Localisation/master into OpenRCT2/develop.
2016-06-13 04:00:17 +00:00
Ted John
79c8455cad
Merge pull request #3862 from OpenRCT2/feature/opengl3
...
Implement OpenGL 3 drawing
2016-06-13 00:13:13 +01:00