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

3614 Commits

Author SHA1 Message Date
Ted John 37471ee1b9 Merge Localisation/master into OpenRCT2/develop. 2015-06-08 04:00:12 +01:00
Ted John 8086a86aab Merge pull request #1263 from trigger-death/new-themes-system 
Fixed themes features tab glitch
 2015-06-08 02:17:56 +01:00
Robert Jordan e471592d16 Fixed themes features tab glitch 2015-06-07 21:11:47 -04:00
Ted John d46c3fe009 Merge pull request #1262 from trigger-death/new-themes-system 
Fixed open button y
 2015-06-08 01:59:55 +01:00
Robert Jordan 21734bd71f Fixed open button y 2015-06-07 20:56:31 -04:00
Ted John 2f91a768f9 Merge pull request #1261 from trigger-death/new-themes-system 
New Themes System
 2015-06-08 01:46:45 +01:00
Robert Jordan 9960c8d901 Fixed merge conflicts 2015-06-07 20:37:56 -04:00
Robert Jordan e90c724a3a Rewrote Themes 
Added rct1 styles and lights.
Themes are now easier to expand
Added features tab to themes window
 2015-06-07 20:31:54 -04:00
Ted John b2dfad5f1b Merge pull request #1244 from LRFLEW/develop 
A fix for #1231
 2015-06-07 23:25:52 +01:00
LRFLEW c0f376aa77 fixed naming convention 2015-06-07 17:20:46 -05:00
LRFLEW d3a6965f95 Made window_loadsave_open accept a default file name 
This fixes #1231, #1245, and adds room for future work, such as porting
track saving.
 2015-06-07 17:12:17 -05:00
LRFLEW 75903ec2d9 Fixed opening save game not changing recommended name 
It was originally handled by load_game(), but was changed when the
loadsave window was implemented.
 2015-06-07 15:20:46 -05:00
LRFLEW 73acb02946 Code Cleanup 
thanks trigger-death
 2015-06-07 15:20:45 -05:00
LRFLEW 66bf2abd37 A fix for #1231 
This has the side-effect of incorrect default names in the scenario
editor, but that can be patched separately.
 2015-06-07 15:20:45 -05:00
Ted John 3cd961a3a0 Merge pull request #1257 from zsilencer/bugfixing 
fix whizzed screenshots
 2015-06-07 21:08:11 +01:00
zsilencer fbebd6527b fix whizzed screenshots 2015-06-07 13:02:17 -06:00
Ted John f8173f996e Merge pull request #1256 from duncanspumpkin/research 
Refactor and fix Research
 2015-06-07 19:42:41 +01:00
Duncan Frost 4f03b0c997 Refactor of research. 
Fix bug that would cause a crash on a scenario that had rides with same base type
 2015-06-07 19:19:17 +01:00
Duncan Frost 9ad775625a Fix small bugs in the inventions window. 
I think there might have been a case where the list could get corrupted that this may prevent.
 2015-06-07 19:19:16 +01:00
Duncan Frost 97966ac707 Implemented scenery_set_setup for research. 
I've also labelled ride_type->flags.
 2015-06-07 19:19:16 +01:00
Duncan Frost cd22f9bd08 Implement the reset ride research function 2015-06-07 19:18:50 +01:00
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