Commit Graph

47 Commits

Author SHA1 Message Date
Duncan Frost e8d22fa002 Fix resolution defaulting to 640*480 2015-03-06 18:37:01 +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
Thomas den Hollander d528273d15 Change to GetLocaleInfo 2015-02-21 00:09:02 +01: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
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
IntelOrca 7f0ed995b5 improve reading and saving of configuration 2015-02-16 22:47:11 +00:00
IntelOrca 0ce4d70e35 make saved games and landscapes copy recursively 2015-02-15 17:31:16 +00:00
Thomas abe3008fc8 Fix warnings and add path indicator 2015-02-15 15:20:19 +01:00
Thomas 10babd3c77 Add ability to change directory in loadsave 2015-02-14 23:26:04 +01:00
IntelOrca ac4cd56b63 add new load / save window, closes #580 2015-02-14 02:16:03 +00:00
IntelOrca a66b29076b move osinterface code to shared or windows 2015-02-12 20:51:40 +00:00
Duncan Frost 12cf791254 Fixed track delete. 2015-02-12 18:40:07 +00:00
Duncan Frost 715c8bcf0f Fixed track rename. 2015-02-12 18:35:41 +00:00
IntelOrca 392ff7bfea remove expansion packs from title sequence, closes #752 2015-02-11 22:18:19 +00:00
IntelOrca 1298031fd2 Merge branch 'develop' into random-map
Conflicts:
	projects/openrct2.vcxproj
	projects/openrct2.vcxproj.filters
	projects/openrct2.vcxproj.user
	src/editor.c
	src/input.c
	src/platform/osinterface.c
	src/rct2.c
	src/scenario.c
	src/world/map.h
2015-02-08 03:05:07 +00:00
IntelOrca ce719ef086 fix fullscreen issues and add title music option 2015-02-06 22:35:08 +00:00
IntelOrca 80959b7db7 fix fullscreen mode saving 2015-01-24 15:06:14 +00:00
IntelOrca 5e074a61e6 fix fullscreen issues 2015-01-24 13:16:35 +00:00
IntelOrca 7cdcb6402e fix fullscreen resolution, fixes #89 2015-01-23 20:47:33 +00:00
Duncan Frost efad54f1c6 Fix arg_parse accessing invalid memory due to mistake in setup code. Reintroduced free memory of command line parameters 2015-01-18 20:56:08 +00:00
Duncan Frost e6f966f395 Fix intro crash. Caused by incorrect pointer address. Fixed crash on freeing unallocated memory. Fixed audio issue when channels set to zero. 2015-01-18 19:13:21 +00:00
Duncan Frost 7e2da48717 Fix #691. Relocate windows on a resize of the window 2015-01-17 09:55:27 +00:00
Duncan Frost f6cb4a0064 Remapped keypad enter to return keycode. 2014-12-22 20:29:36 +00:00
IntelOrca 1ed6e443ca refactor object loading, part 1 2014-12-07 21:45:42 +00:00
IntelOrca d00001fed2 remove unnecessary header includes 2014-11-30 20:27:14 +00:00
IntelOrca d9e0f8ff6a implement save scenario and fix various load / save dialog issues, fixes #433 2014-11-25 02:06:26 +00:00
IntelOrca 5190862573 fixes #337 - shortcut keys on title screen propagating to game 2014-11-24 17:18:21 +00:00
IntelOrca b68a3cb43d improve RCT2 install directory problems, fixes #587 2014-11-22 23:30:03 +00:00
IntelOrca d8844513a1 remove windows.h from input.c and improve window resize 2014-11-10 22:37:55 +00:00
IntelOrca ea6b0de6a6 refactor and move keyboard shortcuts to a new source file 2014-11-05 18:50:51 +00:00
IntelOrca 217ae84c62 add cross platform interface for enumerating files 2014-10-17 03:22:45 +01:00
Duncan Frost 04965ae9d2 Added home, end key. Now uses host window colours. 2014-10-16 21:50:03 +01:00
Duncan Frost 1c62a0c29d Cleaned up code, renamed variables, added comments. Switched over all existing text boxes to new code 2014-10-16 20:58:31 +01:00
Duncan Frost edbfb43251 Added ok/cancel buttons. Added closing on main. 2014-10-16 20:58:30 +01:00
Duncan Frost 94c517decb Fix slight mistake with cursor position when using delete. 2014-10-16 20:58:29 +01:00
Duncan Frost 9a3aeed508 Added some of the suggested changes 2014-10-16 20:58:28 +01:00
Duncan Frost 9cb03a9d3e Fixed bugs in existing method. Now has correct title and description 2014-10-16 20:58:27 +01:00
Duncan Frost cad821349b New technique for text input. 2014-10-16 20:58:26 +01:00
IntelOrca 71e508c416 refactor various platform functions and includes 2014-10-09 14:03:54 +01:00
IntelOrca a35ebea72a improve command line parsing 2014-10-09 01:36:59 +01:00
IntelOrca e57a625c9f refactor game startup and initialisation 2014-10-09 00:30:22 +01:00
IntelOrca a32f73d27f Merge branch 'master' into reorganise-src
Conflicts:
	projects/openrct2.vcxproj
	src/interface/window.h
2014-10-07 20:07:15 +01:00
IntelOrca c8df6174b8 organisation: fix includes 2014-10-06 17:36:58 +01:00
IntelOrca 554e1fe70e organisation: move files and update project 2014-10-06 10:21:07 +01:00