Commit graph

1218 commits

Author SHA1 Message Date
Jools Wills 5bd40476f6
Merge pull request #397 from mmatyas/smurfs
Remove leftover debug code
2018-03-28 14:52:13 +01:00
Mátyás Mustoha 63f4806ac5 Remove leftover debug code 2018-03-28 09:31:10 +02:00
John Rassa 9382507e17
Merge pull request #392 from Koerty/grid-enable-for-developers
[GRID 2] Enable the grid for developers
2018-03-27 16:39:31 -07:00
Koerty b4feb69980 Enable the grid view for developers
- Add the remove function to GridGameListView
- Enable the grid view in ViewController
- The grid view will not be available in the menu yet, but can be enable by tweaking es_settings.cfg
2018-03-27 16:11:50 +02:00
John Rassa 43a1d3d992
Merge pull request #393 from Koerty/grid-size-rename
[GRID] Rename gridSize to gridDimension in ImageGridComponent.h
2018-03-26 14:30:46 -07:00
John Rassa 2c11c7ff5e
Merge pull request #395 from PokeEngineer/master
Fixed a quirk in the Clion PR
2018-03-25 10:54:01 -07:00
Jacob Mullins 565b519693 Fixed a quirk in the Clion PR
@Koerty accidentally excluded all .cmake files instead of the specific files that Clion generated, and was getting in my way of developing a new feature... So, I fixed it.
2018-03-25 12:33:23 -04:00
John Rassa c972e729e4
Merge pull request #394 from Koerty/git-ignore-clion-files
Add automatically generated Clion files to gitignore
2018-03-24 05:21:48 -07:00
Koerty 715ac69445 Add automatically generated Clion files to gitignore 2018-03-23 10:54:46 +01:00
Koerty 41729f8cb8 Rename gridSize to gridDimension in ImageGridComponent.h 2018-03-23 10:25:33 +01:00
Jools Wills 99cc97680d
Merge pull request #387 from pjft/fix-paths
Fixing path generation on the Pi for getDirContents
2018-03-09 18:11:38 +00:00
Jools Wills f7b58527eb
Merge pull request #386 from pjft/scraper-crash
Fix crash when scraping folders
2018-03-09 17:15:42 +00:00
pjft f6649ec070 Fixing path generation on the Pi for getDirContents 2018-03-09 17:06:39 +00:00
pjft 25f31d154c Fix crash when scraping folders 2018-03-09 16:41:55 +00:00
Jools Wills 1e668d8e3f
Merge pull request #384 from pjft/path-fixes
Fixing common path detection
2018-03-02 22:27:53 +00:00
pjft b73d38a781 Fixing common path detection 2018-03-02 10:07:58 +00:00
Jools Wills 566804e682
Merge pull request #383 from pjft/lastplayed-limit
Limiting Last Played view to the last 50 games you played
2018-02-28 02:24:22 +00:00
pjft d3cc0a77ef Limiting last played count to 50 2018-02-27 23:04:14 +00:00
Jools Wills 32258e1f00 bump version to 2.8.0 and add -dev suffix to string 2018-02-27 17:22:08 +00:00
John Rassa 0a945ba556
Merge pull request #380 from tomaz82/getHomePath_fix
Fix getHomePath crash when the environment variable isn't set
2018-02-20 20:49:46 -05:00
Tomas Jakobsson 33086042f9 Fix getHomePath crash when the environment variable isn't set 2018-02-20 19:15:34 +01:00
John Rassa 6f44ef9011
Merge pull request #376 from tomaz82/cleanups
Cleanups
2018-02-17 10:54:38 -05:00
Tomas Jakobsson 5c6b29705a Suggest vector access methods to be inlined 2018-02-15 15:05:47 +01:00
Tomas Jakobsson dbcd749ae7 Add Utils::String::toLower and Utils::String::format 2018-02-15 15:04:46 +01:00
Tomas Jakobsson 267e547122 Rename MameNames::names to MameNAmes::mNamePairs 2018-02-15 15:03:42 +01:00
Jools Wills 71b64e86ba
Merge pull request #374 from tomaz82/fix_collections
Fix double //
2018-02-10 11:01:43 +00:00
Tomas Jakobsson e6df25074b Fix double // 2018-02-10 11:35:24 +01:00
Jools Wills b7679bae6c
Merge pull request #371 from tomaz82/mamenames.xml
Move MameNameMap out of the source and into mamenames.xml
2018-02-09 18:00:01 +00:00
Jools Wills 43df1cf5d4
Merge pull request #372 from tomaz82/fix_readme
Fix the Fedora instructions
2018-02-09 17:59:09 +00:00
Tomas Jakobsson bb4c204e83 Fix the Fedora instructions 2018-02-09 18:37:40 +01:00
Tomas Jakobsson 3f3e1ceb16 Move MameNameMap out of the source and into mamenames.xml 2018-02-09 18:32:05 +01:00
Jools Wills 4d732a448e
Merge pull request #368 from yodatak/patch-1
Update instructions for Fedora compilation
2018-02-08 19:49:31 +00:00
Jools Wills e32ba93785
Merge pull request #370 from tomaz82/build_date
Show build date and time when starting ES with --debug
2018-02-08 19:49:17 +00:00
Tomas Jakobsson 9a535d4441 Show build date and time when starting ES with --debug 2018-02-08 20:45:06 +01:00
Jools Wills f438359828
Merge pull request #367 from tomaz82/no_builtin_resources
Remove all resources from the code
2018-02-08 19:16:10 +00:00
Tomas Jakobsson 1a4d13b6b3 Remove builtin resources 2018-02-08 19:27:44 +01:00
yodatak 5e40fb4237
Update instructions for Fedora compilation
Adding some command to compile EmulationStation on Fedora 27
2018-02-04 06:13:22 +01:00
Jools Wills 3adadc9377
Merge pull request #364 from tomaz82/fix_thumbnails
Fix mStaticImage to use setResize
2018-02-02 18:38:00 +00:00
Jools Wills a0b624075b
Merge pull request #366 from tomaz82/fix_escapedpath
Fix Utils::FileSystem::getEscapedPath
2018-02-02 18:37:31 +00:00
Tomas Jakobsson 6054cb673d Fix start and offset not being reset for each invalidChar tested in Utils::FileSystem::GetEscapedPath 2018-02-02 16:45:21 +01:00
Tomas Jakobsson e52e63cf9c Fix mStaticImage to use setResize 2018-02-01 22:14:54 +01:00
Jools Wills bb678eecd1
Merge pull request #363 from jrassa/g-w-scraper-fix
fix platform name for game and watch
2018-02-01 03:50:48 +00:00
John Rassa 55e578e18c
Merge pull request #362 from tomaz82/image_fix
Fix thumbnail and image to be separated
2018-01-31 22:38:58 -05:00
John Rassa 8e41791222
Merge pull request #361 from tomaz82/boost_filesystem_final
The final traces of boost has been eliminated
2018-01-31 17:59:29 -05:00
Tomas Jakobsson 1228e0c7bf Fix thumbnail and image to be separated as I think it was originally meant to be. 2018-01-31 21:34:55 +01:00
John Rassa d223831d53 fix platform name for game and watch 2018-01-30 20:16:30 -08:00
Tomas Jakobsson 421e4a23df The final traces of boost has been eliminated 2018-01-30 19:21:09 +01:00
John Rassa e569ed7b88
Merge pull request #359 from tomaz82/boost_filesystem
Replace the last usage of boost::filesystem::operations
2018-01-29 16:16:54 -08:00
Tomas Jakobsson 403b798572 Remove the last traces of boost::filesystem::operational, this is PR 4 of 5 in the boost::filesystem removal quest 2018-01-27 22:52:14 +01:00
Jools Wills 5e031b7961
Merge pull request #358 from tomaz82/boost_filesystem
More boost::filesystem / Utils::String work
2018-01-27 18:08:54 +00:00