emu-mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-12-30 22:01:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,794 Commits 5 Branches 11 Tags 1.3 GiB
44066326ff
Commit Graph

58 Commits

Author SHA1 Message Date
Matthew Parlane
b6e054a2be Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/Core/Core/Src/CoreParameter.cpp
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
 2013-08-23 00:51:12 +12:00
Matthew Parlane
59e060aba2 Missed some VS build options. 2013-08-16 21:42:31 +12:00
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
d6ec6ae97a Fix polarssl on Windows. 2013-08-16 00:24:10 +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
f58edd018c Remove a couple files which have apperently never been used for anything. 2013-08-02 20:46:07 -04:00
John Chadwick
16cd26d177 Add UPnP support. 
Feedback is in logs as suggested by skid_au. The checkbox is still there, but
mostly for people who would like to opt out (unfortunately, I can not be sure
how this feature may behave for some routers - there's a hell of a lot of bad
UPnP implementations.)

The Visual Studio stuff is a little messy, so I apologize if anything is a bit
off. I tested most configurations and it worked.

I also tested CMake on Debian Wheezy, Ubuntu Saucy, and Mac OS X Mountain Lion.
All seemed to be OK.
 2013-07-09 18:08:43 -04:00
degasus
1b8d044543 clear cg from project files 2013-02-27 10:55:25 +01:00
degasus
fed574d08b solve merge conflict 2013-02-18 18:55:42 +01:00
degasus
a629dea4dc Merge branch 'master' into GLSL-master 
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Src/GLInterface/WX.cpp
	Source/Core/DolphinWX/Src/GLInterface/WX.h
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.h
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
	Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp

damn mipmap_fixes ...
 2013-02-18 18:49:20 +01:00
skidau
03d9cca2fe Added a script to copy the OpenAL dll's to the main Dolphin folder on new builds. 2013-02-03 19:02:46 +11:00
degasus
d7f43c7a68 remove cg from windows project files 2012-12-28 01:08:29 +01:00
Ryan Houdek
67c1c6b062 Merge branch 'GLES-software' 2012-12-26 12:54:58 -06:00
Ryan Houdek
c43a0dac2e Add to more than 32bit debug 2012-12-26 00:25:49 -06:00
Ryan Houdek
fa9abfdc42 Add a include directory 2012-12-26 00:22:17 -06:00
Ryan Houdek
a35c5a7f22 Add a include directory 2012-12-26 00:20:09 -06:00
Ryan Houdek
e9099459bb Maybe fix Windows compiling. 2012-12-25 22:52:30 -06:00
Ryan Houdek
f2004b2474 Blindly add WGL.cpp file to the Windows project file. Just for Neo 2012-12-17 16:19:55 -06:00
Glenn Rice
832a5a0b26 Add the resource include in only one place for all builds. 2012-12-16 23:39:05 -06:00
Glenn Rice
d34fb84734 Add the resource inclusion to the other builds. 2012-12-16 23:21:11 -06:00
Glenn Rice
a581c75a37 Make the resource include path relative. 2012-12-16 22:52:29 -06:00
Glenn Rice
d1a812231e Rework the way that windows mouse cursor hiding is done to use the built 
in wxWidgets methods.
 2012-12-16 21:32:14 -06:00
Shawn Hoffman
c5d746f3d8 remove scons files from VS projects 2012-03-18 06:41:12 -07:00
Shawn Hoffman
d9a7510937 forgot to add wxwidgets3 vcxproj to git, since it was masked by gitignore... 
fix up misc warnings and build errors
 2012-03-18 03:30:03 -07:00
Shawn Hoffman
c3d13b048c build against wxWidgets3 from Externals on Windows. 
use Externals version of libpng on Windows.
 2012-03-18 02:31:19 -07:00
Shawn Hoffman
46afefb14f Merge branch 'master' into gc-mic 2011-10-16 02:22:21 -07:00
Shawn Hoffman
ade9485aac ok...just need to update the button... 2011-10-09 01:11:48 -07:00
LPFaint99
5316c6d97b Move GCMemcard from DolphinWX/Memorycards to Core/HW 2011-10-04 13:14:18 -07:00
Shawn Hoffman
95517a9741 vs2010: Disable LTCG for realz 2011-09-05 09:43:23 -07:00
baby.lueshi
d8fc690838 New "TAS Input" feature for precise joystick inputs. The feature is still a work in progress, but is functional. Currently overwrites any joystick/keyboard analog inputs and does so for all controllers. 
Renamed OnFrame.cpp/h to a more accurate Movie.cpp/h. Made some small changes that may improve movie synchronization.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7620 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-06-24 06:50:50 +00:00
gnick79
beb6094708 - Removed RTTI support 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7419 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-28 11:34:27 +00:00
gnick79
975ce523b6 * fix crash for x64 and debug build 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7417 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-27 23:05:18 +00:00
gnick79
312c684fdc VideoConfig GUI: 
+ Added "Reset To Default" functionality for per-game profiles.
- Solved a window centering problem that occured during switching between Default Profile and a Per-game Profile.
+ Added final & complete support to reflect changes on the fly and real-time in all cases (even when you edit Default profile).


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7416 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-27 22:23:44 +00:00
donkopunchstania
07c4da6084 Add graphics FIFO recorder and player for debugging the graphics system. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7414 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-27 02:55:08 +00:00
skidau
3db702fe17 Removed the OpenMP option from the DolphinWX project. It was causing a slowdown when the EFB to texture option was activated. This means that the OpenMP texture decoder option will not be hidden for non-OpenMP builds. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7378 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-19 10:05:57 +00:00
skidau
8b2eddf3f3 Enabled OpenMP support in the Windows 32bit builds. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7377 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-19 04:06:46 +00:00
skidau
50c5dbdb09 Added a toggle switch for the OpenMP texture decoder in the graphics settings. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7375 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-19 01:55:57 +00:00
sl1nk3.s
571013acd8 Fix the video software backend. (closes issue 4269) 
Some warning fixes and cleanup.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7361 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-16 22:48:17 +00:00
Shawn Hoffman
6e4923399e revert r7212 (express users must modify a single line, instead) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7220 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-21 15:17:41 +00:00
Glenn Rice
3b6f7644fd Make log options an AUI window instead of a dialog. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7217 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-21 15:01:00 +00:00
Shawn Hoffman
62cb8ebe46 Force dolphin to use the windows7.1sdk (the windows7.1sdk installer is silly and refuses to recognize that vs2010 exists). 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7212 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-20 18:08:20 +00:00
Glenn Rice
c2bc463fe7 Move the log window options from the log window into a separate dialog openned from an item in the options menu. This gives the log window room to show logs. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7191 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-18 12:34:24 +00:00
Glenn Rice
a8992b7960 Move debugger ui files into a subdirectory. Primarily to make it easy to keep debugger strings out of translations, but also because it is more organized. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7163 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-13 06:06:32 +00:00
NeoBrainX
bc6f04adae Move BootManager.cpp to Core since it really doesn't do any wx-specific stuff. 
This one is for NaturalViolence, since he was so eager to see it :P

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7152 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-12 21:25:49 +00:00
Jordan Woyak
efd22d234f Merge UI related projects into the main DolphinWX project. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7136 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-11 21:37:52 +00:00
NeoBrainX
42908c5b2e Remove any wx-specific code from Core. 
Move NetPlay code from DolphinWX to Core.
Even NetPlay with nowx should be possible now if anyone felt like implementing a CLI for it ;)


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7119 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-08 15:36:15 +00:00
Shawn Hoffman
a34b81cc01 vs2010: 
buildfix
move much of the build settings to .props files
-please use them as much as possible in the future, instead of changing individual projects
NOTE: to avoid left over blobs, clean your builds *before* applying these changes.
TODO: add DebugFast target for projects that are lacking it. Lack of DebugFast targets cause the linker to use LTCG when we don't want it.
please test for regressions which could be caused by being too happy with compiler flags :)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7109 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-08 04:03:48 +00:00
Jordan Woyak
dfe84ce0ac Removed the Lua script console and Externals/Lua. The script console was incomplete and no one was working on it. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7051 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-03 20:41:23 +00:00
Glenn Rice
8b309e26dc Remove PluginSpecs.h. Merge the few needed enums from that file into Common.h for now. I am up for suggestions on a better place for those. 
Fix frame dumping on linux.
Make sure that on screen messages get cleared between games.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7039 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-02 04:40:27 +00:00
Shawn Hoffman
af9ef060c0 vs2010: Enable LTCG only for release builds. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7032 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-01 04:45:29 +00:00