mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
10,821 Commits 9 Branches 41 Tags 392 MiB
Commit Graph

942 Commits

Author SHA1 Message Date
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
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