Commit graph

4940 commits

Author SHA1 Message Date
James
5684dc8228 Don't pull in entire JSON repo for single header file 2017-07-18 13:37:27 +10:00
bunnei
f6ed592be0 Merge pull request #2804 from Kloen/theming
citra-qt: UI Themes
2017-07-17 21:30:01 -04:00
Weiyi Wang
9eb8dd311c Merge pull request #2818 from B3n30/network
Enable data transfer over ENet
2017-07-17 17:08:02 +03:00
bunnei
4795caf9d6 Merge pull request #2829 from MerryMage/check_submodules_present
CMakeLists: Check that all submodules are present
2017-07-17 09:52:34 -04:00
B3n30
e2992eb321 stubbed frd::UnscrambleLocalFriendCode (#2827) 2017-07-16 21:32:08 -05:00
James Rowe
bab80f120f Merge pull request #2830 from linkmauve/master
Make enet use the same convention as other submodules
2017-07-16 16:29:58 -06:00
Emmanuel Gil Peyrot
fef9ef2aa8 .gitmodules: Make enet use the same convention as other submodules.
This makes it easier for packagers to preload all submodules.
2017-07-16 21:02:36 +01:00
B3n30
e9ce27c941 Network: Changed timeout for receiving packets to 100ms 2017-07-16 21:30:17 +02:00
B3n30
e443c779a5 Network: Propagate Room closing to connected members 2017-07-16 21:30:10 +02:00
B3n30
99bb995de3 Network: Made send async in RoomMember 2017-07-16 21:30:04 +02:00
B3n30
7eb9751711 Network: Send the game title 2017-07-16 21:29:57 +02:00
B3n30
ea994b412e Network: Enable sending and receiving chat messages 2017-07-16 21:29:49 +02:00
B3n30
ad621f7fa4 Network: Handle the disconnect of a client 2017-07-16 21:29:41 +02:00
B3n30
87c5fd4a75 Network: Enable to send WifiPackets 2017-07-16 21:29:34 +02:00
B3n30
8014f7bdfb Network: Init Network in SDL and QT 2017-07-16 21:29:19 +02:00
B3n30
6b20db1d8e Network: Send JoinRequest and handle the answer in RoomMember 2017-07-16 21:29:11 +02:00
B3n30
e942c65777 Network: Handle join request in Room 2017-07-16 21:29:02 +02:00
B3n30
1d82cf8944 Network: Added Packet class for serialization 2017-07-16 21:28:55 +02:00
B3n30
898b372ba3 Network: Threads for Room and RoomMember 2017-07-16 21:28:47 +02:00
MerryMage
825bc5ee1f CMakeLists: Check that all submodules are present 2017-07-16 19:52:05 +01:00
Weiyi Wang
b5e42d338d Merge pull request #2784 from wwylele/font-archive
load shared font from system archive
2017-07-16 20:12:55 +03:00
Weiyi Wang
b6727d9527 Merge pull request #2824 from jroweboy/mingw_compile_test
Update enet submodule
2017-07-13 09:57:35 +03:00
James Rowe
4127661f33 Update enet submodule
This includes a fix merged upstream to support mingw compilation
2017-07-12 20:39:47 -06:00
bunnei
e159b5ee3e Merge pull request #2819 from bunnei/telemetry-submit
Telemetry: Submit logged data to the Citra service
2017-07-12 21:31:12 -04:00
bunnei
425200bca5 web_backend: Specify api-version on JSON post. 2017-07-11 18:34:30 -04:00
bunnei
7927c9b28f web_service: Add CMake flag to enable. 2017-07-11 18:33:41 -04:00
bunnei
d253007194 telemetry_session: Use TelemetryJson to submit real telemetry. 2017-07-11 18:33:40 -04:00
bunnei
d5a3ab8aef web_service: Implement JSON serialization of telemetry data. 2017-07-11 18:33:38 -04:00
bunnei
07f0f623d1 web_backend: Add initial interface to POST data to Citra Web Services. 2017-07-11 18:33:25 -04:00
bunnei
061f10e286 web_service: Add skeleton project. 2017-07-10 00:15:40 -04:00
bunnei
de913af2c7 settings: Add telemetry endpoint URL. 2017-07-10 00:15:39 -04:00
bunnei
e5a69c42e2 logging: Add WebService as a log cateogry. 2017-07-10 00:15:30 -04:00
bunnei
a13865c10f externals: Add JSON as a submodule. 2017-07-09 18:38:02 -04:00
bunnei
7f37ccd0d8 externals: Add CPR as a submodule. 2017-07-09 13:24:20 -04:00
Sebastian Valle
c13e4d7ea4 Merge pull request #2815 from mailwl/bossp
Service/boss:P: Add some functions to FunctionTable
2017-07-08 13:58:40 -05:00
bunnei
d08d94d942 Merge pull request #2797 from yuriks/cached-vma-free-crash
Memory: Fix crash when unmapping a VMA covering cached surfaces
2017-07-08 14:07:47 -04:00
B3n30
64b6caf5f5 Implement basic virtual Room support based on enet (#2803)
* Added support for network with ENet lib,

connecting is possible, but data can't be sent, yet.

* fixup! Added support for network with ENet lib,

* fixup! CLang

* fixup! Added support for network with ENet lib,

* fixup! Added support for network with ENet lib,

* fixup! Clang format

* More fixups!

* Moved ENetHost* and ENetPeer* into pimpl classes

* fixup! Moved ENetHost* and ENetPeer* into pimpl classes

* fixup! Clang again

* fixup! Moved ENetHost* and ENetPeer* into pimpl classes

* fixup! Moved ENetHost* and ENetPeer* into pimpl classes

* fixup! Moved ENetHost* and ENetPeer* into pimpl classes
2017-07-07 15:34:15 -04:00
James Rowe
77389b2ad7 Merge pull request #2814 from Kloen/macro-remove
Remove unnecessary WIN32_LEAN_AND_MEAN macro definition
2017-07-01 08:45:42 -06:00
mailwl
edef1d54bb Service/boss:P: Add some functions to FunctionTable 2017-07-01 12:21:38 +03:00
Kloen
1e5a589a66 Remove unnecessary WIN32_LEAN_AND_MEAN macro definition 2017-06-30 01:59:55 +02:00
Sebastian Valle
4f7e8c6f1e Merge pull request #2793 from Subv/replyandreceive
Kernel/SVC: Partially implemented svcReplyAndReceive
2017-06-29 17:05:22 -05:00
Subv
4a8de6bb00 Kernel/SVC: Pass the current thread as a parameter to ClientSession::SendSyncRequest. 2017-06-29 12:30:34 -05:00
Yuri Kunde Schlesner
f2ca6e8d8d Merge pull request #2809 from wwylele/texture-copy-fix
gpu: fix edge cases for TextureCopy
2017-06-29 09:29:40 -07:00
wwylele
60f6d78648 gpu: add comments for TextureCopy 2017-06-29 13:09:23 +03:00
Yuri Kunde Schlesner
36ed66c9ad Merge pull request #2800 from wwylele/fog-lutlutlut
gl_rasterizer: use texture buffer for fog LUT
2017-06-28 21:52:20 -07:00
James Rowe
c4bee69784 Merge pull request #2811 from MerryMage/qtdebug
configure_debug: Add label warning that CPU JIT needs to be disabled …
2017-06-28 12:19:05 -06:00
James Rowe
ba31bd1668 Merge pull request #2812 from tiagmoraismorgado/patch-1
fixing a couple of typos
2017-06-28 07:32:45 -06:00
Tiago Morais Morgado
159fce55b9 fixing a couple of typos 2017-06-28 12:56:10 +01:00
MerryMage
8ac1da24c5 configure_debug: Add label warning that CPU JIT needs to be disabled for gdbstub to work 2017-06-28 08:50:22 +01:00
wwylele
36a523b7cf gpu: fix edge cases for TextureCopy 2017-06-27 23:20:23 +03:00