OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-23 00:30:06 +00:00
Code Issues Projects Releases Wiki Activity
590 Commits 1 Branch 0 Tags 135 MiB
0e566b2ffc
Commit Graph

590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
inspuration
0e566b2ffc Merge branch 'master' into citrae 2014-06-12 18:23:47 -04:00
inspuration
984bf7dbc8 Merge branch 'master' of https://github.com/citra-emu/citra 
Conflicts:
	src/core/core.vcxproj.filters
	src/core/hle/service/gsp.cpp
	src/core/hle/service/hid.cpp
 2014-06-12 17:26:18 -04:00
bunnei
08dec75f2f Merge branch 'threading' of https://github.com/bunnei/citra 
Conflicts:
	src/core/hle/function_wrappers.h
	src/core/hle/service/gsp.cpp
 2014-06-12 17:21:51 -04:00
bunnei
4e4d098dcb Kernel: Removed unnecessary "#pragma once". 2014-06-12 16:57:18 -04:00
bunnei
da2c46032c Kernel: Added missing algorithm #include for use of std::find on non-Windows platforms. 2014-06-12 16:56:26 -04:00
inspuration
80886e66f8 QT: update ui_main.h to fix travis build 2014-06-12 14:41:26 -04:00
inspuration
5346cfe3e8 Kernel: Implemented SharedMemory Kernel Object 
HID: Added support for button input
QT: Added dialogue for remapping keys
 2014-06-12 14:01:05 -04:00
Tony Wasserka
c34ba38001 GPU debugger: Const correctness and build fix. 2014-06-12 06:10:56 -04:00
bunnei
b919158050 Removed definition of MAX_PATH, this is already defined in common_paths.h. 2014-06-12 06:10:55 -04:00
archshift
ee4717aaae Preprocessor: #if's out OSX-specific GL changes on other platforms 2014-06-12 06:10:55 -04:00
bunnei
06ef8f001a Common: Removed duplicate "LONG" and "MAX_PATH" definitions. 2014-06-12 06:10:54 -04:00
Tony Wasserka
4c2bff61e5 Pica: Use some template magic to define register structures efficiently. 2014-06-12 06:10:54 -04:00
Tony Wasserka
f82410e633 Further refine GPU command list debugging. 2014-06-12 06:10:53 -04:00
Tony Wasserka
b0051b2203 Refine command list debugging functionality and its qt interface. 2014-06-12 06:10:52 -04:00
Tony Wasserka
6893732348 citra-qt: Add command list view. 2014-06-12 06:10:52 -04:00
Tony Wasserka
5d62f5d92a GPU debugger: Add functionality to inspect command lists. 2014-06-12 06:10:51 -04:00
Tony Wasserka
50b2b73be4 video core: added PICA definitions file. 2014-06-12 06:10:51 -04:00
Tony Wasserka
d4530765ce GPU: Cleanup register definitions. 2014-06-12 06:10:50 -04:00
Tony Wasserka
1dfa392824 Rename LCD to GPU. 2014-06-12 06:10:49 -04:00
Tony Wasserka
87e98ff97b citra-qt: Add GX command history viewer. 2014-06-12 06:10:49 -04:00
Tony Wasserka
31666632ca Add initial graphics debugger interface. 2014-06-12 06:10:48 -04:00
Tony Wasserka
82d3260359 GSP: Define more GX commands. 2014-06-12 06:10:48 -04:00
Tony Wasserka
b1c8bad9a6 Pica: Add command list registers. 2014-06-12 06:10:47 -04:00
bunnei
77c0f9868e Update CONTRIBUTING.md 
- removed variable naming starting with "_"
- removed "Always break, even after a return" from case statements
 2014-06-12 06:10:46 -04:00
archshift
0a48e97c36 CONTRIBUTING: Fix some examples, escape underscores 2014-06-12 06:10:46 -04:00
archshift
d6a4fbf34f Added CONTRIBUTING.md with contents from Coding Style, updated README link 2014-06-12 06:10:45 -04:00
inspuration
0c0d35c698 Merge branch 'master' of https://github.com/citra-emu/citra 
Conflicts:
	src/video_core/gpu_debugger.h
 2014-06-11 15:46:55 -04:00
Tony Wasserka
48419796ba GPU debugger: Const correctness and build fix. 2014-06-11 21:24:35 +02:00
inspuration
69769d4010 Finished primary work on semaphores, implemented mutexing 2014-06-11 14:39:22 -04:00
inspuration
06c041fa79 Merge branch 'master' of https://github.com/citra-emu/citra 2014-06-11 03:56:20 -04:00
inspuration
a2e85c6f95 Merge https://github.com/inspuration/citra 2014-06-11 03:53:32 -04:00
inspuration
7e0ef82f27 Added basic semaphore skeleton code 2014-06-11 03:52:40 -04:00
inspuration
e1e2f0a0ae Updated readme.md to use my travis repo 2014-06-11 01:14:43 -04:00
inspuration
5c4c5f6c52 Fixed problem with qt ui file 2014-06-11 01:05:50 -04:00
inspuration
8e716cdc64 Fixed incorrect slash in header include 2014-06-11 01:00:18 -04:00
inspuration
2b808be027 Additional std::find fixes 2014-06-11 00:54:39 -04:00
inspuration
537c04ac14 Another attempted fix 2014-06-11 00:49:39 -04:00
inspuration
5becefcfd4 Fixed std::find error 2014-06-11 00:44:33 -04:00
inspuration
264335b627 Style tweaks 2014-06-11 00:37:55 -04:00
inspuration
c180fd4003 Fixed minor bug in sharedmem writing 2014-06-11 00:12:54 -04:00
bunnei
0b39535bed VFP: Removed duplicate basic type definitions. 2014-06-10 22:49:11 -04:00
bunnei
2bbaca0ce1 Kernel: Added freeing of kernel objects on emulator shutdown. 2014-06-10 22:43:50 -04:00
inspuration
5f6fa13af6 Implemented SharedMemory Objects 2014-06-10 21:44:03 -04:00
inspuration
f18ae9892a Finished fixing bugs caused by the merge 2014-06-10 16:29:52 -04:00
inspuration
1d6ea166c1 Merge branch 'master' into threading 
Conflicts:
	src/core/core.vcxproj.filters
	src/core/hle/function_wrappers.h
	src/core/hle/service/gsp.cpp
	src/core/hle/service/hid.cpp
	src/core/hle/svc.cpp
 2014-06-10 15:17:04 -04:00
inspuration
df6e6a4f60 Merge branch 'threading' of https://github.com/bunnei/citra into threading 
Conflicts:
	src/core/hle/function_wrappers.h
 2014-06-10 15:10:43 -04:00
inspuration
ad6a99524c Merge remote-tracking branch 'bunnei/master' 2014-06-10 14:59:44 -04:00
bunnei
12845baec6 Removed definition of MAX_PATH, this is already defined in common_paths.h. 2014-06-09 23:01:25 -04:00
bunnei
11d94ea2b3 Common: Removed definition of MAX_PATH, this is already defined in common_paths.h. 2014-06-09 22:54:59 -04:00
bunnei
60185a56fd Event: Updated several log messages to be assertions. 2014-06-09 22:46:54 -04:00