degasus
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
Ryan Houdek
67c1c6b062
Merge branch 'GLES-software'
2012-12-26 12:54:58 -06:00
Ryan Houdek
5169804a61
Remove duplicated X11 code.
2012-12-26 12:12:26 -06:00
Ryan Houdek
9a58f9a3bb
Rename another function...
2012-12-26 00:34:09 -06:00
Ryan Houdek
f4e7a280a9
Remove cg.lib from some files for Windows and renaming a function.
2012-12-26 00:07:43 -06:00
Glenn Rice
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
Ryan Houdek
c884dbf654
Mistype in WX.cpp
2012-12-25 19:18:03 -06:00
Ryan Houdek
01953ff64a
Rename the interface files and hopefully fix OSX building.
2012-12-25 19:08:24 -06:00
Pierre Bourdon
b3ed3bdb91
Define NvOptimusEnablement to tell the Nvidia driver we need high performance
2012-12-25 13:51:13 +01:00
rog
b3714f4874
Don't show compress iso option for wbfs and ciso files.
...
Fixes issue 5809.
2012-12-25 06:31:31 -05:00
NeoBrainX
249afa5eac
Change copyright year to 2013 in the about dialog.
2012-12-24 19:50:16 +01:00
rog
2dd570c880
Should completely fix game list sorting.
2012-12-24 13:29:19 -05:00
Ryan Houdek
53398ca5d8
Remove GLSL option from video options
2012-12-24 12:22:02 -06:00
rog
da5e61b45b
Fix another sorting bug.
2012-12-24 13:04:57 -05:00
rog
14a31d9b3a
Fix sorting bug.
2012-12-24 12:48:14 -05:00
Ryan Houdek
09b05c0f6c
Add header guards to InterfaceBase.h
2012-12-24 09:46:37 -06:00
Matthew Parlane
eedca57270
Revert "support retina display"
...
This reverts commit 3aa9901618
.
2012-12-24 08:01:44 +13:00
Matthew Parlane
f865450b5a
Changed to non conflicting overload.
2012-12-24 00:00:45 +13:00
Matthew Parlane
4dbd2ed7fb
Unused variable.
2012-12-23 23:59:44 +13:00
Grant Paul
3aa9901618
support retina display
2012-12-23 21:33:52 +13:00
Matthew Parlane
3a2c0b778a
Fixed stupid bool to int conversion warnings.
2012-12-23 19:53:15 +13:00
Matthew Parlane
1c01fd9c9d
Remove warning about ambigious if/else.
2012-12-23 19:24:30 +13:00
rog
d66dd970cd
Implement select audio backend CLI option.
...
Fixes issue 4920.
2012-12-22 18:25:52 -05:00
rog
16ac7803f1
Add support for recording bongos.
2012-12-18 23:20:26 -05:00
Glenn Rice
1bd42b7acc
Merge branch 'rehash-msw-cursor-hide'
2012-12-18 08:07:47 -06:00
Ryan Houdek
f6ef6fa0d9
I had the wrong header for Windows in GLVideoInterface.h
2012-12-17 16:23:02 -06:00
Ryan Houdek
6099148541
Blind coding fail
2012-12-17 15:33:19 -06:00
Ryan Houdek
8082323c44
Should hopefully fix OSX
2012-12-17 15:29:38 -06:00
Ryan Houdek
3cb5dffbc9
Missed the video interface files.
2012-12-17 15:01:52 -06:00
Glenn Rice
98ed34d50b
Use wxNullCursor to put the cursor back to its default instead of
...
explicitly setting the cursor to the arrow.
2012-12-17 11:32:10 -06:00
rog
4c7b63cf0e
Save secondary list sorting.
...
Allow sorting by platform ascending.
Fixes issue 5774.
2012-12-17 06:08:45 -05: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
Ryan Houdek
8838944cd3
Revert "Use the global ::wxSetCursor instead of the local one from our panel object. Should close 3956."
...
This reverts commit 884006e4c8
.
2012-12-15 00:04:10 -06:00
Ryan Houdek
884006e4c8
Use the global ::wxSetCursor instead of the local one from our panel object. Should close 3956.
2012-12-14 15:19:22 -06:00
Glenn Rice
a6374f25fd
Fix OSX build once again. Apparently OSX needs to get with the times.
2012-12-10 10:31:08 -06:00
Glenn Rice
e85438cba0
Clean up gcc/g++ compiler warnings that have accumulated.
2012-12-10 00:40:28 -06:00
rog
43d673b576
Save game list sorting.
...
Fixes issue 5771.
2012-12-08 23:53:50 -05:00
John Peterson
983d5d1f73
Making cheats manager resizeable, maximizable, hideable (parentless), higher by default.
2012-12-03 20:58:25 -05:00
rog
97f5b1665f
what is this even...
2012-11-26 02:11:52 -05:00
XtraFear
d6697d50c7
Added option to toggle the display of On-Screen Display messages in the Interface tab.
2012-11-16 23:54:48 +01:00
NeoBrainX
a135512f9b
Build fix.
...
Fixes issue 5674.
2012-11-16 23:46:28 +01:00
rog
3a8e8af2d5
Merge movie-fixes.
2012-11-16 12:07:22 -05:00
rog
14aa7150d9
Add option for author name for movies. Also, minor cleanup for previous options i've added.
2012-11-14 16:23:20 -05:00
rog
a5d210129d
Add an on screen lag counter.
2012-11-11 17:57:06 -05:00
rog
35e5a1e592
Add an option to pause on the last frame of a movie.
2012-11-10 21:57:31 -05:00
Rog
e8c0fea16e
Retain dsp JIT setting when switching to HLE. Fixes issue 5691.
2012-11-09 12:08:56 -05:00
Pierre Bourdon
d13163380d
Bye mamario, you won't be missed
2012-11-02 02:48:55 +01:00
sulokuTDCmago
d032c40a58
- Added a new wilcard for importing savegames, which basically shows all saves (gci, gcs and sav). This is set as default (I really got frustrated of having to change the type every single time when making tests for GCMM, and I think it makes more sense at user level to just show all saves regardless the format)
...
- In icon retrieving I removed the "format check" as it shouldn't really matter to have mixed icon formats. Also removed the "Time splitters hack" as there's no reason for it since we are only checking the last 3 bits and I'm pretty sure having bits 1 and 2 set is the same as having them unset.
- Icon retrieving uses AnimSpeed as stop signal (every icon must have an speed set, the first speed that is 0 means there are no more icons)
- Also, in icon retrieving I added support for "blank frames"(Luigi's Mansion and Pikmin that I know of). With this the base for icon animation is complete.
- Fixed PSOIII savegame patch which was wrong before.
Signed-off-by: LPFaint99 <lpfaint99@gmail.com>
2012-10-29 21:02:59 -07:00
NeoBrainX
f7edfc0118
FifoPlayer: Copy selected object commands to clipboard when pressing ctrl+c
2012-10-22 12:32:57 +02:00
rog
a366521d13
Correct the hotkey labels for undo load state, and load last overwritten state buttons
2012-10-18 03:30:44 -04:00