Florian
30858bed0e
CHG: Additional input types, user-defined input config scripts
2015-04-19 11:57:10 +02:00
Aloshi
915cb376dc
Merge branch 'master' into unstable
2015-03-12 12:22:23 -05:00
Aloshi
646bede3d9
Update version to 2.0.1a.
2015-03-08 16:08:54 -05:00
Aloshi
da86b618c4
Quick fix for the stack overflow with DateTimeComponents in a ComponentGrid.
2015-03-06 09:25:42 -06:00
Aloshi
584a466f11
Fixed regression with Settings (boost::lexical_cast was adding commas...).
2015-03-05 21:33:50 -06:00
Aloshi
a9a8d0da84
Fixed merge issue with new FileData scheme.
2015-03-05 21:21:51 -06:00
Aloshi
1d129cdde8
Merge branch 'gamelistdb' into unstable
2015-03-05 20:24:31 -06:00
Aloshi
7635f11f92
Merge branch 'master' into gamelistdb
...
Conflicts:
es-app/src/guis/GuiGamelistOptions.cpp
2015-03-05 20:11:44 -06:00
Aloshi
0047bd597a
Merge branch 'master' into unstable
2015-03-05 20:07:03 -06:00
Aloshi
90bd22df14
Increment version to 2.0.1.
2015-03-05 18:04:41 -06:00
Aloshi
d2b0fec88b
Catch pageup/pagedown in DateTimeComponent edit mode.
2015-03-05 17:49:26 -06:00
Aloshi
2b3080f90b
Make DateTimeComponent honor theme size values again.
2015-03-05 17:43:38 -06:00
Aloshi
a6a9fff50f
Fixed non-ASCII characters never setting an initial selected value for "jump to letter."
2015-03-05 17:33:19 -06:00
Aloshi
5d0fc6a1b7
Fixed DateTimeComponent being cut off when a date is manually entered (from "unknown" -> "01/01/1990").
2015-03-05 17:21:52 -06:00
Aloshi
1a5b916ca1
Added time conversion for import/export XML.
2015-03-03 18:49:47 -06:00
Aloshi
10a59b41b7
Merge branch 'master' into gamelistdb
2015-03-03 17:18:23 -06:00
Aloshi
b3df00a13d
Merge branch 'master' into unstable
2015-03-03 17:18:08 -06:00
Aloshi
310b1f9613
Removed some unused Renderer functions (onInit, onDeinit).
2015-03-03 16:36:21 -06:00
Alec Lofquist
c52fcb18d6
Added automatic gamelist.xml import prompt.
2015-03-03 13:30:16 -06:00
Alec Lofquist
44fd9d631d
Merge branch 'master' into gamelistdb
...
Conflicts:
es-app/src/SystemData.cpp
2015-03-03 09:36:05 -06:00
Alec Lofquist
69bb3e0e89
Merge branch 'master' into unstable
2015-03-03 09:33:13 -06:00
Aloshi
420fecc737
Only include codecvt on Windows.
...
Should fix gcc build errors.
2015-02-21 21:36:00 -06:00
Aloshi
df896cb933
Hopefully fixed non-ASCII paths not working on Windows.
...
Kind of emulator-dependent on if this works or not.
2015-02-21 16:48:56 -06:00
Aloshi
1500edbde3
Escape %ROM% by putting everything in quotes on Windows.
...
Use backslashes in %ROM% and %ROM_RAW% on Windows.
2015-02-21 16:04:09 -06:00
Aloshi
c0e0f4d702
Merge branch 'master' into gamelistdb
2015-02-10 13:09:31 -06:00
Aloshi
abba195846
Merge branch 'master' into unstable
2015-02-10 13:08:54 -06:00
Aloshi
1de0b888aa
Merge pull request #383 from deadbeef84/scraper-memleak-fix
...
Fixes two memory leaks, which caused the scraper to crash after a while....
2015-02-10 13:06:09 -06:00
Jesper Ek
1e320b7718
Fixes two memory leaks, which caused the scraper to crash after a while. I believe this fixes #180 .
...
Fixes #352 (duplicate).
Fixes #362 (duplicate).
The destructor for AsyncHandle needs to be virtual as its subclasses are
allocated dynamically. I believe this caused the ImageDownloadHandle and its
related resources (such as the HttpReq and its contents) not to be freed
correctly.
2015-02-09 23:23:36 +01:00
Aloshi
b4402b30fe
Merge branch 'master' into unstable
2015-01-25 11:26:46 -06:00
Aloshi
721b02cfab
Fixed ratings mysteriously not working on certain locales (e.g. German).
2015-01-25 11:26:16 -06:00
Aloshi
b5eb65ebd6
Merge branch 'unstable' of https://github.com/Aloshi/EmulationStation into unstable
2015-01-24 17:23:24 -06:00
Alec Lofquist
8a01f71912
Merge branch 'master' into unstable
2015-01-21 14:28:08 -06:00
Aloshi
f79121cd72
Merge pull request #357 from joolswills/mame4all_name_map
...
added additional/differing rom names from mame4all (based on mame 0.37b5 to MameNameMap - #323
2015-01-21 14:27:29 -06:00
Alec Lofquist
d3f23a9986
Fix for issue #356 .
2015-01-21 14:24:50 -06:00
Jools Wills
8b764f7914
added additional/differing rom names from mame4all (based on mame 0.37b5) to MameNameMap - #323
2015-01-21 15:01:44 +00:00
Aloshi
7450822c94
Fixed to build on Windows (VS2012).
2015-01-19 18:03:41 -06:00
Aloshi
68a77d1646
Fixed to build on Windows (VS2012).
2015-01-19 18:02:06 -06:00
Steven Selph
2bd9062c2d
Create a GamesDB scraper using hashing to fetch by ID.
2015-01-19 17:40:24 -05:00
Alec Lofquist
4c4fb5efeb
Fix build errors on Linux.
2015-01-17 14:58:39 -06:00
Aloshi
7150e8d5ab
Merge branch 'master' into gamelistdb
2015-01-15 17:50:28 -06:00
Aloshi
2926442bf0
Set hint regardless of setting (in case it is changed during run-time).
2015-01-15 17:47:31 -06:00
Aloshi
da42b784b2
Merge pull request #348 from felipeota/master
...
Add a setting to allow for joystick input to work while not in focus.
2015-01-15 17:46:00 -06:00
Felipe Otamendi
33d6733d64
Add a setting to allow for joystick input to work while not in focus.
2015-01-13 23:36:25 -02:00
Aloshi
bb303c1db6
Merge branch 'unstable' into gamelistdb
2015-01-10 19:07:29 -06:00
Aloshi
08c2c561ca
Merge branch 'master' of https://github.com/Aloshi/EmulationStation
2015-01-10 19:04:16 -06:00
Aloshi
52ed0ea2e5
Specify FileType in FileData constructor.
2015-01-09 14:15:13 -06:00
Aloshi
3e50413611
Fixed updateExists(system) not actually working.
2015-01-08 14:01:52 -06:00
Aloshi
a99b2e2c73
Fixed another metadatalisttype/filetype test.
...
Fixed "IMPORT XML" option not updating gamelist views.
DetailedGameListView now repopulates instead of recreating itself when changes occur.
2015-01-08 13:48:51 -06:00
Aloshi
68348edf26
Added "IMPORT XML" option to the "SCRAPER" menu.
2015-01-08 13:28:38 -06:00
Aloshi
35370a4bc9
Fixed FileType/MetaDataListType confusions.
...
Fixed launching games causing a crash.
(because the filetype column in GamelistDB used to be isfolder, so the enum was just tested as a boolean).
2015-01-08 12:56:57 -06:00
