c303669dd0
Clean up some messy code issues that have been annoying me.
2012-12-28 09:58:06 -06:00
48ede4dd30
switch to glsl 130, more than OpenGL 3.1 isn't needed
2012-12-28 16:05:14 +01:00
70c63ce6cf
fix dual pass alpha
2012-12-28 14:24:12 +01:00
82b33471ae
cleanup rasterfont
2012-12-28 11:46:00 +01:00
af2820ac88
Don't show multiple exit confirmation dialogues.
...
Pause emulation while waiting for confirmation to exit.
Fixes issue 5822.
2012-12-28 03:39:34 -05:00
225d29f3f6
Fix this annoying warning in ChunkFile.h
2012-12-27 23:43:59 -06:00
7d93834cd8
Bit more cleanup from removing Nvidia CG
2012-12-27 22:53:07 -06:00
95f6685900
Changed the HLE system to allow it to hook the beginning, the end or replace the entire function without changing the GC memory. Fixes Kirby's Return to Dreamland.
...
Added a way to categorise the type of HLE function. Currently, there are debug, floating point, memory and generic functions.
Added a HLE function for OSGetResetCode (Warm reset). Fixes the CSI games.
Added a switch to disable all of the HLE functions if the idle skipping option is disabled.
2012-12-28 14:26:46 +11:00
d7f43c7a68
remove cg from windows project files
2012-12-28 01:08:29 +01:00
193056493a
also use shaderCaches in rasterFont
2012-12-28 00:52:44 +01:00
2fd1c9e7c2
Allow setting cpu engine and whatever bHLE_BS2 is from game ini.
2012-12-27 09:42:20 -05:00
316a33d1e6
Merge branch 'master' into GLSL-master
...
Conflicts:
Source/Core/DolphinWX/Src/VideoConfigDiag.h
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2012-12-27 10:36:54 +01:00
94116bf89c
Always use the right user dir on windows.
2012-12-26 19:55:45 -05:00
db5f4c8c20
fix byte order in osd rasterfont
2012-12-26 23:48:33 +01:00
01cdcc83a3
Merge Fail: Make sure we are using the interface file to get backbuffer dimensions. GL helper function was duplicated.
2012-12-26 13:15:19 -06:00
67c1c6b062
Merge branch 'GLES-software'
2012-12-26 12:54:58 -06:00
5169804a61
Remove duplicated X11 code.
2012-12-26 12:12:26 -06:00
93f72d8463
Don't add superfluous whitespace to the CMake file
2012-12-26 11:07:33 -06:00
2d4c3c7c91
Beautify some tabs.
2012-12-26 10:33:45 -06:00
05730af724
Added some IOS version checks and code to clear memory before loading the dol.
2012-12-26 23:10:41 +11:00
0c845728cc
Added support for Reset (from menu). Fixes Sam & Max.
2012-12-26 23:10:40 +11:00
88e273fac1
Added an IOS check as games which use IOS older than IOS30 do not need to be HLE'd. Added some stubs for Reset to Menu and SSBB's load from disc partition. Fixed loading Fate of Atlantis from the Indiana Jones and the Staff of Kings game.
2012-12-26 23:06:43 +11:00
651cedaac4
Added argument detection and passing to the loaded dol. This fixes the Wii Sports+Wii Sports Resort bundle pack.
2012-12-26 23:06:43 +11:00
fbdf9ba153
Added preliminary support for ES_LAUNCH (Wii Multi-boot games) by using HLE to hijack the OSBootDol function.
...
Metroid Prime Trilogy is working. Wii Sports+Wii Sports Resort is not working. Any games which can be played using the dol replacement trick should work here.
Suspect that the DOL's are meant to receive an argument list which has not been catered for in this code. This probably also means that the Metroid Prime Trilogy games are locked in Veteran difficulty for the time-being.
2012-12-26 23:06:42 +11:00
e2489196e4
Got overzealous. We aren't removing CG quite yet with this branch.
2012-12-26 00:41:25 -06:00
9a58f9a3bb
Rename another function...
2012-12-26 00:34:09 -06:00
c43a0dac2e
Add to more than 32bit debug
2012-12-26 00:25:49 -06:00
fa9abfdc42
Add a include directory
2012-12-26 00:22:17 -06:00
a35c5a7f22
Add a include directory
2012-12-26 00:20:09 -06:00
f4e7a280a9
Remove cg.lib from some files for Windows and renaming a function.
2012-12-26 00:07:43 -06:00
e9099459bb
Maybe fix Windows compiling.
2012-12-25 22:52:30 -06:00
0de073edea
When using the "Keep window on top option" make sure that the effect of
...
that option ends when emulation ends when using render to main.
2012-12-25 21:12:51 -06:00
c884dbf654
Mistype in WX.cpp
2012-12-25 19:18:03 -06:00
01953ff64a
Rename the interface files and hopefully fix OSX building.
2012-12-25 19:08:24 -06:00
b3ed3bdb91
Define NvOptimusEnablement to tell the Nvidia driver we need high performance
2012-12-25 13:51:13 +01:00
ba348c29d7
Merge branch 'new-ax-hle'
...
Only AX GC is merged so far, the new Wii AX development will be done in a
separate branch when I'll start working on it.
There are still a few AX GC bugs remaining, but overall a lot less games have
sound issues than before.
Thanks to everyone who helped test the development builds of this branch and
reported results on the forum thread.
Conflicts:
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
2012-12-25 13:33:53 +01:00
4a74da3e87
Readd the old AXWii (rename the new version to NewAXWii) and set it as default
2012-12-25 13:30:55 +01:00
bff0faea2d
Merge branch 'immediate-removal'
...
Conflicts:
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
2012-12-25 12:39:00 +01:00
b3714f4874
Don't show compress iso option for wbfs and ciso files.
...
Fixes issue 5809.
2012-12-25 06:31:31 -05:00
399a6af66d
revert update the rasterfont shader to GLSL3.3 - OGL 2.0 should be enough
2012-12-25 12:22:02 +01:00
5ac1e908b1
Truly unstable.
2012-12-24 22:12:33 +01:00
9a9f567f28
... and back to unstable again
2012-12-24 21:29:24 +01:00
4798524b75
Dolphin 3.5 release.
2012-12-24 21:29:24 +01:00
e3e14af0dd
Revert "VertexShaderGen: Fix a shader compilation error.". I'm an idiot :p
...
This reverts commit 4d868705fd
2012-12-24 21:29:24 +01:00
2c58385fe2
Revert "Uninitialized usage.. or so it thought."
...
This reverts commit 7839676c87
2012-12-24 21:23:28 +01:00
02acafce52
Merge branch 'translations-update'
2012-12-24 14:09:43 -06:00
4d868705fd
VertexShaderGen: Fix a shader compilation error.
2012-12-24 19:50:16 +01:00
5a78351033
TextureCacheBase: Fix a potential bug when using custom textures.
2012-12-24 19:50:16 +01:00
249afa5eac
Change copyright year to 2013 in the about dialog.
2012-12-24 19:50:16 +01:00
2fedab3bad
OGL: Make OSD messages fade out properly instead of having them disappear spontaneously.
2012-12-24 19:50:16 +01:00
Glenn Rice