1
0
Fork 0
Commit Graph

6111 Commits

Author SHA1 Message Date
朱鹏飞 57827de38b citra_qt: camera integration (#3566)
* Implement camera feature

* Make OpenCVCamera optional

* Fix styling problems

* CI configuration

* Fix CI

* Hopefully final fix

* Hopefully final fix

* Fix all the problems

* Oops..

* Add Qt Multimedia Camera

* Another oops

* Try to fix broken linux CI

* Try to fix broken linux CI

* Fix problems

* Improve UI

* Fix problems

* camera: Add support for Qt <5.10 and fix preview error

* CI: try to fix linux-frozen travis build

* camera: fix problems and add multiple handlers support

* fix CI

* remove most ServiceFramework changes

* Fix format

* Remove last ServiceFramework change

* camera: remove unused interfaces; revert submodule change

* camera: fix CI error

* ci: use ccache for opencv build

* citra_qt: fix configuration error; CI: add mediaservice plugin

* citra_qt: fix clang-format

* citra_qt: fix documentation error

* citra_qt: fix configuration page; camera: fix pausing crash

* citra_qt: fix preview not stopping

* camera: extend handlers length

* camera: fix camera resume error

* camera: fix clang-format

* camera: remove all OpenCV; citra_qt: rewrite configuration

* camera: remove all OpenCV; citra_qt: rewrite configuration

* camera: remove all OpenCV; citra_qt: rewrite configuration

* CI: fix linux ci

* camera: check settings update; citra_qt: fix configuration error

* service_cam: use a better way to apply configuration

* Service_CAM: rewrite camera reload

* cam: fix clang format

* citra_qt: fix argument load issue; camera: base of system camera selection

* citra_qt: Add system camera selection

* camera: fix image upside down, Implement SetFrameRate in Qt Multimedia Camera

* camera: Add missing <array> include, update SetFrameRate and add settings in Qt Multimedia Camera header

* camera: move started in Qt Multimedia Camera header

* QtMultimediaCamera: Move frame rates to SetFrameRate; Set minimum and maximum frame rate

* Update appveyor.yml
2018-05-11 11:42:23 -06:00
Ben bcecfac0ef
Merge pull request #3688 from Hexagon12/translation-update
Added current translations from Transifex
2018-05-10 20:38:54 +02:00
Weiyi Wang 3bd1cd0b2b
Merge pull request #3719 from wwylele/regs-pipeline-type
regs_pipeline: use proper unsigned type where applicable
2018-05-09 13:51:36 +03:00
Hexagon12 17bca8b12f
Updated the translations one more time 2018-05-07 16:31:33 +03:00
wwylele 68b0a3e19e regs_pipeline: use proper unsigned type where applicable 2018-05-06 15:57:48 +03:00
朱鹏飞 590a09d004 CI: Add qwindowsvistastyle.dll (#3716) 2018-05-05 22:39:07 -06:00
Weiyi Wang f85e71c37c
Merge pull request #3715 from wwylele/hardware-vertex-vector
gl_rasterizer: Use GLvec* instead of C arrays
2018-05-06 07:19:06 +03:00
Weiyi Wang 79ac4766b4
Merge pull request #3668 from daniellimws/gdbstub-macros
core/gdbstub: Migrate logging macros
2018-05-05 16:48:52 +03:00
Valentin Vanelslande 473fd552c8 Service/AM: Implement GetProductCode (#3549)
* [skip ci]

* [skip ci]

* [skip ci]

* [skip ci]

* Service/AM: Implement GetProductCode

* fix?

* remove close

* Use PushRaw

* Use NCCHContainer

* 2 if found

* struct

* fix build?

* fix

* remove return

* fix?

* 6 words
2018-05-05 16:43:31 +03:00
Weiyi Wang 0da3b75c9e
Merge pull request #3700 from wwylele/texcache-watcher
gl_rasterizer_cache: cache texture cube
2018-05-05 16:30:39 +03:00
Weiyi Wang 9c55a1f113
Merge pull request #3711 from degasus/vertex_streaming
gl_rasterizer: Use buffer_storage for uniform data.
2018-05-05 16:22:07 +03:00
Markus Wick 5960282303 gl_rasterizer: Use buffer_storage for uniform data.
This replaces the glBufferData logic with the shared stream buffer code.
The new code doesn't need a temporary staging buffer any more, so the
performance should imrpove quite a bit.
2018-05-05 09:22:02 +02:00
MerryMage d6cd1a8712 gl_rasterizer: Use GLvec* instead of C arrays 2018-05-05 04:37:04 +03:00
James Rowe 7bffd7c1b0
Merge pull request #3702 from valentinvanelslande/gitignore
gitignore: ignore CMakeLists.txt.user* instead of CMakeLists.txt.user
2018-05-03 15:17:32 -06:00
James Rowe ca01c7eea8
Merge pull request #3665 from adityaruplaha/log-version
frontend: Log Citra version.
2018-05-03 15:17:04 -06:00
James Rowe ca3b82caa4
Merge pull request #3705 from zhaowenlan1779/multiplayer-fix
citra_qt: multiplayer password dialog fix
2018-05-02 09:17:33 -06:00
Mat M a5f906b8ab
Merge pull request #3708 from FearlessTobi/add-region-column
citra_qt: Add a game region column to the Game List
2018-05-02 00:22:38 -04:00
Weiyi Wang be5777f3de
Merge pull request #3686 from wwylele/glvtx-shader-gen
gl_shader_gen: generate programmable vs/gs and fixed gs
2018-05-01 21:27:48 +03:00
wwylele 1762ad2dcc gl_rasterizer_cache: cache texture cube 2018-05-01 21:26:43 +03:00
FearlessTobi 36c4765054 citra_qt: Add a game region column 2018-05-01 19:57:01 +02:00
zhupengfei b33f7901b6
citra_qt: fix clang-format 2018-05-01 11:26:57 +08:00
zhupengfei 784c41bf34
citra_qt: multiplayer password dialog fix 2018-05-01 11:15:31 +08:00
Valentin Vanelslande 3d9ac49076
gitignore: ignore CMakeLists.txt.user* instead of CMakeLists.txt.user 2018-04-29 19:10:25 -05:00
adityaruplaha 0cece7918a Log Citra version.
Class: Frontend
Level: Info
Format: "Citra Version: " + window title
2018-04-29 21:05:19 +05:30
Weiyi Wang 9c65a45358
Merge pull request #3694 from jroweboy/quickfix
Fix duplicated logs on windows
2018-04-28 10:31:25 +03:00
James Rowe 55414c32d9
Merge pull request #3696 from citra-emu/transifex-condition
Travis: only enable transifex job on main repo
2018-04-27 11:06:51 -06:00
Weiyi Wang bbf8567b49
Travis: only enable transifex job on main repo
To avoid false positive alarm from citra-nightly and citra-canary repo
2018-04-27 19:52:52 +03:00
James Rowe 252e5f173d
Merge pull request #3676 from jroweboy/minor-mp-ui-fix
Minor multiplayer ui fixes
2018-04-27 10:00:21 -06:00
James Rowe 98c150e7fc Fix duplicated logs on windows 2018-04-27 09:58:48 -06:00
James Rowe 1b94f25e6c
Merge pull request #3568 from daniellimws/logging-backends
Logging: Add customizable backends
2018-04-26 21:09:31 -06:00
Weiyi Wang b443eea540
Merge pull request #3689 from jroweboy/txfix
Frontend: Add missing translation for network error messages
2018-04-26 11:42:32 +03:00
James Rowe 65b38a7537 fixup: Address review 2018-04-25 10:31:51 -06:00
James Rowe 6ce111301f Frontend: Add missing translation for network error messages 2018-04-25 09:44:16 -06:00
Hexagon12 bc7cf8328b
Added current translations from Transifex 2018-04-25 12:32:25 +03:00
bunnei ed42b4b0d2
Merge pull request #3678 from wwylele/b15-fallback
gl_shader_decompiler: fallback to CPU shader on GS b15 access
2018-04-25 00:03:11 -04:00
bunnei b003e1398a
Merge pull request #3666 from degasus/vertex_streaming
renderer_opengl: Rewrite stream buffer.
2018-04-24 23:58:41 -04:00
wwylele 191b29e402 gl_shader_gen: generate programmable vs/gs and fixed gs 2018-04-24 20:39:10 +03:00
Daniel Lim Wee Soong 51398e0301 Logging: Add customizable logging backends and fmtlib based macros
* Change the logging backend to support multiple sinks through the
Backend Interface
* Add a new set of logging macros to use fmtlib instead.
* Qt: Compile as GUI application on windows to make the console hidden by
default. Add filter configuration and a button to open log location.
* SDL: Migrate to the new logging macros
2018-04-23 21:32:56 -06:00
MerryMage 8186820d16 pica_to_gl: Add GLuvec{2,3,4} aliases
To allow for transfer for integers into shaders.
2018-04-23 20:21:24 +03:00
wwylele e56128683c gl_shader_decompiler: fallback to CPU shader on GS b15 access 2018-04-23 12:45:56 +03:00
Weiyi Wang 7d8b7d93fc
Merge pull request #3683 from adityaruplaha/multiplayer-ui-wording-fix
multiplayer_ui: Replace "Hide Full Games" with "Hide Full Rooms"
2018-04-22 18:50:11 +03:00
Adityarup Laha c06d6ecea2
Replace "Hide Full Games" with "Hide Full Rooms" 2018-04-22 16:56:49 +05:30
Markus Wick c4010e3f93 renderer_opengl: Drop GLSync, unused. 2018-04-21 16:12:30 +02:00
Markus Wick 5d1dd205c4 renderer_opengl: Rewrite stream buffer. 2018-04-21 16:12:30 +02:00
James Rowe c7726f13e8 Frontend: Prevent a crash from closing a hosted room using the Disconnect button and then trying to host another room 2018-04-20 00:53:56 -06:00
James Rowe 5fef22fc52 Frontend: Prevent connecting to another room when already joining 2018-04-20 00:53:31 -06:00
Weiyi Wang c8d4ca8915
Merge pull request #3073 from jroweboy/multiplayer_pr
Citra-qt: Add multiplayer ui
2018-04-19 21:03:37 +03:00
James Rowe d35693bbbc More minor issue fixes
* Move Joining state change sooner in the code to prevent an issue where
failing to connect multiple times in a row doesn't change the state (as
it goes from CouldNotConnect -> CouldNotConnect which doesn't trigger a
state changed callback)
* Prevent double clicking too fast on a room in the lobby from causing
issues
* Lobby no longer closes when joining a room
2018-04-19 10:28:19 -06:00
James Rowe 62257e0d79 Fix Lobby filtering with player list
* Make double clicking the player list open the correct room
* Fix an issue where filtering with search broke the whos playing list
2018-04-19 10:28:18 -06:00
James Rowe 1f6791431d Move almost all state change tracking to MultiplayerState
Each window can still watch for state changes to update the ui or to
close the window as appropriate, but for any error announcements, they
all belong in Multiplayer state now.
2018-04-19 10:28:18 -06:00