Commit Graph

14774 Commits

Author SHA1 Message Date
skidau
726a3acc9a Merge pull request #1409 from lioncash/err
OGL: Get rid of error macros
2014-10-28 12:48:39 +11:00
skidau
3f7a6e3eee Merge pull request #1405 from lioncash/mono
CheatSearchTab: Make cheat list display in monospace font
2014-10-28 12:47:21 +11:00
skidau
dd3cd30ee8 Merge pull request #1393 from RachelBryk/accel
Fix acceleration emulation for wiimote and nunchuk.
2014-10-28 12:46:37 +11:00
comex
5f4c22df1a Merge pull request #1423 from Buddybenj/cannot
Fix consistency of cannot throughout the project
2014-10-27 21:28:17 -04:00
Buddybenj
1b9add5cab Fix consistency of cannot throughout the project 2014-10-27 20:26:18 -05:00
Ryan Houdek
07a8b1b28f Merge pull request #1422 from randomstuff/fix-llvm
Fix LLVM
2014-10-27 18:58:10 -06:00
Gabriel Corona
cf3ba671bf Fix LLVM
$(llvm-config --ldflags) was passed to the compiler but it needs to be
passed to the linker instead (-L and -l flags).
2014-10-28 01:36:27 +01:00
comex
c76b804258 Merge pull request #1406 from lioncash/const
DolphinQt: Make GetOS const
2014-10-27 15:04:41 -04:00
Ryan Houdek
81dda593cd Merge pull request #1404 from Sonicadvance1/fix-ARMv7
Fixes some ARMv7 regressions.
2014-10-27 05:15:17 -06:00
Ryan Houdek
043bd710a0 Merge pull request #1394 from Sonicadvance1/fix-arm-cpudetect
Fixes ARM CPU detection routine for the hardware.
2014-10-27 05:07:24 -06:00
Lioncash
2b710929f9 Merge pull request #1416 from archshift/clion
Added IDEA/Clion project dir to .gitignore
2014-10-27 00:33:37 -04:00
archshift
0019519bd6 Added IDEA/Clion project dir to .gitignore 2014-10-26 21:19:19 -07:00
skidau
bf97e7f9c1 Merge pull request #1390 from RachelBryk/turbo
Alternate inputs once per frame rather than once per input for turbo.
2014-10-27 12:56:21 +11:00
skidau
7cc33a2fcc Merge pull request #1384 from RachelBryk/hide-mouse
Fix description of hide mouse cursor option.
2014-10-27 12:55:17 +11:00
Ryan Houdek
acacbc0c46 Merge pull request #1412 from Sonicadvance1/fix-LLVM-detection
Fixes LLVM library detection.
2014-10-26 15:33:52 -06:00
Ryan Houdek
bd1a192faf Fixes LLVM library detection.
I must have had a dirty cmake configuration which didn't encounter this issue.
Make sure we are using LLVM_DEFINITIONS to know where we are linking to libraries at.
Link against libLLVM-${VERSION}, the other one was linking us against static libraries...
2014-10-26 16:17:57 -05:00
Lioncash
2f132863d6 Merge pull request #1411 from lioncash/vert-align
EXI_DeviceIPL: Fix vertical alignment of IPL arrays
2014-10-26 13:50:12 -04:00
Lioncash
edea9dfca3 EXI_DeviceIPL: Fix vertical alignment of IPL arrays 2014-10-26 11:45:56 -04:00
Lioncash
49b94e5285 OGL: Get rid of error macros 2014-10-26 04:54:58 -04:00
skidau
f895648eb9 Merge pull request #1396 from comex/star-star-star
Fix 'sizeof' which broke in my reference-to-pointer conversion.
2014-10-26 14:18:02 +11:00
skidau
38acd4d4bf Merge pull request #1382 from Sonicadvance1/LLVM-disasm
Implements LLVM based disassembler for the debugger.
2014-10-26 13:46:01 +11:00
skidau
1078d78a6c Merge pull request #1374 from lioncash/clearctx
AGL: Use NSOpenGLContext's clearCurrentContext in ClearCurrent
2014-10-26 13:44:50 +11:00
skidau
7c58eb344d Merge pull request #1378 from lioncash/gl
GLUtil: Change return type from GLuint to GLenum for OpenGL_ReportGLError.
2014-10-26 13:44:34 +11:00
Lioncash
14c3445ad2 DolphinQt: Make GetOS const 2014-10-25 21:51:58 -04:00
Lioncash
adf6ce076c CheatSearchTab: Make cheat list display in monospace font 2014-10-25 21:44:56 -04:00
Ryan Houdek
0fbd5248ca Fixes a potential crash on the ARMv7 JIT if someone disables the entire JIT in the debugger.
We can't disable branches in the JITs. Make sure they don't become disabled if someone tries to disable the full JIT.
2014-10-25 20:38:44 -05:00
Ryan Houdek
17f352e2aa Fixes some overzealous optimizations from ARMv7 BindToRegister.
We can't do it in rlw and friends.
subfx had an inccorect check.
Minor whitespace and reordering.
2014-10-25 20:36:29 -05:00
Ryan Houdek
484fc392d6 Fixes minor bug in the ARMv7 register cache.
Makes sure our register we are binding doesn't get unloaded immediately.
2014-10-25 20:34:11 -05:00
comex
5f21683343 Merge pull request #1388 from waddlesplash/dolphin-qt
DolphinQt: About dialog fixes, SystemInfo dialog
2014-10-25 21:20:02 -04:00
Augustin Cavalier
7cd0a13d35 Fixes from @comex to add the app bundle and icon on Mac. 2014-10-25 21:17:32 -04:00
Augustin Cavalier
69cd8229d8 Fixes to the About dialog & add the SystemInfo dialog.
Also fix the build on Mac OS X.
2014-10-25 20:59:07 -04:00
Rachel Bryk
f07d3be502 Fix acceleration emulation for wiimote and nunchuk.
The 1-2 least significant bits were missing.
2014-10-25 19:49:42 -04:00
Lioncash
3c5ca8cefe Merge pull request #1402 from lioncash/header
CheatsWindow: Remove unnecessary header includes and forward decls
2014-10-25 17:32:38 -04:00
Lioncash
da528008de CheatsWindow: Remove unnecessary header includes and forward decls 2014-10-25 16:56:16 -04:00
comex
275755aaaf Merge pull request #1381 from skidau/Remove-false-ext-exception-error
Added a check for external exceptions that have been set
2014-10-25 16:48:44 -04:00
comex
4b0c6d8e0f Merge pull request #1385 from lioncash/bitfield
BitField: Fix a typo in the sample usage.
2014-10-25 16:48:31 -04:00
comex
b7cb5b69c4 Merge pull request #1387 from RachelBryk/radius
Change default gcpad radius to 100.
2014-10-25 16:46:06 -04:00
comex
ab7c594b26 Merge pull request #1400 from lioncash/warn
CheatSearchTab: Fix signed/unsigned comparison warning
2014-10-25 16:45:50 -04:00
Lioncash
51a96297e6 CheatSearchTab: Fix signed/unsigned comparison warning 2014-10-25 16:32:33 -04:00
Ryan Houdek
10c3896421 Merge pull request #1399 from dolphin-emu/revert-1389-remove-armv7-opt
Revert "Removes ARMv7 specific byteswap routines from CommonFuncs.h"
2014-10-25 15:28:13 -05:00
Ryan Houdek
3ac2d8e1f1 Revert "Removes ARMv7 specific byteswap routines from CommonFuncs.h" 2014-10-25 15:28:04 -05:00
Lioncash
26adb3cf84 Merge pull request #1397 from comex/std-array-warning
Use double braces for std:array initialization to avoid clang warning.
2014-10-25 16:27:01 -04:00
comex
a9f9e81330 Use double braces for std:array initialization to avoid clang warning.
std::array does not have an initializer list constructor, instead (for
some reason) being defined to contain one public array member, allowing
it to be directly initialized.  Thus the most explicit way to initialize
it is with two braces, one for the struct and one for the array.  C++
allows the second pair of braces to be omitted, but clang complains
about it.
2014-10-25 15:39:24 -04:00
comex
5c2a470b97 Fix 'sizeof' which broke in my reference-to-pointer conversion. 2014-10-25 15:02:12 -04:00
comex
e51676fdf1 Merge pull request #1395 from Sonicadvance1/fix-OSX-spaces
Fixes packaging OS X binary with spaces in the directory name.
2014-10-25 14:58:11 -04:00
Ryan Houdek
c2364a54c1 Fixes packaging OS X binary with spaces in the directory name. 2014-10-25 10:51:54 -05:00
Ryan Houdek
b66a7f83c2 Fixes ARM CPU detection routine for the hardware.
We weren't dropping a newline character from the string, we were cutting off the last character of the hardware name.
This fixes my TK1 being called 'lagun' when it's name is 'laguna'
2014-10-25 09:14:14 -05:00
Ryan Houdek
e780a49a06 Merge pull request #1375 from Sonicadvance1/ARMv7-optimizations
Minor ARMv7 JIT recompiler optimizations.
2014-10-25 08:28:10 -05:00
skidau
bc26cb1b19 Merge pull request #1322 from degasus/ogl-pp
OGL: force enable postprocessing
2014-10-25 13:48:27 +11:00
skidau
8598d6bc2b Merge pull request #1364 from RachelBryk/titles
Read game title from ini file, or titles.txt if it exists.
2014-10-25 13:33:26 +11:00