Commit graph

6346 commits

Author SHA1 Message Date
Aloshi 19c585ec22 Fix font texture filter (to be GL_NEAREST). 2013-07-15 22:57:50 -05:00
Bim Overbohm bfff96ebbc Add Eigen3 to CMakeLists and add find script 2013-07-11 10:47:49 +02:00
Aloshi c9ed1a5c50 Merge pull request #108 from HorstBaerbel/master
Update project description regarding G++4.7 and SD card issues
2013-07-10 04:53:39 -07:00
Aloshi 3745642153 Add -DEIGEN_DONT_ALIGN to compiler flags. 2013-07-10 06:32:51 -05:00
Bim Overbohm 4f8f2e6fa5 Update project description regarding RPI SD card issues 2013-07-10 13:31:57 +02:00
Aloshi 542d41c682 Move from homegrown Vector2 class to Eigen.
Pass a matrix (Eigen::Affine3f) in GuiComponent::render instead of doing
glTranslate behind the scenes.
2013-07-10 06:29:43 -05:00
Aloshi 919662be85 Merge branch 'master' into unstable 2013-07-09 19:03:46 -05:00
Aloshi 7085d74e31 Changed default centering behavior.
Now the detailed view will default to left-aligned.
2013-07-09 19:02:59 -05:00
Aloshi a15031733b Fix crash when no fast-select font specified 2013-07-09 18:52:10 -05:00
Bim Overbohm b1b1d23337 Merge https://github.com/Aloshi/EmulationStation 2013-07-09 16:36:37 +02:00
Aloshi 77e9f2d150 Refactor some of the startup code. 2013-07-09 05:37:37 -05:00
Aloshi 40dc9abdf8 Fix GuiGameList list positioning. 2013-07-09 01:10:48 -05:00
Aloshi dd10edb904 ResourceManager stores Reloadables in a list, instead of vector. 2013-07-09 00:57:28 -05:00
Aloshi a818801ea6 Initialize mOpacity. 2013-07-09 00:48:23 -05:00
Aloshi c8900f4099 Moved to class-individualized static gets for resources.
See issue #95 for discussion.
2013-07-09 00:44:24 -05:00
Aloshi c99324060b Merge branch 'master' into unstable 2013-07-08 19:06:55 -05:00
Bim Overbohm 65e65e1ac9 Update project description regarding G++ 4.7 2013-07-08 10:00:35 +02:00
Aloshi 480bee7a71 Merge pull request #100 from HorstBaerbel/master
Update project description mentioning what to do in case of problems
2013-07-05 05:43:53 -07:00
Bim Overbohm 548b93dbd2 Update project description regarding issues 2013-07-05 11:23:21 +02:00
Aloshi 40ffb4e21a Merge pull request #97 from HorstBaerbel/master
Convert paths to generic form
2013-07-03 05:56:03 -07:00
Bim Overbohm 3c189b33c1 Convert paths to generic form after 341aa766d8
Might not have caught all places where this should be done.
2013-07-03 14:27:06 +02:00
Aloshi d781cebfa1 Remove debug messages 2013-07-03 03:23:18 -05:00
Aloshi 56dffeed8c Fixed memory leak in ImageIO.cpp 2013-07-03 03:17:34 -05:00
Aloshi 6b373924d2 Moved Fonts to be Resources.
Moved Renderer::drawText stuff to the Font class.
Fonts are now used as std::shared_ptrs.
2013-07-03 02:54:55 -05:00
Aloshi fe8c592623 Merge branch 'master' into unstable
Conflicts:
	src/components/ImageComponent.h
2013-07-03 01:30:44 -05:00
Aloshi 341aa766d8 Use path.generic_string() for game paths.
Should now only use forward slashes, regardless of platform.
2013-07-02 22:48:03 -05:00
Aloshi 04946d9fed Remove red test background on ScrollableContainer 2013-07-02 22:25:48 -05:00
Aloshi d616b4a202 Merge remote-tracking branch 'horstbaerbel/master'
Conflicts:
	src/components/GuiGameList.cpp
2013-07-02 22:24:43 -05:00
Aloshi ed384e057b Move scrolling out of TextComponent and into a generic
ScrollableContainer.
2013-07-02 20:01:58 -05:00
Bim acc22739b0 Merge remote-tracking branch 'upstream/master' 2013-07-03 02:12:49 +02:00
Bim 45ed6ae4da Add size set function to GuiComponent
Similar to #92...
2013-07-03 01:48:39 +02:00
Aloshi df78b5352d Changed AnimationComponent to use GuiComponent instead of ImageComponent.
Possible now that the opacity logic has been moved to GuiComponent.
2013-07-02 18:13:55 -05:00
Aloshi 29b1ac1b13 Merge pull request #92 from leandromacrini/master
Moved Opacity logic to GuiComponent
2013-07-02 16:02:05 -07:00
Bim ac51656527 Read/Write sort order to settings
Not written to disk atm.
2013-07-02 23:14:33 +02:00
Bim ded54a6884 Merge 94e32f198b from unstable branch top master
Had to hand-merge GuiGameList.cpp again :/
2013-07-02 22:49:53 +02:00
Bim f72e80b629 Merge remote-tracking branch 'upstream/master'
had to hand-merge GuiGameList.cpp
2013-07-02 21:52:02 +02:00
Sir_Leon be86423712 Merge branch 'master' of https://github.com/leandromacrini/EmulationStation 2013-07-02 17:01:28 +02:00
Sir_Leon b4e554153a Moved Opacity logic to GuiComponent
Moved Opacity logic from ImageComponent to GuiComponent so any extender
of GuiComponent che implement its opacity logic.

Implemented Opacity logic for TextComponent (now text can have fade
animation)
2013-07-02 16:51:33 +02:00
Aloshi 0a6196dd9f Refactored Font class to use a TextCache for vertex data.
The TextComponent class should start using it soon.
2013-07-02 02:53:23 -05:00
Aloshi e785a2dfe0 You can now mix and match game list detail levels.
Basically, only games that have a gamelist.xml will use the detailed view.
2013-07-02 02:04:52 -05:00
Aloshi ec7ad28fdc Finally added scrolling description text. :) 2013-07-02 00:57:31 -05:00
Bim 94e32f198b Make sort order changeable via fast-select menu
Use the left/right keys to switch it.
2013-06-30 19:24:09 +02:00
Bim b329a5e1a0 Merge remote-tracking branch 'upstream/master' 2013-06-30 18:00:16 +02:00
Aloshi 3971fdc674 Fix last entry not showing (issue #90) 2013-06-29 20:57:14 -05:00
Aloshi c18877fdf1 Merge branch 'master' into unstable 2013-06-29 20:44:54 -05:00
Aloshi f4e2a14685 Temporarily disable polling while configuring inputs.
Polling is disabled once the first device is chosen, and resumed once the
last device is configured.
2013-06-29 20:43:13 -05:00
Aloshi 1dfb45e133 Print all Log messages to cout with --debug set.
Added startPolling and stopPolling to InputManager.
2013-06-29 20:37:18 -05:00
Aloshi 20d08587f2 Merge commit '171ca9a' from HorstBaerbel fork 2013-06-29 07:35:33 -05:00
Aloshi d986d739b2 Revert "Disable input device polling code to resolve freeze after ~45 minutes."
This reverts commit 4a1206aee2.
2013-06-29 07:30:32 -05:00
Bim Overbohm a60fe463d4 Support sorting of game list via input
You can now map the functions "sortordernext" and "sortorderprevious" to
inputs (in es_input.cfg) and toggle the game list sort order with them.
The order is: "file name, ascending" (default), "file name, descending",
"rating ascending", "rating descending", "user rating ascending", "user
rating descending", "time played ascending", "times played descending",
"last played time ascending", "last played time descending".
2013-06-28 19:44:28 +02:00