mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,593 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

3593 Commits

Author SHA1 Message Date
IntelOrca f4a4df1cb5 implement window_create_auto_pos 2015-06-07 18:14:33 +01:00
IntelOrca 65377629e4 implement track save select nearby scenery 2015-06-07 16:02:43 +01:00
IntelOrca 28a122ac5c don't show tab image unless tab is shown in new ride window 2015-06-07 14:35:15 +01:00
IntelOrca b79bc68af9 fix #1234 2015-06-07 14:01:32 +01:00
IntelOrca 2eea6bcd4b fix #1229 2015-06-07 13:51:27 +01:00
Ted John 0efd222eac Merge pull request #1252 from Gymnasiast/ownership-editor 
Added cheat to edit land ownership settings in-game
 2015-06-07 13:34:33 +01:00
Ted John ae15039171 Merge pull request #1251 from duncanspumpkin/fix_invis 
Correctly draw invisible entrances
 2015-06-07 13:34:01 +01:00
Ted John 35ef1fd5f3 Merge pull request #1250 from duncanspumpkin/fix_1249 
Fix original windows crashing
 2015-06-07 13:33:37 +01:00
Gymnasiast 90ac515a9b Fix bug introduced in refactor 2015-06-07 13:34:17 +02:00
Gymnasiast c15da4370a Added cheat to edit land ownership settings in-game 2015-06-07 12:45:55 +02:00
Duncan Frost 169628ddb0 Fix #1243. 
For a lengthy reason as to how this worked before see #1243. New version skips bad map_elements (and the next one).
 2015-06-07 10:53:08 +01:00
Duncan Frost 3977865089 Fix original windows crashing 
Due to the change in WWT_LAST assignment any windows that were not finished would access invalid memory and kick up a fuss causing #1249.
 2015-06-07 08:40:55 +01:00
Ted John 00d8b2c463 Merge Localisation/master into OpenRCT2/develop. 2015-06-07 04:00:15 +01:00
IntelOrca f3821c4865 finish remaining ride calculations 2015-06-07 02:56:31 +01:00
Ted John 5fb44a443e Merge pull request #1248 from trigger-death/text-box-widget 
Fixed #1247 font issues.
 2015-06-07 02:56:00 +01:00
Robert Jordan 02a9f1b535 Fixed #1247 font issues. 2015-06-06 21:18:20 -04:00
Ted John ad6ccc2553 Merge pull request #1246 from trigger-death/themes-fix 
Fixed themes "editor" tooltip
 2015-06-07 02:09:41 +01:00
Robert Jordan c0df70a9b0 Fixed themes "editor" tooltip 2015-06-06 21:04:14 -04:00
Ted John c295e8bc2d Merge pull request #1241 from trigger-death/text-box-widget 
Textbox Widget
 2015-06-06 22:27:44 +01:00
Robert Jordan 9f9143a5c6 textbox widget 2015-06-06 17:04:53 -04:00
Ted John 076e7142e9 Merge pull request #1240 from duncanspumpkin/fix_1239 
Fix peep placement crash
 2015-06-06 20:29:16 +01:00
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