ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,919 Commits 6 Branches 12 Tags 1.3 GiB
Commit Graph

90 Commits

Author SHA1 Message Date
lioncash d244bca1f5 Fix a bunch of random typos in comments and logging. 
Also update the comment headers for two functions in GCMemcard.cpp.
 2013-04-19 09:21:45 -04:00
NeoBrainX 5b2d9a7d9f Rename the "Disable Dest. Alpha Pass" option to "Disable Destination Alpha" (GUI-only). 2013-04-07 21:41:25 +00:00
Grant Paul 39965e894d Add native fullscreen support for OS X. 2013-04-03 21:20:43 -07:00
Glenn Rice 6371a6f15d Fix some more strings for translation, and update the catalog. 2013-04-02 17:44:27 -05:00
NeoBrainX 6e88ae9695 Recommend Direct3D 11 or OpenGL instead of Direct3D 9. 2013-03-28 23:34:14 +01:00
Rachel Bryk 81e261eb68 Fix description of disable fog, and move it to enhancements tab. 2013-03-24 15:47:18 -04:00
NeoBrainX bb3ce1f8d3 Mark the Direct3D9 backend deprecated. 2013-03-23 23:53:19 +01:00
degasus a1c5e90083 Merge branch 'master' into GLSL-master 
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/CMakeLists.txt
	Source/Core/DolphinWX/Src/GLInterface.h
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/main.cpp
 2013-03-06 15:59:29 +01:00
Jordan Woyak bdc96342ba More string conversion cleanup. 2013-03-03 18:40:50 -06:00
Jordan Woyak 03ec9a2e08 Kill some unnecessary c_str and use StrToWxStr in a few places that I missed. 2013-02-28 02:40:03 -06:00
Jordan Woyak 56f09d3b91 Attempt to be consistent with conversions between std::string and wxString. 2013-02-28 02:30:05 -06:00
degasus bed29f843f fix spelling 2013-02-21 18:29:17 +01:00
degasus 40e17b4cb8 add option for hacked upload and disable it by default 2013-02-21 18:18:44 +01:00
degasus e0ffdda26e Merge branch 'immediate-removal' into GLSL-master 
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging
 2013-01-24 16:58:28 +01:00
Jordan Woyak d05d10d2a1 Improve "Enable Hotkeys" description. 
Fixes issue 4607.
 2013-01-17 19:54:29 -06:00
Jordan Woyak ba1a31248b Fix typo. 2013-01-17 19:42:56 -06:00
Jordan Woyak 2180c93347 Mention middle mouse button in "Free Look" description. 
Fixes issue 5581.
 2013-01-17 19:38:01 -06:00
Jordan Woyak 70427b3f35 Replace all of Connect/Disconnect with Bind/Unbind. 2013-01-13 12:45:33 -06:00
Jordan Woyak 5dbc3b3219 replace this->Bind with Bind 2013-01-13 03:33:11 -06:00
Jordan Woyak eca93c4c19 Eliminate nearly all the _connect_macro_ ugliness by using wxw's newish Bind functions. 
Unlike Connect, Bind is quite type-safe.
I also seem to have fixed some errors in the input config dialog.
 2013-01-13 03:06:56 -06:00
degasus bff02b3b73 Merge branch 'arb_framebuffer' into GLSL-master 
Conflicts:
	Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
 2013-01-09 11:00:26 +01:00
NeoBrainX b06f30f845 Remove the per pixel depth option. 
Depth calculations are always done in the pixel shader now.

Due to the unpredictability of our zcomploc hacks this commit probably changes the behavior of some games which use zcomploc.
 2013-01-08 18:16:48 +01:00
Rachel Bryk 91023e133b Move widescreen hack to enhancements tab. 2013-01-02 01:21:20 -05:00
Ryan Houdek 53398ca5d8 Remove GLSL option from video options 2012-12-24 12:22:02 -06:00
Matthew Parlane eedca57270 Revert "support retina display" 
This reverts commit 3aa9901618.
 2012-12-24 08:01:44 +13:00
Grant Paul 3aa9901618 support retina display 2012-12-23 21:33:52 +13:00
Shawn Hoffman 31a8424bcc fix formatting uglies introduced in glsl-master branch 2012-10-09 23:54:17 -05:00
Ryan Houdek 7aad45658e Add a GUI option to use GLSL shaders. Also fix a small typo. 2012-10-09 23:42:39 -05:00
Pierre Bourdon 8cefcaa94c Implement a simple benchmarking mode which logs FPS to a file 
Very useful to compare performance between two builds, check the impact of
a configuration option, etc. FPS log is stored in User/Logs/fps.txt and is
reset each time you launch a game. Only enabled if you check the "Log FPS
to file" option in your graphics settings.

Could be improved a bit: currently logs only every 1s (so you can't really
see small variations), maybe output more infos to the fps.txt like
average/stddev (but Excel/Libreoffice/Google Docs can compute that easily
too).
 2012-10-04 05:41:02 +02:00
NeoBrainX 8d30ac462a Instead of invalidating texcache whenever the graphics configuration dialog gets opened, clean up textures on configuration changes. 2012-06-20 18:18:05 +02:00
NeoBrainX 227580d1a5 Remove "Disable Textures". 2012-06-11 23:35:46 +02:00
NeoBrainX 1dd6b978c1 Remove "Disable Lighting". 2012-06-11 23:30:20 +02:00
NeoBrainX b5ad382b07 Fast mipmaps deserves to die!! 2012-06-08 00:22:57 +02:00
skidau 5d9ac22d58 Added a "Keep window on top" option in the graphics options. 2012-04-08 10:29:49 +10:00
NeoBrainX 460610ea0e Revert Rodolfo's recent zcomploc commits until they actually work correctly. 
This reverts commit 402006a83a.
This reverts commit 48d8d71391.
This reverts commit 450dcc9d2c.
 2012-03-30 01:57:53 +02:00
rodolfoosvaldobogado 402006a83a more fixes to zcomplock and opengl implementation 2012-03-29 18:26:58 -03:00
rodolfoosvaldobogado 450dcc9d2c As requested, this is my implementation of zcomploc using a multi-pass algorithm. My apologize to the others devs for committing in the main branch but is the only way to get this tested as soon as possible. 
please test for regressions, speed and for other issues fixed, as a example, the black color in water splash in super mario galaxy are fixed with this rev.
please as soon as yo find a bug let me know.
 2012-03-27 15:44:58 -03:00
parlane bea635d1d5 Fixes issue 5214 for real! 2012-02-15 20:56:50 +00:00
NeoBrainX 5239ba88c9 TextureCache: Remove unsafe texture cache 2012-01-31 18:09:35 +01:00
NeoBrainX 0655ee571d Shader compilation error message modified to contain some helpful information for noobs (includes a reference to the full bad shader dump). 
Removed the "Hide Shader Errors" option; hide shader errors if panic handlers are disabled now.
Removed superfluous error messages about shader compilations; display only one error message instead.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7688 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-07-29 22:18:11 +00:00
Marko Pusljar cac36b8161 added 1.5x, 2.5x, 4x internal resolution 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7669 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-07-05 01:11:03 +00:00
Glenn Rice b705b92075 On linux don't check to see if the xdg-screensaver program is present at build time. Just build in the code to call the program. If the program does not exist it will silently fail, and the screensaver will not be inhibited. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7606 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-06-17 13:14:55 +00:00
Glenn Rice 0e6bb4de35 Fix a couple of strings for translation. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7584 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-06-04 04:34:44 +00:00
j4ck.fr0st 69718855b3 Fix the OSX Build, since noone else seems to care... 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7582 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-06-03 14:44:17 +00:00
Glenn Rice bad9fd1f1d Linux build fix. Also take care of a few compiler warnings that have developed. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7578 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-06-02 23:28:47 +00:00
NeoBrainX 837375a13d Last major UI change before release. 
- Moved display related options in the "Display" tab from the general config to the gfx config, renamed the tab to "Interface"
- Moved Wiimote related options in the "Wii" tab from the general config to the wiimote config
- Moved various other options to more appropriate places ("Set Console as NTSC-J", "Skip GC BIOS"
- Dropped "Window Size" adjustment
- Now displaying a warning if one tries to enable software rendering
- Other minor changes

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7577 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-06-02 19:32:34 +00:00
Glenn Rice 139a518e99 Fix a minor translation issue in the video config dialog. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7554 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-05-23 03:20:42 +00:00
DimitriPilot3 8c304d912a To me, the Free Look option wasn't really broken; for quite a long time, it simply required the SHIFT key to be held before pressing any of the WASD/R/0/9 keys. 
So, clarify this by rewriting the "tooltip" for the Free Look option.  This should close issue 2882 and its duplicates.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7546 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-05-15 17:36:22 +00:00
NeoBrainX b56417113d Fix OS X build (hopefully). 
Fix a small UI inconsistency.
Fix a warning about shadowed variables.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7501 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-05-01 13:41:06 +00:00
NeoBrainX b729fc8748 Video configuration dialog stuff: 
- Introduced a description text field (!!)
- Fixed ALL setting descriptions
- Various other string changes
- Removed the projection statistics setting

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7488 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-04-29 23:11:18 +00:00