Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | EmuWindow: Made pad/touch functions non-static. | bunnei | 2015-03-10 | 1 | -13/+14 |
| | |||||
* | GLFW: Implemented EmuWindow touchpad support. | bunnei | 2015-03-10 | 2 | -0/+26 |
| | |||||
* | Merge pull request #634 from linkmauve/logging-performances | bunnei | 2015-03-09 | 1 | -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 Peyrot | 2015-03-06 | 1 | -1/+2 |
| | | |||||
* | | default_ini.h: Put comments on their own lines | archshift | 2015-03-08 | 1 | -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. | bunnei | 2015-03-07 | 1 | -9/+2 |
|/ | |||||
* | Frontends, HID: Add New 3DS specific pad buttons, and stub the touch one. | Emmanuel Gil Peyrot | 2015-02-22 | 3 | -1/+23 |
| | |||||
* | Asserts: break/crash program, fit to style guide; log.h->assert.h | archshift | 2015-02-11 | 1 | -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_stubs | bunnei | 2015-02-11 | 2 | -0/+6 |
|\ | | | | | Services: Stub some functions | ||||
| * | Services: Stub some functions | purpasmart96 | 2015-02-08 | 2 | -0/+6 |
| | | |||||
* | | arm: Adios armemu | Lioncash | 2015-02-01 | 2 | -2/+0 |
|/ | |||||
* | Added HID_SPVR service and split HID_U implementation into service/hid/hid.xxx | archshift | 2015-01-21 | 1 | -17/+17 |
| | |||||
* | Fix building on MinGW | darkf | 2015-01-12 | 1 | -0/+0 |
| | |||||
* | Use -pthread where and only where needed | Johannes Ekberg | 2015-01-09 | 1 | -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 var | Johannes Ekberg | 2015-01-09 | 1 | -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 stopped | Yuri Kunde Schlesner | 2015-01-04 | 1 | -0/+2 |
| | |||||
* | Core: Change default CPU to dyncom. | bunnei | 2015-01-03 | 1 | -1/+1 |
| | |||||
* | SOC_U: Preliminary implementation of sockets. | Subv | 2014-12-31 | 1 | -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 bar | Chin | 2014-12-31 | 2 | -0/+1 |
| | |||||
* | Fix MSVC-related #defines and add CMakeLists comment | darkf | 2014-12-30 | 1 | -1/+1 |
| | |||||
* | Fix merge conflicts | darkf | 2014-12-30 | 7 | -53/+58 |
|\ | |||||
| * | GPU: Implement frameskip and remove forced framebuffer swap hack. | bunnei | 2014-12-29 | 2 | -0/+2 |
| | | |||||
| * | GPU: Change internal framerate to 30fps. | bunnei | 2014-12-27 | 2 | -2/+2 |
| | | |||||
| * | Merge pull request #275 from yuriks/cmake-clean | bunnei | 2014-12-22 | 1 | -8/+6 |
| |\ | | | | | | | Clean up CMake library specification | ||||
| | * | Clean up CMake library specification | Yuri Kunde Schlesner | 2014-12-15 | 1 | -8/+6 |
| | | | | | | | | | | | | The X11 libraries don't need to be specified when doing dynamic linking | ||||
| * | | License change | purpasmart96 | 2014-12-21 | 6 | -6/+6 |
| |/ | |||||
| * | Add configurable per-class log filtering | Yuri Kunde Schlesner | 2014-12-13 | 3 | -3/+6 |
| | | |||||
| * | Convert old logging calls to new logging macros | Yuri Kunde Schlesner | 2014-12-13 | 3 | -13/+13 |
| | | |||||
| * | New logging system | Yuri Kunde Schlesner | 2014-12-13 | 1 | -5/+11 |
| | | |||||
| * | Change NULLs to nullptrs. | Rohit Nirmal | 2014-12-03 | 1 | -3/+3 |
| | | |||||
| * | Merge pull request #196 from archshift/settings | bunnei | 2014-12-01 | 2 | -15/+7 |
| |\ | | | | | | | Merge Config::ReadXYZs | ||||
| | * | Merge Config::ReadXYZs | archshift | 2014-11-19 | 2 | -15/+7 |
| | | | |||||
| * | | GLFW: Add an error callback before calling glfwInit() | Emmanuel Gil Peyrot | 2014-11-30 | 1 | -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 build | darkf | 2014-11-29 | 1 | -1/+4 |
|/ / | |||||
* | | Remove tabs in all files except in skyeye imports and in generated GL code | Emmanuel Gil Peyrot | 2014-11-19 | 1 | -2/+2 |
| | | |||||
* | | Remove trailing spaces in every file but the ones imported from SkyEye, AOSP or generated | Emmanuel Gil Peyrot | 2014-11-19 | 1 | -1/+1 |
| | | |||||
* | | citra GLFW: Ignore minimal window size hints. | Tony Wasserka | 2014-11-18 | 1 | -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 Wasserka | 2014-11-18 | 1 | -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 Wasserka | 2014-11-18 | 2 | -0/+23 |
| | | |||||
* | | Fixup EmuWindow interface and implementations thereof. | Tony Wasserka | 2014-11-18 | 2 | -20/+44 |
| | | |||||
* | | Viewport scaling and display density independence | Kevin Hartman | 2014-11-18 | 2 | -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_log | Tony Wasserka | 2014-11-15 | 4 | -0/+13 |
|\ | | | | | Add support for disabling log from settings | ||||
| * | Add support for disabling log from settings | Sean | 2014-11-03 | 4 | -0/+13 |
| | | |||||
* | | ARM: Fixed several dyncom bugs. | bunnei | 2014-11-12 | 1 | -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-enabled | bunnei | 2014-10-28 | 3 | -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. | archshift | 2014-10-28 | 2 | -1/+3 |
| | | | |||||
| * | | Use configuration files to enable or disable the new dyncom interpreter. | archshift | 2014-10-28 | 3 | -0/+10 |
| |/ | |||||
* / | Add `override` keyword through the code. | Yuri Kunde Schlesner | 2014-10-26 | 1 | -4/+4 |
|/ | | | | This was automated using `clang-modernize`. | ||||
* | Use config files to store whether SDMC is enabled or not | archshift | 2014-10-23 | 3 | -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 quitting | archshift | 2014-10-19 | 1 | -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. | archshift | 2014-10-17 | 3 | -1/+9 |
| | |||||
* | OpenGL renderer: Request a forward compatible context in citra-qt | Yuri Kunde Schlesner | 2014-10-12 | 1 | -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. | archshift | 2014-10-08 | 7 | -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 Hartman | 2014-09-12 | 2 | -33/+37 |
| | |||||
* | Initial HID PAD work, with GLFW only. | Kevin Hartman | 2014-09-12 | 1 | -3/+36 |
| | |||||
* | Remove hand-crafted Visual Studio solution. | Yuri Kunde Schlesner | 2014-09-01 | 2 | -238/+0 |
| | |||||
* | CMake cleanup | Yuri Kunde Schlesner | 2014-09-01 | 1 | -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 Schlesner | 2014-09-01 | 2 | -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. | bunnei | 2014-08-31 | 1 | -1/+3 |
| | | | | | | Core: Cleaned up comment to be more readable. Citra: Changed loop to be more readable. | ||||
* | Pica: Add support for dumping textures. | Tony Wasserka | 2014-08-25 | 1 | -1/+1 |
| | |||||
* | Removed unused citra.h | archshift | 2014-08-20 | 6 | -15/+3 |
| | |||||
* | Loader: Implemented AppLoader interface for abstracting application loading. | bunnei | 2014-06-25 | 1 | -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. | bunnei | 2014-06-17 | 1 | -1/+1 |
| | |||||
* | Preprocessor: #if's out OSX-specific GL changes on other platforms | archshift | 2014-06-12 | 1 | -0/+5 |
| | |||||
* | Merge branch 'master' of https://github.com/bunnei/citra | bunnei | 2014-05-23 | 2 | -3/+17 |
|\ | |||||
| * | Merge pull request #2 from archshift/issue-7-fix | bunnei | 2014-05-20 | 2 | -3/+17 |
| |\ | | | | | | | Fixes issues with building Citra on OSX | ||||
| | * | CMakeLists: rename HEADS, improved comments | archshift | 2014-05-20 | 1 | -2/+2 |
| | | | | | | | | | | | | Changes for clarity of comments, removed redundant compiler flags. | ||||
| | * | Fixed indents | archshift | 2014-05-01 | 2 | -8/+8 |
| | | | |||||
| | * | Reverse debugging changes | archshift | 2014-05-01 | 1 | -1/+1 |
| | | | |||||
| | * | Linux support | archshift | 2014-05-01 | 1 | -1/+6 |
| | | | |||||
| | * | TGA dumps work, courtesy of @bunnei | archshift | 2014-05-01 | 1 | -1/+1 |
| | | | |||||
| | * | OpenGL 3+ on OSX with GLFW | archshift | 2014-05-01 | 1 | -1/+8 |
| | | | |||||
| | * | A bit of Cmake love | archshift | 2014-05-01 | 1 | -6/+6 |
| | | | |||||
| | * | Some more experimentation | archshift | 2014-04-30 | 1 | -1/+1 |
| | | | |||||
| | * | Merge commit upstream/master into issue-7-fix | archshift | 2014-04-29 | 1 | -1/+1 |
| | |\ | |||||
| | * | | IT'S ALIVE! | archshift | 2014-04-29 | 1 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #13 from archshift/master | bunnei | 2014-05-19 | 1 | -1/+8 |
|\ \ \ \ | |/ / / |/| | | | Use runtime arguments to specify boot filename. | ||||
| * | | | Fixed indents | archshift | 2014-05-05 | 1 | -7/+7 |
| | | | | |||||
| * | | | Check arg count before attempting to access it. | archshift | 2014-05-02 | 1 | -1/+8 |
| | | | | |||||
| * | | | Use runtime arguments to specify boot filename. | archshift | 2014-05-02 | 1 | -1/+1 |
| |/ / | |||||
* | / | updated how we call ARM core to make things much faster | bunnei | 2014-05-17 | 1 | -7/+5 |
| |/ |/| | |||||
* | | Need to add Xcursor to linker? | Thomas Edvalson | 2014-04-26 | 1 | -1/+1 |
|/ | |||||
* | Fixed CMake's import of GLFW. | Thomas Edvalson | 2014-04-25 | 1 | -1/+1 |
| | |||||
* | fixes to build on linux | bunnei | 2014-04-23 | 1 | -1/+1 |
| | |||||
* | removed unused macros from citra.h | bunnei | 2014-04-11 | 1 | -9/+0 |
| | |||||
* | fixed a bunch of errors in CMakeLists | bunnei | 2014-04-10 | 1 | -1/+1 |
| | |||||
* | updated CMakeLists | bunnei | 2014-04-10 | 1 | -2/+2 |
| | |||||
* | - removed deprecated version.h | bunnei | 2014-04-09 | 6 | -30/+22 |
| | | | | | - cleaned up window title - cleaned up emu_window_glfw/emu_window | ||||
* | fixed license headers in citra project | bunnei | 2014-04-09 | 4 | -116/+16 |
| | |||||
* | fixed project includes to use new directory structure | bunnei | 2014-04-09 | 5 | -36/+30 |
| | |||||
* | got rid of 'src' folders in each sub-project | bunnei | 2014-04-09 | 5 | -0/+0 |
| | |||||
* | Merge branch 'hardware-interface' | bunnei | 2014-04-07 | 4 | -39/+9 |
|\ | | | | | | | | | Conflicts: src/core/src/core.h | ||||
| * | removed unused comments, changed main processing loop to be infinite | bunnei | 2014-04-07 | 1 | -34/+2 |
| | | |||||
| * | set window size to correspond to framebuffer sizes | bunnei | 2014-04-06 | 2 | -5/+4 |
| | | |||||
| * | added project linker reference | bunnei | 2014-04-06 | 1 | -0/+3 |
| | | |||||
* | | Support vs express edition without having to get platform sdk | Mathieu Vaillancourt | 2014-04-05 | 1 | -0/+0 |
|/ | |||||
* | added simple processing loop and ELF loading to main()... hackish, will cleanup later | bunnei | 2014-04-01 | 1 | -4/+17 |
| | |||||
* | moved some core functions over to system module | ShizZy | 2013-10-03 | 1 | -2/+2 |
| | |||||
* | upgraded proj files to vs 2013 | ShizZy | 2013-09-27 | 2 | -2/+8 |
| | |||||
* | renamed from citrus to citra | ShizZy | 2013-09-26 | 10 | -0/+534 |