summaryrefslogtreecommitdiffstats
path: root/src/citra (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1897 from linkmauve/sdl2-config-fixMat M2016-06-111-1/+5
|\ | | | | SDL2: Add forgotten default config changes from 7129611e65096ba2cbe8266f6cb068a9b18981d8
| * SDL2: Add forgotten default config changes from 7129611e65096ba2cbe8266f6cb068a9b18981d8.Emmanuel Gil Peyrot2016-06-111-1/+5
| |
* | Merge pull request #1789 from wwylele/input-refactorbunnei2016-06-113-8/+19
|\ \ | |/ |/| Refactor input mapping & implement circle pad modifier
| * implement circle pad modifierwwylele2016-05-152-0/+7
| |
| * Refactor input subsystemwwylele2016-05-153-8/+12
| |
* | Merge pull request #1817 from linkmauve/smdh-stuffbunnei2016-05-251-1/+7
|\ \ | | | | | | Improve SMDH support in loaders and frontends
| * | CitraQt: Simplify the game list loader codeEmmanuel Gil Peyrot2016-05-211-1/+1
| | |
| * | Loader, Frontends: Refactor loader creation and game loadingEmmanuel Gil Peyrot2016-05-211-1/+7
| |/ | | | | | | | | This allows frontends to keep a single loader and use it multiple times e.g. for code loading and SMDH parsing.
* | New3DS: Minor style cleanup to #1520.bunnei2016-05-241-1/+1
| |
* | Merge pull request #1520 from JamePeng/checknew3dsbunnei2016-05-241-2/+3
|\ \ | |/ |/| Implement CheckNew3DS and CheckNew3DSApp
| * Implement CheckNew3DS and CheckNew3DSAppJamePeng2016-04-201-2/+3
| | | | | | | | | | | | Append an item[is_new3ds] to config file[System] group Implement APT::SetNSStateField,it will update the unknown NS_state_field
* | fixup simple type conversions where possibleAlexander Laties2016-05-071-1/+1
| |
* | Merge pull request #1736 from MerryMage/sdl2-sinkbunnei2016-05-071-1/+1
|\ \ | | | | | | AudioCore: SDL2 Sink
| * | AudioCore: SDL2 SinkMerryMage2016-05-071-1/+1
| | |
* | | Frontends, VideoCore: Move glad initialisation to the frontendEmmanuel Gil Peyrot2016-05-061-0/+7
|/ / | | | | | | | | | | | | | | | | | | On SDL2 this allows it to use SDL_GL_GetProcAddress() instead of the default function loader, and fixes a crash when using apitrace with an EGL context. On Qt we will need to migrate from QGLWidget to QOpenGLWidget and QOpenGLContext before we can use gladLoadGLLoader() instead of gladLoadGL(), since the former doesn’t expose a function loader.
* | Audio: Add sink selection to configuration filesMerryMage2016-04-302-0/+8
| |
* | CMakeLists: Use imported version of Threads::ThreadsSam Spilsbury2016-04-241-1/+1
| | | | | | | | | | | | | | This requires bumping up to a minimum of CMake 3.1. The benefit of using the imported target is that you can switch to the -pthread compiler flag on request, which may be necessary for some systems if available.
* | CMakeLists: Use CMAKE_THREAD_LIBS_INITSam Spilsbury2016-04-231-1/+1
| |
* | Config: Add scaled resolution optiontfarley2016-04-212-0/+5
| |
* | SDL2 Frontend: Use argv[0], add a --version, and reorder options.Emmanuel Gil Peyrot2016-04-201-9/+20
| |
* | Use Settings::Apply in SDL frontendJannik Vogel2016-04-111-5/+4
|/
* Default to settings from ini for gdbstubpolaris-2016-04-071-6/+6
|
* Adopted WinterMute's gdbstub changespolaris-2016-04-061-4/+21
| | | | | This fixes the comments left on the PR (whitespace, SO_REUSEADDR, comment changes).
* Common: Remove Common::make_unique, use std::make_uniqueMerryMage2016-04-052-5/+6
|
* Merge pull request #1526 from bunnei/sdl-rgb8bunnei2016-03-151-0/+4
|\ | | | | SDL2: Explicitly use RGB8 color buffer.
| * SDL2: Explicitly use RGB8 color buffer.bunnei2016-03-151-0/+4
| |
* | citra: Shutdown cleanly if ROM load failsMerryMage2016-03-151-8/+6
|/
* Config: Use unique_ptr instead of raw pointerMerryMage2016-03-022-14/+12
|
* Dependencies: Remove GLFW, Add SDL2MerryMage2016-03-029-256/+274
| | | | | | | | | | | | | | citra: Remove GLFW, Add SDL2 FindSDL2: Do not CACHE SDL2_* variables if library is not found EmuWindow_SDL2: Set minimal client area at initialisation time EmuWindow_SDL2: Corrections EmuWindow_SDL2: Fix no decorations on startup on OS X cmake: windows_copy_files
* AudioCore: Skeleton ImplementationMerryMage2016-02-211-1/+1
| | | | | | | | | This commit: * Adds a new subproject, audio_core. * Defines structures that exist in DSP shared memory. * Hooks up various other parts of the emulator into audio core. This sets the foundation for a later HLE DSP implementation.
* Handle changes pointed out in comments on PRpolaris-2015-10-221-2/+1
|
* Remove unnecessary new lines, changed Deinit to Shutdownpolaris-2015-10-121-1/+1
|
* Toggle use_gdbstub in citra GLFWpolaris-2015-10-041-0/+1
|\
| * Implement gdbstubpolaris-2015-09-203-0/+12
| |
* | Implement gdbstubpolaris-2015-10-043-0/+12
|/
* CMake: Add option to download Qt and GLFW binaries over HTTPYuri Kunde Schlesner2015-09-091-0/+3
|
* Increase required OpenGL version to 3.3Yuri Kunde Schlesner2015-08-301-1/+1
| | | | | This gives us several niceties such as Sampler Objects, shader attribute locations and Timer Queries.
* Replace the previous OpenGL loader with a glad-generated 3.3 oneYuri Kunde Schlesner2015-08-302-3/+3
| | | | | | The main advantage of switching to glad from glLoadGen is that, apart from being actively maintained, it supports a customizable entrypoint loader function, which makes it possible to also support OpenGL ES.
* Integrate the MicroProfile profiling libraryYuri Kunde Schlesner2015-08-251-0/+7
| | | | | This brings goodies such as a configurable user interface and multi-threaded timeline view.
* Shader: Initial implementation of x86_x64 JIT compiler for Pica vertex shaders.bunnei2015-08-163-0/+6
| | | | | - Config: Add an option for selecting to use shader JIT or interpreter. - Qt: Add a menu option for enabling/disabling the shader JIT.
* Common: Ported over boilerplate x86 JIT code from Dolphin/PPSSPP.bunnei2015-08-151-1/+1
|
* Merge pull request #873 from jroweboy/input_arrayTony Wasserka2015-07-282-49/+16
|\ | | | | Move input values into an array.
| * Move input values into an arrayJames Rowe2015-07-282-49/+16
| |
* | Citra: Remove dead gpu_refresh_rate option from the default ini file.Emmanuel Gil Peyrot2015-07-261-4/+0
|/
* Implement new argument parsing using getopt and add the corresponding library to externalsGreg Wicks2015-07-122-3/+42
|
* Merge pull request #910 from linkmauve/installTony Wasserka2015-07-121-1/+3
|\ | | | | Tell CMake to install the compiled binaries on Linux.
| * Citra, CitraQt: Tell cmake to install the compiled binaries.Emmanuel Gil Peyrot2015-07-091-1/+3
| | | | | | | | | | This will help packaging tremendously, as a `make DESTDIR=… install` will now put every file at their place (on Linux and related).
* | Citra: Fix the includes a bit, thanks to include-what-you-use.Emmanuel Gil Peyrot2015-06-285-8/+19
|/
* Merge pull request #832 from yuriks/refresh-rate-optionbunnei2015-05-311-1/+0
|\ | | | | Remove gpu_refresh_rate configuration option
| * Remove gpu_refresh_rate configuration optionYuri Kunde Schlesner2015-05-301-1/+0
| | | | | | | | | | | | | | Changing it makes emulation inherently inaccurate. It also had a wrong default value (30, whereas the real system has a refresh rate of 60 Hz) which, even if changed, would continue to be used unless people manually removed it from their config files.
* | Remove every trailing whitespace from the project (but externals).Emmanuel Gil Peyrot2015-05-291-0/+0
|/
* Assets: Move citra.ico from src/assets to dist.Emmanuel Gil Peyrot2015-05-251-9/+9
|
* OpenGL renderertfarley2015-05-231-0/+4
|
* INI hw/sw renderer toggletfarley2015-05-222-0/+6
|
* Common: Remove async loggingYuri Kunde Schlesner2015-05-121-6/+0
| | | | | | | | | | | It provided a large increase in complexity of the logging system while having a negligible performance impact: the usage patterns of the ring buffer meant that each log contended with the logging thread, causing it to effectively act as a synchronous extra buffering. Also removed some broken code related to filtering of subclasses which was broken since it was introduced. (Which means no one ever used that feature anyway, since, 8 months later, no one ever complained.)
* Common: Remove common.hYuri Kunde Schlesner2015-05-073-2/+5
|
* Common: Remove many unnecessary cross-platform compatibility macrosYuri Kunde Schlesner2015-05-071-1/+1
|
* EmuWindow: Clip mouse input coordinates to emulated screen dimensions.Zaneo2015-05-021-1/+1
| | | | | | | If the mouse position for a mouse move/drag would take it outside the emulated screen dimensions, clip the coordinates to the emulated screen dimensions. Qt and GLFW will report negative coordinates for mouse positions to the left, or above citra window. Added restriction to mouse coordinates passed to touchmoved by Qt/GLFW to be greater or equal to zero.
* Allow the user to set the background clear color during emulationarchshift2015-04-042-0/+12
| | | | The background color can be seen at the sides of the bottom screen or when the window is wider than normal.
* HID: Complete refactor of pad/touch input to fix threading issues.bunnei2015-03-111-11/+6
|
* EmuWindow: Made pad/touch functions non-static.bunnei2015-03-101-13/+14
|
* GLFW: Implemented EmuWindow touchpad support.bunnei2015-03-102-0/+26
|
* Merge pull request #634 from linkmauve/logging-performancesbunnei2015-03-091-1/+2
|\ | | | | Apply the logging filter before sending the message to the queue
| * Logging: check for filter before sending to the queue, to skip all heavy formatting on the other thread.Emmanuel Gil Peyrot2015-03-061-1/+2
| |
* | default_ini.h: Put comments on their own linesarchshift2015-03-081-4/+15
| | | | | | | | Apparently inline comments is not necessarily standard in the INI format, and our parser was erroneously parsing the comments as values.
* | Set framebuffer layout from EmuWindow.bunnei2015-03-071-9/+2
|/
* Frontends, HID: Add New 3DS specific pad buttons, and stub the touch one.Emmanuel Gil Peyrot2015-02-223-1/+23
|
* Asserts: break/crash program, fit to style guide; log.h->assert.harchshift2015-02-111-5/+5
| | | | | | | Involves making asserts use printf instead of the log functions (log functions are asynchronous and, as such, the log won't be printed in time) As such, the log type argument was removed (printf obviously can't use it, and it's made obsolete by the file and line printing) Also removed some GEKKO cruft.
* Merge pull request #526 from purpasmart96/citra_stubsbunnei2015-02-112-0/+6
|\ | | | | Services: Stub some functions
| * Services: Stub some functionspurpasmart962015-02-082-0/+6
| |
* | arm: Adios armemuLioncash2015-02-012-2/+0
|/
* Added HID_SPVR service and split HID_U implementation into service/hid/hid.xxxarchshift2015-01-211-17/+17
|
* Fix building on MinGWdarkf2015-01-121-0/+0
|
* Use -pthread where and only where neededJohannes Ekberg2015-01-091-4/+0
| | | | | | Passing -pthread to GCC as a flag makes it both link to libpthread, and make C standard library routines reentrant. This makes the additional explicit links unnecessary. Additionally, on OSX, this is the default behavior, and clang will print a message about it being unused if it's present there.
* Generic PLATFORM_LIBRARIES varJohannes Ekberg2015-01-091-11/+1
| | | | This both reduces redundancy in add_executable definitions, and makes it easier to link additional libraries. In particular, extra libraries are needed on OSX - see next commit.
* Frontends: Shutdown core when emulation is stoppedYuri Kunde Schlesner2015-01-041-0/+2
|
* Core: Change default CPU to dyncom.bunnei2015-01-031-1/+1
|
* SOC_U: Preliminary implementation of sockets.Subv2014-12-311-2/+2
| | | | | | | | | | | | | Stubbed CreateMemoryBlock Using Berkeley sockets, and Winsock2.2 on Windows. So far ftpony creates the socket and accepts incoming connections SOC_U: Renamed functions to maintain consistency Also prevents possible scope errors / conflicts with the actual Berkeley socket functions SOCU: Close all the opened sockets when cleaning up SOCU
* Add citra icon to Windows executable and title barChin2014-12-312-0/+1
|
* Fix MSVC-related #defines and add CMakeLists commentdarkf2014-12-301-1/+1
|
* Fix merge conflictsdarkf2014-12-307-53/+58
|\
| * GPU: Implement frameskip and remove forced framebuffer swap hack.bunnei2014-12-292-0/+2
| |
| * GPU: Change internal framerate to 30fps.bunnei2014-12-272-2/+2
| |
| * Merge pull request #275 from yuriks/cmake-cleanbunnei2014-12-221-8/+6
| |\ | | | | | | Clean up CMake library specification
| | * Clean up CMake library specificationYuri Kunde Schlesner2014-12-151-8/+6
| | | | | | | | | | | | The X11 libraries don't need to be specified when doing dynamic linking
| * | License changepurpasmart962014-12-216-6/+6
| |/
| * Add configurable per-class log filteringYuri Kunde Schlesner2014-12-133-3/+6
| |
| * Convert old logging calls to new logging macrosYuri Kunde Schlesner2014-12-133-13/+13
| |
| * New logging systemYuri Kunde Schlesner2014-12-131-5/+11
| |
| * Change NULLs to nullptrs.Rohit Nirmal2014-12-031-3/+3
| |
| * Merge pull request #196 from archshift/settingsbunnei2014-12-012-15/+7
| |\ | | | | | | Merge Config::ReadXYZs
| | * Merge Config::ReadXYZsarchshift2014-11-192-15/+7
| | |
| * | GLFW: Add an error callback before calling glfwInit()Emmanuel Gil Peyrot2014-11-301-2/+6
| | | | | | | | | | | | | | | | | | It will print a message to know what happened in case something went wrong in a GLFW call. Also replace every printf() in the glfw emu-window by ERROR_LOG().
* | | Fix MinGW builddarkf2014-11-291-1/+4
|/ /
* | Remove tabs in all files except in skyeye imports and in generated GL codeEmmanuel Gil Peyrot2014-11-191-2/+2
| |
* | Remove trailing spaces in every file but the ones imported from SkyEye, AOSP or generatedEmmanuel Gil Peyrot2014-11-191-1/+1
| |
* | citra GLFW: Ignore minimal window size hints.Tony Wasserka2014-11-181-8/+2
| | | | | | | | GLFW provides no proper support for this, hence we just allow any window size to be used.
* | EmuWindow: Remove window title getters/setters.Tony Wasserka2014-11-181-3/+4
| | | | | | | | | | The window title is none of the emulation core's business. The GUI code is free to put whatever it wants there. Providing properly thread-safe window title getters and setters is a mess anyway.
* | EmuWindow: Add support for specifying minimal client area sizes.Tony Wasserka2014-11-182-0/+23
| |
* | Fixup EmuWindow interface and implementations thereof.Tony Wasserka2014-11-182-20/+44
| |
* | Viewport scaling and display density independenceKevin Hartman2014-11-182-1/+9
|/ | | | | The view is scaled to be as large as possible, without changing the aspect, within the bounds of the window. On "retina" displays, or other displays where window units != pixels, the view should no longer draw incorrectly.
* Merge pull request #159 from SeannyM/enable_logTony Wasserka2014-11-154-0/+13
|\ | | | | Add support for disabling log from settings
| * Add support for disabling log from settingsSean2014-11-034-0/+13
| |
* | ARM: Fixed several dyncom bugs.bunnei2014-11-121-1/+1
| | | | | | | | | | | | | | - Fixed NZCVT flags to properly save state when function returns. - Fixed counter to keep track of the actual number of instructions executed. - Fixed single-step mode to only execute one instruction at a time. - DefaultIni: Removed comment that no longer applied to dyncom.
* | Merge pull request #151 from archshift/dyncom-enabledbunnei2014-10-283-0/+12
|\ \ | | | | | | Use configuration files to enable or disable the new dyncom interpreter.
| * | Added `gpu_refresh_rate` config setting for the new interpreter speed hack.archshift2014-10-282-1/+3
| | |
| * | Use configuration files to enable or disable the new dyncom interpreter.archshift2014-10-283-0/+10
| |/
* / Add `override` keyword through the code.Yuri Kunde Schlesner2014-10-261-4/+4
|/ | | | This was automated using `clang-modernize`.
* Use config files to store whether SDMC is enabled or notarchshift2014-10-233-0/+9
| | | | Before, it used to use whether the directory actually existed. As a result, .citra-emu/sdmc was never auto-created (something quite confusing to me until I read through the logs).
* emu_window_glfw.cpp: Fixed graceful quittingarchshift2014-10-191-1/+1
| | | | In PR #143, the name of the function IsOpen was originally ShouldClose, but was changed. The function's caller was changed to reflect this, but the return value wasn't.
* Implemented graceful closing of the GLFW window, along with emulation.archshift2014-10-173-1/+9
|
* OpenGL renderer: Request a forward compatible context in citra-qtYuri Kunde Schlesner2014-10-121-3/+0
| | | | This should fix context creation on OS X. Also requests a core context on all platforms in Citra-GLFW, for consistency.
* Added configuration file system.archshift2014-10-087-30/+156
| | | | Uses QSettings on citra-qt, and inih on citra-cli.
* Added support for multiple input device types for KeyMap and connected Qt.Kevin Hartman2014-09-122-33/+37
|
* Initial HID PAD work, with GLFW only.Kevin Hartman2014-09-121-3/+36
|
* Remove hand-crafted Visual Studio solution.Yuri Kunde Schlesner2014-09-012-238/+0
|
* CMake cleanupYuri Kunde Schlesner2014-09-011-6/+18
| | | | | | | | Several cleanups to the buildsystem: - Do better factoring of common libs between platforms. - Add support to building on Windows. - Remove Qt4 support. - Re-sort file lists and add missing headers.
* Replace GLEW with a glLoadGen loader.Yuri Kunde Schlesner2014-09-012-3/+2
| | | | | | | | | This should fix the GL loading errors that occur in some drivers due to the use of deprecated functions by GLEW. Side benefits are more accurate auto-completion (deprecated function and symbols don't exist) and faster pointer loading (less entrypoints to load). In addition it removes an external library depency, simplifying the build system a bit and eliminating one set of binary libraries for Windows.
* Core: Refactor core to use only one function for execution.bunnei2014-08-311-1/+3
| | | | | | Core: Cleaned up comment to be more readable. Citra: Changed loop to be more readable.
* Pica: Add support for dumping textures.Tony Wasserka2014-08-251-1/+1
|
* Removed unused citra.harchshift2014-08-206-15/+3
|
* Loader: Implemented AppLoader interface for abstracting application loading.bunnei2014-06-251-15/+8
| | | | | | | | | | | | | | | | | | - Various cleanups/refactorings to Loader, ELF, and NCCH modules. - Added AppLoader interface to ELF and NCCH. - Updated Qt/GLFW frontends to check AppLoader ResultStatus. NCCH: Removed extra qualification typos. Loader: Removed unnecessary #include's. NCCH: Improved readability of memcmp statements. NCCH: Added missing space. Elf: Removed unnecessary usage of unique_ptr. Loader: Removed unnecessary usage of unique_ptr.
* Loader: Moved elf and loader modules to a "loader" subdirectory.bunnei2014-06-171-1/+1
|
* Preprocessor: #if's out OSX-specific GL changes on other platformsarchshift2014-06-121-0/+5
|
* Merge branch 'master' of https://github.com/bunnei/citrabunnei2014-05-232-3/+17
|\
| * Merge pull request #2 from archshift/issue-7-fixbunnei2014-05-202-3/+17
| |\ | | | | | | Fixes issues with building Citra on OSX
| | * CMakeLists: rename HEADS, improved commentsarchshift2014-05-201-2/+2
| | | | | | | | | | | | Changes for clarity of comments, removed redundant compiler flags.
| | * Fixed indentsarchshift2014-05-012-8/+8
| | |
| | * Reverse debugging changesarchshift2014-05-011-1/+1
| | |
| | * Linux supportarchshift2014-05-011-1/+6
| | |
| | * TGA dumps work, courtesy of @bunneiarchshift2014-05-011-1/+1
| | |
| | * OpenGL 3+ on OSX with GLFWarchshift2014-05-011-1/+8
| | |
| | * A bit of Cmake lovearchshift2014-05-011-6/+6
| | |
| | * Some more experimentationarchshift2014-04-301-1/+1
| | |
| | * Merge commit upstream/master into issue-7-fixarchshift2014-04-291-1/+1
| | |\
| | * | IT'S ALIVE!archshift2014-04-291-1/+3
| | | |
* | | | Merge pull request #13 from archshift/masterbunnei2014-05-191-1/+8
|\ \ \ \ | |/ / / |/| | | Use runtime arguments to specify boot filename.
| * | | Fixed indentsarchshift2014-05-051-7/+7
| | | |
| * | | Check arg count before attempting to access it.archshift2014-05-021-1/+8
| | | |
| * | | Use runtime arguments to specify boot filename.archshift2014-05-021-1/+1
| |/ /
* | / updated how we call ARM core to make things much fasterbunnei2014-05-171-7/+5
| |/ |/|
* | Need to add Xcursor to linker?Thomas Edvalson2014-04-261-1/+1
|/
* Fixed CMake's import of GLFW.Thomas Edvalson2014-04-251-1/+1
|
* fixes to build on linuxbunnei2014-04-231-1/+1
|
* removed unused macros from citra.hbunnei2014-04-111-9/+0
|
* fixed a bunch of errors in CMakeListsbunnei2014-04-101-1/+1
|
* updated CMakeListsbunnei2014-04-101-2/+2
|
* - removed deprecated version.hbunnei2014-04-096-30/+22
| | | | | - cleaned up window title - cleaned up emu_window_glfw/emu_window
* fixed license headers in citra projectbunnei2014-04-094-116/+16
|
* fixed project includes to use new directory structurebunnei2014-04-095-36/+30
|
* got rid of 'src' folders in each sub-projectbunnei2014-04-095-0/+0
|
* Merge branch 'hardware-interface'bunnei2014-04-074-39/+9
|\ | | | | | | | | Conflicts: src/core/src/core.h
| * removed unused comments, changed main processing loop to be infinitebunnei2014-04-071-34/+2
| |
| * set window size to correspond to framebuffer sizesbunnei2014-04-062-5/+4
| |
| * added project linker referencebunnei2014-04-061-0/+3
| |
* | Support vs express edition without having to get platform sdkMathieu Vaillancourt2014-04-051-0/+0
|/
* added simple processing loop and ELF loading to main()... hackish, will cleanup laterbunnei2014-04-011-4/+17
|
* moved some core functions over to system moduleShizZy2013-10-031-2/+2
|
* upgraded proj files to vs 2013ShizZy2013-09-272-2/+8
|
* renamed from citrus to citraShizZy2013-09-2610-0/+534