citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code
4,322 Commits 1 Branch 0 Tags 58 MiB
Commit Graph

4322 Commits

Author SHA1 Message Date
James Rowe 0920950d5e Merge pull request #2405 from jroweboy/nightly-deploy 
Change deploy to use github releases instead
 2017-01-04 21:02:51 -07:00
James Rowe 0a6ca01991 Change deploy to use github releases instead, but only for the citra-nightly repo 2017-01-04 20:53:46 -07:00
Jonathan Hao c18cb1b192 Fix some warnings (#2399) 2017-01-04 13:48:29 -03:00
bunnei 159bcbfdbc Update .travis.yml 2017-01-03 23:07:14 -05:00
James Rowe 3289892cd3 Merge pull request #2401 from jroweboy/travis-key 
Try a different travis key
 2017-01-03 20:03:57 -07:00
James Rowe 737c8bee16 Try a different travis key 2017-01-03 20:00:26 -07:00
Yuri Kunde Schlesner e2de82543b Merge pull request #2382 from mailwl/nfc 
Service/NFC: stub GetTagInRangeEvent
 2017-01-03 12:56:02 -03:00
James Rowe 0b897c45d2 Merge pull request #2390 from jroweboy/bintray 
Try a different encrypted bintray api key for travis.
 2016-12-31 23:57:36 -05:00
James Rowe 8f6c3b5c20 Try a different encrypted bintray api key for travis. Change appveyor to upload to a long git hash (since travis is stuck uploading to the full hash name) 2016-12-31 23:38:15 -05:00
James Rowe bb396ed8fc Merge pull request #2254 from jroweboy/bintray 
Add deploy to bintray for builds to master
 2016-12-31 22:16:44 -05:00
James Rowe 4a6cf7ecaf Trying to make a consistent nightly versioning 2016-12-31 19:37:21 -05:00
James Rowe b03e7bf28f Add deploy to bintray for builds to master 2016-12-31 13:54:51 -05:00
Sebastian Valle f7dd8d5e81 Merge pull request #2386 from bunnei/fix-bg-color 
config: SDL: Move background color setting to correct section.
 2016-12-30 09:51:56 -05:00
mailwl f2985f7080 Service/NFC: stub GetTagInRangeEvent 
Fix Fatal Error in Mini-Mario & Friends - amiibo Challenge
 2016-12-30 09:40:54 +03:00
bunnei 02b4b2ed6e config: SDL: Move background color setting to correct section. 2016-12-30 00:35:38 -05:00
bunnei f556d6ee90 Merge pull request #2240 from wwylele/auto-region 
Config: auto-select region and language
 2016-12-29 22:09:01 -05:00
bunnei 2f746e9946 Merge pull request #2367 from JayFoxRox/lighting-lut-quickfix 
Lighting LUT Quickfix
 2016-12-29 13:41:51 -05:00
bunnei 14f8065843 Merge pull request #2376 from wwylele/remove-unused 
Core: remove unused hle.cpp
 2016-12-27 10:43:13 -05:00
wwylele f927beb5e2 Core: remove unused hle.cpp 2016-12-27 10:27:48 +02:00
bunnei 6409b1d1a4 Merge pull request #2374 from wwylele/whats-going-on-with-that-pr 
Core: reset cpu_core in Shutdown to make IsPoweredOn work properly
 2016-12-26 18:19:40 -05:00
Jannik Vogel 6ed4206f87 Minor cleanup in GLSL code 2016-12-25 21:38:10 +01:00
Jannik Vogel 88f409aec9 Offset lighting LUT samples correctly 2016-12-25 21:37:26 +01:00
wwylele fe2ed4bf72 Core: reset cpu_core in Shutdown to make IsPoweredOn work properly 2016-12-24 20:55:38 +02:00
bunnei 51dd13b8a0 Merge pull request #2369 from MerryMage/core-frontend 
core: Move emu_window and key_map into core
 2016-12-23 17:35:35 -05:00
Yuri Kunde Schlesner 56e4066f4f Merge pull request #2370 from wwylele/where-is-my-shared-font 
file_util: fix missing sysdata path
 2016-12-23 12:42:40 -08:00
wwylele 488b7a4041 file_util: fix missing sysdata path 2016-12-23 22:19:14 +02:00
MerryMage 64f98f4d0f core: Move emu_window and key_map into core 
* Removes circular dependences (common should not depend on core)
 2016-12-23 13:42:39 +00:00
bunnei 5e8ef00497 Merge pull request #2364 from mailwl/nwm-services 
Service/NWM: add nwm services
 2016-12-22 21:29:23 -05:00
mailwl 069a88dad7 Service/NWM: add nwm services 2016-12-22 22:51:27 +03:00
bunnei 76890672a0 Merge pull request #2366 from MerryMage/MemoryReadCode 
arm_dynarmic: Provide MemoryReadCode callback
 2016-12-22 14:25:15 -05:00
bunnei aa47af7fb6 Merge pull request #2343 from bunnei/core-cleanup 
Core: Top-level consolidate & misc cleanup
 2016-12-22 11:47:44 -05:00
MerryMage f8cf87ce34 arm_dynarmic: Provide MemoryReadCode callback 
Change of interface in dynarmic 36082087ded632079b16d24137fdd0c450ce82ea
 2016-12-22 16:07:14 +00:00
bunnei 17d740299a Merge pull request #2285 from mailwl/csnd-format 
csnd:SND: Reformat source code
 2016-12-22 00:47:50 -05:00
bunnei 8b1e269e58 ThreadContext: Move from "core" to "arm_interface". 2016-12-22 00:27:49 -05:00
bunnei e26fbfd1d7 core: Replace "AppCore" nomenclature with just "CPU". 2016-12-22 00:27:46 -05:00
bunnei 7623957f80 Merge pull request #2361 from lioncash/disasm 
disassembler: Remove mutable specifier from breakpoints member variable
 2016-12-22 00:15:06 -05:00
bunnei 5ac5cbeab7 Address clang-format issues. 2016-12-21 23:48:14 -05:00
bunnei 4fc8b8229e core: Remove HLE module, consolidate code & various cleanups. 2016-12-21 23:48:13 -05:00
bunnei 232ef55c1a core: Consolidate core and system state, remove system module & cleanups. 2016-12-21 23:29:13 -05:00
bunnei 707cc66362 file_util: Remove unused paths. 2016-12-21 23:29:12 -05:00
bunnei 198b6c9bdd core: Consolidate top-level system state into a singleton. 2016-12-21 23:29:04 -05:00
bunnei 81e22ae8c7 loader: Remove duplicate docstrings. 2016-12-21 23:27:50 -05:00
bunnei 067e15d348 Merge pull request #2362 from lioncash/graphics 
citra-qt: Move graphics debugging code into its own folder
 2016-12-21 23:26:04 -05:00
Lioncash 8309d0dade citra-qt: Move graphics debugging code into its own folder 
Keeps all graphics debugging stuff from cluttering up the root debugger
folder
 2016-12-21 17:19:21 -05:00
Lioncash f2c307557a disassembler: Remove mutable specifier from breakpoints member variable 
Breakpoints has been const correct with regards to what the
DisassmblerModel needs for quite a while now.
 2016-12-21 14:12:41 -05:00
bunnei 29564d73bd Merge pull request #2319 from yuriks/profile-scopes 
VideoCore: Make profiling scope more representative
 2016-12-21 13:33:49 -05:00
bunnei c4491352b3 Merge pull request #2357 from lioncash/ui 
citra-qt: Move bits of constructor behavior to named functions
 2016-12-21 13:33:16 -05:00
bunnei bc2c13ede1 Merge pull request #2356 from Chainsawkitten/GLboolean 
Use GL_TRUE when setting color_mask
 2016-12-20 19:24:47 -05:00
Lioncash cc1f2c131b citra-qt: Move bits of constructor behavior to named functions 
Makes the initialization process a tad easier to grok,
since the constructor isn't just a glob of random unrelated behaviors.
 2016-12-19 15:12:28 -05:00
Albin Bernhardsson ddec9cb369 Use GL_TRUE when setting color_mask 2016-12-19 19:06:35 +01:00