octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,161 Commits 52 Branches 0 Tags 63 MiB
Commit Graph

6161 Commits

Author SHA1 Message Date
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
Weiyi Wang bba2a60b22
Merge pull request #3670 from jbeich/qt 
Unbreak build with Qt 5.9.4 (at least on FreeBSD)
 2018-04-19 18:02:35 +03:00
Weiyi Wang 977abd2c7a
Merge pull request #3607 from adityaruplaha/sdl2-fullscreen 
SDL2: Implement fullscreen
 2018-04-19 16:16:37 +03:00
Jan Beich 394638e9c9 Qt: Add missing #include after 2f8bd18296 
In file included from src/citra_qt/citra-qt_autogen/mocs_compilation.cpp:14:
In file included from src/citra_qt/citra-qt_autogen/EWIEGA46WW/moc_game_list_p.cpp:9:
src/citra_qt/game_list_p.h:160:17: error: use of undeclared identifier 'QCoreApplication'; did you mean 'QApplication'?
        setText(QCoreApplication::translate("GameList", status.text));
                ^~~~~~~~~~~~~~~~
                QApplication
/usr/local/include/qt5/QtGui/qwindowdefs.h:81:7: note: 'QApplication' declared here
class QApplication;
      ^
In file included from src/citra_qt/citra-qt_autogen/mocs_compilation.cpp:14:
In file included from src/citra_qt/citra-qt_autogen/EWIEGA46WW/moc_game_list_p.cpp:9:
src/citra_qt/game_list_p.h:160:17: error: incomplete type 'QApplication' named in nested name specifier
        setText(QCoreApplication::translate("GameList", status.text));
                ^~~~~~~~~~~~~~~~~~
/usr/local/include/qt5/QtCore/qobject.h:446:18: note: forward declaration of 'QApplication'
    friend class QApplication;
                 ^
In file included from src/citra_qt/citra-qt_autogen/mocs_compilation.cpp:14:
In file included from src/citra_qt/citra-qt_autogen/EWIEGA46WW/moc_game_list_p.cpp:9:
src/citra_qt/game_list_p.h:161:20: error: use of undeclared identifier 'QCoreApplication'; did you mean 'QApplication'?
        setToolTip(QCoreApplication::translate("GameList", status.tooltip));
                   ^~~~~~~~~~~~~~~~
                   QApplication
/usr/local/include/qt5/QtGui/qwindowdefs.h:81:7: note: 'QApplication' declared here
class QApplication;
      ^
In file included from src/citra_qt/citra-qt_autogen/mocs_compilation.cpp:14:
In file included from src/citra_qt/citra-qt_autogen/EWIEGA46WW/moc_game_list_p.cpp:9:
src/citra_qt/game_list_p.h:161:20: error: incomplete type 'QApplication' named in nested name specifier
        setToolTip(QCoreApplication::translate("GameList", status.tooltip));
                   ^~~~~~~~~~~~~~~~~~
/usr/local/include/qt5/QtCore/qobject.h:446:18: note: forward declaration of 'QApplication'
    friend class QApplication;
                 ^
 2018-04-18 20:03:52 +00:00
Daniel Lim Wee Soong 10f0fbc0e5 core/gdbstub: Migrate logging macros 
Change to use the new logging macros
 2018-04-18 21:53:26 +08:00
Weiyi Wang 048b0fc0d3
Merge pull request #3662 from wwylele/shader-hash-cache 
shader: avoid recomputing hash for the same program
 2018-04-18 12:10:25 +03:00
adityaruplaha e5f5fdee2e SDL2: Implement fullscreen 2018-04-17 23:22:23 +05:30
Weiyi Wang 2d372bae14
Merge pull request #3663 from jroweboy/quick-fix 
Use the QT_TRANSLATE_NOOP macro
 2018-04-17 20:23:23 +03:00
James Rowe 2f8bd18296 Use the QT_TRANSLATE_NOOP macro 2018-04-17 10:42:05 -06:00
wwylele d52ddd0ec4 shader: avoid recomputing hash for the same program 2018-04-17 09:47:59 +03:00
wwylele 3cc460ab34 shader_jit: change passing ShaderSetup to passing uniforms struct into the program 
We are going to add private memebers to ShaderSetup, which forbids the usage of offsetof. The JIT program only use the uniform part of the setup, so we can just isolate it.
 2018-04-17 09:35:43 +03:00
Weiyi Wang cb36f9fad2
Merge pull request #3645 from wwylele/shader-manager 
renderer_opengl: refactor shader & program objects and add shader manager for rasterizer
 2018-04-16 16:38:38 +03:00
Mat M c250cbd5b3
Merge pull request #3660 from baka0815/translation 
Don't translate function keys in Qt GUI
 2018-04-16 08:12:29 -04:00
baka0815 4321ab44ea citra-qt: Don't translate function keys in InitializeHotkeys() 2018-04-16 12:37:13 +02:00
Weiyi Wang a2ab91fa31
Merge pull request #3463 from FearlessTobi/game-list-compat 
citra-qt: Show Game Compatibility within Citra
 2018-04-16 01:45:16 +03:00
FearlessTobi fbc05fac19 Show game compatibility within Citra 2018-04-16 00:42:58 +02:00
Weiyi Wang 17e14d5615
Merge pull request #3649 from liushuyu/ci-cache 
travis: use ccache to speed up build
 2018-04-15 14:24:10 +03:00
Merry d5b1c33587
Merge pull request #3656 from lioncash/relocate 
sm: Relocate the service manager to the System class
 2018-04-15 10:34:14 +01:00
Merry 9e21094dea
Merge pull request #3631 from daniellimws/boss-fmt 
service/boss: Migrate logging macros
 2018-04-15 08:59:42 +01:00
liushuyu 0d3983bc66
travis: use mkdir -p to avoid `|| true` 2018-04-13 20:30:04 -06:00
liushuyu 2193e9b742
travis: use cmake flags and whitespace cleanup 2018-04-13 19:10:37 -06:00
liushuyu 16981d6be4 travis: use cache 2018-04-13 19:10:20 -06:00
Lioncash a78920e60b
sm: Relocate the service manager to the System class 
Rather than have it live as a global variable, place it into the System class and make it instance-based.
 2018-04-13 07:15:34 -04:00
Weiyi Wang 7f408eefa3
Merge pull request #3655 from lioncash/fwd-decl 
cam: Correct forward declaration type for Core::EventType
 2018-04-13 10:19:28 +03:00
Lioncash 5309b51c12 cam: Correct forward declaration type for Core::EventType 
This is actually a struct, not a class.
 2018-04-12 23:15:16 -04:00
Weiyi Wang bfd1d963ba
Merge pull request #3638 from ds84182/we-need-more-rounds 
Round TEV outputs and the final fragment output in GLSL
 2018-04-12 23:32:27 +03:00
Weiyi Wang 9772513141
Merge pull request #3639 from wwylele/texture-cude-fix 
gl_rasterizer_cache: exit FillTextureCube when address is invalid
 2018-04-12 22:54:14 +03:00
Weiyi Wang dfe9b4edf8
Merge pull request #3587 from valentinvanelslande/apt-fmt 
Service/APT: Migrate logging macros
 2018-04-12 22:47:44 +03:00
Weiyi Wang 6df2e3ccc9
Merge pull request #3614 from valentinvanelslande/movie-fmt 
movie: migrate logging macros
 2018-04-12 22:46:15 +03:00
Weiyi Wang ca6f6f172b
Merge pull request #3634 from ccawley2011/citra-room-glad 
citra-room: Use the default OpenGL loader instead of SDL_GL_GetProcAddress
 2018-04-12 22:45:30 +03:00
Weiyi Wang f10123f546
Merge pull request #3611 from adityaruplaha/fullscreen-fix 
citra-qt: Fix the stuck in fullscreen bug.
 2018-04-12 22:43:04 +03:00
N00byKing f29f4ccdc9 gsp_gpu, shared_page: Change 3D LED State on SetLedForceOff 2018-04-12 16:44:29 +02:00
wwylele 8dc75598a4 gl_rasterizer: isolate shader management into its own class 2018-04-11 14:52:37 +03:00
wwylele 36bc92273b gl_shader_gen: accept an option to generate separable shaders 2018-04-11 14:52:37 +03:00
wwylele bdab18d2d9 gl_resource_manager: add OGLPipeline 2018-04-11 14:52:37 +03:00
wwylele 4f9b9c4b80 gl_state: add pipeline state 2018-04-11 14:41:43 +03:00
wwylele 48869c768f gl_resource_manager: separate OGLShader and OGLProgram 2018-04-11 14:41:43 +03:00
wwylele d2ee40dc45 gl_shader_util: separate shader object creation and program object creation 2018-04-11 14:41:43 +03:00
Merry 8b858f1bf7
Merge pull request #3647 from liushuyu/master 
travis: fix Transifex upload
 2018-04-11 10:43:29 +01:00