archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-22 20:31:50 +02:00
Code Issues Projects Releases Packages Wiki Activity
12474 commits 5 branches 11 tags 1.3 GiB
Commit graph

2415 commits

Author SHA1 Message Date
Pierre Bourdon
196953c50a Use the new Dolphin icon 2013-09-22 16:00:39 +02:00
Pierre Bourdon
91c0e02609 Don't require running Dolphin in the directory that contain Languages/ on Windows 2013-09-21 21:17:47 +02:00
Glenn Rice
d321aa7e7a Pull in translations from Transifex. 2013-09-21 11:24:33 -05:00
Scott Mansell
1fb373f439 Stop dolphin from loading help.png 
It was never used, just wasting time and resources.
This patch simply deletes two lines of code.
 2013-09-21 06:34:50 +02:00
Rachel Bryk
d2c3222fcc Fix copying Sys/Wii to User/Wii on startup. 
Fixes issue 6621.
 2013-09-21 00:34:19 -04:00
Pierre Bourdon
86f6e8cc1e Better fix for issue 6614: ISOProperties should store integer settings for PHack booleans. INIFile is stupid, please kill it with fire. 2013-09-18 12:33:57 +02:00
Pierre Bourdon
ec9c395f4f Add WBFS to the file extensions supported by Dolphin on OSX 2013-09-17 16:50:44 +02:00
Pierre Bourdon
e34d8aee1d Add * to the characters leading a verbatim line (used in Gecko codes comments) 2013-09-17 16:50:44 +02:00
Rachel Bryk
47ce3dd09d Really fix reading projection hacks from game inis. 2013-09-17 10:44:47 -04:00
Rachel Bryk
e3d01de01d Fix reading projection hack from game inis in ISOProperties. 2013-09-17 10:40:12 -04:00
Rachel Bryk
ec5cf60f5e Set L/R buttons in tas input, instead of just the analog triggers. 
Fixes issue 6613.
 2013-09-17 09:56:45 -04:00
LPFaint99
a7e1fb81b1 Merge branch 'wad_gamenames' 2013-09-15 21:38:31 -07:00
Rachel Bryk
b4c082f1b3 No, i don't check what i committed before pushing to master, one week before a release. 
Fixes a mistake from  550c855ae6.
 2013-09-14 22:58:32 -04:00
Rachel Bryk
550c855ae6 Create blank ini file before editing it, if it doesn't already exists. This prevents the editor from prompting to create it. 2013-09-14 20:30:42 -04:00
LPFaint99
5d202ae9ea proper fix for issue 6206 2013-09-14 15:09:58 -07:00
Pierre Bourdon
501eafb407 Overlay local gameinis over global gameinis instead of copying. 
Huge megacommit because a lot of things needed to be modified to make this
possible.
 2013-09-14 17:46:41 +02:00
Pierre Bourdon
aa202c2e21 Move global gameinis from User to Sys. Get rid of SHARED_USER. 2013-09-14 06:08:30 +02:00
Pierre Bourdon
86e765f3eb Move Themes/ from User to Sys. Only Gameinis remain. 2013-09-14 06:08:30 +02:00
Pierre Bourdon
91a758b342 Move TextureDecoder.cl from User to Sys 2013-09-14 06:08:30 +02:00
Pierre Bourdon
c3eec379df Move global User/Wii to Sys/Wii 2013-09-14 06:08:30 +02:00
Pierre Bourdon
e7213ca4b1 Overlay the user Shaders/ over the shared one to avoid copying files 2013-09-14 06:08:30 +02:00
Pierre Bourdon
6bdb6585d6 Overlay the user Maps/ over the shared one to avoid copying files 2013-09-14 06:08:29 +02:00
Pierre Bourdon
b587af3ea3 Change the initial user directory creation to stop special casing Windows 2013-09-14 06:08:29 +02:00
Rachel Bryk
dfcef6890e Use global user directory on windows. 
Can override by setting HKCU\Software\Dolphin-emu\LocalUserConfig to true.
 2013-09-14 06:08:29 +02:00
Pierre Bourdon
44066326ff Hack the gettext detection a bit to fix translations not working on OSX buildbot builds 2013-09-12 18:22:31 +02:00
Shawn Hoffman
484130049d On windows, ignore WM_QUERYENDSESSION and close upon WM_ENDSESSION. 
The messages can come through CFrame::MSWWindowProc and the wxApp implementation, so make sure to catch both.
Fixes issue 6546.
 2013-09-10 03:14:21 -07:00
Shawn Hoffman
2d492bdc4f Revert "Leak an object when quitting Dolphin to try and fix issue 6546" 
This reverts commit 380b780dd1.

Revert "Move the CFrame::ClosePages call from ~CFrame to CFrame::OnClose"
This reverts commit e29de302a6.
 2013-09-10 01:04:29 -07:00
Pierre Bourdon
e29de302a6 Move the CFrame::ClosePages call from ~CFrame to CFrame::OnClose 2013-09-09 18:49:10 +02:00
Pierre Bourdon
380b780dd1 Leak an object when quitting Dolphin to try and fix issue 6546 2013-09-09 18:44:21 +02:00
NeoBrainX
3db2108dbb Add two buttons to the ISOProperties dialog so that we still meet string freeze deadline. 2013-09-08 21:04:03 +02:00
Glenn Rice
cf09974d61 Merge branch 'translate-about' 2013-09-07 09:56:54 -05:00
Rachel Bryk
33fb1b562f Move some code from NetPlayClient.h to NetPlayProto.h, and only include that outside of NetPlay. 2013-09-07 00:27:35 -04:00
Rachel Bryk
2bc44f98c3 Disable gui controls for gc controllers and memory cards during netplay and movies. 2013-09-07 00:06:03 -04:00
Glenn Rice
f1c6357750 Enable translation of the about dialog. 2013-09-06 21:02:11 -05:00
Ryan Houdek
a7f244e96d Revert "Revert "[NetPlay] Make the Memory Card A/B setting sync across netplay."" 
This reverts commit 5696da0b3e.

JMC messed up, it wasn't due to this commit.
 2013-09-04 19:16:28 -05:00
Ryan Houdek
5696da0b3e Revert "[NetPlay] Make the Memory Card A/B setting sync across netplay." 
This reverts commit e110f1049c.

This unfixes issue 6575. Reverted due to huge performance hit on behalf of JMC.
 2013-09-04 02:55:13 -05:00
Rachel Bryk
e9ffba7ab8 Don't ever ever let CFrame::DoStop() run twice at the same time. 2013-09-03 18:53:23 -04:00
Justin Chadwick
e110f1049c [NetPlay] Make the Memory Card A/B setting sync across netplay. 
Fixes issue 6575.
 2013-09-03 17:41:52 -04:00
Rachel Bryk
8ae10b3e12 [NetPlay] Allow recording movies during netplay. 
Fixes issue 6207.
 2013-09-03 15:50:41 -04:00
Rachel Bryk
cea7737aef Fix crash on stop in netplay, and stop netplay when anyone with a pad mapped in game stops emulation. 2013-09-02 21:54:28 -04:00
Justin Chadwick
6b1c8f9d17 [Netplay] Read dual core setting before syncing it with clients. 
Fixes issue 6573.

Fixes issue 6535.
 2013-09-02 19:55:25 -04:00
degasus
1b1cc82e5b rename vertex streaming hack tooltip 
String is copyed from issue 6552.
 2013-09-02 13:33:36 +02:00
Ryan Houdek
2897619ddb Removal of my terrible idea. 2013-09-02 05:31:48 -05:00
Ryan Houdek
831963616f [Android] Make texture loading/deleting/drawing backend non-specific by making them happen in the backend instead of somewhere else. Just a clean up commit really. 2013-09-02 01:40:05 -05:00
comex
35b8dfbe0c A few more warnings. 2013-09-01 23:33:35 -04:00
comex
2630169229 More warnings: mark/avert truncating conversions from float. 2013-09-01 22:59:35 -04:00
comex
403744dee8 Fix use of deprecated screen resolution API. 
(This is currently pointless, as the code in question is not used on OS
X anyway, but I'd like to see that option come back.  In any case, fixes
the warning)
 2013-09-01 22:58:35 -04:00
comex
fd7cf5bb71 A bunch of trivial changes to fix clang warnings. 2013-09-01 22:58:33 -04:00
Ryan Houdek
b03ff7a86b [Android] Fix the game thread never leaving. 2013-09-01 01:10:40 -05:00
Jasper St. Pierre
22f57cf07a NetPlay: Don't bother with the host's controller settings 
Use the pad mapping to calculate the number of devices
we want, and add them on each client when we get the
message.
 2013-08-31 21:18:14 -04:00
Pierre Bourdon
751c2e69f6 Add a link to our documentations guides in Dolphin 2013-08-31 10:31:43 +02:00
comex
11cffddbf7 Fix a trivial bug in b6728c1405. 2013-08-31 01:54:57 -04:00
Lioncash
7ce3d846d5 Indent the code in the previous bug fix I did. Now there aren't braces on the same level as each other. Should have initially done this along with that commit. 2013-08-31 00:39:19 -04:00
LPFaint99
199c4e0d78 Merge branch 'wiiSaveExportFixes' 
saves like super smash bros brawl, mario kart, etc which use simple copy restriction via the banner file are now able to be imported natively with the wii/wiiU system menu
save files which include subdirs are correctly packaged

NOTE: saves which include 'nocopy'/'nomove' folders will likely always require homebrew

adds feature to export all wii saves
 2013-08-30 20:52:09 -07:00
Lioncash
93b0f46d34 Fix a tiny bug in CodeView.cpp. If statement with more than one line was missing braces. 2013-08-30 18:29:03 -04:00
comex
b6728c1405 Avoid unnecessary bundle copies on OS X: 
- Make "copy data into bundle" depend on the files actually being
  changed, rather than being run on every build.

- postprocess_bundle depends on system files and checking the Dolphin
  binary and all that, and would be iffy to try to avoid rerunning;
  but it's only needed to produce a redistributable bundle, so add
  SKIP_POSTPROCESS_BUNDLE to skip it for development.
 2013-08-30 17:54:52 -04:00
Pierre Bourdon
2ab7fc10da Rollback "DSP on Thread" to only affect LLE. 
Keep the threading code in AX HLE in case we want/need to enable it again at
some point. Not too confident about refactoring it right now.
 2013-08-30 09:14:30 +02:00
Ryan Houdek
96394da1c2 [Android] Let NativeLibrary handle initial folder structure creation. 2013-08-29 18:07:32 -05:00
Ryan Houdek
957c263367 [Android] Add save state native functions. 2013-08-29 17:47:50 -05:00
Ryan Houdek
18fd690533 Only use static iconv on Android. 2013-08-29 05:53:15 -05:00
Ryan Houdek
cb8e7a1be5 Work around check_lib not finding iconv. 2013-08-29 05:40:16 -05:00
Ryan Houdek
160d72a9ae [Android] Add in a static libiconv library so non English games don't crash Dolphin Mobile. 2013-08-29 04:43:31 -05:00
Matthew Parlane
15f8603d1f Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Common/Src/FileUtil.cpp
 2013-08-26 00:50:57 +00:00
Rachel Bryk
8882f89bbc Allow user folder to be set via command line. 
Clean up GetUserPath(), to allow setting any path with it.
 2013-08-24 23:15:55 -04:00
Matthew Parlane
5548e77438 Merge branch 'master' into wii-network 2013-08-24 23:56:31 +12:00
Jasper St. Pierre
dfb34ddef4 NetPlayWindow: Make the spacing consistent on both sides 2013-08-23 20:40:34 -04:00
Pierre Bourdon
9303b57db1 Refactor VideoCommon/OnScreenDisplay. 
Use strings internally, use a multimap and std::function for callbacks (instead
of a flat vector + loop over the vector to find the right callback type), fix
coding style issues. Simplify MainAndroid code a bit.
 2013-08-24 02:13:54 +02:00
Jasper St. Pierre
23ff31451f NetPlay: Rework pad mapping 
Pad mapping and the UI behind it is significantly confusing,
and has been confusing users since NetPlay was introduced.

As part of a large code cleanup to help NetPlay more stable,
introduce a better pad mapping system where local pad mapping
is handled by the client. Now, all the server and other
clients know is which player have which controllers, and the
clients only know this so they can show the pad mapping in the
UI; they don't do anything else with it.

A future cleanup will use this pad mapping data to completely
ignore the pads configured in the settings pane on the host.
 2013-08-23 09:40:08 -04:00
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
LPFaint99
c2d208df96 add the ability to export all save files 2013-08-18 15:02:40 -07:00
LPFaint99
477c21e946 fix import/export of games with folders. 
remove copy protection bit from banner
	- should allow *some* copy protected games to be moved to a real system;
	ex: super smash bros brawl, mario kart
games with a nocopy/nomove folder cannot be imported to a real system without using homebrew tools, warn for these saves
	ex: guitar hero
remove some unneccessary class fields
the class is still incredibly ugly :(
 2013-08-18 15:00:50 -07:00
skidau
c774fb4880 Removed a redundant tooltip text. 2013-08-18 17:09:01 +10:00
skidau
5cec914484 Changed the default audio latency to 2. Made soft_oal.dll the default on Windows builds as the old OpenAL32.dll is outdated and contains bugs. 2013-08-18 17:03:21 +10:00
Ryan Houdek
ba76b016da [Android] Fix Wii games. 2013-08-17 19:41:28 -05:00
Jasper St. Pierre
756bf93111 NetWindow: Move "Write memcards" checkbox to be host-only 
The setting is propagated from the host, so the client checkbox would
be ignored anyway.
 2013-08-16 21:42:38 -04:00
Ryan Houdek
08b27bb3b8 In the EGL backend context interface, don't call eglMakeCurrent. This was only done to pull in some information to the info log. This is necessary since eglMakeCurrent binds the context to the current thread and we need to destroy the context and reinitialize it when jumping to a new thread. We already call MakeCurrent in Video_Prepare which is done in the new thread. 2013-08-16 23:41:45 +00:00
NeoBrainX
1ba98550ef VideoConfigDialog: Rephrase "Hacked Buffer Upload" and its description to something less technical. 2013-08-16 14:26:50 +00:00
Rachel Bryk
89d324786a Prevent stopping emulation before fully booting. This can sometimes cause dolphin to crash. 2013-08-16 10:04:08 -04: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
Pierre Bourdon
c6d8d52041 Fix a warning introduced by the recent netplay UI changes 2013-08-15 15:05:20 +02:00
Rachel Bryk
6d67ea2fda Merge remote-tracking branch 'origin/master' into wiimote-netplay 2013-08-15 09:00:04 -04:00
Matthew Parlane
d6ec6ae97a Fix polarssl on Windows. 2013-08-16 00:24:10 +12:00
Matthew Parlane
d8b39b9dcf Support PolarSSL on *nix 
Removed unneeded PolarSSL directories.
Remove duplicate sha1 and md5 files.
Define out SSL test file writing.
Fix format string bug and warning.
 2013-08-15 23:36:17 +12:00
Matthew Parlane
fede38985e Replace OpenSSL with PolarSSL 
Works on windows, not yet cmake.
 2013-08-15 20:47:47 +12:00
Jasper St. Pierre
998194246c NetPlay: Disable the "Start" button while the game is running 2013-08-14 18:16:07 -04:00
Jasper St. Pierre
1c74e412e2 NetPlay: Remove the "Stop" button 
Now that the host can simply close the window, there's no need for this extra control.
 2013-08-14 18:16:06 -04:00
Jasper St. Pierre
5241deaebe NetPlay: Allow hosts to stop the game by closing the game window 2013-08-14 18:16:05 -04:00
Jasper St. Pierre
92f8d79574 NetPlay: Set the pad buffer size on server creation 
If we don't do this, then when the game starts we'll send out the
buffer size to clients being a super large value of junk, and they'll
hang forever trying to accumulate an input buffer a size that they'll
never ever reach in a million years.

This never manifested in release builds for some reason.
 2013-08-14 18:15:28 -04:00
John Chadwick
a791733c27 Fix invalid C++ code (returning reference to local) - thanks devm33. 2013-08-13 14:47:32 -04:00
Jasper St. Pierre
d0084cb41d Main: Fix code that creates the BIOS subdirectories 
We need to ensure that the file path ends with DIR_SEP, as
File::CreateFullPath is a very naive function.
 2013-08-12 06:23:58 -04:00
Jasper St. Pierre
22b3c26654 Main: Create BIOS subdirs of GC userdir on load 
So that users don't get confused about where to place the BIOS files
 2013-08-11 14:33:26 -04:00
Rachel Bryk
d0f05291e7 Add wiimote support to netplay. 2013-08-07 08:16:41 -04:00
Jasper St. Pierre
a3a222bf5b NetPlay: Remove NetPlay.h / NetPlay.cpp 
Now the server and client implementations are entirely separate.
 2013-08-05 05:05:06 -04:00
Jasper St. Pierre
3b32d3c90d NetPlay: Split the server out, and make the local system manage a client as well 
This should be transparent, but it may cause regressions.

The idea here is that now all players, including the host of the server,
talk to the server through TCP/IP networking. This significantly reduces
our codepaths through netplay, and will prevent strange local-only bugs
from happening.

The cleanup isn't 100% finished yet. The NetPlay dialog still drives the
server through private APIs. I eventually want to sanction off the server
entirely, so all communication is done through TCP/IP. This will allow us
to have high-traffic public servers that can relay multiple games and
lobbies at a time, and split off channel and game management to people
other than the host.

This is all still just a pipe dream, though.
 2013-08-05 04:42:26 -04:00
Pierre Bourdon
28e12a4198 Change the OSX CFBundleIndentifier to use the proper domain name 2013-08-03 18:37:57 +02:00
Rachel Bryk
f58edd018c Remove a couple files which have apperently never been used for anything. 2013-08-02 20:46:07 -04:00
Rachel Bryk
541106d611 Increase number of save state slots to 10. 2013-08-02 20:42:30 -04:00
Rachel Bryk
c1baed086d Fix hotkeys. 2013-08-02 16:14:34 -04:00
Rachel Bryk
44d17b5da5 Add hotkeys to increase/decrease the frame limit. 2013-07-30 19:25:12 -04:00
Rachel Bryk
a33b1fcdc6 Make hotkeys for togglign IR, AR, efb copies and fog settings configurable. 2013-07-30 05:49:02 -04:00
Ryan Houdek
5d38a9c91e [Android] Some minor cleanup. 2013-07-27 15:09:33 -05:00
Rachel Bryk
3f03588dec Tas input works with bongos too. 2013-07-23 20:43:51 -04:00
Braden
ec148008d0 Clean up code for multiple GameCube Controllers 
Conflicts:

	Source/Core/DolphinWX/Src/Frame.cpp
	Source/Core/DolphinWX/Src/FrameTools.cpp
 2013-07-23 20:35:33 -04:00
Braden
59d6df7046 Adds Support for multiple GameCube Controllers 
Conflicts:

	Source/Core/DolphinWX/Src/Frame.cpp
 2013-07-23 20:22:08 -04:00
Rachel Bryk
8a4b6f3d73 Forgot this from the last commit. 2013-07-23 19:55:17 -04:00
Rachel Bryk
9fdc7360cd Fix L and R triggers with tas input. 
Partially copied from revision 1be844406c, but allows < fully pressed, and without the typo.
 2013-07-23 19:44:43 -04:00
Jasper St. Pierre
09338c673c FrameTools: Use the correct window handle for resizing the window 
We want to resize the OpenGL window, not the frame window.
 2013-07-23 15:02:00 -04:00
Jasper St. Pierre
6d463d1b67 NetPlay: Allow building a server without a game 
This isn't hooked up in the UI yet, but it will allow us to
basically start the server and chat system without choosing
a game.
 2013-07-22 07:29:15 -04:00
Jasper St. Pierre
f693488c8a InputConfigDiag: Save the configuration when pressing "OK" 
This fixes a common UI complaint of the control dialog UI.
Also, don't close the dialog if we have an error with the expression.
 2013-07-22 03:19:38 -04:00
Jasper St. Pierre
bc17798ef2 InputConfigDiag: Add a simple error status label 
This tells you what you did wrong at a high level if you messed up.
 2013-07-22 03:19:22 -04:00
Jasper St. Pierre
3c7f223aa1 Add "Q" / "E" as freelook keybindings 
To move the view up and down.
 2013-07-22 00:14:42 -04:00
Jasper St. Pierre
52482115e1 Move in-game keybinding handling to a central location 
Instead of handling it separately in every backend.
 2013-07-21 23:17:16 -04:00
Rachel Bryk
e742b32c65 Drag and drop. 2013-07-21 22:25:26 -04:00
Jasper St. Pierre
fec641d14a X11: Don't do a round-trip to the server to figure out our size on configure 
Simply use the values from the event structure.
 2013-07-21 01:59:40 -04:00
Jasper St. Pierre
01ff85506d X11: Don't use a client event as a wrapper for XMoveResizeWindow 
Simply configure the window from here
 2013-07-21 01:59:40 -04:00
Jasper St. Pierre
ca97b10dda Actually link to XI2 
No idea how this was working before
 2013-07-21 01:59:40 -04:00
Ryan Houdek
737df2a68c Patch from Degasus that removes the last of the the GL_TEXTURE_RECTANGLE usages. This is needed to have GLES3 support. 2013-07-13 17:24:23 -05:00
Ryan Houdek
52cb398804 [Android] Actually push the library file to the correct location. 2013-07-13 10:32:23 -05:00
Glenn Rice
8b65775ee1 Fix a couple of compiler warnings that have cropped up. 2013-07-10 15:07:57 -05: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
Pierre Bourdon
22c80e1dc2 Fix ICC profiles in some of our PNGs (ic_drawer, Dolphin icon). 
Also keep a PNG version of bin2c'd resources in order to make these kind of
changes easier in the future.

Fixes recent versions of libpng complaining loudly about our images.
 2013-07-07 02:40:59 +02:00
Jasper St. Pierre
b2e7248b58 LogWindow: Fix a bad initializer 
Since these defaults aren't used, don't bother specifying them.
 2013-07-05 22:39:18 -04:00
Ryan Houdek
cdfd7905a0 [Android] Copy over DSP roms and font assets on build and first runs. 2013-07-05 19:18:33 -05:00
Rachel Bryk
e4846de692 Add hotkeys for save/load state to/from file. 2013-06-30 19:01:30 -04:00
Jasper St. Pierre
d5983b587e InputConfigDialog: Don't show "..." for complicated expressions 
Just show the actual expression. We need to do a bit of mangling
here as wx has no way to turn off mnemonics parsing, so do that
as well.
 2013-06-29 18:28:14 -04:00
Jasper St. Pierre
1083d78721 InputConfigDiag: Put the colon after the device name 
Oops. The dialog accidentally generated the wrong syntax for
this one.
 2013-06-29 02:58:17 -04:00
Ryan Houdek
9edfb5c710 [Android] Disable OpenGL ES 3 EGL bit. This is due to drivers complaining(Which they should do) when they don't support GLES3. Qualcomm drivers don't care about it being ES2 or ES3 bit anyway. Intel drivers are untested in this code path, but GLES3 is untested entirely in desktop anyway. 2013-06-26 08:19:01 -05:00
Rachel Bryk
63a747edc0 Add shortcut to (dis)connect the balance board. 
Fixes issue 6383.
 2013-06-26 06:23:29 -04:00
Jasper St. Pierre
55950365e3 InputConfigDiag: Fix complex bindings with with left-click Detect 
This fixes the binding of XBox 360 controllers and similar devices
with complex control names.
 2013-06-25 15:05:53 -04:00
Rachel Bryk
5904ffb21d Fix last commit, and set the position on mouse down instead of mouse up. 2013-06-25 11:04:28 -04:00
Rachel Bryk
b892d838ff Allow dragging the analog sticks with the tas input. 2013-06-25 10:52:25 -04:00
John Peterson
e250550de3 Removing muted Wiimote audio 
because that reduce writes
 2013-06-25 09:24:45 -04:00
John Peterson
0fd3acd152 Saving real Wiimote state 
because that's simpler than reconnecting
 2013-06-25 09:24:14 -04:00
Jasper St. Pierre
c5c86d17dc InputConfigDiag: Use "..." for complicated expressions 
The full expression is quite often too big for a simple button
label, so encourage people to use the full editor to edit it.
 2013-06-25 00:58:31 -04:00
Jasper St. Pierre
62281fbfde InputConfigDiag: Give the input text field a monospace font 2013-06-25 00:58:30 -04:00
Jasper St. Pierre
03a835ec07 InputConfigDiag: Update for the new expression language 
Modify the buttons and editor interface for the new expression
language, like the new op name for add, the new device name syntax,
and add new editing features, like simple selection behavior on
unary ops.
 2013-06-25 00:58:30 -04:00
Jasper St. Pierre
877106b027 InputCommon: Split Device stuff out 
The ExpressionParser needs this to be out of here to prevent issues
with cyclic references.
 2013-06-25 00:58:30 -04:00
Ryan Houdek
6bb7cc5fea [Android] Add an about screen that shows build revision. 2013-06-22 22:54:36 -05:00
Ryan Houdek
2b9f79dff3 [Android] Remove SimonVT menudrawer library. Move to Google's support library for their navigation drawer support. Overall cleanup. 2013-06-22 07:45:05 -05:00
degasus
010165b2c2 fix gcc warning, probably also the logic 
comparing two char pointers doesn't compare the strings
 2013-06-20 10:43:09 +02:00
Ryan Houdek
7223778520 [Android] Gamepad input. Refactor JNI native functions to all pull from a single class instead of everywhere willy-nilly 2013-06-18 07:09:38 -05:00
Matthew Parlane
868c627876 Fixes Issue 6353 Remove extract apploader/dol from top level 2013-06-17 22:51:15 +12:00
Matthew Parlane
43a4d41889 Handle 1 partition only, fixes Issue #6353 2013-06-17 19:25:55 +12:00
ondra.hosek
3ff2a3a11a Fix the GameCube mic dialog header's invalid include guard. 
Fixes issue 6349.
 2013-06-06 21:30:50 +10:00
John Peterson
b6e1127c8a Adding stick radius setting 
because that makes it easier to adjust it

Adding visual aid for the hardware range because that makes it easier to adjust the radius relative to it
 2013-06-06 09:28:59 +02:00
John Peterson
80b09c074e Changing the Gecko code comparison from metadata to data comparison 
because different data sometimes have the same metadata
 2013-06-01 09:21:57 +02:00
degasus
3378f7d6a7 fix auto fullscreen resolution on linux 2013-05-25 11:43:56 +02:00
Rachel Bryk
743230500f Add auto fullscreen resolution option. Not tested on Linux, let me know if it doesn't work (it probably does). 
Fixes issue 6082.
 2013-05-25 03:08:09 -04:00
degasus
6a5e7d7be4 also hide hacked buffer option on d3d 2013-05-23 13:58:37 +02:00
degasus
ae55d82e43 disable hacked buffer option for d3d 2013-05-23 11:08:07 +02:00
Matthew Parlane
86b4a87fef Merge branch 'wii_bb' 
Adds Balance Board support.
 2013-05-21 23:34:58 +12:00
Matthew Parlane
d642abce46 Only show 4 config dialogs in wiimote config. 2013-05-21 23:31:41 +12:00
Matthew Parlane
7208823396 Added config for enabling Balance Board. 
Fixed other structures that still assumed 4 of everything.
 2013-05-19 00:30:20 +12:00
Ryan Houdek
2c7f9b1b78 [Android] Copy over the Dolphin shared library to the Android APK build directory so it doesn't need to be manually copied each time. 2013-05-18 03:56:45 -05:00
Matthew Parlane
19252f4e0e Initial commit with balance board working on Linux. 
Will not work on any other platform currently.
Missing any sort of config, and definitely no emulation mode.
 2013-05-18 20:31:37 +12:00
degasus
f7c3cacb5c ppd: fix small issues in my last commit 2013-05-10 12:51:06 +02:00
degasus
89be1cbf51 recreate "per pixel depth" option and renamed it to fast depth calculation 2013-05-09 17:48:48 +02:00
NeoBrainX
6871cc9700 FifoPlayerDlg: Improve navigating through search results. 2013-05-06 22:20:17 +02:00
Ryan Houdek
b6963ce1cb [Android] Use vsnprintf for the log messages. 2013-05-05 23:37:01 -05:00
Ryan Houdek
09def3ed3f [Android] Add in a compiling option for GLES3 2013-05-05 23:37:01 -05:00
Glenn Rice
12d791a628 Fix some of the compiler warnings that have appeared recently. 2013-05-05 23:22:57 -05:00
John Peterson
46cd91dc0d Build fix 2013-05-05 21:23:16 +02:00
John Peterson
7cc2e3146b Updating Cheats manager when the ISO is changed etc. 
The Cheats manager should be updated when the ISO is changed because it's non-modal

Removing code that read the ID from file because the cheats manager only has a use when an emulation is running (when the ID doesn't need to be read from the ISO again because it's in a variable). This fixes loading Gecko codes for .wad during an emulation because "VolumeHandler::GetVolume()" return false in this case
 2013-05-05 12:25:53 +02:00
lioncash
c2859a5207 Dammit Ctrl-Z. Restore a wxSpinCtrl parameter that accidentally got removed in the last commit. 2013-05-01 09:41:45 -04:00
lioncash
fbc77e956a Display the initial number of frames that are to be recorded in the Fifo Player. 
Before this commit, nothing would would be displayed in the "Frames to Record" text control.

This fixes that by setting it to what m_FramesToRecord is initially set to, which is 1 (at the time of this commit).
 2013-05-01 09:35:31 -04:00
lioncash
62065be788 Fix a bug where FIFO recording could not work. 
Example (in step by step explanation):

1. Run Dolphin.

2. Go to Tools -> Fifo Player

3. Go to the Record tab and hit record and then stop without a game loaded.

The button is now disabled and will not become active again for the whole time that Dolphin is running. Dolphin must be closed and then re-opened in order to use it again. This fixes that.

I've tested it with multiple conditions to make sure this doesn't beef anything else related to the Fifo Player.

ie)

- Record then Stop without a game loaded (multiple times)
- Record then Stop with a game loaded (multiple times, as well as testing playback. All of which work fine).
 2013-05-01 09:05:37 -04:00
skidau
e70a277af2 Added Dance Mat support for the Family Trainer/Active Life series. 
Select the dance mat via Configure > Gamecube > Port 1 > Dance Mat

The dance mat is mapped to the GC Pad:

D-Pad Up = Blue Arrow Up
D-Pad Down = Blue Arrow Down
D-Pad Left = Blue Arrow Left
D-Pad Right = Blue Square
Y Button = Orange Arrow Up
A Button = Orange Arrow Down
X Button = Orange Arrow Right
B Button = Oranage Square
 2013-04-30 23:36:46 +10:00
Rachel Bryk
e5fdd301a9 Merge remote-tracking branch 'John-Peterson/state' 2013-04-29 22:32:08 -04:00
John Peterson
ef2e0a87d0 Adding option to save and load state by timestamp 
Load by timestamp: load last state is expanded from 1 to 8 actions, for newest to oldest state

Save by timestamp: overwrite the oldest state (or use an empty slot if available)

Adding remaining hardcoded state keys to hotkey dialog

Adding a program exit hotkey
 2013-04-30 04:13:55 +02:00
John Peterson
8dbe236606 Fixing or disabling the "Download Codes (WiiRD Database)" button problem 
The "Download Codes (WiiRD Database)" button is enabled (and its click return silently without an effect) when "Tools → Cheats Manager" is opened when there's a running emulation for which there's no "[Gecko]" ini section, confusing the user about the reason for not downloading codes or showing an error when there's no running emulation

Solution

when there's a running emulation: fix the button

when there's no running emulation: disable the button (to indicate to the user that this button must be clicked elsewhere, in the ISO settings dialog, the user will realise or remember)
 2013-04-29 12:00:23 -04:00
Glenn Rice
2c8c6304d7 Make sure the EGL evdpy is closed. 2013-04-26 11:35:42 -05:00
Glenn Rice
1666e091ef Make EGL and X11 dpy/evdpy usage consistent. EGL needs testing. 2013-04-26 10:53:46 -05:00
Glenn Rice
03dfe7b816 The evdpy should be used for the X11 window creation and in the event 
thread.  dpy should only be used for GL.
 2013-04-25 23:41:45 -05:00
Ryan Houdek
bd72e13dd4 Generally make the Android UI better. 2013-04-23 14:27:49 -05:00
Ryan Houdek
f28efc24eb Have our EGL interface use our logging functions. 2013-04-23 14:27:49 -05:00
Glenn Rice
9a50d055a1 Add Swedish translations. 2013-04-23 06:44:33 -05:00
Ryan Houdek
05eda7b0c1 Fix a build issue with options -DUSE_EGL=True -DUSE_GLES=True 2013-04-20 17:19:22 +00:00
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
Lioncash
e2ae73ba39 Lastly - new license header introduced to main Dolphin project. All done now. 2013-04-17 23:43:35 -04:00
John Chadwick
1e6dacf1e4 Make dolphin aware of disc revision numbers. Display them under game properties and use them in netplay. 
Patch by johnwchadwick.
Fixed issue 6243.
 2013-04-16 22:39:05 -05:00
skidau
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
lioncash
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
skidau
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
Ryan Houdek
7772f0d071 Merge branch 'Android-trash' since it is no longer quite so trashy. 2013-04-14 23:36:00 -05:00
Ryan Houdek
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
Ryan Houdek
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
Ryan Houdek
605bbf5ca8 Merge remote-tracking branch 'origin/master' into Android-trash 2013-04-13 00:58:37 -05:00
degasus
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
NeoBrainX
6af14bd4ce DolphinWX: Fail less at explaining what framelimit is doing. 2013-04-10 12:52:13 +00:00
Jordan Woyak
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
Jordan Woyak
5c374b2718 Update iso file cache version. 2013-04-09 13:04:23 -05:00
Jordan Woyak
98d35e590e Fixed split WBFS file size display. (probably) 
Fixed issue 6222.
 2013-04-09 12:58:56 -05:00
Lioncash
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
Lioncash
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
NeoBrainX
5b2d9a7d9f Rename the "Disable Dest. Alpha Pass" option to "Disable Destination Alpha" (GUI-only). 2013-04-07 21:41:25 +00:00
John Chadwick
8ce0d43717 Allow enabling memory card writes for netplay clients, instead of just the server. 2013-04-07 13:04:44 -04:00
John Chadwick
c7abf7e8d2 Allow disabling memory card writes in netplay. 
Fixes issue 6217.
 2013-04-07 12:18:07 -04:00
Grant Paul
39965e894d Add native fullscreen support for OS X. 2013-04-03 21:20:43 -07:00
Glenn Rice
3fdc46877a Make the GUI show a translated "No audio output" sound backend string. 2013-04-03 09:22:39 -05:00
Glenn Rice
6371a6f15d Fix some more strings for translation, and update the catalog. 2013-04-02 17:44:27 -05:00
Pierre Bourdon
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
Jordan Woyak
d951c4c374 real buildfix 2013-04-02 13:07:51 -05:00
Jordan Woyak
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
Pierre Bourdon
49d809ac0e Merge branch 'osx-libcxx' 2013-04-01 18:17:49 +02:00
Lioncash
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
Lioncash
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
Grant Paul
aabd8ce664 Add retina display support for Mac. 2013-03-31 11:36:42 -07:00
Pierre Bourdon
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
Glenn Rice
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
Pierre Bourdon
4895e38bd5 This change might work better if I git add the files 2013-03-29 07:31:15 -07:00
NeoBrainX
6e88ae9695 Recommend Direct3D 11 or OpenGL instead of Direct3D 9. 2013-03-28 23:34:14 +01:00
Ryan Houdek
2444fdbbdd I missed some files required for our GLInterface. 2013-03-27 21:18:07 -05:00
Jordan Woyak
507f53e226 Fixed issue 6119. 2013-03-27 14:26:45 -05:00
lioncash
6fe5f5a6ba [DolphinWX] Remove a duplicate conditional in Frame.cpp 2013-03-27 15:09:04 -04:00
Ryan Houdek
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
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
Ryan Houdek
d11679a06e Android mega commit of trash. 2013-03-19 21:53:09 -05:00
Ryan Houdek
61e1659b97 Disabled OSX x86 build since we require 10.7 minimum. This takes support back to late 2006 models. Also, Missed CG framework addition. 2013-03-19 08:50:56 -05:00
Braden
befe6e6962 Short,sweet and fixes issue 5725 2013-03-18 21:40:46 -05:00
Braden
c5033e8594 Hide cursor in fullscreen mode on OSX fixes issue 3956 2013-03-18 17:45:08 -05:00
Braden
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
Braden
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
degasus
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
Rachel Bryk
8767b30f75 My OCD will not stand for this. 2013-03-15 15:42:59 -04:00
Ryan Houdek
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
Rachel Bryk
d63d7fde9e So much more readable now! 2013-03-15 11:45:43 -04:00
Rachel Bryk
def578fea6 Fix checks for preventing the main and render windows from spawning off screen. 2013-03-15 09:19:39 -04:00
skidau
afb6f9127a Corrected a typo. 2013-03-15 19:32:47 +11:00
degasus
84119a966b Revert "remove wx from agl" 
This reverts commit e63a5d8529.
window_handle is also used at many other places, so just move it here isn't allowed
 2013-03-15 02:40:08 +01:00
Ryan Houdek
d6c7e7d652 Let's do this version check again. 2013-03-14 15:46:27 -05:00
Ryan Houdek
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
Rachel Bryk
eaebebc33d Prevent the render window from spawning off screen. 
Fixes issue 6063.
 2013-03-14 05:28:02 -04:00
degasus
e63a5d8529 remove wx from agl 2013-03-14 09:52:13 +01:00
Braden
a0fdcaced8 Removes the redundant window on OSX 2013-03-13 21:34:52 -05:00
Rachel Bryk
0b34457a8e All the cool kids hard code string lengths. 
Fixes issue 6090.
 2013-03-13 07:04:53 -04:00
Rachel Bryk
e73cc858bc Allow playing movies from command line. Also remove some unneeded code. 2013-03-13 01:37:35 -04:00
degasus
382be2aabd Merge branch 'master' into GLSL-master 
Conflicts:
	.gitignore
 2013-03-12 11:28:56 +01:00
skidau
83fc5f4747 Merge branch 'FIFO-BP' 
# By skidau (30) and Pierre Bourdon (1)
* FIFO-BP: (31 commits)
  Set g_bSignalTokenInterrupt on the main thread.  Fixes the random hang in Harry Potter: Prisoner of Azkaban.
  Used a scheduled event to generate the ARAM DMA interrupt if the DMA is greater than a certain size.  Fixes NFS:HP2 GC.
  Bumped up the disc transfer speed enough to prevent audio stuttering in Gauntlet: Dark Legacy.
  Enabled Synchronise GPU on "SPEED CHALLENGE - Jacques Villeneuve's Racing Vision".  Required to go in-game.
  Added direct GameCube controller commands to the Serial Interface emulation.  Fixes the controls in MaxPlay Classic Games Volume 1 and the Action Replay disc.
  Increased the FIFO buffer size to 2MB from 1MB.  Fixes Killer 7's Angel boss.
  Used an immediate GenerateDSPInterrupt when transferring data from ARAM to MRAM and a scheduled DSP interrupt when transferring data from MRAM to ARAM.
  Fixes the audio cutting in and out in the Resident Evil GC games using DSP HLE. Triggered the ARAM interrupt by the scheduler instead of directly in function.
  Implemented proper timing for the sample counter in the AudioInterface, removing the previous hack. Cleaned up some of the audio streaming code.
  Skipped the EE check if there is a CP interrupt pending.
  Disabled "Speed up disc transfer" from the ZTP GC game ini.
  Removed the disc seek times for GC games and removed the disc speed option on Wii games. Checked for external exceptions only in mtmsr.
  Delayed the interrupts in the EXI Channel.
  Merge aram-dma-fixes (r76a13604ef49b522281af75675f044d59a74e871)
  Added a patch that bypasses the FIFO reset code in Wallace and Gromit: Project Zoo, allowing it to go in-game.
  Made vertex loading take constant time.
  Increased the cycle time of the vertex command.  Fixes "Speed Challenge: Jacques Villeneuve's Racing Vision".
  Moved the setting of the Finish interrupt signal back to the main thread as it was causing Wii games like Resident Evil 4 (Wii) to hang.
  Profile stores, fp stores and ps stores only to the fifo write addresses list.  This should make the JIT a little faster as it will not be checking for external exceptions unnecessarily.
  ...

Conflicts:
	Source/Core/VideoCommon/Src/PixelEngine.cpp
 2013-03-12 19:47:59 +11:00
degasus
e1ca002937 osx: only use accelerated backends 2013-03-11 16:36:07 +01:00
Rachel Bryk
13a64e992d Fix a typo. 2013-03-08 22:47:56 -05: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
Ryan Houdek
1214bf1359 Add ARM Jit to GUI when built on ARM 2013-03-06 03:25:45 +00:00
Jordan Woyak
10d57a3402 Use standard binary multiple unit symbols for game size display. 
Use integer math for the calculation as we cannot rely on floats for something as important as game size display!
 2013-03-05 14:58:30 -06:00
degasus
4714e4f99c fix agl 2013-03-05 15:17:00 +01:00
Ryan Houdek
240238308c Disable SSE2 check in the GUI when building ARM. 2013-03-05 14:03:01 +00:00
Ryan Houdek
3ac7ee4623 Fix compiling Dolphin on devices that provide crazy GLES drivers 2013-03-05 03:53:25 +00:00
Jordan Woyak
bdc96342ba More string conversion cleanup. 2013-03-03 18:40:50 -06:00
Jordan Woyak
6026b29844 Separate banner and volume name getting functions. Game properties now shows the correct "banner" name in more cases. 2013-03-03 18:34:03 -06:00