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

10624 Commits

Author SHA1 Message Date
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
NeoBrainX 76a316ffab Don't exit when bluetooth support is not available on Windows. 
Fixes running Dolphin in Wine and on regular Windows setups where bthprops.cpl is not available.

Fixes issue 6283.
 2013-04-29 21:32:13 +02:00
NeoBrainX 9cb263ad48 PixelShaderGen: Set some uid fields that I missed before. 2013-04-29 21:19:48 +02:00
NeoBrainX 02afec5076 Polish shader uid checking. 2013-04-29 21:00:39 +02:00
NeoBrainX 77dae3496a PixelShaderGen: Cleanups. 2013-04-29 19:52:12 +02:00
NeoBrainX adab4e37f7 Fix some mistakes from the master merge; some cleanups. 2013-04-29 19:37:32 +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 4f5832827e Merge branch 'fix-linux-win-resize' 2013-04-26 12:04:09 -05: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
Rachel Bryk 5afceca7a1 Apparently we can't trust m_strVideoBackend on osx. 2013-04-26 02:47:49 -04: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
Rachel Bryk 3b732f695d Show video backend and audio engine in title bar. 
Fixes issue 6276.
 2013-04-25 19:59:08 -04:00
NeoBrainX 5e6b712651 Merge 'master' into shader-uids-awesome. 
Conflicts:
	Source/Core/VideoCommon/Src/BPMemory.h
	Source/Core/VideoCommon/Src/LightingShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.h
	Source/Core/VideoCommon/Src/PixelShaderManager.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.h
 2013-04-25 14:05:54 +02:00
NeoBrainX eef95fa4c5 ShaderGenCommon: Adding documentation. 2013-04-25 13:30:41 +02:00
Matthew Parlane d18b71ccf9 Back to broken ES_launch but 4 wiimotes working. 2013-04-25 15:28:42 +12:00
Matthew Parlane 7c50ac931d Update before enqueue. 2013-04-25 14:37:12 +12:00
Matthew Parlane a2b543d47f request_queue may not have anything in it on return from ExecuteCommand 
i.e. when calling ES_Launch and everything is reset.

Don't call Update after queuing a request.
 2013-04-25 14:24:05 +12:00
skidau a03c35eb70 Removed the old Accurate VBeam emulation setting from the game ini's. 2013-04-25 10:33:57 +10:00
Matthew Parlane 3f46f26c49 Merge branch 'master' into wii-network 2013-04-25 02:35:39 +12:00
degasus 673d256f45 glew1.8 debug build fix 2013-04-24 16:24:55 +02:00
Ryan Houdek 87331fcef5 Change Android project name to dolphin emulator 2013-04-24 09:00:14 -05:00
Matthew Parlane 00316e182b Cleanup session data on deconstruct. 2013-04-25 01:59:20 +12:00
Lioncash 9ee3a30878 Remove something that slipped through the last commit. 
Don't even know why that was there.
 2013-04-24 09:55:12 -04:00
Lioncash bd284f1468 [Android] WINDOW_SERVICE should be accessed statically. 
(it's a static final variable in the Context class, so... yeah).
 2013-04-24 09:48:11 -04:00
Matthew Parlane c3dbbe011d Merge branch 'master' into wii-network 2013-04-25 01:41:45 +12:00
Matthew Parlane 62ebfa0a78 Probably breaks a "fixed" issue.. 2013-04-25 01:39:33 +12:00
Lioncash 8da425b008 Formatting cleanup for VideoCommon. 
Block braces on new lines.

Also killed off trailing whitespace and dangling elses.

Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
 2013-04-24 09:21:54 -04:00
Matthew Parlane e98069b647 Merge branch 'master' into wii-network 2013-04-25 01:13:14 +12:00
Matthew Parlane c118c71eac ES needs to handle it's own reply. 
pDevice was being used after free otherwise.
 2013-04-25 01:11:36 +12:00
Matthew Parlane 5df545926b Tidy up and support for setting rootca. 2013-04-24 21:35:36 +12:00
degasus 4a48485482 Revert "Revert "Fix performance issues on certain legacy graphics hardware that isn't capable of copying an integer."" 
This reverts commit 8b7141d3de.

GLSL120 can't handle integer attributes :-(
 2013-04-24 03:03:52 +02:00
Ryan Houdek 1b76655312 Missed a few asset copies 2013-04-23 14:27:50 -05:00
Ryan Houdek bd72e13dd4 Generally make the Android UI better. 2013-04-23 14:27:49 -05:00
Ryan Houdek 453fdff4bd Add SimonVT's android-menudrawer. This will be used in the menu interface for Dolphin Android. 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
Lioncash c2e0b9e070 Add Swedish to Windows build system. 2013-04-23 10:42:28 -04:00
Matthew Parlane 934e150596 Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
	Source/Core/Core/Src/ConfigManager.cpp
	Source/Core/Core/Src/HLE/HLE_OS.h
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
 2013-04-24 00:48:00 +12:00
Matthew Parlane b652f1974f Completed port to gnutls for linux. 2013-04-24 00:32:44 +12:00
Glenn Rice 9a50d055a1 Add Swedish translations. 2013-04-23 06:44:33 -05:00
Lioncash e3e818f83c Fix parameter naming in DSPEmulator.h. Should be "HLE" in CreateDSPEmulator's prototype, not "LLE". 2013-04-23 07:21:48 -04:00
Pierre 9a8dd7963e Merge branch 'dspjit' 
Conflicts:
	Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
	Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
	Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp
	Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
 2013-04-21 12:29:18 +02:00
Ryan Houdek 9720d6b418 Allow runtime setting of fastmem in ARM and disable since it seems to be causing issues again. Cortex-A9 only? 2013-04-20 17:36:49 +00:00
Ryan Houdek 05eda7b0c1 Fix a build issue with options -DUSE_EGL=True -DUSE_GLES=True 2013-04-20 17:19:22 +00:00
Ryan Houdek 0973d503ef Fix making the config directory so copying over assets won't fail. 2013-04-20 12:11:58 -05:00
Ryan Houdek b47915d1e4 Enforce landscape view since rotations cause huge issues atm. 2013-04-19 09:44:38 -05: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
Ryan Houdek 47f1505499 Add a fastmem option for enabling and disabling fastmem at runtime. 2013-04-19 07:50:33 -05:00
Ryan Houdek bf5a046b82 Update the ant files to build the APK from terminal 2013-04-18 23:26:00 -05:00