Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-27 16:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
529 commits 5 branches 36 tags 656 MiB
Commit graph

286 commits

Author SHA1 Message Date
Aloshi e65d94fe54 Initialize std::functions with nullptr instead of NULL. 2013-09-22 19:40:51 -05:00
Aloshi a3a4636fd5 Search for box hooked up. 
Display thumbnails for results.
Still need to resolve boxart.
 2013-09-20 18:55:05 -05:00
Aloshi 3105073e50 Work on scraper UI integration (about there, just need a real scraper 
now).
 2013-09-19 18:41:14 -05:00
Aloshi 5dfaeeabb4 More infastructure for scrapers (starting to hook into GuiMetaDataEd). 2013-09-17 16:50:49 -05:00
Aloshi e823592660 Added AsyncReqComponent for easy asynchronous, cancelable HTTP requests with a nice loading icon. 2013-09-15 14:11:39 -05:00
Aloshi 8e12ff9506 Completely removed GuiBox. 2013-09-14 12:51:13 -05:00
Aloshi d7a6cae4ce Moved the fast select GUI to nine patches. 
Luckily, no one ever used it anyway.
 2013-09-14 12:32:21 -05:00
Aloshi b0d156d6bd Move GuiSettingsMenu to use NinePatch. 2013-09-14 11:14:21 -05:00
Aloshi 74e8c40d67 Moved TextEditComponent to use NinePatchComponent. 
Enable key repeat while text editing.
 2013-09-14 10:58:34 -05:00
Aloshi 8bd5966f87 Added single-line edit + view mode to TextEditComponent. 
Used automatically if component height <= font height.
 2013-09-12 16:35:44 -05:00
Aloshi f9571b9389 TextEditComponent is now fixed-height and supports cursor-based editing. 
Fixed a text-wrapping bug with consecutive newlines in Font::wrapText.
 2013-09-07 17:46:26 -05:00
Aloshi 268b918c46 Changed GuiGameEd to GuiMetaDataEd. 
Now accepts std::functions for save/delete.
 2013-08-23 17:15:00 -05:00
Aloshi e55e0f3da7 Added FolderData::removeFileRecursive(FileData* f). 
Fixed ButtonComponent crashing when pressed with no press func set.
 2013-08-23 12:21:22 -05:00
Aloshi f2689f49a6 Merge branch 'master' into unstable 2013-08-23 11:28:45 -05:00
Aloshi b76413137e Hopefully fix trying to showing too many entries in TextListComponent. 2013-08-23 11:21:00 -05:00
Aloshi f89a418b5c Moving from GuiBox to simple mobile-style Nine Patches. 2013-08-23 09:53:48 -05:00
Aloshi 77fb840a4b Added a basic ButtonComponent class. 2013-08-22 15:29:50 -05:00
Aloshi df897c0b5a Finally implemented TextCaches for TextComponent and TextEditComponent. 
Huge boost in performance with rendering game descriptions.
(It's About Damn Time (TM))
 2013-08-21 20:08:36 -05:00
Aloshi bde5b6888f Properly fill in display_width and display_height for 0 now. 2013-08-21 15:59:11 -05:00
Aloshi bed9c1fbb5 TextEditComponents now resize vertically as needed. 2013-08-21 14:49:33 -05:00
Aloshi 7cb3cc09ee Fixed a long-standing invalid OpenGL disable in drawRect. 
Fixed a really strange bug in ComponentList vertical centering
that was causing TextEditComponent to render the top GuiBox border
incorrectly with odd sizes.
 2013-08-21 12:40:39 -05:00
Aloshi 7c2e7f9069 Basic text editing support. 2013-08-19 10:36:48 -05:00
Aloshi 1418f85ba7 Fixed some subtle bugs with SDL2 joystick changes. 
Removed platform-specific input device list polling.
Now we use SDL2's handy SDL_JOYDEVICEADDED event.
 2013-08-19 09:05:30 -05:00
Aloshi b5fe2cc8fc Began work on the metadata editor. 2013-08-18 09:16:11 -05:00
Aloshi 421797929d New generic metadata backend. 2013-08-14 07:16:49 -05:00
Aloshi dbcb9aed37 Moved es_systems.cfg to use XML. 
Updated README.md to reflect new format.
"descname" has been renamed to "fullname".
 2013-08-13 01:56:10 -05:00
Aloshi 60adf05077 Use res2h-generated files for embedded resources. 
You do not need res2h to build ES, only if you wish to modify resource
files.
Added a simple corner.png and bar.png for a border in the settings menu.
Added ImageComponent::setColorShift(unsigned int color) to change the
OpenGL color array.
 2013-08-07 17:40:27 -05:00
Aloshi 4f416d13a0 Add a "disable sounds" option to the settings menu. 2013-08-07 00:41:55 -05:00
Aloshi eb2481ca19 Remove debug text. 2013-08-06 23:46:43 -05:00
Aloshi 92adc41cd6 Fixed really sneaky texture deallocation bug. 
Textures allocated with no path (e.g. the transition image which uses
copyScreen()) weren't being deinitialized with the renderer.  Which meant
something else could take the old texture ID, and when the no-path texture
got destroyed, it would take a texture along with it.
 2013-08-06 23:35:06 -05:00
Aloshi 55b71fab49 Fixed ScrollableContainer clipping. 
Changed game select effect to interpolate more interestingly.
 2013-08-06 22:46:25 -05:00
Aloshi 541d9a62d1 Fix vertical and horizontal GuiBox images being flipped. 2013-08-06 19:03:40 -05:00
Aloshi bd940c56b4 Added new game launch/return effect. 2013-08-06 08:15:20 -05:00
Aloshi 04ffc7447c Fix mis-declared render methods for input setup GUIs. 2013-07-26 18:28:51 -05:00
Aloshi 8d78052808 Finally use parenting in GuiGameList. 
Added setCentered(bool) to TextComponent.
Fixed Font::sizeWrappedText to return an accurate width.
 2013-07-23 01:27:28 -05:00
Aloshi e2c30a568d Added a Window::normalizeNextUpdate() method. 
If you know something is about to cause the framerate to tank (e.g. theme
loading), you can tell the next update to be, at maximum, the average of
the previous five seconds of frames.
The framerate drawing code has also been moved to Window.
 2013-07-17 01:47:02 -05:00
Aloshi 28f7a9c6e1 Fix Settings menu and associated components. 2013-07-16 23:18:30 -05: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
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 c8900f4099 Moved to class-individualized static gets for resources. 
See issue #95 for discussion.
 2013-07-09 00:44:24 -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 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
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
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
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
Aloshi 441e0f660c Merge branch 'master' into unstable 2013-06-26 20:33:18 -05:00
Aloshi 6f9ea15696 Fixed GuiGameList screenshot crash. For real, this time, probably. 2013-06-26 20:32:51 -05:00
Aloshi 85f3ebf152 Fixed GuiGameList crashing on non-detailed view. 2013-06-21 16:54:41 -05:00
Aloshi 90af5d47ab Created the ResourceManager, Resource, and TextureResource classes. 
The ResourceManager provides a unified interface for accessing resource
data, embedded or from the filesystem, with
initialization/deinitialization handled automatically behind the scenes.
It also keeps from creating duplicate resources (e.g. when two
ImageComponents use the same image file).
Audio still needs to be moved over to it.
 2013-06-21 11:49:29 -05:00
Aloshi 5619674c55 Work-around for no front buffer access on GLES. 
Buffer swap now occurs after update but before render.
 2013-06-19 19:56:45 -05:00
Aloshi f651ea401c Removed volume from GuiInputConfig since it's in GuiSettingsMenu now. 2013-06-19 16:07:12 -05:00
Aloshi 62529029d7 Hooked up GuiSettingsMenu. 
Settings now save/load from ~/.emulationstation/es_settings.cfg.
 2013-06-19 16:02:42 -05:00
Aloshi 1534cec865 Added ComponentListComponent for laying out elements in a grid and 
navigating through them.
Added SliderComponent for selecting from a range of values.
Added SwitchComponent for selecting an "ON" or "OFF" value.
 2013-06-18 20:12:30 -05:00
Aloshi e8465baaba Moved externs for command-line args into a Settings singleton. 2013-06-17 14:01:03 -05:00
Aloshi 19eb1c412f Merge remote-tracking branch 'origin/unstable' into unstable 2013-06-16 16:24:17 -05:00
Aloshi da6ae9ac10 Initial screen transition when switching systems. 2013-06-16 16:23:04 -05:00
Aloshi 1b71abd44c Fixed marquee effect staying on when changing systems. 2013-06-15 13:06:52 -05:00
Aloshi 861297ae25 Added initial TextComponent. 
Reworked GuiGameList to use a TextComponent for description.
Changed set/clearClipRect to push/popClipRect.
Fixed Y coordinate in the clip rect functions.
Sorta fixed AnimationComponent being totally out of whack with VSync off.
 2013-06-14 10:48:13 -05:00
Aloshi aec15ba0a1 Refactored Font to use a Vertex struct and Vector2. 
Fixed InputConfig error messages dumping to console and not logging.
Fixed skipped inputs being saved.
 2013-06-14 07:34:12 -05:00
Aloshi f577a72c23 Re-added input config fix that went missing... 2013-06-02 19:18:26 -05:00
Aloshi 7faf9fca53 Added Size and getSize() to GuiComponent. 
Added setClipRect and clearClipRect to Renderer.
TextListComponent finally has a marquee. :)
 2013-06-02 17:33:49 -05:00
Aloshi 826624481a Refactored ImageComponent to use Vector2. 2013-06-02 16:05:29 -05:00
Aloshi 24512c0c9f Component rendering now uses OpenGL translation. 
You don't need to take into account offset when rendering anymore.
 2013-06-02 14:34:50 -05:00
Aloshi 424fcb0329 Basic GuiComponent refactor complete. 2013-06-02 10:08:32 -05:00
Aloshi 80e33849b5 Fixed a few crashes, better support for higan 
Fixed AudioManager/InputManager unsigned vs signed comparison warnings.
Fixed a FolderData sorting crash (I can't believe nobody's reported
this).
Fixed a GuiTheme crash for empty paths.
Added the %ROM_RAW% tag, for the unescaped ROM name - useful for higan
on windows.
SystemData will now add folders that end in EXTENSION as GameDatas, and
not recurse through them.  Also useful for higan.
 2013-05-27 12:13:38 -05:00
Bim Overbohm 970aa78cda Make master volume controllable via input 
Standard mapping is +/- keys. Setting is written to es_input.cfg.
 2013-05-23 11:43:50 +02:00
Bim Overbohm edc26aa4e1 Add Volume control in Windows and Linux 
Add volume control int Windows through the mixer API (until XP) and the
EndpointVolume API (Vista and above). Add volume control in Linux
through ALSA.
Convert AudioManager to use shared_ptrs.
 2013-05-22 19:11:10 +02:00
Aloshi cd76e2a654 Added ability to skip all inputs beyond menu by pressing Accept. 2013-05-16 14:39:40 -05:00
Aloshi ec48c5d3a4 Fixed a crash with empty path names in theme box definitions. 2013-05-16 13:27:19 -05:00
Bim Overbohm 1f91fe6cdf Fix compile errors on Ubuntu 
Set the GCC compiler flags properly. Add missing include.
 2013-05-15 09:40:16 +02:00
Bim Overbohm af9b9f732f Remove the need for SDL_mixer 
SDL_mixer is not in the standard SDL distribution. The mixing is now
done using regular SDL_Audio functions. AudioManager is converted to a
singleton and std::shared_ptrs are used for all Sound objects. Note that
for GCC "-std=c++11" might need to be added to the CMAKE_CXX_FLAGS.
 2013-05-14 21:31:39 +02:00
Aloshi ffe573d1d6 Ported to Windows. 
Added --windowed for desktop builds.
 2013-05-13 14:53:28 -05:00
Aloshi 149c1bcbdd More descriptive names for inputs 2013-04-18 16:44:43 -05:00
Aloshi a119997ec7 Added page up/page down to the Input Config screen. 
Updated the README.
 2013-04-13 18:10:23 -05:00
Aloshi c6a7f8abf9 Fixed InputManager's handling of controllers with duplicate names. 
Added emergency keyboard config if no players can be loaded.
Switched some console output to log output.
 2013-04-13 13:19:06 -05:00
Aloshi 1007821ca3 Add device name to input config files. 
Properly init/deinit renderer stuff in Renderer_init_rpi.cpp. Probably.
 2013-04-11 21:59:19 -05:00
Aloshi a5f4749d5d Added InputConfig saving/loading. 2013-04-11 17:27:27 -05:00
Aloshi 14a05d4943 Init/deinit theme-declared fonts. 2013-04-11 16:33:12 -05:00
Aloshi b01f2705de More work on reinitialization. Fonts still not working. 2013-04-10 12:29:07 -05:00
Aloshi 05c258f515 Functionality seems to have been restored at last. 2013-04-09 13:13:47 -05:00
Aloshi 4747d70e1f More work. 2013-04-08 12:40:15 -05:00
Aloshi 04841ca436 More work. 
I really am nuts.
 2013-04-08 11:52:40 -05:00
Aloshi 47dfe5d5fb Quick fix for the joystick event state with GuiInputConfig. 2013-03-28 21:57:01 -05:00
Aloshi 34c3d607b5 Added fast select font tag. 2013-03-17 12:16:40 -05:00
Aloshi f336eece75 Added "Reload" menu option. 
As usual, it's undertested, please report any problems.
 2013-01-26 11:47:43 -06:00
Aloshi 9a27a868bb Fixed selected text color changes only applying to centered lists. 2013-01-08 23:01:52 -06:00
Aloshi 016df5864f Fixed game list rendering one entry short. 2013-01-08 11:34:17 -06:00
Aloshi 3d17f30f5b Changed OpenGL min texture filter to Linear for GuiImage. 2013-01-08 11:19:38 -06:00
Aloshi 8fc2b8377a Made the list selected color have no effect if zero. 2013-01-08 09:23:28 -06:00
Aloshi e59c430b89 Added <basicTheme> support. 2013-01-06 14:33:50 -06:00
Aloshi 2efca58869 Added a logging system to ES. 
You should no longer see non-error output with ES except for "cleanly shutting down".
The new log file is located in ~/.emulationstation/es_log.txt.
If you notice any performance degredation, please tell me!
 2013-01-04 17:31:51 -06:00
Aloshi d0cea1b8e7 Added --debug switch. 
You no longer need a keyboard to save input configuration; that was stupid anyway. You should be able to set up ES without a keyboard now!
 2012-12-20 12:29:05 -06:00
Aloshi af36932f30 Added --no-exit switch. 
This switch will keep ES from displaying the "Exit" option in the menu.
 2012-12-18 09:20:13 -06:00
Aloshi 529c3a24c7 Updated README.md/THEMES.md for twolife's changes. 
DESCNAME is a new, optional tag.
You can now use ~/.emulationstation/SYSTEMNAME/ for theme and gamelist files!
 2012-12-18 09:08:25 -06:00
Sébastien NOEL 3da7a0dd14 Add a new directory for gamelist.xml & theme.xml for each system 2012-12-17 20:29:43 +01:00
Aloshi 3acbd0af9c Fixed a crash when opening the start menu. 
Fixed PAGEDOWN/PAGEUP not appearing in the input config GUI.
Fixed PAGEDOWN/PAGEUP not properly updating detail data.
 2012-12-08 12:55:54 -06:00
Aloshi 989ba9a8f9 Heavily refactored how theming data is accessed. 2012-11-17 12:39:49 -06:00
Aloshi 6e31f17c3b Fixed the default game image size to properly fit within the info column. 2012-11-17 11:29:20 -06:00
Aloshi 4bbec51a6f Added Exit command to the menu. 2012-11-14 09:07:09 -06:00
Aloshi 38bbbb3fb7 Moved PAGEUP/PAGEDOWN configuration to the end of the enums to preserve backwards compatibility with older es_input.cfgs. 2012-11-12 09:27:07 -06:00
Aloshi ae4498f5f4 Merge branch 'master' of https://github.com/Aloshi/EmulationStation 2012-11-12 09:21:57 -06:00
Aloshi 3e522998ce Removed LinLibertine font, instead opting for a system default. 2012-11-12 09:21:35 -06:00
invisiblek 8cf16af40b Add support for PAGEUP and PAGEDOWN 
Also add functions to move 10 lines on these keystrokes
 2012-11-12 02:06:33 +00:00
Aloshi fe030fb6c7 Added custom font support. 
Check out THEMES.md for more information.
 2012-10-31 09:46:06 -05:00
Aloshi 3ebb819a7c Fixed up some things that were causing compiler warnings. 2012-10-28 18:07:05 -05:00
Aloshi 5b0166d294 Fixed an issue with skipping joystick input. 
Fixed the selected text color in the restart/shutdown menu.
Updated README.md.
 2012-10-25 13:03:35 -05:00
Aloshi 77e14423b9 Added the gameImageNotFound tag. See THEMES.md for details. 2012-10-25 12:36:30 -05:00
Aloshi aa6506aec1 Began paving the way for custom font support. 
Font sizes might be a little different than they were before - sorry about that!
 2012-10-24 10:28:37 -05:00
Aloshi 8b242a0532 Fixed listSelectorColor's alpha not working properly. 2012-10-17 13:32:01 -05:00
Aloshi 8b1e061929 Reworked opacity to be stored in that wasted color byte. 2012-10-17 13:21:56 -05:00
Aloshi 358658a36d Initial GuiAnimation added. 2012-10-17 12:15:58 -05:00
Aloshi c2b970f2cf Fixed game list continuing to scroll after you open a menu or start a game. 2012-10-14 12:49:57 -05:00
Aloshi 03995a66bb Fixed theming for game image dimensions. 2012-10-13 18:51:35 -05:00
Aloshi 8120fcb54d The game list can no longer be left-aligned unless the detailed view is active. 2012-10-13 18:40:44 -05:00
Aloshi 61c9b10abd New game image theming tags! See THEMES.md for details. 
Also, some minor fixes all around (game descriptions no longer appear while scrolling, woo!).
 2012-10-13 18:37:51 -05:00
Aloshi 65701c58c1 Added some more menu sound theming tags. 
Menu scroll sound now also applies to the fast select menu.
 2012-10-13 15:05:43 -05:00
Aloshi ea1a3117a5 Added menu sounds. See THENMES.md for more details. 2012-10-13 13:29:53 -05:00
Aloshi 20aa6d2a6e Updated THEMES.md to reflect tiling changes. 2012-10-10 10:26:14 -05:00
Aloshi 640c3b52bc Redid tiling! 
Now faster (always uses 6 verticies thanks to wrapped textures) and precise (properly cuts off).
 2012-10-10 10:21:03 -05:00
Aloshi b6264f4858 Fixed GuiBox/GuiFastSelect render order. 2012-10-10 08:56:34 -05:00
Aloshi b6afbd8c09 Fixed GuiBox's background being positioned wrong. 2012-10-10 08:54:39 -05:00
Aloshi 6de46003d9 Added theming tag for the Fast Select box's text color. 2012-10-10 08:51:48 -05:00
Aloshi 9b3589a22f Added theme tags for the Fast Select GuiBox. 
See THEMES.md for more detail.
 2012-10-07 17:59:20 -05:00
Aloshi 57461ba676 More progress with GuiBox. 2012-10-07 17:25:51 -05:00
Aloshi 41f164e53b Further work on GuiBox. 2012-10-07 16:56:33 -05:00
Aloshi 62336ab2fb Fixed a long-standing bug with detailed GuiGameList detection after mapping input. 2012-10-05 15:18:36 -05:00
Aloshi aea93748d5 Began working on GuiBox for theming of boxes (a revolutionary concept). 2012-10-05 15:04:12 -05:00
Aloshi a3c128f4ce GuiFastSelect is working. 
Should be able to map a joystick input to Fast Select too, but untested.
 2012-10-05 08:44:18 -05:00
Aloshi 31aebf3a7d Added <listSelectedColor> tag. 
Began implementing GuiFastSelect. You can see what's currently in place by holding F2 and pressing up/down.
Hopefully fixed nearest neighbor filters with GuiImage.
 2012-09-30 22:29:55 -05:00
Aloshi 9901a07fb6 Added some new theming tags. 
See changelog.txt (September 15) for more details.
 2012-09-15 16:24:33 -05:00