5e4e2ef852
It should be signed.
2013-01-04 22:36:44 +13:00
20b50026ca
Fix a merge conflict: all the cool kids just delete any code that doesn't automerge, without considering how easy it'd be to do manually.
2013-01-01 10:29:00 -05:00
cbab60e8b4
Get rid of comparison between signed/unsigned warnings and others.
2013-01-02 00:42:33 +13:00
47681ea08d
Possibly fix build for mac.
2013-01-02 00:19:00 +13:00
e0c9a1fd09
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Common/Src/CommonPaths.h
Source/Core/Core/CMakeLists.txt
Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
2013-01-01 23:28:46 +13:00
c728ef2cd3
Last warning for me on Linux.
2013-01-01 14:42:30 +13:00
4c374cd58a
Improve file search speeds by deleting an unused file.
2012-12-31 15:27:36 +13:00
bcf1f54c65
Optimized the Dolphin SEO process a bit
2012-12-31 02:31:55 +01:00
71bb297f2c
Always count gc controller inputs.
2012-12-30 06:48:37 -05:00
64afbade33
Fix 4 warnings on OSX
2012-12-30 04:32:37 -06:00
ff3b22e1ff
Clear up some warnings that crop up from -Wextra
2012-12-30 03:28:50 -06:00
e5d5365bac
Fix the last few warnings in Dolphin on my system.
2012-12-30 02:34:14 -06:00
49ed752126
This line in SWRenderer has been wrong ever since the beginning.
2012-12-30 02:12:31 -06:00
b4f30e549e
Missed a precision qualifier in a HWRasterizer shader.
2012-12-29 21:50:07 -06:00
539bf405f2
In memory of calc84.
...
http://dolphin-emu.org
2012-12-30 16:31:38 +13:00
30dd9c2e17
always calls glBindBuffer(0) after disabling vao
2012-12-29 12:50:42 +01:00
cd54d6efdd
Mismatched new/delete.
2012-12-29 22:26:09 +13:00
670ca7e993
Toggle wiimote status based on the actual status, instead of some dumb checkbox that is almost never even right.
...
The checkbox is still wrong when starting emulation, but it's now purely cosmetic.
Actually fixes issue 5594.
2012-12-29 02:48:20 -05:00
e9d00bfeeb
revert RasterFont optimization
...
isn't needed and also not tested and buggy
2012-12-29 00:37:50 +01:00
3ec3b7683e
Fix (dis)connecting wiimotes via hotkey.
...
Fixes issue 5594.
2012-12-28 11:21:08 -05:00
c303669dd0
Clean up some messy code issues that have been annoying me.
2012-12-28 09:58:06 -06:00
af2820ac88
Don't show multiple exit confirmation dialogues.
...
Pause emulation while waiting for confirmation to exit.
Fixes issue 5822.
2012-12-28 03:39:34 -05:00
225d29f3f6
Fix this annoying warning in ChunkFile.h
2012-12-27 23:43:59 -06:00
94116bf89c
Always use the right user dir on windows.
2012-12-26 19:55:45 -05:00
db5f4c8c20
fix byte order in osd rasterfont
2012-12-26 23:48:33 +01:00
01cdcc83a3
Merge Fail: Make sure we are using the interface file to get backbuffer dimensions. GL helper function was duplicated.
2012-12-26 13:15:19 -06:00
67c1c6b062
Merge branch 'GLES-software'
2012-12-26 12:54:58 -06:00
5169804a61
Remove duplicated X11 code.
2012-12-26 12:12:26 -06:00
93f72d8463
Don't add superfluous whitespace to the CMake file
2012-12-26 11:07:33 -06:00
2d4c3c7c91
Beautify some tabs.
2012-12-26 10:33:45 -06:00
e2489196e4
Got overzealous. We aren't removing CG quite yet with this branch.
2012-12-26 00:41:25 -06:00
9a58f9a3bb
Rename another function...
2012-12-26 00:34:09 -06:00
c43a0dac2e
Add to more than 32bit debug
2012-12-26 00:25:49 -06:00
fa9abfdc42
Add a include directory
2012-12-26 00:22:17 -06:00
a35c5a7f22
Add a include directory
2012-12-26 00:20:09 -06:00
f4e7a280a9
Remove cg.lib from some files for Windows and renaming a function.
2012-12-26 00:07:43 -06:00
e9099459bb
Maybe fix Windows compiling.
2012-12-25 22:52:30 -06:00
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
c884dbf654
Mistype in WX.cpp
2012-12-25 19:18:03 -06:00
01953ff64a
Rename the interface files and hopefully fix OSX building.
2012-12-25 19:08:24 -06:00
b3ed3bdb91
Define NvOptimusEnablement to tell the Nvidia driver we need high performance
2012-12-25 13:51:13 +01:00
ba348c29d7
Merge branch 'new-ax-hle'
...
Only AX GC is merged so far, the new Wii AX development will be done in a
separate branch when I'll start working on it.
There are still a few AX GC bugs remaining, but overall a lot less games have
sound issues than before.
Thanks to everyone who helped test the development builds of this branch and
reported results on the forum thread.
Conflicts:
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
2012-12-25 13:33:53 +01:00
4a74da3e87
Readd the old AXWii (rename the new version to NewAXWii) and set it as default
2012-12-25 13:30:55 +01:00
bff0faea2d
Merge branch 'immediate-removal'
...
Conflicts:
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
2012-12-25 12:39:00 +01:00
b3714f4874
Don't show compress iso option for wbfs and ciso files.
...
Fixes issue 5809.
2012-12-25 06:31:31 -05:00
399a6af66d
revert update the rasterfont shader to GLSL3.3 - OGL 2.0 should be enough
2012-12-25 12:22:02 +01:00
4798524b75
Dolphin 3.5 release.
2012-12-24 21:29:24 +01:00
e3e14af0dd
Revert "VertexShaderGen: Fix a shader compilation error.". I'm an idiot :p
...
This reverts commit 4d868705fd
2012-12-24 21:29:24 +01:00
2c58385fe2
Revert "Uninitialized usage.. or so it thought."
...
This reverts commit 7839676c87
2012-12-24 21:23:28 +01:00
4d868705fd
VertexShaderGen: Fix a shader compilation error.
2012-12-24 19:50:16 +01:00
Matthew Parlane