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