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

2618 Commits

Author SHA1 Message Date
IntelOrca cede292bdd change windows installer to use new logo 2015-02-22 17:42:40 +00:00
IntelOrca 640a08c09b Merge branch 'windows-installer' into develop 2015-02-22 17:39:23 +00:00
IntelOrca d467557538 add logo icon 2015-02-22 17:37:39 +00:00
Ted John 1bfbec6abe Merge pull request #856 from ThomasdenH/develop 
Resolve string conflict
 2015-02-22 16:55:04 +00:00
Thomas b5d0c3466b Resolve string conflict 
Simplex noise and autosave used the same string constants
 2015-02-22 15:49:23 +01:00
Ted John 8fd1a1f0ed Merge pull request #854 from adrian17/ride-prices 
Fixed ride price approximations being truncated; fixes #850.
 2015-02-22 14:24:23 +00:00
Adrian Wielgosik 534b5e9e0b Fixed ride price approximations being truncated; fixes #850. 2015-02-22 15:17:45 +01:00
Ted John 4f61c6078e Merge pull request #853 from ThomasdenH/develop 
Fixed map smoothing issue
 2015-02-22 14:03:15 +00:00
Thomas a8f7868ec7 Fixed map smoothing issue 2015-02-22 12:31:26 +01:00
Ted John 618eb84c12 Merge pull request #833 from ThomasdenH/develop 
Use locale info to create default config
 2015-02-21 16:41:02 +00:00
Thomas acad7af40e Fix error and removed debugging 
in platform_get_locale_currency()
 2015-02-21 17:26:38 +01:00
Thomas 7bc4c4270d Fix warnings 2015-02-21 17:13:15 +01:00
Ted John e2d8a19d5d Merge pull request #849 from duncanspumpkin/fix_peep 
Fix peeps leaving queues
 2015-02-21 11:07:03 +00:00
IntelOrca a3df2527b0 implement autosaving, closes #778 2015-02-21 11:05:15 +00:00
Duncan Frost bde676e6a3 Fix peeps leaving queues 2015-02-21 10:39:32 +00:00
Ted John eb77e96105 Merge pull request #848 from Garogolun/tooltip-fix 
Fix tooltip y calculation, fixes #340
 2015-02-21 02:07:13 +00:00
IntelOrca ff8bef8fc3 try to fix to scenario complete issues 2015-02-21 02:04:46 +00:00
Timmy Weerwag eb44707ec9 Fix tooltip y calculation, fixes #340 2015-02-21 03:01:32 +01:00
Ted John bf8d37c02e Merge pull request #847 from Garogolun/window-footpath-mousedown 
Decompiled the window_footpath_mousdown procs
 2015-02-21 01:22:07 +00:00
Timmy Weerwag 8abd8ad775 Decompiled the window_footpath_mousdown procs 2015-02-21 00:40:52 +01:00
Thomas den Hollander d528273d15 Change to GetLocaleInfo 2015-02-21 00:09:02 +01:00
Ted John 635966ed35 Merge pull request #846 from adrian17/staff-window 
Fix wrong tooltip being displayed in staff list window
 2015-02-20 22:04:44 +00:00
Adrian Wielgosik 2ed9b325ec Fix wrong tooltip being displayed in staff list window 2015-02-20 22:36:13 +01:00
Ted John bac2d12c42 Merge pull request #845 from duncanspumpkin/fix_cheat_detection 
Fix negative money due to cheat detection.
 2015-02-20 20:18:31 +00:00
Duncan Frost 67b82b1065 Fix negative money due to cheat detection. 2015-02-20 19:45:23 +00:00
Thomas den Hollander 33c30521e2 Fix merge conflics 2015-02-20 09:12:53 +01:00
Thomas den Hollander 23304b1770 Moved endif to end of file 2015-02-20 08:59:09 +01:00
IntelOrca f172b26291 make options window centred 2015-02-20 02:19:18 +00:00
Ted John f8836cf0a3 Merge pull request #836 from Garogolun/title-options 
Add button to access options window from title screen
 2015-02-20 02:17:57 +00:00
Timmy Weerwag 454e7dbd23 Move title_options button after resizing screen 2015-02-20 02:31:17 +01:00
Timmy Weerwag d38852f926 Stick windows on title screen to back 2015-02-20 02:30:16 +01:00
Timmy Weerwag 873eac46e8 Restart title music if necessary 2015-02-20 02:10:13 +01:00
Timmy Weerwag 09e9288eb8 Added options button to title screen 2015-02-20 01:35:29 +01:00
Ted John c5f31f0eac Merge pull request #835 from Garogolun/resolution-dropdown-fix 
fix the resolution dropdown disabling
 2015-02-19 23:05:08 +00:00
Timmy Weerwag 1df5202af1 fix the resolution dropdown disabling 
fixes after setting fullscreen mode to "Fullscreen (desktop)" and
re-opening the options screen, the resolution dropdown was enabled again
 2015-02-19 23:49:17 +01:00
Thomas ee6cbf8059 Add import 2015-02-19 20:48:48 +01:00
Thomas b8a9745eda Use locale info to create default config 
Issue #736, get measurement system, temperature system, language and
currency from locale and use it as default.
 2015-02-19 20:40:14 +01:00
Ted John 7e2969abaf Merge pull request #832 from duncanspumpkin/fix_hack 
Fix Footpath Scenery Clear
 2015-02-19 18:49:16 +00:00
Duncan Frost 095f6e1216 Fix hack causing flags to not be passed to scenery clearing function 2015-02-19 18:42:45 +00:00
Ted John bfdd86d49a Merge pull request #831 from adrian17/land-tool-drag 
Decompiled window_top_toolbar_land_tool_drag
 2015-02-19 17:35:21 +00:00
Adrian Wielgosik 1ae4bf42ce Removed unused arguments 2015-02-19 17:39:35 +01:00
Adrian Wielgosik 1b6f752a00 Decompiled window_top_toolbar_land_tool_drag 2015-02-19 17:33:26 +01:00
Ted John f1c446435b Merge pull request #827 from adrian17/water_tool_drag 
Decompiled window_top_toolbar_water_tool_drag
 2015-02-19 00:46:53 +00:00
Adrian Wielgosik a7455f8b31 Decompiled window_top_toolbar_water_tool_drag 2015-02-18 20:28:45 +01:00
Ted John e0b2c30b27 Merge pull request #826 from jcdavis/6B9CB0 
Decompile banner_init (6B9CB0)
 2015-02-18 10:18:08 +00:00
Jackson Davis 5ec0cd5e8e Decompile banner_init (6B9CB0) 2015-02-17 19:47:47 -08:00
Ted John a1a32a3977 Merge pull request #823 from duncanspumpkin/fix_817 
Implemented missing guest icons from news messages
 2015-02-17 20:48:07 +00:00
Duncan Frost 612fcbe770 Implemented missing guest icons from news messsages. 2015-02-17 20:39:35 +00:00
Ted John e39a220058 Merge pull request #814 from nbrochu/mapgen-simplex-tab 
Added a 3rd tab to Map Generation (Simplex)
 2015-02-17 18:54:20 +00:00
Ted John 7ba2790c3d Update readme.md 2015-02-17 18:49:29 +00:00