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