Commit Graph
100 Commits
Author SHA1 Message Date
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
James RoweandGitHub 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
James RoweandGitHub 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 RoweandGitHub 1b94f25e6c Merge pull request #3568 from daniellimws/logging-backends
Logging: Add customizable backends
2018-04-26 21:09:31 -06: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
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
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
James Rowe a5c8e07f46 Remove duplicated logic in HostRoom
Fixes some issues with multiple warning messages
2018-04-19 10:28:18 -06:00
James Rowe 2be02f221d Fix player list not showing in lobby. Fix host and direct connect crashing citra 2018-04-19 10:28:18 -06:00
James Rowe 01b49b7e78 Fix compilation issue where unique_ptr needs full class declaration 2018-04-19 10:28:17 -06:00
James Rowe c635c7f40d Address more review comments
* Make Validation a singleton instead
* Wording changes for error messages
* Smart pointers for Ui members
* Other minor nitpicks
2018-04-19 10:28:17 -06:00
James Rowe a85511cd7d Fix multiplayer dropdowns and proxy model
* Filters in the lobby properly remove rooms
* Multiplayer menu items for Show Room and Leave Room work as intended
2018-04-19 10:28:17 -06:00
James Rowe 601fd81d5c Address review comments 2018-04-19 10:28:16 -06:00
James Rowe 3be7aa2cfc Moved the password icon to the room name.
Also added a dark mode lock icon as well (and fixed a small bug
preventing the lock icon from showing up)
2018-04-19 10:28:16 -06:00
James Rowe aa391ed60d Fixed and issue where multiplayer state was covering the File and Emulation menu items when it shouldn't even be visible 2018-04-19 10:28:16 -06:00
James Rowe 599eebf511 Remove the current players blurb 2018-04-19 10:28:16 -06:00
James Rowe 2d1efcc36b Add a member list expandable to the lobby. Fix issue with hosting more than once. 2018-04-19 10:28:15 -06:00
James Rowe f346a9d372 Split multiplayer code into its own class 2018-04-19 10:28:15 -06:00
James Rowe ddbbab8fd6 Add network status text to the status bar 2018-04-19 10:28:15 -06:00
James Rowe 871196bc10 Citra-qt: Add multiplayer ui 2018-04-19 10:28:14 -06:00
James Rowe 2f8bd18296 Use the QT_TRANSLATE_NOOP macro 2018-04-17 10:42:05 -06:00
James Rowe 501717e9db Update fmtlib to fix msvc warnings
Additionally, when updating fmtlib, there was a change in fmtlib broke
how the old logging macro was overloaded, so this works around that by
just naming the fmtlib macro impl something different
2018-04-05 22:33:12 -06:00
James RoweandGitHub 1fecead2ff Merge pull request #3624 from wwylele/sync-uniform
gl_rasterizer: move shader uniform sync from SetShader() to ctor
2018-04-05 00:30:38 -06:00
James RoweandGitHub c57b0767af Merge pull request #3602 from lioncash/json
verify_login: Make VerifyLogin exceptionless
2018-04-04 23:39:28 -06:00
James RoweandGitHub c084c97cb8 Merge pull request #3625 from N00byKing/thing
default_ini.h: Update Comment
2018-04-03 10:48:09 -06:00
James RoweandGitHub 384849232b Merge pull request #3516 from wwylele/shadow-sw
SwRasterizer: Implement shadow mapping
2018-03-31 23:29:22 -06:00
James RoweandGitHub a779304c91 Merge pull request #3616 from valentinvanelslande/appveyor-j4
appveyor: set jobs to 4 for mingw
2018-03-31 17:04:47 -06:00
James RoweandGitHub 11b9d303da Merge pull request #3610 from BreadFish64/update-icons-signal
QT: add themed icon update signal
2018-03-30 09:40:36 -06:00
James RoweandGitHub 74465389f3 Merge pull request #3172 from MerryMage/mingw-pdb
appveyor: Generate PDBs for mingw build
2018-03-27 09:52:03 -06:00
James RoweandGitHub 8c44447aeb Merge pull request #3504 from degasus/vertex_streaming
Vertex streaming
2018-03-16 23:17:47 -06:00
James RoweandDaniel Lim Wee Soong ab4ba71f3e fixup! Prevent crashes on closing by waiting for the impl thread 2018-03-16 11:18:06 +08:00
James RoweandDaniel Lim Wee Soong 87bc5266ef Logging: Various logging improvements
* Uses PopWait to reduce the amount of busy waiting if there aren't many
new logs
* Opens the log file as shared on windows, letting other programs read
the logs, but not write to them while citra is running
* Flushes the logs to disk if a log >= error arrives
2018-03-16 11:18:06 +08:00
James RoweandDaniel Lim Wee Soong 9fdc89a456 SPSCQueue: Add PopWait
Adds a condition var to SPSCQueue so when a new log is pushed it will
wake the consumer thread that is calling PopWait. This only applies to
to queues with NeedSize=true
2018-03-16 11:18:06 +08:00
James RoweandDaniel Lim Wee Soong 47f0185bcd fixup! move message 2018-03-16 11:18:06 +08:00
James RoweandDaniel Lim Wee Soong 7b78425d6b Address review comments 2018-03-16 11:18:06 +08:00
James RoweandDaniel Lim Wee Soong f6762f05cd Use the correct linker flag for mingw 2018-03-16 11:18:06 +08:00
James RoweandDaniel Lim Wee Soong 0daac3020e 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-03-16 11:18:06 +08:00
James RoweandGitHub 0ad38cf3c8 Merge pull request #3522 from jroweboy/update-glad
Update GLAD GL bindings to include extensions
2018-03-15 00:15:27 -06:00
James RoweandGitHub 33a0e87ac2 Merge pull request #3410 from jroweboy/clang-format-target
Clang format as a build target
2018-03-09 11:10:27 -07:00
James Rowe f61141e86a Update the entire application to use the new clang format style 2018-03-09 10:54:43 -07:00
James Rowe ed36edf69c Travis: Update clang-format to 6.0 2018-03-09 10:50:09 -07:00
James Rowe b6d94864fd CMake: Conditionally turn on bundled libs for MSVC
Removes the annoying step when generating sln for MSVC where you have to
click an extra checkbox after the first generate fails by using a
conditional option. The USE_BUNDLED options will be off by default, but
if the enable_lib option is enabled and the toolset is msvc, they are
turned ON.
2018-03-09 10:50:08 -07:00
James Rowe 9d59ff1879 CMake: Update contributing guide with the new clang format info 2018-03-09 10:50:08 -07:00
James Rowe 47ea473018 CMake: Add a custom clang format target
Checks to see if clang-format can be found, and if it is, sets up a
custom target that will run against the src dir and auto formats all
files. In MSVC, this is a project, and in Makefiles, its a make target
2018-03-09 10:50:08 -07:00
James Rowe 1d419bac1b Disable accelerated texture copy for Texture surfaces 2018-03-04 22:06:09 -07:00
James RoweandGitHub f3234db5e2 Merge pull request #3440 from B3n30/file_read_delay
File_Sys: Add a size dependent delay for each file read
2018-03-04 21:32:50 -07:00
James Rowe 739f8e5367 Fix clang format 2018-03-04 20:59:42 -07:00
James RoweandGitHub ce725f24ca Merge pull request #3444 from jroweboy/fix-multiplayer
UDS: Add non zero mac address to the shared page
2018-03-04 20:40:37 -07:00
James Rowe d26cf11399 Fix clang format 2018-03-04 20:27:22 -07:00
James Rowe 878217372b Remove useless static cast 2018-03-04 20:16:36 -07:00
James Rowe 1f87766b86 Change to use CryptoPP random and address review comments 2018-02-22 22:31:58 -07:00
James Rowe 752cfcaaae Move writing to shared page to the nwm init 2018-02-22 10:20:34 -07:00
James Rowe ffe94421b2 UDS: Add non zero mac address to the shared page
Apparently several games check the shared page mac address and wifi
link level values, and will refuse to start UDS if they are not correct.
This change gives a default value (in case you aren't connected to a
network) and will read the value from Room if you are connected.
2018-02-22 10:17:38 -07:00
James RoweandGitHub 33fe6c30e0 Merge pull request #3322 from MerryMage/DSP
audio_core: Remove global state
2018-02-19 09:08:37 -07:00
James Rowe 18456ff9e6 Address Lioncash's comments 2018-02-05 20:31:50 -07:00
James RoweandGitHub 587450cd04 Merge pull request #3422 from BreadFish64/BreadFish64-patch-1
correct escape sequence warning
2018-02-03 14:21:42 -07:00
James RoweandGitHub b002511df0 citra-qt: Add customizable speed limit target (#3353)
citra-qt: Add customizable speed limit target

* Update SDL config for the new frame_limit option
* Made max lag time a function of target speed percent.
* Added a checkbox to enable/disable frame limiter
* UI: Prevent frame_limit from under/overflowing
* UI: Hide target speed percent when frame limiter is off
* Disable frame limit spin box when framelimit isn't enabled
2018-01-25 22:24:40 -07:00
James RoweandGitHub 44d07574b1 Merge pull request #2882 from danzel/movie-squash
Movie (Game Inputs) recording and playback
2018-01-23 01:03:37 -07:00
James RoweandGitHub 0e8c25fdfa Merge pull request #3361 from wwylele/ptm-new-framework
Service/PTM: convert to ServiceFramework
2018-01-22 11:57:44 -07:00
James RoweandGitHub bf4e35b916 Merge pull request #3399 from FearlessTobi/patch-1
Remove "tr" from image formats in graphics_surface.cpp
2018-01-19 08:17:40 -07:00
James RoweandGitHub 0086b57d5a Merge pull request #3401 from Reegea85/patch-1
citra-qt: fix broken About box link
2018-01-19 08:09:37 -07:00
James RoweandGitHub e1ffcde355 Merge pull request #3297 from wwylele/translation-tx
citra-qt: add translation support; link translation with transifex
2018-01-18 09:01:00 -07:00
James Rowe 1c4d1d1ace Move trasnfer_framebuffer to a member of RasterCache. Address review comments 2017-12-23 16:10:32 -07:00
James Rowe 10fb9242ae Fix clang format 2017-12-23 16:10:32 -07:00
James Rowe 4e053220a8 When downloading from a surface into gl_buffer, ingore any x/y offsets in rect and use 0,0 as the origin 2017-12-23 16:10:31 -07:00
James Rowe 7e673af527 Remove the correct intervals from the surface when validating 2017-12-23 16:10:31 -07:00