f498686289
Merge branch 'VBeam-fix'
...
* VBeam-fix:
Renamed the VBeam variable for clarity.
Fixed VBeam emulation in interlaced mode, removing the hacks in the audio timing. Fixed VBeam emulation in progressive scan mode. Retained the old VBeam speed hack. This option has now been switched so that the accurate behaviour is on by default and the speed hack (inaccurate behaviour) is enabled when the option is checked.
2013-04-16 21:21:40 +10:00
71828e02f7
Renamed the VBeam variable for clarity.
2013-04-16 21:18:53 +10:00
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
61c11284ea
Fixed VBeam emulation in interlaced mode, removing the hacks in the audio timing.
...
Fixed VBeam emulation in progressive scan mode.
Retained the old VBeam speed hack. This option has now been switched so that the accurate behaviour is on by default and the speed hack (inaccurate behaviour) is enabled when the option is checked.
2013-04-15 20:23:25 +10: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
8a9fcd3014
Kill off dangling else's in the InputCommon project.
...
Some indentations were also too far for some things. Fixed this.
Also update the license header to show Git instead of SVN.
Got rid of some trailing spaces/tabs too.
2013-04-14 22:53:10 -04:00
37b67971e7
Merge remote-tracking branch 'origin/master' into Android-trash
...
Conflicts:
Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
2013-04-14 20:43:42 -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
b91930a2d4
Really minor LogInfo consistency fix in ActionReplay.cpp.
...
All the other [bit size] Write LogInfo calls had a hyphen in the text.
2013-04-14 00:17:22 -04:00
605bbf5ca8
Merge remote-tracking branch 'origin/master' into Android-trash
2013-04-13 00:58:37 -05:00
48927c17d2
Good job Windows. Stop choosing the same names as I do.
2013-04-13 00:54:11 -05:00
39a7096711
Extend our OSD class to support callbacks on init, onframe, and shutdown.
2013-04-13 00:48:53 -05:00
ccf1cee203
Implement a few more store instructions on ARM
2013-04-13 05:02:27 +00:00
62adcaf552
Fix fastmem on ARM
2013-04-12 20:19:42 +00:00
6d9c0c8863
Merge in latest changes to ArmEmitter from the PPSSPP crew. Should fix the dumb random crashes I had from IOS icache clearing not initializing a value.
2013-04-12 11:59:19 -05:00
2c722bb04f
GOOGLE CODE, STOP BEING CRAP please :(
2013-04-12 02:46:30 +00:00
71a1ae3a16
Make debug builds use unicode, not multibyte.
2013-04-12 02:44:48 +00:00
ef4d59a21e
Refactored the SystemTimers to allow for per-UCode timing. Fixes issue 6237.
2013-04-12 12:08:05 +10:00
7e630ba920
Merge branch 'primitive_restart'
2013-04-11 14:01:58 +02: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
154c533e76
VertexShaderGen: Fix a small GLSL regression in emboss mapping.
2013-04-10 11:44:49 +00:00
1aa10b579a
fix triangle_fan size calculation
...
wasn't updated for the new primitive restart implementation
2013-04-10 12:45:44 +02:00
a6412f7bd4
render a triangle for a 3 vertice quad
...
fix issue 6214
2013-04-10 12:36:59 +02: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
385d8e2b15
ChunkFile has allowed me to accidentally "Do" a non-POD for the last time!
2013-04-09 19:02:22 -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
018282c2b9
Track the real wiimote rumble state to drop outgoing rumble reports with no effect.
...
This eliminates constant streams of reports in various games that constantly send audio reports. (Just Dance 2, DKCR, etc.)
(Speaker data reports are converted to rumble reports when speaker data is disabled.)
2013-04-08 18:50:42 -05:00
b0108631f6
use templates for primitive restart
2013-04-08 19:39:43 +02:00
4dca133745
small cleanups
2013-04-08 17:58:23 +02:00
80b56ddd17
convert triangle_fan to triangle_strip
2013-04-08 17:22:16 +02:00
702198f39b
Merge branch 'master' into primitive_restart
...
Conflicts:
Source/Core/VideoCommon/Src/VideoConfig.h
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
2013-04-08 15:57:51 +02:00
4c40e70b8a
ogl: support glsl120
2013-04-08 14:50:58 +02:00
deece78e19
Seriously, someone kill me.
2013-04-08 03:11:45 -04:00
48f3e962d6
Kill me now.
...
Fixes issue 6227.
2013-04-08 03:05:12 -04: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
195336021f
Fix a few typos in the comments/logging in VideoDX9, VideoCommon, and VideoSoftware projects.
...
See Render.cpp, PixelShaderGen.cpp, and PixelShaderManager.cpp for most of the changes.
See VertexShaderManager.cpp for a logging typo fix.
See SWRenderer.cpp for a small typo fix for a message that gets swprintf'd in DrawDebugText.
See SWVertexLoader.cpp for a typo fix of an assert message.
Should slightly improve the readability of some of those files.
2013-04-07 17:11:29 -04:00
42e97e462c
Look for wiimotes when "Continuous Scanning" is enabled even if a device using the MS stack is not found.
...
Fixed issue 6215.
2013-04-07 14:21:20 -05:00
0ca7ea6c3f
D3D11: Fix glitched polygon edges when MSAA is enabled (this time without breaking OpenGL)
2013-04-07 20:58:48 +02: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
b76c7cf4f3
Bumped up the LLE period to 12600 as it seemed to be a bit more stable.
2013-04-07 21:44:44 +10:00
52053f5d95
Forced an exception check after an interrupt is generated by the DSP. Changed the timing back to 3ms/5ms periods, fixing the slowdown and garbled AX audio.
...
Fixed Accurate VBeam emulation when DSP HLE audio is being used.
2013-04-07 16:27:46 +10:00
53368823cb
Merge branch 'real-wiimote-minor-fixes'
2013-04-06 16:57:55 -05:00
8a2109691a
Quick fix to get Zelda: Wind Waker booting again.
2013-04-07 07:18:28 +10:00
ecb4337209
Made the timing consistent between DSP HLE and DSP LLE. Fixes Lost Kingdoms II in DSP HLE mode.
2013-04-06 20:26:43 +11:00
skidau