ef85b9af45
Update the license file text (change SVN to Git) in all projects except Core since I was told a merge was happening soon. So for the sake of the merge going smoothly, I'll fix that when I remove the tab/space mismatches from the Core project.
...
Also, some tab/space mismatches removed from VideoOGL, and some places I missed in VideoDX[number] projects.
Now, the Core is literally the only project with tab/space mismatches (on a large scale).
2013-04-15 16:28:55 -04:00
7772f0d071
Merge branch 'Android-trash' since it is no longer quite so trashy.
2013-04-14 23:36:00 -05:00
44bbb54a62
Add a Androind ControllerInterface class for allowing input in a non-hacky way. Add a default GCPad.ini file so it actually works.
2013-04-14 23:02:53 -05:00
bde7ea00ef
Removes the Java ButtonManager for one in the C++ source so the OSD class can call in to it each frame for drawing the buttons. Copy our assets to the dolphin-emu directory for now. Remove NativeRenderer, ButtonManager, and Button Java classes since they aren't used anymore. Buttons A, B, and Start all work and are drawn on screen now. Button input on Android is still a bit hacky, needs a proper controller interface still. Android specific button drawing code is still hanging out in SWRenderer.cpp
2013-04-14 20:39:56 -05:00
605bbf5ca8
Merge remote-tracking branch 'origin/master' into Android-trash
2013-04-13 00:58:37 -05:00
3c87512180
ogl: fix single core crash
...
osx is missing, sorry but I'm too stupid for objective-c
2013-04-11 03:32:07 +02:00
6af14bd4ce
DolphinWX: Fail less at explaining what framelimit is doing.
2013-04-10 12:52:13 +00:00
b30c5b0048
NetPlay: Updated the "Alert" text. Removed the "?" button as it was useless. Sorted the game lists. Made wider the player list.
2013-04-09 22:04:55 -05:00
5c374b2718
Update iso file cache version.
2013-04-09 13:04:23 -05:00
98d35e590e
Fixed split WBFS file size display. (probably)
...
Fixed issue 6222.
2013-04-09 12:58:56 -05:00
3ed0a96367
Remove an extraneous comment indicator from DebuggerPanel.cpp in DolphinWX.
...
Was asked to remove it, so... yeah.
2013-04-08 01:47:51 -04:00
1db10b139c
Remove all tab/space mismatches from the DolphinWX project (at least 99%. I promise!)
...
Also fix up the dangling else's. Shit just looks incredibly ugly in terms of actual structure in the code.
I took the liberty of adding comments in FifoPlayerDlg.cpp, LogConfigWindow.cpp, LogWindow.cpp, and FrameAui.cpp to better explain some things.
If any comments are wrong, don't hesitate to complain.
2013-04-08 01:16:50 -04:00
5b2d9a7d9f
Rename the "Disable Dest. Alpha Pass" option to "Disable Destination Alpha" (GUI-only).
2013-04-07 21:41:25 +00:00
8ce0d43717
Allow enabling memory card writes for netplay clients, instead of just the server.
2013-04-07 13:04:44 -04:00
c7abf7e8d2
Allow disabling memory card writes in netplay.
...
Fixes issue 6217.
2013-04-07 12:18:07 -04:00
39965e894d
Add native fullscreen support for OS X.
2013-04-03 21:20:43 -07:00
3fdc46877a
Make the GUI show a translated "No audio output" sound backend string.
2013-04-03 09:22:39 -05:00
6371a6f15d
Fix some more strings for translation, and update the catalog.
2013-04-02 17:44:27 -05:00
eb06c62a6e
Merge branch 'new-ax-hle'
...
GC and Wii games using the AX UCode should now work almost perfectly with DSP
HLE. If you get any issue, make sure the "DSP on dedicated thread" option is
disabled, and try setting framelimit to "Audio".
As a side effect, DSP HLE should not desync anymore (making it usable in
netplay and TAS) with AX games.
Conflicts:
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp
2013-04-02 21:00:44 +02:00
d951c4c374
real buildfix
2013-04-02 13:07:51 -05:00
69779a4321
Fix loading of "themes" with non-ascii character names.
...
Fixed issue 6189.
Why did GetUserPath return a non-const ref to string..?
2013-04-01 23:22:20 -05:00
49d809ac0e
Merge branch 'osx-libcxx'
2013-04-01 18:17:49 +02:00
58159a1693
Some more logging typos and clarifications. Missed these in my last commit.
...
This commit mainly elaborates on some messages a little more. Also fixes some typos that slipped through the last commit.
A large change in text can be seen in EXI_DeviceMemoryCard.cpp. I added more info as to why a write to a memory card may fail. (This actually was a reason I was unable to write to a memcard recently).
Elaborations can be seen in WGL.cpp
I did change some comments in some files that I was correcting logging messages in, however this is only if I spot a typo or if an abbreviation is lower-cased. Even in that case, the amount of changes done to comments is very minimal.
2013-04-01 00:10:54 -04:00
f432d6038e
Fix some typos and correct some capitalizations in the log messages.
...
Makes the logging look more orderly and less spammy when spitting out things.
2013-03-31 19:13:30 -04:00
aabd8ce664
Add retina display support for Mac.
2013-03-31 11:36:42 -07:00
e3b0a2c9bf
Add an option to run the AX processing on the CPU thread. Fixes timing issues causing audio glitches on Wii, and should improve the overall stability of AX HLE.
2013-03-30 14:02:30 +01:00
485bd70df2
Fix some strings for translation and update the pot file to include
...
those strings once again.
2013-03-29 11:05:22 -05:00
4895e38bd5
This change might work better if I git add the files
2013-03-29 07:31:15 -07:00
6e88ae9695
Recommend Direct3D 11 or OpenGL instead of Direct3D 9.
2013-03-28 23:34:14 +01:00
2444fdbbdd
I missed some files required for our GLInterface.
2013-03-27 21:18:07 -05:00
507f53e226
Fixed issue 6119.
2013-03-27 14:26:45 -05:00
6fe5f5a6ba
[DolphinWX] Remove a duplicate conditional in Frame.cpp
2013-03-27 15:09:04 -04:00
7034c79ab9
Big commit. Fix running the APK, I had missed a view in the manifest. Clean up the Android EGL context creation to fit more in line with how Dolphin works. This breaks input at the moment as well. Change the memarena from 768MB to 64MB to allow 1GB phones to potentially run it. Rename EGL_X11 back to EGL since this merge brings in some of soreau's changes to more easily allow different platforms like Wayland and Android. Not quite all of the code because some needs to be cleaned up still.
2013-03-24 21:06:34 -05:00
81e261eb68
Fix description of disable fog, and move it to enhancements tab.
2013-03-24 15:47:18 -04:00
bb3ce1f8d3
Mark the Direct3D9 backend deprecated.
2013-03-23 23:53:19 +01:00
d11679a06e
Android mega commit of trash.
2013-03-19 21:53:09 -05:00
befe6e6962
Short,sweet and fixes issue 5725
2013-03-18 21:40:46 -05:00
c5033e8594
Hide cursor in fullscreen mode on OSX fixes issue 3956
2013-03-18 17:45:08 -05:00
a2af6494cf
Clean up CInterfaceAGL, make sure the screen gets cleared on stop, and remove the FPS update that messes up GUI builds since GUIless doesn't build anyways.
2013-03-18 17:15:59 -05:00
ae3c5a64cc
Fix full screen on OSX, well as fixed as its ever been. Apperently in render to main it always shown the FPS on the bottom in full screen.
2013-03-17 20:58:43 -05:00
e1a081ad2d
Merge branch 'GLSL-master'
...
Merge an endless story. The branch name is a lie, it was started as glsl, but now it is a complete reworked opengl3 backend.
It just began with simple changes which aren't supported on osx.
They either support ogl2 OR ogl3 core, but mixing isn't allowed.
As the branch name says, the vicious circle starts with GLSL, but just implementing one wasn't possible either:
- OSX supports only GLSL100 which doesn't support our shaders.
- Vertex Array Objects are needed for ogl3, but not supported on ogl2
- immediate mode isn't supported any more, so we must implement vertex buffers
- uniform buffers are recommended as else we would need tons glUniform
- postprocessing shaders have to be converted to glsl
- lots of smaller outdated issues and bug fixes :-)
Thanks at all for testing and at Sonic for converting all of our shaders to glsl130
And sorry for all upcoming bugs...
2013-03-15 22:49:26 +01:00
8767b30f75
My OCD will not stand for this.
2013-03-15 15:42:59 -04:00
8c1091a21f
Merge branch 'master' into GLSL-master
...
Conflicts:
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
2013-03-15 11:19:52 -05:00
d63d7fde9e
So much more readable now!
2013-03-15 11:45:43 -04:00
def578fea6
Fix checks for preventing the main and render windows from spawning off screen.
2013-03-15 09:19:39 -04:00
afb6f9127a
Corrected a typo.
2013-03-15 19:32:47 +11:00
84119a966b
Revert "remove wx from agl"
...
This reverts commit e63a5d8529
2013-03-15 02:40:08 +01:00
d6c7e7d652
Let's do this version check again.
2013-03-14 15:46:27 -05:00
db1fc9019b
Add a OSX version check to GLSL so if anyone running < OSX 10.7 gets a message instead of crashing when running the game. Turn off DEBUG_GLSL.
2013-03-14 15:25:41 -05:00
eaebebc33d
Prevent the render window from spawning off screen.
...
Fixes issue 6063.
2013-03-14 05:28:02 -04:00
lioncash