citra-emu
/
citra
Archived
1
0
Fork 0
Commit Graph

6188 Commits

Author SHA1 Message Date
N00byKing 2814bbc3da renderer_opengl: Allow usage of Stereoscopic 3D 2018-06-01 17:01:06 +02:00
N00byKing e4788130e5 citra, citra_qt, settings.h: Add Options for Stereoscopic 3D 2018-06-01 17:01:00 +02:00
Weiyi Wang 08b119153d
Merge pull request #3799 from wwylele/sigh
gl_rasterizer: reset texture state context after every draw
2018-06-01 14:24:28 +03:00
wwylele f0ee4c0595 gl_rasterizer: reset texture state context after every draw 2018-06-01 12:05:30 +03:00
James Rowe 7715fd2c19
Merge pull request #3750 from wwylele/cube-watcher-fix
gl_rasterizer_cache: add missing watcher invalidation
2018-05-31 23:11:39 -06:00
James Rowe f7f5a54bc3
Merge pull request #3751 from wwylele/shader-warning-shutup
gl_shader_gen: rearrange function definition to avoid suprious warnings
2018-05-31 23:10:42 -06:00
James Rowe 87d2866127
Merge pull request #3757 from zhaowenlan1779/game-list-fix
citra_qt: Improve Game List Item display
2018-05-31 23:10:02 -06:00
James Rowe a3acb5129b
Merge pull request #3773 from kdex/master
CMake: Avoid non-compliant standard library extensions in MSVC
2018-05-31 23:07:28 -06:00
James Rowe 489d5a3da9
Merge pull request #3769 from Kloen/dark-theme-updates
citra-qt: Update Dark theme to latest version
2018-05-31 22:45:54 -06:00
Stevie c25f56a147 Baseline OSX Travis CI build to 10.13 (#3765)
Bump Travis CI xcode9.2 to xcode9.3.
2018-05-31 22:24:18 -06:00
James Rowe 174241ff90
Merge pull request #3800 from liushuyu/master
citra: correct regex for matching nickname
2018-05-31 22:14:39 -06:00
James Rowe 131cf363da
Merge pull request #3790 from jbeich/master
cryptopp: unbreak on aarch64
2018-05-31 22:14:03 -06:00
James Rowe 04a9145dfc
Merge pull request #3776 from darkf/cubeb-sink2
Implement a Cubeb audio sink
2018-05-31 22:13:12 -06:00
darkf 04139e26bd cubeb_sink: Skip devices without a name
Previously this would crash.
2018-05-31 21:01:48 -05:00
darkf ce6d9e2e28 externals: Don't build cubeb with tests 2018-05-31 21:01:48 -05:00
darkf 35c43aa293 audio_core: Only include cubeb if it's available 2018-05-31 21:01:48 -05:00
darkf af73dd45f0 audio_core: Implement a cubeb audio sink 2018-05-31 21:01:48 -05:00
liushuyu c0f352bc4e
citra: correct regex for matching nickname 2018-05-31 19:38:12 -06:00
James Rowe 72f9142bb1
Merge pull request #3746 from wwylele/ndm-new-framework
Service/NDM: convert to ServiceFramework
2018-05-29 23:54:21 -06:00
朱鹏飞 84728cb8d3 Update README.md to describe current condition more accurately (#3737)
Update README.md to describe current condition more accurately
2018-05-29 23:51:25 -06:00
James Rowe e63c374ff0
Merge pull request #3714 from wwylele/primitive-restart-guard
video_core/command_processor: correctly handles 0xFFFF index as a normal index
2018-05-29 23:22:00 -06:00
James Rowe aa95604928
Merge pull request #3652 from N00byKing/3dtv_crashfix
gsp_gpu, shared_page: Change 3D LED State on SetLedForceOff
2018-05-29 22:43:52 -06:00
James Rowe 0095c20b8d
Merge pull request #3594 from valentinvanelslande/hotkeys
citra_qt: Add Continue/Pause & Toggle Speed Limit hotkeys
2018-05-29 22:19:23 -06:00
Jan Beich 2772362f05 cryptopp: add missing bits used by SIMD on aarch64
externals/cryptopp/cryptopp/crc-simd.cpp:97:13: error: use of undeclared identifier '__crc32w'
        w = __crc32w(w,x);
            ^
externals/cryptopp/cryptopp/rijndael-simd.cpp:126:25: error: use of undeclared identifier 'vaeseq_u8'
        uint8x16_t r1 = vaeseq_u8(data, key);
                        ^
externals/cryptopp/cryptopp/sha-simd.cpp:109:25: error: use of undeclared identifier 'vsha1cq_u32'
        uint32x4_t r1 = vsha1cq_u32 (data1, 0, data2);
                        ^

/usr/bin/ld: error: externals/cryptopp/cryptopp/cpu.cpp:(function CryptoPP::DetectArmFeatures()): undefined symbol 'CryptoPP::CPU_ProbeNEON()'
/usr/bin/ld: error: externals/cryptopp/cryptopp/cpu.cpp:(function CryptoPP::DetectArmFeatures()): undefined symbol 'CryptoPP::CPU_ProbeCRC32()'
/usr/bin/ld: error: externals/cryptopp/cryptopp/cpu.cpp:(function CryptoPP::DetectArmFeatures()): undefined symbol 'CryptoPP::CPU_ProbePMULL()'
2018-05-28 23:03:55 +00:00
Valentin Vanelslande 90bcb26c3b citra_qt: Add Continue/Pause & Toggle Speed Limit hotkeys 2018-05-28 16:36:56 -05:00
Weiyi Wang 65f5bc73a0
Merge pull request #3789 from degasus/texture_bindings
gl_rasterizer: Don't flip the texture bindings.
2018-05-28 23:14:09 +03:00
Markus Wick caba02d42a gl_rasterizer: Don't flip the texture bindings.
The state object isn't used anywhere else, so there
is no need to revert the state.
And the comment is just wrong: It doesn't matter
which textures are bound on framebuffer binding, it
only matters at draw time. And we reset all bindings
before the draw call. So let's use gl_state as it is
designed to avoid flipping states.
2018-05-28 21:04:59 +02:00
wwylele 549abe556b Service/NDM: convert to ServiceFramework 2018-05-28 11:28:13 +03:00
Weiyi Wang 09982c3386
Merge pull request #3732 from ccawley2011/fix-arm
Fix compilation on ARM
2018-05-26 20:14:55 +03:00
zhupengfei 9504aa19d5
game_list: rewrite format 2018-05-26 22:27:59 +08:00
Weiyi Wang 03209efe99
Merge pull request #3753 from spbennett/json_3.12
Upgrade JSON for Modern C++
2018-05-25 20:39:12 +03:00
Weiyi Wang cad00ea5fd
Merge pull request #3755 from spbennett/xbyak-5.64
Xbyak 5.64
2018-05-25 20:38:52 +03:00
Weiyi Wang ba4a0525bf
Merge pull request #3724 from degasus/scissor
gl_rasterizer: Remove redundant scissor state change.
2018-05-25 20:35:41 +03:00
Weiyi Wang 1c03ff14c5
Merge pull request #3777 from einstein95/patch-1
Fix build
2018-05-25 13:17:27 +03:00
Logan B b5934237fa
Fix build 2018-05-25 20:28:15 +12:00
darkf 83ee80666f Import cubeb as an external 2018-05-25 02:06:28 -05:00
kdex 513fffc96b
CMake: Avoid non-compliant standard library extensions in MSVC 2018-05-24 06:23:06 +02:00
zhupengfei e5c8b9f0a2
game_list: append filename after program ID 2018-05-23 21:36:10 +08:00
Kloen 15e2be85b5 citra-qt: Change link colors to a more readable one when using the dark theme 2018-05-23 02:51:19 +02:00
Kloen 9ced6934ad Update qdarkstyle theme to latest version 2018-05-22 19:49:24 +02:00
Steve Bennett a7f73b9a14 Xbyak 5.64
---

Updated to Xbyak 5.64
811f4959ee
2018-05-19 13:03:55 -07:00
Steve Bennett b9eeca218d Upgrade JSON for Modern C++
---

Upgrade JSON for Modern C++ to 3.1.2
https://raw.githubusercontent.com/nlohmann/json/v3.1.2/single_include/nlohmann/json.hpp
2018-05-19 12:59:38 -07:00
Weiyi Wang 45aa95093c
Merge pull request #3744 from liushuyu/master
travis: use cmake in official repository
2018-05-19 18:24:20 +03:00
Weiyi Wang 0c60e96533
Merge pull request #3758 from j-selby/fix-text-formatter
Add missing std::string import in text_formatter
2018-05-19 14:47:30 +03:00
James 29551c187a Add missing std::string import in text_formatter 2018-05-19 21:31:09 +10:00
zhupengfei 3b18faa163
citra_qt: Improve Game List Item display 2018-05-19 17:21:26 +08:00
Christoph 3bf924cd20 Camera translation (#3747)
* citra_qt: correct spelling in configuration

* citra_qt/camera: Changed the order of the translation

The translation may not correspond to "couln't load" and "the camera", so create two cases which can get translated individually.
Also add a space after "the camera".

* citra_qt/camera: use the same syntax for the filter in "still_image_camera.cpp" as in "configure_camera.cpp"

* citra_qt/camera: the config should only get added if it's not empty
2018-05-19 12:03:06 +03:00
wwylele 92a1252835 gl_shader_gen: rearrange function definition to avoid suprious warnings 2018-05-19 00:36:33 +03:00
wwylele 8b4e832c5f gl_rasterizer_cache: add missing watcher invalidation 2018-05-18 23:58:43 +03:00
Markus Wick 8e1e52cad9 gl_rasterizer_cache: Use clean state for glBlitFramebuffer.
Framebuffer blits depends on pixel tests:
Ownership (is fine)
Scissor (is broken on the last commit)
Masking (is broken on master for a while)

So let's be honest and start with a clean state in
those helper functions.
2018-05-18 21:13:56 +02:00