mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-08-29 13:36:07 +02:00
Code Issues Projects Releases Wiki Activity
13942 commits 9 branches 41 tags 334 MiB
Commit graph

1296 commits

Author SHA1 Message Date
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
Jacob Wallraff
eb706fbdf5 Adding string ids 2016-02-25 17:59:31 +00:00
Ted John
74973a4a97 Merge pull request #2950 from janisozaur/ride-names 
Rename ride_entry functions and provide better logging
 2016-02-25 12:43:19 +00:00
OpenRCT2 git bot
10dbcfe447 Merge Localisation/master into OpenRCT2/develop. 2016-02-25 04:00:14 +00:00
IntelOrca
b0887f174b split sound and music mixing correctly, closes #1270 2016-02-24 22:42:50 +00:00
Michał Janiszewski
d19fe0e334 Make sure null ride type gets handled properly 2016-02-24 23:16:25 +01:00
OpenRCT2 git bot
2e81dfa29e Merge Localisation/master into OpenRCT2/develop. 2016-02-24 04:00:13 +00:00
OpenRCT2 git bot
fe7c99e256 Merge Localisation/master into OpenRCT2/develop. 2016-02-23 04:00:20 +00:00
OpenRCT2 git bot
196d3d8dcc Merge Localisation/master into OpenRCT2/develop. 2016-02-22 04:00:14 +00:00
Gymnasiast
21cb7a948b Make 'All files' translatable 2016-02-21 18:42:55 +01:00
OpenRCT2 git bot
9c08d03b0d Merge Localisation/master into OpenRCT2/develop. 2016-02-21 04:00:14 +00:00
Gymnasiast
d32b7286f5 Adjust string ids 2016-02-21 00:21:14 +01:00
Ted John
5182441768 Merge pull request #2968 from octaroot/add_multiplayer_strings 
Fix #2802 - extract hardcoded network-related strings
 2016-02-20 15:07:53 +00:00
OpenRCT2 git bot
05d66fac25 Merge Localisation/master into OpenRCT2/develop. 2016-02-20 04:00:14 +00:00
Martin Černáč
830b897dc6 Refactor conditional buffers and string_ids 2016-02-19 17:17:10 +01:00
Martin Černáč
62672af35e Refactor sprintf and string_formater usages 2016-02-18 17:43:47 +01:00
Martin Černáč
361d30c6f5 Fix #2802 - extract hardcoded network-related strings 
I extracted all of the hardcoded network-related strings. In addition to that, I also refactored the way last_disconnect_reason was being accessed/modified.
 2016-02-18 14:52:02 +01:00
OpenRCT2 git bot
b13af3c8f5 Merge Localisation/master into OpenRCT2/develop. 2016-02-18 04:00:15 +00:00
Martin Černáč
fdfb4f7bd3 Add "neverending marketing" cheat 
This cheat allows the player to have never-ending marketing campaigns
 2016-02-17 09:35:56 +01:00
OpenRCT2 git bot
ab04ece601 Merge Localisation/master into OpenRCT2/develop. 2016-02-14 04:00:17 +00:00
Ted John
6d384fa2e5 Merge pull request #2911 from Overv/show-peeps-in-closed-ride 
Show amount of peeps still on ride in tooltip when ride is closed (resolves #2708)
 2016-02-13 11:19:40 +00:00
Alexander Overvoorde
d07b7159c8 Add amount of customers currently on ride to customers tab 2016-02-13 04:23:59 +01:00
OpenRCT2 git bot
6d47bf19d3 Merge Localisation/master into OpenRCT2/develop. 2016-02-12 04:00:14 +00:00
OpenRCT2 git bot
d87bb01801 Merge Localisation/master into OpenRCT2/develop. 2016-02-11 04:00:17 +00:00
Alexander Overvoorde
5ee7d1bbae Show amount of peeps still on ride in tooltip when ride is closed (resolves #2708) 2016-02-10 22:29:19 +01:00
OpenRCT2 git bot
629bb93e3e Merge Localisation/master into OpenRCT2/develop. 2016-02-10 04:00:14 +00:00
OpenRCT2 git bot
03b34459dd Merge Localisation/master into OpenRCT2/develop. 2016-02-09 04:00:15 +00:00
OpenRCT2 git bot
4ae8d450e0 Merge Localisation/master into OpenRCT2/develop. 2016-02-07 04:00:12 +00:00
OpenRCT2 git bot
3a3b731db6 Merge Localisation/master into OpenRCT2/develop. 2016-02-05 04:00:11 +00:00
OpenRCT2 git bot
45cf56167b Merge Localisation/master into OpenRCT2/develop. 2016-02-04 04:00:15 +00:00
IntelOrca
72bed4f677 fix theme window strings 2016-02-03 18:28:25 +00:00
IntelOrca
c99ec93295 add theme entries for new windows 2016-02-03 18:23:47 +00:00
OpenRCT2 git bot
a2c607682c Merge Localisation/master into OpenRCT2/develop. 2016-02-03 04:00:11 +00:00
zsilencer
b2083deed0 implement cheats over multiplayer 2016-02-02 14:08:59 -07:00
OpenRCT2 git bot
7e21ef7ca4 Merge Localisation/master into OpenRCT2/develop. 2016-02-02 04:00:12 +00:00
Michał Janiszewski
f352fb7d47 Better options window design for scaling 2016-02-01 21:23:20 +01:00
Michał Janiszewski
b3ed293bb3 Add another page to options 
All 32 available widgets on "Display" page were taken, this adds another
page, "Rendering", to the options window, so it can hold remaining widgets.
 2016-02-01 21:19:28 +01:00
Michał Janiszewski
80ad302087 Allow user to use NN scaling at integer scales 
While linear/anisotropic filtering introduces in previous commit looks
good at non-integer scales, using it at integer scales may make screen
look unnecessarily blurry. This commit introduces an option to use NN
scaling at integer values of scale.
 2016-02-01 21:19:26 +01:00
Michał Janiszewski
18ec2238a2 Allow runtime selection of render quality hint 
This change allows to pass render quality hint to SDL in runtime. While
using hardware display, SDL can hint the renderer to use linear or
anisotropic filtering, which can deliver a better experience when using
non-integer scale value.
 2016-02-01 21:18:15 +01:00
Martin Černáč
85b6effd0f Refactor the weather cheat UI 
I removed the two buttons that were used previously to change the park's weather with a proper dropdown, which allows the player to select any of the available weather, not being limited to just two options. This change is (currently) listed on the project's wiki page 'Features to implement'.
 2016-02-01 18:46:19 +01:00
OpenRCT2 git bot
4019dee3ca Merge Localisation/master into OpenRCT2/develop. 2016-02-01 04:00:15 +00:00
Ted John
d299dca475 Merge pull request #2844 from janisozaur/network-version 
Decouple network version from OpenRCT2 version
 2016-01-30 22:37:30 +00:00
Michał Janiszewski
e814cdd271 Decouple network version from OpenRCT2 version 
This allows to present a different version of network stream than just
OpenRCT2 version, as we can possibly have breaking changes to network in
one release cycle.

This commit also adds easy way of identification which hosts are running
which versions, by showing a tooltip when hovering mouse cursor over the
network compatibility icon. Client's own version is displayed as well.
 2016-01-30 22:44:43 +01:00
OpenRCT2 git bot
083ec35362 Merge Localisation/master into OpenRCT2/develop. 2016-01-30 04:00:12 +00:00
OpenRCT2 git bot
b23c27c6e9 Merge Localisation/master into OpenRCT2/develop. 2016-01-29 04:00:13 +00:00
OpenRCT2 git bot
7a6cdbcfed Merge Localisation/master into OpenRCT2/develop. 2016-01-28 04:00:13 +00:00
OpenRCT2 git bot
cc40a8292c Merge Localisation/master into OpenRCT2/develop. 2016-01-27 04:00:12 +00:00
OpenRCT2 git bot
c79541a3a7 Merge Localisation/master into OpenRCT2/develop. 2016-01-26 04:00:13 +00:00
Michał Janiszewski
dd37ca05c3 Disable opening cheats window in MP 
When connecting to a server, also reset cheats.

This should fix #2811
 2016-01-25 21:44:09 +01:00
Chad Anderson
bc92446d32 New Game Option 
I added a menu option to bring up the Scenario Selector from within
game, so that you can easily choose a new level without needing to load
the Title Screen.
 2016-01-25 13:15:26 -07:00
OpenRCT2 git bot
233e3ff058 Merge Localisation/master into OpenRCT2/develop. 2016-01-25 04:00:13 +00:00
Aaron van Geffen
2d90bc8354 Allow assigning a shortcut to the options window. 2016-01-25 00:45:24 +09:00
Ted John
6eaa93c9bc Merge pull request #2783 from zsilencer/multiplayer 
MP groups and permissions
 2016-01-24 12:29:27 +00:00
zsilencer
85d77bb838 show last action in player window 2016-01-23 16:46:52 -07:00
zsilencer
db90477cae add locate player's most recent action button 2016-01-23 14:16:26 -07:00
zsilencer
5a43e313b5 add can't kick host error 2016-01-23 13:29:17 -07:00
zsilencer
5f7c81083e add separate Clear Landscape action and fix a bug 2016-01-23 13:19:17 -07:00
zsilencer
de1fa24e7b add last player action to player list 2016-01-23 12:32:02 -07:00
zsilencer
ef4fc84634 consolidate actions list 2016-01-23 11:34:05 -07:00
OpenRCT2 git bot
1b2edef980 Merge Localisation/master into OpenRCT2/develop. 2016-01-23 04:00:13 +00:00
zsilencer
c557f02f4b fix issue with incorrect game_command_playerid 2016-01-22 16:57:00 -07:00
zsilencer
1277c1a0d2 MP permissions update 2 2016-01-22 11:12:35 -07:00
zsilencer
7a249c6457 Add ability to toggle individual action permissions 2016-01-21 20:32:51 -07:00
zsilencer
6e3068cd0a MP groups and permissions 2016-01-20 21:42:31 -07:00
OpenRCT2 git bot
d4864108a6 Merge Localisation/master into OpenRCT2/develop. 2016-01-20 04:00:14 +00:00
Ted John
cee61f8929 Merge Localisation/master into OpenRCT2/develop. 2016-01-18 04:00:18 +00:00
Ted John
805b0dbb05 Merge Localisation/master into OpenRCT2/develop. 2016-01-17 04:00:18 +00:00
Ted John
57420cbc66 Merge Localisation/master into OpenRCT2/develop. 2016-01-15 04:00:19 +00:00
Ted John
0450aa0057 Merge Localisation/master into OpenRCT2/develop. 2016-01-14 04:00:19 +00:00
Marijn van der Werf
a85b2d3982 Show ALT as OPTION in keyboard shortcut list 2016-01-12 23:05:03 +01:00
Marijn van der Werf
dd8239f684 Add space after 'CMD + ' 2016-01-12 22:52:34 +01:00
Marijn van der Werf
72739e8cd8 Allow setting CMD as shortcut key 2016-01-12 22:29:36 +01:00
Ted John
16537ada4a Merge Localisation/master into OpenRCT2/develop. 2016-01-11 04:00:17 +00:00
Gymnasiast
24448f2734 Show names of missing expansion packs and use localised names; cleanup 2016-01-09 22:55:10 +01:00
Ted John
73b0e403c4 Merge Localisation/master into OpenRCT2/develop. 2016-01-07 04:00:19 +00:00
Ted John
de99a6c3dc Merge Localisation/master into OpenRCT2/develop. 2016-01-06 04:00:20 +00:00
Ted John
79b7913b78 Merge Localisation/master into OpenRCT2/develop. 2016-01-05 04:00:19 +00:00
Ted John
e4052b332f Merge Localisation/master into OpenRCT2/develop. 2016-01-04 04:00:18 +00:00
IntelOrca
ededc82cba add DLC and Build your own scenario classification 2016-01-02 21:06:46 +00:00
Gymnasiast
4c6dbd0702 Add entries for RCT1/AA/LL scenarios 2016-01-02 21:05:58 +00:00
IntelOrca
82b05950ff add RCT1 title sequence 2016-01-02 21:05:33 +00:00
Aaron van Geffen
f7d33f3cab Rename constants et al per code reviewer's request. 2016-01-02 21:03:38 +00:00
Aaron van Geffen
15782b88c4 Experimental: optional unlocking of scenarios ("campaign mode") in scenario select screen. 2016-01-02 21:01:53 +00:00
Aaron van Geffen
448d4fb657 New string ids for scenario select screen. 2016-01-02 21:00:02 +00:00
Ted John
c1d33e7308 Merge Localisation/master into OpenRCT2/develop. 2016-01-02 04:00:17 +00:00
Hielke Morsink
829c3a3339 Added correct tooltips for moving up/down buttons. 2016-01-01 21:29:09 +01:00
Hielke Morsink
ae4ff5fc6c Redesigned UI to be more consistent with the ride/staff windows. 2016-01-01 21:29:07 +01:00
Hielke Morsink
389249abfd Better UI spacing. 2016-01-01 21:29:03 +01:00
Hielke Morsink
64312957a0 Added column headers instead of labels, and added columns for the flags. 2016-01-01 21:28:59 +01:00
Hielke Morsink
d68ed36147 Recreated UI for tile inspector. Added swap functionality. 2016-01-01 21:28:55 +01:00
Ted John
928db1bf18 Merge Localisation/master into OpenRCT2/develop. 2016-01-01 04:00:18 +00:00
Ted John
47ca70b513 Merge Localisation/master into OpenRCT2/develop. 2015-12-31 04:00:17 +00:00
Ted John
4e465edeea Merge Localisation/master into OpenRCT2/develop. 2015-12-29 04:00:18 +00:00
Ted John
38edde37c0 Merge Localisation/master into OpenRCT2/develop. 2015-12-28 04:00:18 +00:00
Ted John
5cf31b8de4 Merge Localisation/master into OpenRCT2/develop. 2015-12-27 04:00:16 +00:00
IntelOrca
cd99b87de6 add UI for notification settings 2015-12-26 17:30:13 +00:00
IntelOrca
4eb8192549 replace tutorial button with new multiplayer button 
tutorial button and multiplayer button can be enabled / disabled easily, window auto resizes etc.
 2015-12-26 17:09:37 +00:00
Ted John
799d377d90 Merge Localisation/master into OpenRCT2/develop. 2015-12-26 04:00:18 +00:00
Ted John
570c732355 Merge Localisation/master into OpenRCT2/develop. 2015-12-25 04:00:18 +00:00
Ian Spence
434b62436c Addresses code review comments 2015-12-24 08:44:12 -08:00
Ian Spence
ba038c10ab Automatically open shops & stalls 
- Added a new option under misc to automatically open shops and stalls
 - Option is disabled by default
 - When enabled, shops & stalls are automatically opened right after being placed on the map
 2015-12-24 00:00:41 -08:00
Ted John
652031e0fe Merge Localisation/master into OpenRCT2/develop. 2015-12-24 04:00:18 +00:00
Ted John
578bf2e175 Merge Localisation/master into OpenRCT2/develop. 2015-12-23 04:00:18 +00:00
Ted John
8b9c4d1824 Merge Localisation/master into OpenRCT2/develop. 2015-12-22 04:00:19 +00:00
Ted John
b6b18c812f Merge Localisation/master into OpenRCT2/develop. 2015-12-21 04:00:18 +00:00
Gymnasiast
dd460300ca Extend fast lift hill cheat and update description 2015-12-20 21:12:24 +01:00
Jonathan Haas
bf536ce7b7 Add one decimal place to SI velocities 2015-12-20 11:27:03 +01:00
Ted John
229abec6bf Merge Localisation/master into OpenRCT2/develop. 2015-12-20 04:00:17 +00:00
IntelOrca
22b4df1a99 implement SI units for distance / speed measurement, closes #2496 2015-12-18 21:12:30 +00:00
Rune Laenen
1a4ebcc0f7 Add option to trap mouse cursor 2015-12-18 09:13:26 +01:00
Ted John
ed8e6afb6f Merge Localisation/master into OpenRCT2/develop. 2015-12-18 04:00:17 +00:00
Michael Steenbeek
7701dd600c UK: Change 'peep' to 'guest' for consistency 2015-12-17 19:38:42 +01:00
Ted John
59a1701ccc Merge Localisation/master into OpenRCT2/develop. 2015-12-15 04:00:17 +00:00
Ted John
a423c6c458 Merge Localisation/master into OpenRCT2/develop. 2015-12-14 04:00:17 +00:00
Ted John
32a794731c Merge Localisation/master into OpenRCT2/develop. 2015-12-13 04:00:17 +00:00
Ted John
3ed756d98c Merge Localisation/master into OpenRCT2/develop. 2015-12-12 04:00:17 +00:00
Ted John
5cacb8d0ec Merge Localisation/master into OpenRCT2/develop. 2015-12-11 04:00:17 +00:00
IntelOrca
ca01e55fa8 add show fps, #2223 2015-12-09 21:42:46 +00:00
Ted John
8d971d3e0e Merge Localisation/master into OpenRCT2/develop. 2015-12-03 04:00:17 +00:00
Ted John
abfc025c5a Merge Localisation/master into OpenRCT2/develop. 2015-12-02 04:00:19 +00:00
IntelOrca
42f5004406 Merge Localisation/master into OpenRCT2/pre-release-0.0.3. 2015-11-30 18:50:39 +00:00
duncanspumpkin
89f5f53324 Merge branch 'changelog_additions' of https://github.com/e-foley/OpenRCT2 into pre-release-0.0.3 2015-11-30 17:09:35 +00:00
Ted John
9f61ade4d1 Merge Localisation/master into OpenRCT2/develop. 2015-11-30 04:00:18 +00:00
Gymnasiast
d985e1d3d7 Update title sequence for 0.0.3 
Add three parks, increase some intervals

Adjust one interval

Update title sequence for 0.0.3
 2015-11-29 19:10:54 +01:00
IntelOrca
c6056cbb6c Merge branch 'pre-release-0.0.3' into develop 
Conflicts:
	src/audio/audio.c
 2015-11-27 22:05:40 +00:00
Ted John
c63eef9a21 Merge pull request #2378 from IntelOrca/support-unicode-currencies 
support unicode currencies with ascii fallback
 2015-11-27 17:56:44 +00:00
Ted John
9b1e1249c3 Merge Localisation/master into OpenRCT2/develop. 2015-11-27 04:00:18 +00:00
Michael Steenbeek
ceeedc50cd UK: Missed occurrence of the Fahrenreit symbol 
Thanks to @e-foley for pointing it out.
 2015-11-26 23:38:24 +01:00
IntelOrca
7ea0e2d6a3 improve language load fail behaviour 
improve currencies
fix bug in supported glyph check
 2015-11-26 18:28:52 +00:00
Michael Steenbeek
99a91b11c5 UK: Fahrenheit degree symbol 2015-11-26 16:36:36 +01:00
IntelOrca
46924bc9eb support unicode currencies with ascii fallback 2015-11-25 22:31:00 +00:00
Ted John
e7655b059a Merge Localisation/master into OpenRCT2/develop. 2015-11-22 04:00:18 +00:00
Ted John
7474515e5c Merge Localisation/master into OpenRCT2/develop. 2015-11-21 04:00:17 +00:00
Ted John
562c9cb68e Merge Localisation/master into OpenRCT2/develop. 2015-11-20 04:00:18 +00:00
Ted John
e9deafa5df Merge Localisation/master into OpenRCT2/develop. 2015-11-19 04:00:17 +00:00
Ted John
64159d83d0 Merge Localisation/master into OpenRCT2/develop. 2015-11-18 04:00:17 +00:00
Ted John
50edff6158 Merge pull request #2314 from Gymnasiast/obsolete-tooltip 
Remote obsolete date tooltip
 2015-11-17 18:21:29 +00:00
Ted John
9300c7d372 Merge Localisation/master into OpenRCT2/develop. 2015-11-17 04:00:18 +00:00
Gymnasiast
2afed6a4de Remote obsolete date tooltip 2015-11-16 11:04:00 +01:00
Ted John
9cbc1afbe2 Merge Localisation/master into OpenRCT2/develop. 2015-11-16 04:00:17 +00:00
Gymnasiast
8953357f85 Add Czech and fix some typos 2015-11-15 12:30:13 +01:00
Ted John
bcd14ad586 Merge Localisation/master into OpenRCT2/develop. 2015-11-15 04:00:16 +00:00
Ted John
32b1171b2f Merge Localisation/master into OpenRCT2/develop. 2015-11-14 04:00:26 +00:00
duncanspumpkin
45c4dfe12d Merge branch 'develop' into pre-release-0.0.3 2015-11-13 23:30:13 +00:00
Duncan
bc9a28d7ae Merge pull request #2261 from osconnoisseur/fix_2233 
Add buttons for Up and New File in the load/save dialog and fix #2233
 2015-11-13 22:50:46 +00:00
U-HP-Pavilion-PC\Cameron
e2545599ed Converted to sentence case and removed brackets from STR_2718 and 2719 in english_uk.txt 2015-11-13 16:25:52 -06:00
U-HP-Pavilion-PC\Cameron
557a89928c Revert "Converted to sentence case and removed brackets from STR_2718 and STR_2719" 
This reverts commit 7aa8e6040e.
 2015-11-13 16:23:16 -06:00
U-HP-Pavilion-PC\Cameron
7aa8e6040e Converted to sentence case and removed brackets from STR_2718 and STR_2719 2015-11-13 16:08:33 -06:00
Ted John
8bcf2e1b8c Merge Localisation/master into OpenRCT2/develop. 2015-11-13 04:00:17 +00:00
Michał Janiszewski
80510c91bd Add ui option to change scale in run-time 
Doesn't let user go lower than 0.5f
 2015-11-12 01:18:42 +01:00
Ted John
207e8e8008 Merge Localisation/master into OpenRCT2/develop. 2015-11-10 04:00:19 +00:00
Ted John
03cbb37d8a Merge Localisation/master into OpenRCT2/develop. 2015-11-09 04:00:16 +00:00
Ted John
40268878a0 Merge pull request #2245 from Gymnasiast/american-spelling 
Correct two instances of American spelling
 2015-11-08 12:49:49 +00:00
Michael Steenbeek
4855a53c22 Correct two instances of American spelling 2015-11-08 13:11:36 +01:00
Ted John
91edd322ae Merge pull request #2242 from Gymnasiast/more-currencies 
Add South Korean Won and Russian Rouble as currencies, closes #2222, also fix #2232
 2015-11-08 11:58:41 +00:00
Gymnasiast
4e5b8a1a19 Add South Korean Won and Russian Rouble as currencies, closes #2222, also fix #2232 2015-11-08 11:46:11 +01:00
Michael Steenbeek
a1aa08b209 Fix #2231 2015-11-08 10:06:20 +01:00
IntelOrca
15f6f9b66a remove git merge seperator 2015-11-08 04:10:40 +00:00
IntelOrca
40a885f2c4 Merge branch 'zsilencer-network' into develop 2015-11-08 04:08:53 +00:00
Ted John
301c7f53c1 Merge Localisation/master into OpenRCT2/develop. 2015-11-08 04:00:17 +00:00
zsilencer
1e9381ef97 master server list 2015-11-07 22:27:51 +00:00
zsilencer
9acfd27735 password prompt for client 2015-11-07 22:26:46 +00:00
zsilencer
3b639ced47 allow host to specify password #2072 2015-11-07 22:25:47 +00:00
Michael Steenbeek
c9808823a2 Add notice that 'No entrance' only works in OpenRCT2 2015-11-07 15:48:46 +01:00
Ted John
5d0e88afa0 Merge pull request #2218 from duncanspumpkin/corrupt 
Corrupt Element Inserter
 2015-11-07 11:44:25 +00:00
duncanspumpkin
983436d425 Implemented a insert corrupt element button on the tile inspector 2015-11-07 10:04:57 +00:00
Ted John
10674fe439 Merge Localisation/master into OpenRCT2/develop. 2015-11-07 04:00:18 +00:00
IntelOrca
daf95940ac add warning message for two unstable cheats 2015-11-06 18:46:18 +00:00
Ted John
f68e307c06 Merge pull request #2211 from Gymnasiast/open-new-window 
Correct 'Open new window'
 2015-11-06 18:35:30 +00:00
Michał Janiszewski
2d62c356c3 Early out and report error if langauge files are missing 
This is a common problem if you don't set up your paths properly on
Linux, so be nice and try to provide helpful message why we failed to
load instead of crashing on user a moment later.
 2015-11-05 22:41:20 +01:00
Michael Steenbeek
68aea9740d Update english_uk.txt 2015-11-05 14:43:06 +01:00
Michael Steenbeek
b3c8a1d2b7 Correct 'Open new window' 2015-11-05 10:08:08 +01:00
Ted John
273293456c Merge Localisation/master into OpenRCT2/develop. 2015-11-03 04:00:16 +00:00
Ted John
1f9c02fc5f Merge Localisation/master into OpenRCT2/develop. 2015-10-30 04:00:17 +00:00
Ted John
0b66558852 Merge Localisation/master into OpenRCT2/develop. 2015-10-29 04:00:17 +00:00
Ted John
7ac22b3be5 Merge Localisation/master into OpenRCT2/develop. 2015-10-28 04:00:16 +00:00
Ted John
4865cedc59 Merge Localisation/master into OpenRCT2/develop. 2015-10-27 04:00:18 +00:00
Ted John
04eacc8904 Merge Localisation/master into OpenRCT2/develop. 2015-10-26 04:00:17 +00:00
Hielke Morsink
dc8e197799 Added 10-minute inspections cheat. 2015-10-24 17:10:33 +02:00
Ted John
5e9912e880 Merge pull request #2038 from HaasJona/restart_required 
Require a restart after changing hardware rendering
 2015-10-24 14:44:01 +01:00
Jonathan Haas
475466dcd9 Require a restart after changing hardware rendering setting, decouple setting from active status 2015-10-24 12:50:28 +02:00
Ted John
ad7d2b3c00 Merge Localisation/master into OpenRCT2/develop. 2015-10-20 04:00:17 +01:00
Ted John
516cb1f7c9 Merge Localisation/master into OpenRCT2/develop. 2015-10-18 04:00:17 +01:00
IntelOrca
341b658ed0 add gui option for stay_connected 2015-10-16 22:45:17 +01:00
IntelOrca
6c6fa1d444 add ability for server to kick player, closes #2071 2015-10-16 22:20:16 +01:00
Ted John
6068b361bc Merge Localisation/master into OpenRCT2/develop. 2015-10-16 04:00:16 +01:00
Ted John
fdfe52fc19 Merge pull request #2057 from Gymnasiast/show-vehicles-from-other-track-types 
Show vehicles from other track types
 2015-10-15 12:57:57 +01:00
Ted John
e6359f486b Merge Localisation/master into OpenRCT2/develop. 2015-10-14 04:00:16 +01:00
Ted John
2db3f4ee23 Merge Localisation/master into OpenRCT2/develop. 2015-10-13 04:00:16 +01:00
Gymnasiast
105280a082 Introduce cheat option to show vehicles from other track types 2015-10-12 15:58:15 +02:00
Ted John
66dd53dd36 Merge pull request #2050 from OpenRCT2/game-command-land-smooth 
Implement mountain tool + enhanced functionality.
 2015-10-11 18:11:18 +01:00
IntelOrca
d5ae4a55ff allow 1 to 64 mountain tool size 2015-10-11 12:26:33 +01:00
Ted John
fbd2598ac3 Merge Localisation/master into OpenRCT2/develop. 2015-10-11 04:00:16 +01:00