Commit Graph
100 Commits
Author SHA1 Message Date
James Roweandzhupengfei e040bc9355 Multiplayer: Send an error message when connecting to a full room 2018-12-15 10:40:26 +08:00
James RoweandGitHub 11bc9028bb Merge pull request #4478 from liushuyu/master
travis: MinGW: minor changes
2018-12-02 01:00:58 -07:00
James RoweandGitHub 874a95cea7 Merge pull request #4291 from KyButler/master
Slightly changed wording of LOG_ERROR statements.
2018-10-02 13:32:33 -06:00
James RoweandGitHub 9518a2d814 Merge pull request #4263 from spycrab/cmake_bin
cmake: Output binaries to bin on every platform
2018-09-25 12:27:22 -06:00
James RoweandGitHub 90c891406f Merge pull request #4258 from jroweboy/gitattributes
Meta: Add gitattributes file
2018-09-22 15:03:55 -06:00
James Rowe d6f303c6db Meta: Add gitattributes file
Github Linguist will read this file when calculating language stats for
the repository. We can use this to exclude any vendored dependencies in
externals and dist. Also makes all h files be considered cpp
2018-09-22 14:59:15 -06:00
James RoweandGitHub cd20ca0e2a Merge pull request #4226 from valentinvanelslande/enum
citra.py: use IntEnum for request types
2018-09-22 14:30:42 -06:00
James RoweandGitHub ded7e1f7c3 Merge pull request #4245 from wwylele/thread-cleanup
Common/Thread cleanup
2018-09-22 14:27:06 -06:00
James Rowe 3f4a7f8f58 Input: Remove global variables from SDL Input
Changes the interface as well to remove any unique methods that
frontends needed to call such as StartJoystickEventHandler by
conditionally starting the polling thread only if the frontend hasn't
started it already. Additionally, moves all global state into a single
SDLState class in order to guarantee that the destructors are called in
the proper order
2018-09-22 14:13:50 -06:00
James Rowe bfcc712132 Input: Copy current SDL.h/cpp files to impl
This should make reviewing much easier as you can then see what changed
happened between the old file and the new one
2018-09-22 14:11:15 -06:00
James RoweandGitHub 687e3e74ca Merge pull request #3959 from zhaowenlan1779/semi-reset
service/apt: Implement soft reset & CloseApplication
2018-09-19 21:02:59 -06:00
James RoweandGitHub 54c32647a1 Merge pull request #4204 from valentinvanelslande/language-fix
Repopulates fields in System Settings when retranslating the UI

Fixes #4203
2018-09-11 21:57:38 -06:00
James RoweandGitHub 05118a2326 Merge pull request #4130 from FearlessTobi/port-942
Port #942 from yuzu: "qt: Minor cleanup-related changes"
2018-08-26 12:22:34 -06:00
James RoweandGitHub 83cc398514 Merge pull request #4127 from FearlessTobi/port-929
Port #929 from yuzu: "gdbstub: Minor changes "
2018-08-26 12:21:11 -06:00
James RoweandGitHub a6723ec2eb Merge pull request #4126 from FearlessTobi/port-892
Port #892 from yuzu: "Make global EmuWindow instance part of the base renderer class"
2018-08-26 12:00:55 -06:00
James RoweandGitHub 50270fd791 Merge pull request #4059 from zhaowenlan1779/udp-input-ui
citra_qt: add motion/touch config
2018-08-26 11:56:50 -06:00
James RoweandGitHub 13262c187c Merge pull request #3922 from zhaowenlan1779/qt-movie
movie: Add Qt Movie feature
2018-08-26 11:07:15 -06:00
James RoweandGitHub 7279335fc0 Merge pull request #4110 from citra-emu/revert-4109-rpc-opt
Revert "Set Discord Rich Presence "OFF" by default"
2018-08-20 10:59:53 -06:00
James RoweandGitHub b3ca900ba7 Revert "Set DiscordRPC OFF by default (#4109)"
This reverts commit 516be14a6b.
2018-08-20 10:34:58 -06:00
James RoweandGitHub 20cb8f66db Merge pull request #4099 from zhaowenlan1779/lle-service-modules-fixup
citra_qt: set object name for LLEServiceModulesWidget
2018-08-14 10:48:03 -06:00
James RoweandGitHub aed15a8d9d Merge pull request #4012 from zhaowenlan1779/ui-retext
citra_qt: UI text improvements
2018-08-13 23:31:39 -06:00
James RoweandGitHub 6a1fa3c84e Merge pull request #4096 from CodingKoopa/change-udp-log
udp: Change invalid packet message to Debug
2018-08-12 20:47:14 -06:00
James RoweandGitHub 106ef861bb Merge pull request #4094 from valentinvanelslande/fix-typos
network: fix 3 typos
2018-08-12 16:59:03 -06:00
James RoweandGitHub 58639220a0 Merge pull request #4084 from zhaowenlan1779/udp-input-port
input_common/udp: allow changing pad index
2018-08-10 23:24:55 -06:00
James RoweandGitHub dceb4150a8 Merge pull request #4065 from zhaowenlan1779/port-yuzu-947
game_list: Use QString::fromStdString() where applicable instead of c_str()
2018-08-09 09:41:35 -06:00
James RoweandGitHub 77573b93ce Merge pull request #4066 from zhaowenlan1779/port-yuzu-946
Port "qt/main: Collapse if statement in UpdateRecentFiles()" from yuzu
2018-08-09 09:41:10 -06:00
James RoweandGitHub 22c0575cf4 Merge pull request #4061 from zhaowenlan1779/port-yuzu-967
Port "file_util: Avoid sign-conversions in WriteArray() and ReadArray()" from yuzu
2018-08-09 09:40:26 -06:00
James RoweandGitHub cc6d3ce22f Merge pull request #4053 from Steveice10/master
am: Corrections to handling of non-existent content indices.
2018-08-09 09:39:44 -06:00
James RoweandGitHub 9c53ccf4cb Merge pull request #4062 from zhaowenlan1779/port-yuzu-951
Port "externals: Update glad to 0.1.26" from yuzu
2018-08-09 09:37:12 -06:00
James RoweandGitHub 93386efccb Merge pull request #4056 from zhaowenlan1779/clear-recent-files
citra_qt: add Clear Recent Files menu action
2018-08-07 21:28:33 -06:00
James RoweandGitHub 9a0191d623 Merge pull request #4049 from jroweboy/udp-input
Input: UDP Client to provide motion and touch controls
2018-08-07 21:08:48 -06:00
James Rowe 169bb29a54 Correct direction vectors for cemuhook motion input 2018-08-07 21:05:09 -06:00
James Rowe 6bcbda5ab2 Input: UDP Client to provide motion and touch controls
An implementation of the cemuhook motion/touch protocol, this adds the
ability for users to connect several different devices to citra to send
direct motion and touch data to citra.
2018-08-07 21:05:09 -06:00
James RoweandGitHub 0233f3286c Merge pull request #4052 from zhaowenlan1779/bg-color-real-fix
video_core: Allow changing background color while emulation is running
2018-08-04 09:27:30 -06:00
James RoweandGitHub 751e00a615 Merge pull request #3902 from valentinvanelslande/restart
citra_qt: add restart hotkey & menu option
2018-08-02 22:55:07 -06:00
James RoweandGitHub 6bc87cdf3e Merge pull request #3987 from zhaowenlan1779/language-config-fix-2
citra_qt/configuration: retranslate hotkey widget on language change
2018-08-02 11:15:27 -06:00
James RoweandGitHub c35a251d86 Merge pull request #3985 from BreadFish64/fix-warnings
core: clean up warnings
2018-08-02 11:14:57 -06:00
James RoweandGitHub 14b0435df2 Merge pull request #3994 from FearlessTobi/replace-clamp-functions
Remove MathUtil::Clamp and replace it with its std:: counterpart
2018-08-02 11:08:07 -06:00
James RoweandGitHub cafe9838b5 Merge pull request #4047 from zhaowenlan1779/bg-color
citra_qt/configuration: Add background color config
2018-08-02 11:05:20 -06:00
James RoweandGitHub 4b59c1b601 Merge pull request #4042 from wwylele/i-love-drivers
gl_rasterizer: apply AMD hack only when the vendor is AMD
2018-08-02 11:01:25 -06:00
James RoweandGitHub c771dd9813 Merge pull request #4021 from FearlessTobi/port-709
Port #709 from yuzu: "common/misc: Deduplicate code in GetLastErrorMsg()
2018-08-02 11:00:53 -06:00
James RoweandGitHub 4250dedc8f Merge pull request #4000 from Hexagon12/tx-update
dist/languages: Update translations
2018-08-02 11:00:14 -06:00
James RoweandGitHub 05eb0ccb03 Merge pull request #4014 from wwylele/old-service
service: remove deprecated service interface
2018-07-30 11:31:54 -06:00
James RoweandGitHub 7b46b7e29a Merge pull request #4010 from zhaowenlan1779/statusbar-retheme
qt_themes: add themed connected/disconnected icons for dark and fix status bar theme updating
2018-07-30 10:35:42 -06:00
James RoweandGitHub ecb3dc2fb8 Merge pull request #4038 from zhaowenlan1779/port-yuzu-711
Port "common/swap: Minor changes" from yuzu
2018-07-30 10:21:49 -06:00
James RoweandGitHub 8fd9f22657 Merge pull request #4030 from zhaowenlan1779/port-yuzu-743
Port "logging: Use std::string_view where applicable" from yuzu
2018-07-30 10:19:28 -06:00
James Rowe 6a973cc0bb citra-qt: Init logging sooner so we dont miss some logs on startup 2018-07-27 09:29:31 -06:00
James RoweandGitHub 4a3c4f5f67 Merge pull request #3989 from zhaowenlan1779/statusbar-retranslate
citra_qt: retranslate status bar
2018-07-25 10:19:11 -06:00
James RoweandGitHub d79cb6373d Merge pull request #3972 from zhaowenlan1779/common-timer
common/timer: use std::chrono, avoid platform-dependent code
2018-07-25 10:00:04 -06:00
James RoweandGitHub e4d65927c2 Merge pull request #3991 from zhaowenlan1779/no-lle-applets
applet_manager: disable loading LLE applets
2018-07-25 09:54:02 -06:00
James RoweandGitHub 9d95373282 Merge pull request #3999 from NarcolepticK/stub-service-ps
service/ps: Boilerplate to register service, no functions implemented
2018-07-25 09:52:45 -06:00
James RoweandGitHub 7fb8b6b7a2 Merge pull request #3971 from adityaruplaha/cpu-jit-move
citra_qt: Move CPU JIT toggle to Debug tab.
2018-07-25 09:50:33 -06:00
James RoweandGitHub 7fa2076918 Merge pull request #3946 from zhaowenlan1779/macos-no-hw-shader
citra_qt: disable hw shader by default for macos
2018-07-18 10:07:12 -06:00
James RoweandGitHub bc30b314d8 Merge pull request #3947 from zhaowenlan1779/autofill-multiplayer
citra_qt: use Citra Web Service username as default multiplayer nickname
2018-07-18 10:02:14 -06:00
James RoweandGitHub 2f8c9c8126 Merge pull request #3831 from FearlessTobi/add-volume-slider
citra_qt: Add a volume slider
2018-07-18 09:56:47 -06:00
James RoweandGitHub bf6da61da5 Merge pull request #3850 from zhaowenlan1779/swkbd
applets/swkbd: Software Keyboard Implementation
2018-07-17 09:02:55 -06:00
James RoweandGitHub 331c6f4d38 Merge pull request #3706 from liushuyu/appveyor-cache
Use Travis CI to build MinGW packages
2018-07-11 19:43:12 -06:00
James Roweandliushuyu 5543c9c094 Build: Change the linux-mingw upload folder to canary-mingw to match the old naming scheme 2018-07-12 09:33:53 +08:00
James RoweandGitHub 6a08167505 Merge pull request #3905 from valentinvanelslande/remove-return
citra_qt: Remove return
2018-07-02 20:12:55 -06:00
James RoweandGitHub f36ff5b4c4 Merge pull request #3913 from BynariStar/patch-1
citra_qt: Remove obsolete application attribute
2018-07-02 19:52:00 -06:00
James RoweandGitHub 4564fc5baa Merge pull request #3904 from valentinvanelslande/fix-macro
gl_shader_gen: remove newline in logging macro
2018-06-30 18:20:17 -06:00
James Roweandzhupengfei caacefcc2e frontend/applets: frontend swkbd base
Original commits by @jroweboy:

* Rebase out the other commit

* changing branches

* More work on stuff and things ecks DEE

Changes by @zhaowenlan1779:

* Removed #include of result.h
2018-06-30 08:01:31 +08:00
James RoweandGitHub f9a89ff410 Merge pull request #3894 from wwylele/log-finalize
Finalize logging system migration
2018-06-29 17:46:07 -06:00
James RoweandGitHub 5e641d16d0 Merge pull request #3834 from j-selby/fix-cpp-httplib
Update cpp-httplib for gzip + chunked encoding fixes
2018-06-26 09:57:08 -06:00
James RoweandGitHub 26254072e7 Merge pull request #3759 from degasus/TBO_upload
Rewrite texture_buffer_object handling.
2018-06-26 09:24:55 -06:00
James RoweandGitHub fa5d247b43 Merge pull request #3846 from zhaowenlan1779/clang
service/ac: fix clang format
2018-06-19 19:44:23 -06:00
James RoweandGitHub f18b8e3998 Merge pull request #3804 from zhaowenlan1779/titlebar
citra-qt: Improve Title Bar display
2018-06-19 19:41:12 -06:00
James RoweandGitHub e27bb6394d Merge pull request #3837 from zhaowenlan1779/aboutdialog-builddate
citra-qt: Add build date in about dialog
2018-06-19 11:57:40 -06:00
James RoweandGitHub 574824a26c Merge pull request #3632 from N00byKing/3dtv_botenable
Add Support for Stereoscopic 3D
2018-06-17 21:05:15 -06:00
James RoweandGitHub c39dee1569 Merge pull request #3617 from BreadFish64/multiple-game-dirs
QT: Add support for multiple game directories
2018-06-17 21:04:24 -06:00
James RoweandGitHub cf9bfe0690 Merge pull request #3787 from wwylele/shader-jit-state
shader/jit: preserve integer & condition register across invocation
2018-06-09 18:38:05 -06:00
James RoweandGitHub 2dac1a9590 Merge pull request #3788 from wwylele/shader-jit-breakc
shader/jit: implement breakc
2018-06-09 18:36:46 -06:00
James RoweandGitHub f31c836285 Merge pull request #3805 from jbeich/cubeb
Unbreak install
2018-06-09 18:14:22 -06:00
James RoweandGitHub 51832ce858 Merge pull request #3828 from liushuyu/master
travis: fix tx push (again)
2018-06-09 15:53:19 -06:00
James RoweandGitHub cf3ea85397 Merge pull request #3824 from jbeich/cryptopp
Update cryptopp to 7.1 snapshot
2018-06-09 14:10:31 -06:00
James RoweandGitHub e52d93bc58 Merge pull request #3825 from liushuyu/master
travis: share environment variables with Docker
2018-06-09 14:04:05 -06:00
James RoweandGitHub 6811eda2b9 Merge pull request #3764 from zhaowenlan1779/camera-flip
camera: camera refinement
2018-06-09 14:02:50 -06:00
James RoweandGitHub a5cf5b56bd Merge pull request #3826 from Steveice10/master
boss: Return buff_size in parameter 2 of ReceiveProperty.
2018-06-09 13:34:03 -06:00
James RoweandGitHub ad81bca8dd Merge pull request #3819 from zhaowenlan1779/game-list-refix
game_list: fix system title display
2018-06-09 13:32:28 -06:00
James RoweandGitHub 50def5a73f Merge pull request #3803 from wwylele/nwm-uds-fix
UDS: fix RecvBeaconBroadcastData response header
2018-06-02 09:58:54 -06:00
James RoweandGitHub 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 RoweandGitHub 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 RoweandGitHub 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 RoweandGitHub 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 RoweandGitHub 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
James RoweandGitHub 174241ff90 Merge pull request #3800 from liushuyu/master
citra: correct regex for matching nickname
2018-05-31 22:14:39 -06:00
James RoweandGitHub 131cf363da Merge pull request #3790 from jbeich/master
cryptopp: unbreak on aarch64
2018-05-31 22:14:03 -06:00
James RoweandGitHub 04a9145dfc Merge pull request #3776 from darkf/cubeb-sink2
Implement a Cubeb audio sink
2018-05-31 22:13:12 -06:00
James RoweandGitHub 72f9142bb1 Merge pull request #3746 from wwylele/ndm-new-framework
Service/NDM: convert to ServiceFramework
2018-05-29 23:54:21 -06:00
James RoweandGitHub 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 RoweandGitHub 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 RoweandGitHub 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
James RoweandGitHub e35c634fc6 Merge pull request #3742 from wwylele/glvtx-ui
citra-qt: add gpu shader emulation related configurations
2018-05-18 13:04:18 -06:00
James RoweandGitHub 64a8c8ee07 Merge pull request #3741 from wwylele/glvtx-last
gl_rasterizer: implement AccelerateDrawBatch to emulate PICA shader on hardware
2018-05-18 13:03:40 -06:00
James RoweandGitHub e48662196f Merge pull request #3735 from wwylele/transifex-test-2
travis: fix dependency name for transifex job
2018-05-11 23:35:55 -06:00
James RoweandGitHub afe445fc57 Merge pull request #3734 from wwylele/transifex-push-fix
travis: add missing dependency for transifex push job
2018-05-11 15:49:28 -06:00
James RoweandGitHub 80bfd87270 Merge pull request #3730 from FearlessTobi/game-compat-fixes
citra_qt: Refactor game list compatibility system
2018-05-11 11:59:53 -06:00
James RoweandGitHub 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 RoweandGitHub ca01c7eea8 Merge pull request #3665 from adityaruplaha/log-version
frontend: Log Citra version.
2018-05-03 15:17:04 -06:00
James RoweandGitHub ca3b82caa4 Merge pull request #3705 from zhaowenlan1779/multiplayer-fix
citra_qt: multiplayer password dialog fix
2018-05-02 09:17:33 -06:00