Matthew Parlane
|
9de7611ff9
|
Merge branch 'master' into wii-network
Conflicts:
CMakeLists.txt
Source/Core/Core/Core.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj.filters
Source/Dolphin_2010.sln
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
|
2013-08-16 19:17:07 +12:00 |
|
Matthew Parlane
|
417552b21e
|
Not sure what that was.
|
2013-08-16 01:06:44 +12:00 |
|
Matthew Parlane
|
d6ec6ae97a
|
Fix polarssl on Windows.
|
2013-08-16 00:24:10 +12:00 |
|
Matthew Parlane
|
d8b39b9dcf
|
Support PolarSSL on *nix
Removed unneeded PolarSSL directories.
Remove duplicate sha1 and md5 files.
Define out SSL test file writing.
Fix format string bug and warning.
|
2013-08-15 23:36:17 +12:00 |
|
Matthew Parlane
|
e1f8146d96
|
Use explicit output dir for PolarSSL
|
2013-08-15 21:53:52 +12:00 |
|
Matthew Parlane
|
b93d62dcb8
|
Remove LTCG and platform toolset, fix code style.
|
2013-08-15 21:43:43 +12:00 |
|
Matthew Parlane
|
fede38985e
|
Replace OpenSSL with PolarSSL
Works on windows, not yet cmake.
|
2013-08-15 20:47:47 +12:00 |
|
Rachel Bryk
|
bff2bc1288
|
Clear patches on shutdown.
Fixes issue 6434.
|
2013-07-25 16:43:00 -04:00 |
|
Ryan Houdek
|
4deea2bcae
|
Revert "[Android] Use equals to compare GL version string instead of contains. This should really be some sort of sscanf check so we can check if version > 3.0 but we'll worry about that when OpenGL ES 4.0 is released."
This reverts commit bc58e7f42f .
|
2013-07-25 19:35:01 +00:00 |
|
Ryan Houdek
|
bc58e7f42f
|
[Android] Use equals to compare GL version string instead of contains. This should really be some sort of sscanf check so we can check if version > 3.0 but we'll worry about that when OpenGL ES 4.0 is released.
|
2013-07-25 18:45:40 +00:00 |
|
Ryan Houdek
|
3e697b363e
|
Fix an issue where TextureConverter.cpp was creating a renderbuffer with the wrong format. Also a few minor shader issues where they were using integers in place of floats.
|
2013-07-25 18:39:00 +00:00 |
|
Ryan Houdek
|
e0a5f7842e
|
Fix Mali-T604 shader compilation
|
2013-07-25 16:13:33 +00:00 |
|
Ryan Houdek
|
672871b3be
|
Add in the Mali driver bug so we can call glFlush every flush. It seemingly is quicker calling flush every time instead of every n times.
|
2013-07-25 05:44:20 +00:00 |
|
Rachel Bryk
|
7a6eeb5fbd
|
Merge branch 'multi-tas-input'
|
2013-07-23 20:44:21 -04:00 |
|
Rachel Bryk
|
3f03588dec
|
Tas input works with bongos too.
|
2013-07-23 20:43:51 -04:00 |
|
Braden
|
ec148008d0
|
Clean up code for multiple GameCube Controllers
Conflicts:
Source/Core/DolphinWX/Src/Frame.cpp
Source/Core/DolphinWX/Src/FrameTools.cpp
|
2013-07-23 20:35:33 -04:00 |
|
Braden
|
59d6df7046
|
Adds Support for multiple GameCube Controllers
Conflicts:
Source/Core/DolphinWX/Src/Frame.cpp
|
2013-07-23 20:22:08 -04:00 |
|
Rachel Bryk
|
8a4b6f3d73
|
Forgot this from the last commit.
|
2013-07-23 19:55:17 -04:00 |
|
Rachel Bryk
|
9fdc7360cd
|
Fix L and R triggers with tas input.
Partially copied from revision 1be844406c , but allows < fully pressed, and without the typo.
|
2013-07-23 19:44:43 -04:00 |
|
Jasper St. Pierre
|
09338c673c
|
FrameTools: Use the correct window handle for resizing the window
We want to resize the OpenGL window, not the frame window.
|
2013-07-23 15:02:00 -04:00 |
|
degasus
|
0ba6d12e9d
|
fix a small uid awsome bug
|
2013-07-23 02:13:40 +02:00 |
|
NeoBrainX
|
9795d10dcb
|
OGL/SamplerCache: Treat lod_bias as a signed integer.
|
2013-07-22 18:24:56 +00:00 |
|
degasus
|
c6ae08fc39
|
implement emulate efb format changes on ogl backend
|
2013-07-22 15:41:10 +02:00 |
|
Jasper St. Pierre
|
a963c621dc
|
NetPlay: Sync across whether to save memcards or not
There's no reason this shouldn't be synced other than laziness.
|
2013-07-22 07:29:15 -04:00 |
|
Jasper St. Pierre
|
6d463d1b67
|
NetPlay: Allow building a server without a game
This isn't hooked up in the UI yet, but it will allow us to
basically start the server and chat system without choosing
a game.
|
2013-07-22 07:29:15 -04:00 |
|
Jasper St. Pierre
|
2631ec3cff
|
Core: Remove an unused var
|
2013-07-22 07:29:15 -04:00 |
|
degasus
|
15b8ac64ef
|
Implement zcomploc on OpenGL4.2+
|
2013-07-22 12:02:16 +02:00 |
|
Jasper St. Pierre
|
f693488c8a
|
InputConfigDiag: Save the configuration when pressing "OK"
This fixes a common UI complaint of the control dialog UI.
Also, don't close the dialog if we have an error with the expression.
|
2013-07-22 03:19:38 -04:00 |
|
Jasper St. Pierre
|
bc17798ef2
|
InputConfigDiag: Add a simple error status label
This tells you what you did wrong at a high level if you messed up.
|
2013-07-22 03:19:22 -04:00 |
|
Jasper St. Pierre
|
3c7f223aa1
|
Add "Q" / "E" as freelook keybindings
To move the view up and down.
|
2013-07-22 00:14:42 -04:00 |
|
Jasper St. Pierre
|
52482115e1
|
Move in-game keybinding handling to a central location
Instead of handling it separately in every backend.
|
2013-07-21 23:17:16 -04:00 |
|
Rachel Bryk
|
e742b32c65
|
Drag and drop.
|
2013-07-21 22:25:26 -04:00 |
|
Jasper St. Pierre
|
4981b7cdd3
|
VertexShaderManager: Make ProjectionHack private
There's no reason to make this public, and it prevents a build
issue with the next commit.
|
2013-07-21 17:56:20 -04:00 |
|
Jasper St. Pierre
|
3b29320113
|
wx: Prevent warnings when compiling with recent versions of g++
g++ tends to think this is a string literal instead of concatenation.
|
2013-07-21 17:56:20 -04:00 |
|
Rachel Bryk
|
481c081db3
|
Merge branch 'possibly-useful-netplay-changes'
|
2013-07-21 13:33:14 -04:00 |
|
Ryan Houdek
|
82f7b20b91
|
There. Fix all the issues where we are using integers when we should be using floats in the texture conversion shaders.
|
2013-07-21 12:00:20 +00:00 |
|
Ryan Houdek
|
83a79c28ca
|
Continuation of the previous commit. I missed a integer.
|
2013-07-21 11:27:26 +00:00 |
|
Ryan Houdek
|
6194234a54
|
Fix a issue in the texture conversion shaders that was multiplying an integer with a float.
|
2013-07-21 11:17:21 +00:00 |
|
Jasper St. Pierre
|
fec641d14a
|
X11: Don't do a round-trip to the server to figure out our size on configure
Simply use the values from the event structure.
|
2013-07-21 01:59:40 -04:00 |
|
Jasper St. Pierre
|
01ff85506d
|
X11: Don't use a client event as a wrapper for XMoveResizeWindow
Simply configure the window from here
|
2013-07-21 01:59:40 -04:00 |
|
Jasper St. Pierre
|
ca97b10dda
|
Actually link to XI2
No idea how this was working before
|
2013-07-21 01:59:40 -04:00 |
|
Jasper St. Pierre
|
bd7ca7625b
|
Fix up last commit
I forgot to git add this change.
|
2013-07-21 00:51:07 -04:00 |
|
Jasper St. Pierre
|
3239e4946f
|
Use pkg-config to check for XInput2
|
2013-07-21 00:45:03 -04:00 |
|
Max Eliaser
|
fe2fe8b6cc
|
Clean up all the GetName methods for XInput2 controls.
|
2013-07-20 13:58:02 -08:00 |
|
Max Eliaser
|
9fbc5ff27c
|
Add X11 XInput2 input plugin, including MPX and with support for axis controls.
Based on the original XLib plugin, and thus shares some of its warts.
|
2013-07-20 13:58:02 -08:00 |
|
Rachel Bryk
|
41fe2e1466
|
Don't sync dual core setting in netplay.
|
2013-07-20 13:20:14 -04:00 |
|
Rachel Bryk
|
96219df4fd
|
Allow non-SIDEVICE_GC_CONTROLLER controllers in netplay again.
|
2013-07-19 22:58:33 -04:00 |
|
Rachel Bryk
|
e4767aec55
|
Sync some important settings with server during netplay.
|
2013-07-19 18:48:27 -04:00 |
|
Rachel Bryk
|
919e54c695
|
Automatically connect the appropriate controllers for netplay.
|
2013-07-19 15:53:20 -04:00 |
|
Rachel Bryk
|
0e1efd7d38
|
Poll the controllers with the same timing as movies for netplay. Might help prevent desyncs.
|
2013-07-19 15:01:04 -04:00 |
|