Michael Steenbeek
171271215e
Change some ride type names for clarity, fix Americanism
2017-12-08 07:59:44 +01:00
OpenRCT2 git bot
25c54165e8
Merge Localisation/master into OpenRCT2/develop.
2017-12-06 04:02:49 +00:00
Michael Steenbeek
4e4a1a9d49
Revert accidental use of {SMALLFONT} after {MOVE_X}
...
{MOVE_X} is followed by a number. During initial import in 2014, {MOVE_X}{10} was accidentally replaced.
2017-12-05 15:43:27 +01:00
Christian F. Coors
0b45098e05
Fix music acknowledgement
2017-12-05 10:43:17 +01:00
Michael Steenbeek
0ffa2b541a
Use more consistent terminology and remove some Americanisms
2017-12-05 10:23:36 +01:00
OpenRCT2 git bot
94a3d88691
Merge Localisation/master into OpenRCT2/develop.
2017-12-05 04:01:28 +00:00
Michael Steenbeek
b9a6382557
Remove unused tutorial and guest number strings
2017-12-04 11:27:37 +01:00
Michael Steenbeek
273edee634
Turn construction marker into a define
2017-12-04 11:26:53 +01:00
Aaron van Geffen
1ef73997b5
Removed interface to window limit setting.
2017-12-04 11:26:53 +01:00
Aaron van Geffen
c000263bbb
Remove construction marker colour option.
2017-12-04 11:26:53 +01:00
Aaron van Geffen
38d45a102b
Remove interface to option for handymen mowing by default.
2017-12-04 11:26:53 +01:00
Aaron van Geffen
837b177d9d
Simplify UI scaling display quality options ( #6764 )
...
Simplify UI scaling display quality options.
This removes three options:
* 'Use NN scaling at integer scales', as NN is decidedly preferable at integer scales.
* Anisotropic scaling, as it produces results very similar (if not equal) to linear scaling.
* NN as a selectable option in the dropdown - NN is forced on integer scales and unavailable for non-integer scales.
2017-12-03 22:35:16 +01:00
OpenRCT2 git bot
08893ecff9
Merge Localisation/master into OpenRCT2/develop.
2017-12-03 04:02:57 +00:00
Michael Steenbeek
63f7820b25
Fix #1185 : Close button colour of prompt windows does not match
2017-12-01 17:36:30 +01:00
OpenRCT2 git bot
f4b6b728e3
Merge Localisation/master into OpenRCT2/develop.
2017-12-01 04:00:39 +00:00
OpenRCT2 git bot
5d5c64acbf
Merge Localisation/master into OpenRCT2/develop.
2017-11-30 04:00:45 +00:00
OpenRCT2 git bot
743c79c169
Merge Localisation/master into OpenRCT2/develop.
2017-11-29 04:00:46 +00:00
OpenRCT2 git bot
66aa25da81
Merge Localisation/master into OpenRCT2/develop.
2017-11-28 04:01:14 +00:00
OpenRCT2 git bot
a3be15c9c9
Merge Localisation/master into OpenRCT2/develop.
2017-11-27 04:01:17 +00:00
OpenRCT2 git bot
94c4c285ee
Merge Localisation/master into OpenRCT2/develop.
2017-11-26 04:00:30 +00:00
OpenRCT2 git bot
4b860f5efd
Merge Localisation/master into OpenRCT2/develop.
2017-11-25 04:01:15 +00:00
Michael Steenbeek
d88c01de74
Split Steel Wild Mouse and Spinning Wild Mouse when using Ride Groups
...
Includes a little cleanup for the Ride Groups and a fix in the table with available pieces, which erroneously listed banked pieces as available.
2017-11-23 16:00:58 +01:00
OpenRCT2 git bot
ad8fce4d77
Merge Localisation/master into OpenRCT2/develop.
2017-11-23 04:01:09 +00:00
zyliwax
7bffc4ae33
Adding gridlines display toggle shortcut. ( #6313 )
...
This feature existed in the original RCT1/2 games but was not present in
the latest development commit.
The original shortcut for this key was '7', placing it between the
"Invisible people toggle" (6) shortcut and the "Height marks on land
toggle" (8). This commit preserves as much as possible, using
placeholder comments that signify the relevant values which this
feature actually uses where this is not possible.
2017-11-22 12:02:23 +00:00
OpenRCT2 git bot
65ab767597
Merge Localisation/master into OpenRCT2/develop.
2017-11-22 04:00:47 +00:00
Michael Steenbeek
c1400a12eb
Allow separate ride and vehicle names per ride entry
2017-11-21 18:55:42 +01:00
OpenRCT2 git bot
28497cae4a
Merge Localisation/master into OpenRCT2/develop.
2017-11-21 04:00:34 +00:00
Michael Steenbeek
adae6041f3
Show list of available vehicles in New Ride window
2017-11-20 19:42:29 +01:00
OpenRCT2 git bot
36236d8c97
Merge Localisation/master into OpenRCT2/develop.
2017-11-17 04:00:43 +00:00
OpenRCT2 git bot
891de0ad3e
Merge Localisation/master into OpenRCT2/develop.
2017-11-11 04:02:02 +00:00
OpenRCT2 git bot
c56d5b5f81
Merge Localisation/master into OpenRCT2/develop.
2017-11-09 04:00:20 +00:00
OpenRCT2 git bot
0e4d9a2518
Merge Localisation/master into OpenRCT2/develop.
2017-11-08 04:00:35 +00:00
Philip Goto
8be9e156dd
Modify explanation tooltip of scaling quality option
2017-11-06 23:05:21 +01:00
Philip Goto
ad3f23162a
Add explanation tooltip to scaling quality option
2017-11-06 23:05:21 +01:00
Philip Goto
b66df2d6db
Add smooth nearest neighbor scaling
...
This commit implements smooth nearest neighbor scaling, this scaling method looks sharper than linear scaling and not deformed like NN scaling.
2017-11-06 23:05:21 +01:00
OpenRCT2 git bot
46f898e992
Merge Localisation/master into OpenRCT2/develop.
2017-11-06 04:00:28 +00:00
OpenRCT2 git bot
ce6ae6d07a
Merge Localisation/master into OpenRCT2/develop.
2017-11-04 04:00:41 +00:00
OpenRCT2 git bot
a8374af240
Merge Localisation/master into OpenRCT2/develop.
2017-11-03 04:00:32 +00:00
OpenRCT2 git bot
e9c7f6d589
Merge Localisation/master into OpenRCT2/develop.
2017-11-02 04:00:33 +00:00
Michael Steenbeek
3d8ec4e393
Warn when loading incompatible RCTC saves
2017-11-01 20:23:06 +01:00
LRFLEW
778cb9d024
Rename CopyFramebufferShader to ApplyPaletteShader
2017-10-30 16:21:49 +01:00
LRFLEW
aac1c59714
OpenGL: Add multi-pass transparency
2017-10-30 16:21:49 +01:00
LRFLEW
d3d41ea724
OpenGL: Add single-pass transparency
2017-10-30 16:21:49 +01:00
LRFLEW
3d2d99817c
OpenGL: Add Depth Buffer and Depth Test
2017-10-30 16:21:49 +01:00
LRFLEW
6bf2e0157b
OpenGL: Improve Shaders
2017-10-30 16:21:49 +01:00
LRFLEW
f105237a2e
OpenGL: Delay Palette Mapping Until Final Framebuffer Copy to Screen
2017-10-30 16:21:49 +01:00
OpenRCT2 git bot
e656418286
Merge Localisation/master into OpenRCT2/develop.
2017-10-30 04:00:30 +00:00
OpenRCT2 git bot
33dd3b2275
Merge Localisation/master into OpenRCT2/develop.
2017-10-25 04:00:33 +00:00
OpenRCT2 git bot
f938904cfe
Merge Localisation/master into OpenRCT2/develop.
2017-10-24 04:00:27 +00:00
OpenRCT2 git bot
47f5423845
Merge Localisation/master into OpenRCT2/develop.
2017-10-23 04:00:25 +00:00
OpenRCT2 git bot
5c98c7ee5e
Merge Localisation/master into OpenRCT2/develop.
2017-10-22 04:00:35 +00:00
OpenRCT2 git bot
34fe5ac976
Merge Localisation/master into OpenRCT2/develop.
2017-10-21 04:00:25 +00:00
OpenRCT2 git bot
46961f1813
Merge Localisation/master into OpenRCT2/develop.
2017-10-20 04:00:23 +00:00
Aaron van Geffen
9f67fafc43
Add theme support for console background colour.
2017-10-19 21:26:53 +02:00
OpenRCT2 git bot
814b28c814
Merge Localisation/master into OpenRCT2/develop.
2017-10-19 04:00:26 +00:00
Robert Jordan
ec22d04089
Fix #6470 : Title sequence naming issues
...
Predefined title sequence filenames are now treated as "reserved".
Custom title sequences cannot use reserved names and an error will
appear if the user tries.
Duplicating predefined title sequence now uses default text of
predefined sequence's proper name instead of filename.
Renamed `WIDX_TITLE_EDITOR_RENAME_SAVE_BUTTON` to
`WIDX_TITLE_EDITOR_RENAME_BUTTON` to follow formatting of other preset
button ids.
Added string id 6154, `STR_ERROR_RESERVED_NAME`, "Name is reserved".
2017-10-18 11:18:14 +02:00
OpenRCT2 git bot
a7ff610c4b
Merge Localisation/master into OpenRCT2/develop.
2017-10-18 04:00:32 +00:00
OpenRCT2 git bot
2ec1c71c9f
Merge Localisation/master into OpenRCT2/develop.
2017-10-17 04:00:34 +00:00
OpenRCT2 git bot
a31add2141
Merge Localisation/master into OpenRCT2/develop.
2017-10-16 04:00:30 +00:00
OpenRCT2 git bot
691fb3ab51
Merge Localisation/master into OpenRCT2/develop.
2017-10-15 04:00:34 +00:00
Krutonium
fd459f0791
Add a visible notification for missing KDialog/Zenity
2017-10-14 22:16:51 +02:00
OpenRCT2 git bot
18d29fdc24
Merge Localisation/master into OpenRCT2/develop.
2017-10-13 04:00:32 +00:00
OpenRCT2 git bot
a27adb5df0
Merge Localisation/master into OpenRCT2/develop.
2017-10-12 06:38:35 +00:00
Michael Steenbeek
17557569d0
Turn 'unlock all prices' into a regular option
...
This uses a previously unused S6 flag to save this option persistently.
This should not make S6 import much harder, but should reduce the amount of questions about S4 import.
Also refactor the checks whether the user can ask money for rides or entry. This should make it a lot easier
when our own save format comes around.
2017-10-11 08:33:17 +02:00
OpenRCT2 git bot
c724074ff4
Merge Localisation/master into OpenRCT2/develop.
2017-10-09 04:00:26 +00:00
Christian F. Coors
e737b3108c
Add status messages to server list window
2017-10-08 11:51:22 +02:00
OpenRCT2 git bot
b56ad772f4
Merge Localisation/master into OpenRCT2/develop.
2017-10-07 04:00:21 +00:00
OpenRCT2 git bot
e5fe681793
Merge Localisation/master into OpenRCT2/develop.
2017-10-06 04:00:24 +00:00
OpenRCT2 git bot
8d2769dbc9
Merge Localisation/master into OpenRCT2/develop.
2017-10-04 04:00:31 +00:00
OpenRCT2 git bot
396793739a
Merge Localisation/master into OpenRCT2/develop.
2017-10-03 04:00:38 +00:00
OpenRCT2 git bot
606130c2bb
Merge Localisation/master into OpenRCT2/develop.
2017-10-02 04:00:27 +00:00
OpenRCT2 git bot
58b980d6ba
Merge Localisation/master into OpenRCT2/develop.
2017-09-30 04:00:30 +00:00
OpenRCT2 git bot
43e1e711b7
Merge Localisation/master into OpenRCT2/develop.
2017-09-29 04:00:29 +00:00
OpenRCT2 git bot
f5cc789978
Merge Localisation/master into OpenRCT2/develop.
2017-09-24 04:00:24 +00:00
OpenRCT2 git bot
e1568aab21
Merge Localisation/master into OpenRCT2/develop.
2017-09-23 04:00:26 +00:00
OpenRCT2 git bot
08eef61eb4
Merge Localisation/master into OpenRCT2/develop.
2017-09-22 04:00:21 +00:00
OpenRCT2 git bot
3818ee5577
Merge Localisation/master into OpenRCT2/develop.
2017-09-21 04:00:25 +00:00
OpenRCT2 git bot
a24f2fba6a
Merge Localisation/master into OpenRCT2/develop.
2017-09-20 04:00:24 +00:00
OpenRCT2 git bot
a774ae8bd7
Merge Localisation/master into OpenRCT2/develop.
2017-09-15 04:00:21 +00:00
Michael Steenbeek
d551108f12
en-GB: Fix typo
2017-09-14 13:34:54 +02:00
OpenRCT2 git bot
185ae6ff07
Merge Localisation/master into OpenRCT2/develop.
2017-09-14 04:00:26 +00:00
Michael Steenbeek
d4cc97165c
Clean up brake speed in ride construction window, fix #6271
2017-09-13 21:57:36 +02:00
Michael Steenbeek
597d40b25b
Add cheat to show all drawable track elements
2017-09-13 19:38:30 +02:00
OpenRCT2 git bot
c6e162e31c
Merge Localisation/master into OpenRCT2/develop.
2017-09-13 04:00:20 +00:00
OpenRCT2 git bot
e8d1cdbd99
Merge Localisation/master into OpenRCT2/develop.
2017-09-12 04:00:20 +00:00
OpenRCT2 git bot
2e8d1b5ed7
Merge Localisation/master into OpenRCT2/develop.
2017-09-09 04:00:18 +00:00
OpenRCT2 git bot
0fe18149ee
Merge Localisation/master into OpenRCT2/develop.
2017-09-05 04:00:19 +00:00
OpenRCT2 git bot
49066bac4a
Merge Localisation/master into OpenRCT2/develop.
2017-09-03 04:00:21 +00:00
OpenRCT2 git bot
4a5e5b6519
Merge Localisation/master into OpenRCT2/develop.
2017-09-02 04:00:17 +00:00
Ted John
3f1991804a
Add debug option to show dirty blocks
2017-08-31 22:36:15 +01:00
OpenRCT2 git bot
85650a27f5
Merge Localisation/master into OpenRCT2/develop.
2017-08-31 04:00:22 +00:00
rwjuk
c2b862ee51
Clean up and improve UI of track install window
...
Clean up and improve UI of track install window
Cleanup window def
Clean up and improve track install window
Name track_list.var_484
Format widget definitions
Use get_friendly_track_type_name()
Guard against NULL
2017-08-22 11:52:26 +02:00
Keatzee
a0f62f52f8
Fix bulrush typo
2017-08-21 08:12:07 +02:00
OpenRCT2 git bot
1a932ea964
Merge Localisation/master into OpenRCT2/develop.
2017-08-21 04:00:23 +00:00
OpenRCT2 git bot
96fbffa3f2
Merge Localisation/master into OpenRCT2/develop.
2017-08-19 04:00:22 +00:00
OpenRCT2 git bot
82be1de6d0
Merge Localisation/master into OpenRCT2/develop.
2017-08-18 04:00:20 +00:00
OpenRCT2 git bot
152897cff0
Merge Localisation/master into OpenRCT2/develop.
2017-08-17 04:00:28 +00:00
jensj12
c3a5ffbe04
Implement #3994 : Show bottom toolbar with map tooltip
2017-08-16 22:27:20 +02:00
Dennis-Z
634ee96f54
Implement OpenGL renderer FilterRect through palette remapping
...
Replace the previous "filtering" of rectangles based on
luminance, now using a remap palette like the software renderer for
better output colors.
Various other simplifications regarding to rectangle rendering are
included here too.
2017-08-16 00:43:41 +02:00
OpenRCT2 git bot
88d2805fd0
Merge Localisation/master into OpenRCT2/develop.
2017-08-15 04:00:25 +00:00
OpenRCT2 git bot
68c2175cf3
Merge Localisation/master into OpenRCT2/develop.
2017-08-12 04:00:29 +00:00
OpenRCT2 git bot
2dc87469fd
Merge Localisation/master into OpenRCT2/develop.
2017-08-05 04:00:29 +00:00
Gymnasiast
ca77c75a56
Improve tabs, alignment, remove now-unnecessary information and strings
...
Removes RCT2 version string, Infogrames credits and logo, removes strings for aforementioned info.
Moves OpenRCT2 version string to under the Changelog... button, rewords and fixes some of the strings
2017-08-04 08:41:46 +02:00
wolfreak99
ffc1dc6376
Add OpenRCT2 information and changelog to About window
2017-08-04 08:38:35 +02:00
OpenRCT2 git bot
2934a10d58
Merge Localisation/master into OpenRCT2/develop.
2017-08-03 04:00:18 +00:00
Michał Janiszewski
ee443818a8
Verify size of objects sent/requested ( #6076 )
2017-08-01 12:29:16 +01:00
OpenRCT2 git bot
84d273ac54
Merge Localisation/master into OpenRCT2/develop.
2017-07-31 04:00:18 +00:00
OpenRCT2 git bot
d23de89b33
Merge Localisation/master into OpenRCT2/develop.
2017-07-29 04:00:16 +00:00
OpenRCT2 git bot
bb57e3aa45
Merge Localisation/master into OpenRCT2/develop.
2017-07-28 04:00:18 +00:00
OpenRCT2 git bot
6f626f0997
Merge Localisation/master into OpenRCT2/develop.
2017-07-27 04:00:29 +00:00
Kuriibo
59fabad37c
Added new string for shortcut, validate_global_widx
2017-07-26 17:23:47 +01:00
OpenRCT2 git bot
efdc52662d
Merge Localisation/master into OpenRCT2/develop.
2017-07-26 04:00:19 +00:00
Michael Steenbeek
ef6aea98e4
Implement #4135 : Rename RC Designer to Track designer and allow more ride types
2017-07-25 12:16:37 +02:00
OpenRCT2 git bot
fe19d9a2a3
Merge Localisation/master into OpenRCT2/develop.
2017-07-25 04:00:25 +00:00
Gymnasiast
cc289a60b6
Correct 'Haunted Harbour' identifier
2017-07-24 08:49:45 +02:00
OpenRCT2 git bot
e431c812fa
Merge Localisation/master into OpenRCT2/develop.
2017-07-24 04:00:18 +00:00
wolfreak99
47a89c4cf3
Add "Ignore research status" cheat
2017-07-23 12:09:29 +02:00
OpenRCT2 git bot
eb28bba119
Merge Localisation/master into OpenRCT2/develop.
2017-07-23 04:00:16 +00:00
Richard Jenkins
fab8efbe2a
Implement #5855 : Display source game in missing obj window
2017-07-19 11:04:00 +02:00
OpenRCT2 git bot
0702402af4
Merge Localisation/master into OpenRCT2/develop.
2017-07-19 04:00:18 +00:00
OpenRCT2 git bot
ca1aaec59c
Merge Localisation/master into OpenRCT2/develop.
2017-07-18 04:00:26 +00:00
OpenRCT2 git bot
1b042506d9
Merge Localisation/master into OpenRCT2/develop.
2017-07-16 04:00:23 +00:00
Zankoas
ff51d4aec6
Minor spelling fixes for en-GB localisation
2017-07-14 23:56:28 +02:00
William Wallace
fbb424ba21
Add enums for DrawImageInstance flags
2017-07-13 18:10:14 +01:00
William Wallace
09f5019394
Improve rendering of masked sprites in OpenGL drawing engine
2017-07-13 10:18:05 +02:00
OpenRCT2 git bot
7d5daad2e1
Merge Localisation/master into OpenRCT2/develop.
2017-07-09 04:00:32 +00:00
OpenRCT2 git bot
e225ea2bc0
Merge Localisation/master into OpenRCT2/develop.
2017-07-08 04:00:41 +00:00
spacek531
e47e71e949
change format to uint8 to stop overflow
...
[ci-skip]
2017-07-07 17:35:33 +01:00
spacek531
51c34ff800
removed BOM from en-GB
...
[ci skip]
2017-07-07 17:35:31 +01:00
spacek531
c815a427c0
Change Seconds (internal) to Milliseconds, en-GB too
2017-07-07 17:35:31 +01:00
OpenRCT2 git bot
487e94dd72
Merge Localisation/master into OpenRCT2/develop.
2017-07-06 04:00:28 +00:00
OpenRCT2 git bot
3151b2b9da
Merge Localisation/master into OpenRCT2/develop.
2017-07-05 04:00:19 +00:00
OpenRCT2 git bot
0be6003474
Merge Localisation/master into OpenRCT2/develop.
2017-07-04 04:00:23 +00:00
OpenRCT2 git bot
126d0df2d0
Merge Localisation/master into OpenRCT2/develop.
2017-07-03 04:00:24 +00:00
OpenRCT2 git bot
018ccea688
Merge Localisation/master into OpenRCT2/develop.
2017-07-02 04:00:27 +00:00
rwjuk
214bf3988b
Implement 'missing objects' window
...
Implement 'missing objects' window
Basic implementation of 'bad objects' window
Add new object_load_error.c
Add object_load_error.c
Faffing about
String stuff
Stuff
Get window basically displaying
Proper col header for object
Display object types
Display file name and explanatory message
Probably about time I added myself to the dev list
Cleanup and comments
Make bad object window work with SC6
Fix whitespace, string IDs, flip core function sense
Fix spacing in string_ids.h
Fix string ID snafu
Fix HasNoInvalidObjects() sense
Attempt to refactor this to pass data properly
Move typedefs to separate header
Fix up signatures
Add park_load_result_types.h
Clean up includes and remnants of prev implementation
Split duplication into function, free invalid entries list on close
Use pointer for object_validity_result param
Fixup string IDs
Use LoadObject() directly
Use dependency injection, fix string termination
Xcode fix, make helper function static
Fix buffer overrun and memory leak
Use SDL for clipboard functionality
Fix function & variable declarations
Rework editor_read_s6() to use new park load result type
Update changelog for #5624
[ci skip]
Fix mem leak, function signature and whitespace
2017-07-01 01:28:51 +01:00
OpenRCT2 git bot
f3b3345db6
Merge Localisation/master into OpenRCT2/develop.
2017-06-30 04:00:32 +00:00
Gymnasiast
4e87ad6ac3
Properly check 'Finish 5 roller coasters' criteria, fixes #597
...
This fixes the following things:
- The objective was not available when using money (despite it being used on such scenarios in RCT1)
- The scenario editor set the 'partially finished flag' on every single ride
- The scenario editor did not check if there were five finished roller coasters
- When checking the goal, there was no check if the ride was a roller coaster
- When checking the goal, there was no check if the ride was one of the roller coasters to be completed
2017-06-29 17:32:12 +02:00
OpenRCT2 git bot
961c6cb44f
Merge Localisation/master into OpenRCT2/develop.
2017-06-26 04:00:23 +00:00
OpenRCT2 git bot
0318b5b1ca
Merge Localisation/master into OpenRCT2/develop.
2017-06-25 04:00:18 +00:00
OpenRCT2 git bot
050ac3dee4
Merge Localisation/master into OpenRCT2/develop.
2017-06-24 04:00:23 +00:00
Matte A
92426994af
Giving the cheat "Own all land" a tool-tip
2017-06-23 08:18:45 +02:00
OpenRCT2 git bot
f7937f56f0
Merge Localisation/master into OpenRCT2/develop.
2017-06-23 04:00:24 +00:00
OpenRCT2 git bot
14f9b221b3
Merge Localisation/master into OpenRCT2/develop.
2017-06-22 04:00:22 +00:00
OpenRCT2 git bot
1d93ac5011
Merge Localisation/master into OpenRCT2/develop.
2017-06-21 04:00:25 +00:00
OpenRCT2 git bot
97e6191851
Merge Localisation/master into OpenRCT2/develop.
2017-06-20 04:00:23 +00:00
Michael Steenbeek
4019dee565
en-GB: Change name of 'Midi Coaster'
2017-06-19 12:36:28 +02:00
OpenRCT2 git bot
c018cff5a3
Merge Localisation/master into OpenRCT2/develop.
2017-06-18 04:00:26 +00:00
OpenRCT2 git bot
bb0a655558
Merge Localisation/master into OpenRCT2/develop.
2017-06-17 04:00:19 +00:00
OpenRCT2 git bot
183e338173
Merge Localisation/master into OpenRCT2/develop.
2017-06-16 04:00:22 +00:00
Michael Steenbeek
96a7a8ab50
Sort rides into ride groups when in select-by-track-type mode
...
* Add ride groups
* Convert ride groups to C++
* Fix linking and crashes in Xcode
* Comment out .field syntax to make Visual Studio happy
* Fix alignment, fix changelog, cleanup
* Properly save ride group index in the ride object repository and bump its version
* Fix fallback behaviour when the ride entry is not available or not invented
* Fix include
* Rename RideGroup to RideGroupManager, add const, cleanup
* Break after finding matching ride group
2017-06-14 13:31:27 +02:00
OpenRCT2 git bot
4f873ce64a
Merge Localisation/master into OpenRCT2/develop.
2017-06-14 04:00:21 +00:00
OpenRCT2 git bot
f5ce5c9289
Merge Localisation/master into OpenRCT2/develop.
2017-06-13 04:00:22 +00:00
Richard Jenkins
4c67ef1d6a
Implement persistent 'real names of guests' setting
2017-06-12 14:05:19 +02:00
OpenRCT2 git bot
5c5389a2ff
Merge Localisation/master into OpenRCT2/develop.
2017-06-10 04:00:28 +00:00
OpenRCT2 git bot
6eb14aa90d
Merge Localisation/master into OpenRCT2/develop.
2017-06-09 04:00:20 +00:00
OpenRCT2 git bot
6e216141ca
Merge Localisation/master into OpenRCT2/develop.
2017-06-08 04:00:22 +00:00
Jeremy Herbert
ac99683955
Add cheat to disable ride value ageing
2017-06-07 21:52:47 +01:00
OpenRCT2 git bot
d249855728
Merge Localisation/master into OpenRCT2/develop.
2017-06-07 04:00:25 +00:00
Michał Janiszewski
43114b105c
Extend logging with signs and track modifications
2017-06-06 23:17:46 +02:00
delebota
f69e7ac89e
Setup server action logging for server admins in multiplayer
...
Squash commit containing:
- 398d978 Setup server action logging for server admins in multiplayer
- 13330ae Added server action logging for using cheats in multiplayer
- b619019 Added server action logging for demolishing rides in multiplayer
- 93de752 Added server action logging for editing ride properties in multiplayer
- 8a3d932 Added server action logging for editing park properties in multiplayer
- c78b6e7 Moved duplicate chat and server logging code into new network methods
- c8f66bf Changed logging variable types to avoid deprecated conversion errors in CI builds
- 454e527 Added improved server action logging for using cheats in multiplayer
- 1194305 Moved server action logging code in game.c into a separate method to reduce clutter
- d59cd42 Added server action logging for add/edit/remove scenery in multiplayer
- c41ae0e Added server action logging for clients in multiplayer
- c383341 Removed unused variable to fix CI build error
- 2d1d8e3 Added server action logging for ride creation in multiplayer
2017-06-06 23:07:54 +02:00
wolfreak99
07d1ba4f8c
Create "Own all land" cheat functionality ( #5056 )
...
Implement "Own all land" cheat into cheat window
Restore only valid peep spawn points
Code improvements
Update to use PEEP_SPAWN / PARK_ENTRANCE defines
2017-06-06 21:50:42 +01:00
Ted John
30585ea2a9
Show guest money effects with high precision
2017-06-05 21:18:14 +01:00
Sam Olsen
b9e9b8320f
Add enhancement to show money effect when peeps make purchases
2017-06-05 21:02:05 +01:00
wolfreak99
36ca5b30ac
Mark selected save file in load/save window
2017-06-05 15:45:36 +02:00
OpenRCT2 git bot
26196c62c3
Merge Localisation/master into OpenRCT2/develop.
2017-05-28 04:00:23 +00:00
OpenRCT2 git bot
dabaddd4cf
Merge Localisation/master into OpenRCT2/develop.
2017-05-26 04:00:23 +00:00
OpenRCT2 git bot
0728e6869b
Merge Localisation/master into OpenRCT2/develop.
2017-05-23 04:00:22 +00:00
OpenRCT2 git bot
eca9ef09b5
Merge Localisation/master into OpenRCT2/develop.
2017-05-19 04:00:25 +00:00
OpenRCT2 git bot
d699c8038e
Merge Localisation/master into OpenRCT2/develop.
2017-05-18 04:00:21 +00:00
OpenRCT2 git bot
b539bc6191
Merge Localisation/master into OpenRCT2/develop.
2017-05-17 04:00:18 +00:00
OpenRCT2 git bot
d56dd24a20
Merge Localisation/master into OpenRCT2/develop.
2017-05-12 04:00:21 +00:00
OpenRCT2 git bot
b83934da95
Merge Localisation/master into OpenRCT2/develop.
2017-05-10 04:00:24 +00:00
OpenRCT2 git bot
787ddf811f
Merge Localisation/master into OpenRCT2/develop.
2017-05-09 04:00:21 +00:00
OpenRCT2 git bot
4ab1289c83
Merge Localisation/master into OpenRCT2/develop.
2017-05-08 04:00:23 +00:00
OpenRCT2 git bot
1dffe4ea3f
Merge Localisation/master into OpenRCT2/develop.
2017-05-06 04:00:22 +00:00
OpenRCT2 git bot
6e7ce919f7
Merge Localisation/master into OpenRCT2/develop.
2017-05-05 04:00:22 +00:00
OpenRCT2 git bot
f8cb551721
Merge Localisation/master into OpenRCT2/develop.
2017-05-04 04:00:18 +00:00
OpenRCT2 git bot
e4de788baf
Merge Localisation/master into OpenRCT2/develop.
2017-05-03 04:00:18 +00:00
OpenRCT2 git bot
5d4d3c6394
Merge Localisation/master into OpenRCT2/develop.
2017-05-01 04:00:22 +00:00
Pulkit
dff1d724a0
Updated the location of the mute button
2017-04-30 17:33:26 +01:00
Pulkit
f7d01e3983
Modified the Mute button Like the Cheat
...
I implemented the Mute button but for some reason I am unable to enable
the checkbox. Could someone kindly look into it
2017-04-30 17:33:26 +01:00
Pulkit
ffa3896b24
Mute Button Implemented like in RCT1
...
Added the Mute button, like requested in the Issue #1421 .
2017-04-30 17:33:21 +01:00
OpenRCT2 git bot
b45d4f328b
Merge Localisation/master into OpenRCT2/develop.
2017-04-30 04:00:18 +00:00
Harry Lam
ce5e6b7df4
en-GB: "harbor" -> "harbour" ( #5412 )
...
[ci skip]
2017-04-29 21:18:38 +02:00
OpenRCT2 git bot
ee4e863dc6
Merge Localisation/master into OpenRCT2/develop.
2017-04-29 04:00:21 +00:00
OpenRCT2 git bot
18ada57bab
Merge Localisation/master into OpenRCT2/develop.
2017-04-28 04:00:25 +00:00
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
OpenRCT2 git bot
20f36ec1ee
Merge Localisation/master into OpenRCT2/develop.
2017-04-27 04:00:21 +00:00
OpenRCT2 git bot
f26380c5b7
Merge Localisation/master into OpenRCT2/develop.
2017-04-26 04:00:22 +00: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
OpenRCT2 git bot
5b16e0587f
Merge Localisation/master into OpenRCT2/develop.
2017-04-25 04:00:23 +00: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
OpenRCT2 git bot
a16220ef82
Merge Localisation/master into OpenRCT2/develop.
2017-04-24 04:00:21 +00:00
Hugo Wallenburg
6e41508bad
Make paths in STR_2743 consistent with STR_5836
2017-04-23 16:21:08 +02:00
OpenRCT2 git bot
bea17e1aa0
Merge Localisation/master into OpenRCT2/develop.
2017-04-23 04:00:17 +00:00
OpenRCT2 git bot
9bb0aab7e7
Merge Localisation/master into OpenRCT2/develop.
2017-04-22 04:00:22 +00:00
OpenRCT2 git bot
e72542be68
Merge Localisation/master into OpenRCT2/develop.
2017-04-21 04:00:19 +00: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
OpenRCT2 git bot
4a97d53c0a
Merge Localisation/master into OpenRCT2/develop.
2017-04-15 04:00:17 +00:00
OpenRCT2 git bot
f07fb2dfe1
Merge Localisation/master into OpenRCT2/develop.
2017-04-14 04:00:29 +00:00
OpenRCT2 git bot
8198254b72
Merge Localisation/master into OpenRCT2/develop.
2017-04-12 04:00:20 +00: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
OpenRCT2 git bot
998a05d217
Merge Localisation/master into OpenRCT2/develop.
2017-04-11 04:00:23 +00: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
OpenRCT2 git bot
ae2e94ce54
Merge Localisation/master into OpenRCT2/develop.
2017-04-10 04:00:23 +00:00
OpenRCT2 git bot
d55258608b
Merge Localisation/master into OpenRCT2/develop.
2017-04-09 04:00:24 +00:00
OpenRCT2 git bot
1639f614f1
Merge Localisation/master into OpenRCT2/develop.
2017-04-08 04:00:16 +00: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
OpenRCT2 git bot
1659a93552
Merge Localisation/master into OpenRCT2/develop.
2017-04-06 04:00:18 +00:00
OpenRCT2 git bot
447153ccfb
Merge Localisation/master into OpenRCT2/develop.
2017-04-04 04:00:19 +00: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
OpenRCT2 git bot
44db9ce80c
Merge Localisation/master into OpenRCT2/develop.
2017-03-26 04:00:27 +00:00
OpenRCT2 git bot
78ff61ce31
Merge Localisation/master into OpenRCT2/develop.
2017-03-23 04:00:20 +00:00
OpenRCT2 git bot
468f369907
Merge Localisation/master into OpenRCT2/develop.
2017-03-17 04:00:28 +00:00
OpenRCT2 git bot
18767850bd
Merge Localisation/master into OpenRCT2/develop.
2017-03-16 04:00:18 +00:00
Ted John
6e7c5b7031
Add scenery eyedropper button
2017-03-13 18:05:13 +00:00
OpenRCT2 git bot
6880490c66
Merge Localisation/master into OpenRCT2/develop.
2017-03-12 04:00:17 +00:00
wolfreak99
2fe134fd5f
Make shortcut keys window bigger and resizable
2017-03-11 22:09:24 +01:00
OpenRCT2 git bot
2e37d6e427
Merge Localisation/master into OpenRCT2/develop.
2017-03-08 04:00:25 +00:00
OpenRCT2 git bot
38bc6f82e3
Merge Localisation/master into OpenRCT2/develop.
2017-03-07 04:00:24 +00:00
OpenRCT2 git bot
8bd10df859
Merge Localisation/master into OpenRCT2/develop.
2017-03-05 04:00:20 +00:00
OpenRCT2 git bot
a33752e1e3
Merge Localisation/master into OpenRCT2/develop.
2017-03-04 04:00:21 +00:00
Joël Troch
8167ff9678
Fix #1730 : Add keyboard shortcuts for track construction ( #5200 )
2017-03-03 09:35:42 +01:00
OpenRCT2 git bot
4aa44e15c6
Merge Localisation/master into OpenRCT2/develop.
2017-03-03 04:00:22 +00:00
OpenRCT2 git bot
2da540ba5c
Merge Localisation/master into OpenRCT2/develop.
2017-03-02 04:00:23 +00:00
OpenRCT2 git bot
6b3b4949fe
Merge Localisation/master into OpenRCT2/develop.
2017-03-01 04:00:17 +00: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
Duncan
1654ba4fe4
Merge pull request #5236 from duncanspumpkin/refactor
...
Refactor fence to wall
2017-02-28 06:56:06 +00:00
OpenRCT2 git bot
3a0318ff04
Merge Localisation/master into OpenRCT2/develop.
2017-02-26 04:00:16 +00:00
OpenRCT2 git bot
e8a7f9a065
Merge Localisation/master into OpenRCT2/develop.
2017-02-25 04:00:17 +00:00
OpenRCT2 git bot
9ee910c4db
Merge Localisation/master into OpenRCT2/develop.
2017-02-24 04:00:16 +00:00
OpenRCT2 git bot
7005d5dca1
Merge Localisation/master into OpenRCT2/develop.
2017-02-22 04:00:19 +00:00
duncanspumpkin
69af723972
Remove more fences
2017-02-21 20:22:03 +00:00
OpenRCT2 git bot
ba8f2ef103
Merge Localisation/master into OpenRCT2/develop.
2017-02-21 04:00:18 +00:00
OpenRCT2 git bot
a10173b928
Merge Localisation/master into OpenRCT2/develop.
2017-02-19 04:00:18 +00:00
OpenRCT2 git bot
9abff205c3
Merge Localisation/master into OpenRCT2/develop.
2017-02-18 04:00:20 +00:00
OpenRCT2 git bot
cfab71a076
Merge Localisation/master into OpenRCT2/develop.
2017-02-17 04:00:20 +00:00
Michał Janiszewski
6f7d869639
Merge pull request #5110 from Broxzier/tileinspector_multiplayer
...
Multiplayer support for the tile inspector
2017-02-15 13:20:35 +01:00
OpenRCT2 git bot
bea5a4316f
Merge Localisation/master into OpenRCT2/develop.
2017-02-15 04:00:24 +00:00
OpenRCT2 git bot
13df54c9d0
Merge Localisation/master into OpenRCT2/develop.
2017-02-13 04:00:19 +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
OpenRCT2 git bot
bf0be4ca98
Merge Localisation/master into OpenRCT2/develop.
2017-02-12 04:00:23 +00:00
Ted John
3a1331190b
Merge pull request #5203 from oli414/price-tooltips
...
Add tooltip for ride and entrance price when price is disabled for clarification
2017-02-11 11:57:05 +00:00
OpenRCT2 git bot
5f3fc807af
Merge Localisation/master into OpenRCT2/develop.
2017-02-11 04:00:24 +00: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
OpenRCT2 git bot
0b4aa0d771
Merge Localisation/master into OpenRCT2/develop.
2017-02-05 04:00:18 +00:00
OpenRCT2 git bot
ae2e0faad0
Merge Localisation/master into OpenRCT2/develop.
2017-02-02 04:00:23 +00:00
OpenRCT2 git bot
457d3db612
Merge Localisation/master into OpenRCT2/develop.
2017-02-01 04:00:20 +00:00
OpenRCT2 git bot
a52339b13e
Merge Localisation/master into OpenRCT2/develop.
2017-01-29 04:00:21 +00:00
OpenRCT2 git bot
661ebbd997
Merge Localisation/master into OpenRCT2/develop.
2017-01-28 04:00:23 +00:00
OpenRCT2 git bot
8d56821f56
Merge Localisation/master into OpenRCT2/develop.
2017-01-27 04:00:18 +00:00
OpenRCT2 git bot
a72cf41fcf
Merge Localisation/master into OpenRCT2/develop.
2017-01-26 04:00:18 +00: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
OpenRCT2 git bot
89b7a173a4
Merge Localisation/master into OpenRCT2/develop.
2017-01-24 04:00:24 +00: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
ed940ab41c
Merge pull request #5098 from IntelOrca/enable-lightfx
...
Resolve #5048 : Enable light FX
2017-01-22 01:31:56 +00:00
Ted John
fc66f42c31
Add config option to enable / disable light FX
2017-01-21 12:01:01 +00:00
OpenRCT2 git bot
4b0f45a740
Merge Localisation/master into OpenRCT2/develop.
2017-01-21 04:00:20 +00:00
OpenRCT2 git bot
8c9b57915c
Merge Localisation/master into OpenRCT2/develop.
2017-01-20 04:00:20 +00:00
OpenRCT2 git bot
cadb451806
Merge Localisation/master into OpenRCT2/develop.
2017-01-16 04:00:17 +00:00
OpenRCT2 git bot
ebf479d5bf
Merge Localisation/master into OpenRCT2/develop.
2017-01-12 04:00:17 +00:00
OpenRCT2 git bot
ea25a022ee
Merge Localisation/master into OpenRCT2/develop.
2017-01-11 04:00:17 +00:00
wolfreak99
8932f61a67
Add cheats to set/add money by custom amounts
2017-01-10 23:43:42 +01:00
OpenRCT2 git bot
e537a378dd
Merge Localisation/master into OpenRCT2/develop.
2017-01-08 04:00:21 +00:00
OpenRCT2 git bot
2d47ddb1b3
Merge Localisation/master into OpenRCT2/develop.
2017-01-06 04:00:15 +00:00
OpenRCT2 git bot
397806af19
Merge Localisation/master into OpenRCT2/develop.
2017-01-05 04:00:15 +00:00
OpenRCT2 git bot
b1b73a7745
Merge Localisation/master into OpenRCT2/develop.
2017-01-04 04:00:15 +00:00
Gymnasiast
5a82b2e0d1
Add booster elements to build window, fix implementation
2017-01-01 17:17:11 +01:00
OpenRCT2 git bot
68ed96194f
Merge Localisation/master into OpenRCT2/develop.
2017-01-01 04:00:23 +00:00
OpenRCT2 git bot
6080a159de
Merge Localisation/master into OpenRCT2/develop.
2016-12-29 04:00:21 +00:00
OpenRCT2 git bot
519903d657
Merge Localisation/master into OpenRCT2/develop.
2016-12-24 04:00:22 +00:00
Ted John
f57d69eeb9
Remove title sequences
2016-12-16 17:21:16 +00:00
OpenRCT2 git bot
fc9d3a2869
Merge Localisation/master into OpenRCT2/develop.
2016-12-14 04:00:20 +00:00
OpenRCT2 git bot
fe9dd6b7a8
Merge Localisation/master into OpenRCT2/develop.
2016-12-13 04:00:17 +00:00
OpenRCT2 git bot
1dd2751f4a
Merge Localisation/master into OpenRCT2/develop.
2016-12-07 04:00:19 +00:00
OpenRCT2 git bot
c462a6dd23
Merge Localisation/master into OpenRCT2/develop.
2016-12-06 04:00:17 +00:00
OpenRCT2 git bot
a5de893439
Merge Localisation/master into OpenRCT2/develop.
2016-12-04 04:00:22 +00:00
OpenRCT2 git bot
fc666e707a
Merge Localisation/master into OpenRCT2/develop.
2016-11-28 04:00:23 +00:00
OpenRCT2 git bot
039d64e256
Merge Localisation/master into OpenRCT2/develop.
2016-11-26 04:00:22 +00:00
OpenRCT2 git bot
f03f718dd1
Merge Localisation/master into OpenRCT2/develop.
2016-11-24 04:00:18 +00:00
OpenRCT2 git bot
0e37aa918c
Merge Localisation/master into OpenRCT2/develop.
2016-11-23 04:00:19 +00:00
OpenRCT2 git bot
349ca774ca
Merge Localisation/master into OpenRCT2/develop.
2016-11-22 04:00:15 +00:00
Michael Steenbeek
09d2f9417e
Label OpenGL experimental, fixes #4716
2016-11-21 09:49:07 +01:00
OpenRCT2 git bot
118ac9b062
Merge Localisation/master into OpenRCT2/develop.
2016-11-20 04:00:26 +00:00
OpenRCT2 git bot
516b4c645b
Merge Localisation/master into OpenRCT2/develop.
2016-11-16 04:00:18 +00:00
Ted John
4d7f52960d
Merge pull request #4737 from Broxzier/copy_element
...
Copy/paste single elements
2016-11-14 21:24:40 +00:00
OpenRCT2 git bot
4226f39a70
Merge Localisation/master into OpenRCT2/develop.
2016-11-14 04:00:23 +00:00
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
OpenRCT2 git bot
3266867171
Merge Localisation/master into OpenRCT2/develop.
2016-06-12 04:00:21 +00:00
Ted John
8185a88e47
implement drawing solid coloured sprites
2016-06-11 18:28:03 +01:00
Ted John
e3ecb91b91
implement DrawLine with shader
2016-06-11 17:43:53 +01:00
Ted John
e34ee15738
implement overlay transparency for FillRect
2016-06-11 16:46:24 +01:00
Ted John
2a569dc062
implement a ping-pong framebuffer
2016-06-11 15:18:31 +01:00
OpenRCT2 git bot
304d7970ac
Merge Localisation/master into OpenRCT2/develop.
2016-06-11 04:00:16 +00:00
Ted John
b0b0b82fd1
implement scaling for OpenGL
2016-06-11 02:24:39 +01:00
Ted John
84ca31a240
implement masked image shader
2016-06-10 20:17:00 +01:00
Ted John
808afe0a81
add drawimage shader and optimise
2016-06-10 17:54:29 +01:00
Ted John
a9d49838fa
add cross pattern support for fillrect shader
2016-06-10 17:54:29 +01:00
Ted John
c48031581b
get the fillrect shader working
2016-06-10 17:54:29 +01:00
Ted John
dc7b8b4d3b
add initial shader code
2016-06-10 17:54:29 +01:00
OpenRCT2 git bot
af0f77e857
Merge Localisation/master into OpenRCT2/develop.
2016-06-10 04:00:20 +00:00
OpenRCT2 git bot
b511eb0a2e
Merge Localisation/master into OpenRCT2/develop.
2016-06-09 04:00:18 +00:00
Ted John
504e5e0720
Merge pull request #3803 from IntelOrca/refactor/drawing
...
Refactor drawing and add initial infrastructure for OpenGL rendering.
2016-06-08 21:21:39 +01:00
OpenRCT2 git bot
426e106111
Merge Localisation/master into OpenRCT2/develop.
2016-06-08 04:00:22 +00: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
OpenRCT2 git bot
84334c1485
Merge Localisation/master into OpenRCT2/develop.
2016-06-07 04:00:18 +00:00
OpenRCT2 git bot
3dc4b601b8
Merge Localisation/master into OpenRCT2/develop.
2016-06-06 04:00:21 +00:00
OpenRCT2 git bot
4f6929edf6
Merge Localisation/master into OpenRCT2/develop.
2016-06-04 04:00:21 +00:00
Ted John
82dd7601eb
Merge pull request #3782 from janisozaur/desyncs
...
synchronise reset_0x69EBE4 over network
2016-06-03 10:47:01 +01:00
OpenRCT2 git bot
7e291c32bc
Merge Localisation/master into OpenRCT2/develop.
2016-06-03 04:00:19 +00: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
OpenRCT2 git bot
99a7346c3f
Merge Localisation/master into OpenRCT2/develop.
2016-06-02 04:00:26 +00:00
OpenRCT2 git bot
67f11318cd
Merge Localisation/master into OpenRCT2/develop.
2016-06-01 04:00:20 +00:00
Ted John
7157199b45
add information tab to multiplayer
2016-05-31 17:16:08 +01:00
Ted John
b68da1189b
Merge pull request #3776 from IntelOrca/feature/chatlogs
...
Save chat logs
2016-05-31 11:39:00 +01:00
OpenRCT2 git bot
649ea9c705
Merge Localisation/master into OpenRCT2/develop.
2016-05-31 04:00:17 +00:00
Ted John
feb65ea93c
add option to log chat history
2016-05-30 18:01:17 +01:00
OpenRCT2 git bot
b624d284aa
Merge Localisation/master into OpenRCT2/develop.
2016-05-30 04:00:21 +00:00
OpenRCT2 git bot
f257c81e99
Merge Localisation/master into OpenRCT2/develop.
2016-05-29 04:00:20 +00:00
OpenRCT2 git bot
23d856162e
Merge Localisation/master into OpenRCT2/develop.
2016-05-28 04:00:22 +00: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
OpenRCT2 git bot
95249cf1df
Merge Localisation/master into OpenRCT2/develop.
2016-05-26 04:00:47 +00: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
OpenRCT2 git bot
f04fa3ca4f
Merge Localisation/master into OpenRCT2/develop.
2016-05-25 04:00:21 +00: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
OpenRCT2 git bot
2130bf0126
Merge Localisation/master into OpenRCT2/develop.
2016-05-24 04:00:19 +00:00
OpenRCT2 git bot
be26ed4281
Merge Localisation/master into OpenRCT2/develop.
2016-05-23 04:00:18 +00:00
Matte A
e7510262ac
Add clarifications to <not used anymore> ( #3693 )
2016-05-22 15:31:41 +02:00
OpenRCT2 git bot
804568f3c8
Merge Localisation/master into OpenRCT2/develop.
2016-05-22 04:00:20 +00:00
OpenRCT2 git bot
2eeb20cb83
Merge Localisation/master into OpenRCT2/develop.
2016-05-21 04:00:20 +00:00
OpenRCT2 git bot
02152ae70e
Merge Localisation/master into OpenRCT2/develop.
2016-05-20 04:00:17 +00:00
Matte A
c96bd533ff
Change en-GB screen language ( #3668 )
2016-05-19 17:04:57 +02:00
OpenRCT2 git bot
9e6df440b5
Merge Localisation/master into OpenRCT2/develop.
2016-05-19 04:00:20 +00:00
Martin Černáč
feed51de27
Add correct tooltip entry for the no. circuits ( #3650 )
2016-05-18 12:56:30 +01:00
OpenRCT2 git bot
1fd2c1d000
Merge Localisation/master into OpenRCT2/develop.
2016-05-18 04:00:21 +00:00
OpenRCT2 git bot
f1c5d47705
Merge Localisation/master into OpenRCT2/develop.
2016-05-17 04:00:20 +00:00
OpenRCT2 git bot
193ae36cb4
Merge Localisation/master into OpenRCT2/develop.
2016-05-16 04:00:19 +00:00
OpenRCT2 git bot
800dc83951
Merge Localisation/master into OpenRCT2/develop.
2016-05-15 04:00:23 +00:00
OpenRCT2 git bot
f62932a5d3
Merge Localisation/master into OpenRCT2/develop.
2016-05-14 04:00:20 +00:00
OpenRCT2 git bot
a675192bdf
Merge Localisation/master into OpenRCT2/develop.
2016-05-13 04:00:19 +00: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
OpenRCT2 git bot
7c7dea8f00
Merge Localisation/master into OpenRCT2/develop.
2016-05-12 04:00:21 +00:00
OpenRCT2 git bot
5636e6a130
Merge Localisation/master into OpenRCT2/develop.
2016-05-10 04:00:18 +00:00
OpenRCT2 git bot
05384db02a
Merge Localisation/master into OpenRCT2/develop.
2016-05-09 04:00:20 +00: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
OpenRCT2 git bot
95a1f0a0fd
Merge Localisation/master into OpenRCT2/develop.
2016-05-08 04:00:24 +00:00
OpenRCT2 git bot
0d4fefeecd
Merge Localisation/master into OpenRCT2/develop.
2016-05-07 04:00:18 +00:00
Matte A
9421cc0bd4
Add shortcut for the Multiplayer window ( #3509 )
2016-05-06 21:14:49 +01:00
OpenRCT2 git bot
a58ef72eb9
Merge Localisation/master into OpenRCT2/develop.
2016-05-06 04:00:29 +00:00
OpenRCT2 git bot
0a710d3a01
Merge Localisation/master into OpenRCT2/develop.
2016-05-05 04:00:20 +00:00
OpenRCT2 git bot
a8aff1679e
Merge Localisation/master into OpenRCT2/develop.
2016-05-04 04:00:18 +00: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
OpenRCT2 git bot
2854973c09
Merge Localisation/master into OpenRCT2/develop.
2016-05-03 04:00:19 +00:00
X7123M3-256
8f6089818f
Added "Disable train length limits" string
2016-05-02 21:37:05 +02:00
OpenRCT2 git bot
4c9cc4f9f8
Merge Localisation/master into OpenRCT2/develop.
2016-05-02 04:00:18 +00:00
Patrick de Wit
7656cfdcbe
Add rides amount to ride_list window. ( #3461 )
2016-04-30 17:12:12 +01:00
OpenRCT2 git bot
c2344d3373
Merge Localisation/master into OpenRCT2/develop.
2016-04-29 04:00:19 +00:00
OpenRCT2 git bot
2ae18e4014
Merge Localisation/master into OpenRCT2/develop.
2016-04-28 04:00:15 +00:00
OpenRCT2 git bot
8e59a6c102
Merge Localisation/master into OpenRCT2/develop.
2016-04-27 04:00:16 +00:00
Ted John
1729061df8
use ISO 639-1 for language filenames, closes #2420 ( #3431 )
2016-04-26 19:52:42 +01:00
OpenRCT2 git bot
80dc44836a
Merge Localisation/master into OpenRCT2/develop.
2016-04-26 04:00:17 +00:00
OpenRCT2 git bot
9b5d706bab
Merge Localisation/master into OpenRCT2/develop.
2016-04-25 04:00:15 +00:00
Nubbie
44a92e3f6b
Explain what 'Advertise' means, fixes #3382
2016-04-24 21:24:28 +02:00
OpenRCT2 git bot
b0da767747
Merge Localisation/master into OpenRCT2/develop.
2016-04-23 04:00:19 +00:00
OpenRCT2 git bot
9561e76c39
Merge Localisation/master into OpenRCT2/develop.
2016-04-22 04:00:17 +00:00
OpenRCT2 git bot
f6bfbb0186
Merge Localisation/master into OpenRCT2/develop.
2016-04-21 04:00:15 +00:00
Rune Laenen
e0c103031e
Add shortcut to mute sound
2016-04-20 19:56:57 +02:00
OpenRCT2 git bot
11bf9111c3
Merge Localisation/master into OpenRCT2/develop.
2016-04-20 04:00:15 +00: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
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
OpenRCT2 git bot
6c505025f5
Merge Localisation/master into OpenRCT2/develop.
2016-04-19 04:00:18 +00:00
janisozaur
24eaa0a56d
Show units used when streaming the map over network. Fix #3328 ( #3331 )
2016-04-17 21:27:23 +01:00
OpenRCT2 git bot
ea19684d94
Merge Localisation/master into OpenRCT2/develop.
2016-04-16 04:00:14 +00:00
Ted John
964ffdb0be
add late localisation changes
2016-04-15 22:25:43 +01:00
Michael Steenbeek
7aaa7bb0ca
New title sequence ( #3310 )
2016-04-15 21:29:53 +01:00
OpenRCT2 git bot
a4283cff03
Merge Localisation/master into OpenRCT2/develop.
2016-04-12 19:25:41 +00:00
OpenRCT2 git bot
8e247c3b06
Merge Localisation/master into OpenRCT2/develop.
2016-04-12 04:00:29 +00:00
OpenRCT2 git bot
2090c4aad2
Merge Localisation/master into OpenRCT2/develop.
2016-04-11 04:00:17 +00:00
wolfreak99
1947b1dd30
require special permission for cluster building, closes #3045
2016-04-10 11:52:34 +01:00
OpenRCT2 git bot
343ee0ea94
Merge Localisation/master into OpenRCT2/develop.
2016-04-09 04:00:18 +00:00
OpenRCT2 git bot
5d04ab3b82
Merge Localisation/master into OpenRCT2/develop.
2016-04-08 04:00:18 +00:00
OpenRCT2 git bot
6de15f2367
Merge Localisation/master into OpenRCT2/develop.
2016-04-07 04:00:17 +00:00
Matte A
e934d56a89
Fix colliding strings
2016-04-06 21:04:32 +02:00
Michael Steenbeek
164d782bc2
UK: Rephrase land paint tool description, fixes #3131
2016-04-06 20:57:25 +02:00
Nubbie
3017607521
Add 3 MORE descriptions for cheats
2016-04-06 18:08:14 +01:00
OpenRCT2 git bot
f50191cee9
Merge Localisation/master into OpenRCT2/develop.
2016-04-06 04:00:18 +00:00
Nubbie
68d21e22a1
Improve descriptions for cheats
...
Note: Language IDs have changed slightly
2016-04-04 17:35:05 +01:00
OpenRCT2 git bot
842ae98f76
Merge Localisation/master into OpenRCT2/develop.
2016-04-03 04:00:13 +00:00
OpenRCT2 git bot
4d8e8efa0e
Merge Localisation/master into OpenRCT2/develop.
2016-04-01 04:00:19 +00:00
OpenRCT2 git bot
d07e471796
Merge Localisation/master into OpenRCT2/develop.
2016-03-30 04:00:26 +00:00
OpenRCT2 git bot
90e4b69de7
Merge Localisation/master into OpenRCT2/develop.
2016-03-26 04:00:14 +00:00
OpenRCT2 git bot
c7220f6b3f
Merge Localisation/master into OpenRCT2/develop.
2016-03-24 04:00:15 +00:00
OpenRCT2 git bot
e87876c570
Merge Localisation/master into OpenRCT2/develop.
2016-03-21 04:00:16 +00:00
OpenRCT2 git bot
fdead70403
Merge Localisation/master into OpenRCT2/develop.
2016-03-17 04:00:21 +00:00
OpenRCT2 git bot
52d0fb1b2a
Merge Localisation/master into OpenRCT2/develop.
2016-03-16 04:00:18 +00:00
Michael Steenbeek
2503be8f49
UK: Use clearer screen mode terminology, closes #3128 , closes #3129
2016-03-14 20:55:59 +01:00
OpenRCT2 git bot
3305bbd168
Merge Localisation/master into OpenRCT2/develop.
2016-03-11 04:00:16 +00:00
OpenRCT2 git bot
50ef184772
Merge Localisation/master into OpenRCT2/develop.
2016-03-08 04:00:15 +00:00
OpenRCT2 git bot
b6c8917b3a
Merge Localisation/master into OpenRCT2/develop.
2016-03-07 04:00:18 +00:00
OpenRCT2 git bot
25e536bb1c
Merge Localisation/master into OpenRCT2/develop.
2016-03-06 04:00:13 +00:00
OpenRCT2 git bot
dcf248a1d4
Merge Localisation/master into OpenRCT2/develop.
2016-03-05 04:00:14 +00:00
danidoedel
57b7934b83
Add ability to disable lightning effect, resolves #1299
2016-03-04 23:13:20 +01:00
OpenRCT2 git bot
9ef4af548b
Merge Localisation/master into OpenRCT2/develop.
2016-03-04 04:00:15 +00:00
OpenRCT2 git bot
da631e9009
Merge Localisation/master into OpenRCT2/develop.
2016-03-03 04:00:16 +00:00
IntelOrca
c60e05fc99
add default ride inspection interval option, closes #1455
2016-03-02 19:27:54 +00:00
OpenRCT2 git bot
9cc930ebac
Merge Localisation/master into OpenRCT2/develop.
2016-03-02 04:00:17 +00:00
IntelOrca
dcf09c5d4b
show total number of players online on server list
2016-03-01 18:45:30 +00:00
OpenRCT2 git bot
e94d2a9d8b
Merge Localisation/master into OpenRCT2/develop.
2016-03-01 04:00:23 +00:00
IntelOrca
e57f27e1a1
improve group renaming
2016-02-29 22:34:37 +00:00
IntelOrca
a634aacfab
show information about locked scenarios, closes #2660
2016-02-29 21:28:01 +00:00
Michael Steenbeek
ad37bd0496
UK: Typo
2016-02-29 11:11:51 +01:00
IntelOrca
5ee023c86e
reinstate string id: 5664
2016-02-28 10:37:44 +00:00
OpenRCT2 git bot
9e732095ec
Merge Localisation/master into OpenRCT2/develop.
2016-02-28 04:00:13 +00:00
OpenRCT2 git bot
af72a537af
Merge Localisation/master into OpenRCT2/develop.
2016-02-27 04:00:19 +00:00
Michał Janiszewski
e232358608
Display message with chat shortcut keys upon connection
...
Works for server as well.
2016-02-26 10:26:30 +01:00
OpenRCT2 git bot
adde88ca92
Merge Localisation/master into OpenRCT2/develop.
2016-02-26 04:00:23 +00:00
IntelOrca
1dde20a8f5
remove unused string ID
2016-02-25 20:21:22 +00:00
IntelOrca
6484326892
use built ago label for ride list instead of age
2016-02-25 17:59:32 +00:00