mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,572 Commits 9 Branches 40 Tags 382 MiB
Commit Graph

3572 Commits

Author SHA1 Message Date
Duncan Frost 117526ec77 Fix #1239. Issue caused by sign extension. 2015-06-06 20:12:21 +01:00
IntelOrca dd84ee8340 implement more ride rating calculations 2015-06-06 14:30:43 +01:00
IntelOrca 859e7a3418 implement more ride rating calculations 2015-06-06 12:36:45 +01:00
Ted John 886f7f3a46 Merge Localisation/master into OpenRCT2/develop. 2015-06-06 04:00:13 +01:00
Ted John 32eeed7853 Merge pull request #1235 from trigger-death/object-selection-search 
Object Selection Search
 2015-06-06 01:34:21 +01:00
Robert Jordan 4e43b04524 Fixed english_uk conflicts 2015-06-05 20:19:53 -04:00
Robert Jordan a4a0b5f4fd Renumbered strings AGAIN 2015-06-05 20:16:40 -04:00
Robert Jordan a490284569 Renumbered strings 2015-06-05 20:16:01 -04:00
Ted John 2c540f19cf Merge pull request #1233 from trigger-death/clear-sceney-filter 
Clear scenery tool now as options
 2015-06-06 01:13:17 +01:00
Robert Jordan c3d36c96ef Now resets scroll properly 2015-06-05 19:02:20 -04:00
Robert Jordan 6179888231 Renamed strings and removed warnings 2015-06-05 18:59:07 -04:00
Robert Jordan c9c3e66289 Object selection search 
Can now search for objects in the object selection window.
 2015-06-05 18:54:47 -04:00
Robert Jordan cf61f68c86 Removed unused resource 2015-06-05 12:39:40 -04:00
Robert Jordan 83fda8fc56 Clear scenery tool now as options 
Can now choose to clear small scenery, large scenery, and/or footpaths.
 2015-06-05 12:38:52 -04:00
IntelOrca 27484d1a27 implement more ride rating calculations 2015-06-05 16:29:13 +01:00
Ted John d8cf23b659 Merge pull request #1232 from zsilencer/bugfixing 
fixes #1230 and #1212
 2015-06-05 10:58:13 +01:00
zsilencer 71ae580483 fixes #1230 and #1212 2015-06-05 01:02:02 -06:00
Ted John cb9630e30b Merge Localisation/master into OpenRCT2/develop. 2015-06-05 04:00:14 +01:00
IntelOrca d51f6ac3c9 add more ride rating calculations and fix bugs 2015-06-05 03:10:42 +01:00
Ted John 1903ab16bb Merge pull request #1223 from zsilencer/volume_control 
add volume control in options
 2015-06-05 00:57:37 +01:00
IntelOrca 5100ed747b refactor rest of ride ratings 2015-06-04 23:52:24 +01:00
zsilencer c6e63d5d25 add volume control in options 2015-06-04 16:31:54 -06:00
IntelOrca 9c4f7b0973 refactor ride ratings and add junior coaster ride calculation 2015-06-04 22:49:02 +01:00
Ted John d3ae912748 Merge pull request #1225 from mzmiric5/develop 
don't build g2 on ci
 2015-06-04 22:41:46 +01:00
Miso Zmiric (Mike Squinter) 05b8e7b7b1 don't build g2 on ci 2015-06-04 22:02:38 +01:00
Ted John dfcea20443 Merge pull request #1222 from ThomasdenH/develop 
Change use of gfx_draw_string() to gfx_draw_string_left()
 2015-06-04 20:40:41 +01:00
Thomas e9a33e0de6 Change use of gfx_draw_string() to gfx_draw_string_left() 2015-06-04 21:27:38 +02:00
Ted John 6f4854222e Merge pull request #1221 from duncanspumpkin/fix_bugs 
Fix bugs
 2015-06-04 20:24:14 +01:00
Duncan Frost 47e41b5d82 Fix bug introduced in previous bug fixing! 
Accidently switched two functions. Small refactor as well.
 2015-06-04 20:15:27 +01:00
Duncan Frost 8351e56353 Fix small graphical bug on bottom arrow. 
Caused by not setting the font style before using them.
Also the origin was one pixel off.
 2015-06-04 20:15:26 +01:00
Duncan Frost 44d4ff4d03 Fix cross hatching graphical glitch. 
Forgot to Xor the value before clearing it. Fixes #1177
 2015-06-04 20:15:25 +01:00
Duncan Frost 2765f15584 Cheats showing pressed after tab change 
Fixes #1084
 2015-06-04 20:15:24 +01:00
Duncan Frost cd753e13e4 Fix #1213 once and for all. 
Forgot to check that the tool in use was the set land rights tool.
 2015-06-04 20:15:23 +01:00
Ted John b688b1eb5f Merge pull request #1220 from trigger-death/options-window-pages 
Options window now uses paged widgets
 2015-06-04 20:04:11 +01:00
Robert Jordan 319fe2b6a2 Didn't commit one file. 2015-06-04 14:51:54 -04:00
Robert Jordan 4b0d005e0f Options window now uses paged widgets 
Widgets now are defined by page.
Fixed options window flashing text colour when first opened.
Fixed themes window gfx_invalidate happening every step.
 2015-06-04 14:51:39 -04:00
Ted John 3e12e9502f Merge pull request #1218 from ThomasdenH/develop 
Refactor cheat window and fix #1084
 2015-06-04 19:08:46 +01:00
Thomas 9f6f7c8b9e Move cheat tab tips 2015-06-04 19:58:16 +02:00
Thomas 9ddd655b20 Refactor cheat window and fix #1084 2015-06-04 19:52:35 +02:00
Ted John 86dc6fd30d Merge pull request #1216 from danidoedel/patch-3 
fix label position and mapgen background bugs
 2015-06-04 16:50:54 +01:00
danidoedel bcbc05e9a2 fix mapgen background bug 2015-06-04 17:39:07 +02:00
danidoedel c481905d0a fix research label position 2015-06-04 17:34:47 +02:00
danidoedel d9807221b8 fix number of selected items label position 2015-06-04 17:33:29 +02:00
danidoedel a57e4587f1 fix number of designs label position 2015-06-04 17:31:42 +02:00
danidoedel c736face55 fix status label position 2015-06-04 17:29:47 +02:00
danidoedel 89e4b1c824 fix status label position 2015-06-04 17:27:56 +02:00
Ted John 55ede367bd Merge pull request #1215 from ThomasdenH/develop 
Fix #1214
 2015-06-04 14:18:02 +01:00
Thomas 70edd18a36 Fix #1214 2015-06-04 15:13:18 +02:00
IntelOrca 67c6e899c1 fix motion simulator ride rating calculation 2015-06-04 12:56:24 +01:00
IntelOrca 41250f350c Merge branch 'marcotc-develop' into develop 2015-06-04 12:48:20 +01:00