Commit Graph

12258 Commits

Author SHA1 Message Date
Ryan Houdek bf5f485a2c Merge pull request #197 from lioncash/android-things
Fix misc Android things.
2014-03-22 21:45:22 -05:00
Lioncash 13c780d6a7 Fix two untranslated Japanese strings. 2014-03-22 22:42:29 -04:00
Lioncash 7922428dd7 Fix a call to a parent class method in InputOverlay.
Should have been a call to draw, not onDraw. Behavior-wise, it's still the
same however.
2014-03-22 22:41:42 -04:00
Matthew Parlane b57949131d Merge pull request #196 from Sonicadvance1/gradle-buildoptions
Pass our signing information to gradle by argument.
2014-03-23 01:36:14 +13:00
Ryan Houdek d85b8afe58 Pass our signing information to gradle by argument.
Changes from using environment variables that the world can see to arguments.
So we don't have to expose our keys and aliases to people
2014-03-22 07:33:18 -05:00
Ryan Houdek 89efec6109 Merge pull request #167 from neobrain/ogl-efbpokes
Implement EFB pokes in the OpenGL backend.
2014-03-20 15:25:56 -05:00
Lioncash 9ed562d7de Mark the PPCDebugInterface and DSPDebugInterface as final. 2014-03-18 20:42:08 -04:00
Tony Wasserka 51fdf8a9b2 Merge pull request #191 from Jezze/for-dolphin
Some cleanups for OGL/Vertexmanager.cpp
2014-03-18 20:47:44 +01:00
Jens Nyberg ae260e55e4 OGL/VertexManager: Do not check if g_nativeVertexFmt is zero
The variable is already dereferenced both before and after this
check which means that if this variable would ever be zero it would
have crashed dolphin already.
2014-03-18 21:33:30 +01:00
Jens Nyberg 80421156b6 OGL/VertexManager: Minor cleanup of if case 2014-03-18 21:33:30 +01:00
Pierre Bourdon c11aadee41 Merge pull request #182 from RachelBryk/extract-gc-dol
Add extract dol/apploader options back for gc disks.
2014-03-18 20:41:35 +01:00
Ryan Houdek eac11b7625 Merge pull request #190 from lioncash/stream-final
Minor audio stream changes.
2014-03-18 13:51:20 -05:00
lioncash aecc8ea666 Remove usesMixer function from the sound streams.
This isn't used anywhere in the codebase. Not even the base SoundStream has it as part of its interface.
2014-03-18 10:42:07 -04:00
lioncash 5e5ab61d0c Mark the audio streams as final.
These aren't intended to be continually extended.
2014-03-18 10:37:45 -04:00
Pierre Bourdon fab2808e5c Merge pull request #189 from Jezze/for-dolphin
Remove superfluous bit shift
2014-03-18 09:04:25 +01:00
Jens Nyberg 4a68550d01 Remove superfluous bit shift 2014-03-18 04:07:45 +01:00
Ryan Houdek 027240da45 Merge pull request #188 from Sonicadvance1/clang-warnings
Fixes warnings that Clang 3.4 exposes on Android.
2014-03-17 20:19:11 -05:00
Ryan Houdek 484fb46390 Clang 3.4 exposes some warnings on Android.
Fixes all warnings on Android build except for what is in externals.
Removes a function from TextureDecoder_Generic since it is unused and generates a warning.
2014-03-17 18:17:12 -05:00
Matthew Parlane 8f0fa997cb Merge pull request #187 from Sonicadvance1/android-clang-fix
Fix the Android build when using clang 3.4
2014-03-18 11:58:57 +13:00
Ryan Houdek 3586ab1d4c Fix the Android build when using clang 3.4 2014-03-17 17:56:22 -05:00
Matthew Parlane 8e45783d54 Merge pull request #186 from Sonicadvance1/gradle-fix
Fix building the release APK with gradle.
2014-03-18 11:08:44 +13:00
Ryan Houdek adaf095229 Fix building the release APK with gradle.
In release build all warnings are errors, and lint has some obnoxious warnings.
2014-03-17 16:28:31 -05:00
Pierre Bourdon 154dee8c6c Merge pull request #183 from Sonicadvance1/Arch-fix
Fix arch detection on x86.
2014-03-17 20:23:28 +01:00
Ryan Houdek 8ecb7524bc Fix arch detection on x86. 2014-03-17 11:46:19 -05:00
Ryan Houdek d4c53eed01 Fix arch detection on x86. 2014-03-17 11:36:27 -05:00
Ryan Houdek a6ee74b58d Fix arch detection on x86. 2014-03-17 11:33:11 -05:00
Rachel Bryk 57f3e1c907 Add extract dol/apploader options back for gc disks.
It was removed from the menu for the disk item in 868c6278, but we want to keep it there for gc games, since they don't have separate partitions.
2014-03-17 03:10:17 -04:00
Matthew Parlane 6445e02d53 Merge pull request #159 from Tilka/misc
Cleanup stuff
2014-03-17 17:43:20 +13:00
Tillmann Karras 46becfc06b Tests: fix signed/unsigned comparison warning 2014-03-17 02:55:58 +01:00
Tillmann Karras fa3cc05753 Turn some non-const refs into pointers 2014-03-17 02:55:57 +01:00
Tillmann Karras 7e39cf3b0d .gitignore: fix the build directory pattern 2014-03-17 02:55:56 +01:00
Tillmann Karras 2fcaca0603 More range-based loops and overrides 2014-03-17 02:55:55 +01:00
Tillmann Karras 3fc9ca0789 UCodes: nits 2014-03-17 02:55:54 +01:00
Tillmann Karras 3c46c0ede9 Interpreter: make some class members private 2014-03-17 02:55:54 +01:00
Matthew Parlane d3e9702cec Merge pull request #181 from lioncash/unused-core-func
Remove unused function PanicAlertToVideo from Core.cpp.
2014-03-17 14:14:15 +13:00
Lioncash 692deb24ba Remove unused function PanicAlertToVideo from Core.cpp. 2014-03-16 21:07:34 -04:00
Lioncash 5edce0eeb6 Simplify log queue clearing.
Simply just keep popping the queue until it's empty. No point in using a for loop for this.

Combined some if statements too.
2014-03-16 20:58:13 -04:00
Pierre Bourdon 4a906fdf7b Merge pull request #170 from RachelBryk/save-skip-bios
Save bHLE_BS2 to config cache before it can be changed while booting.
2014-03-17 01:06:46 +01:00
Rachel Bryk 89dbec437f Save bHLE_BS2 to config cache before it can be changed while booting.
This variable can be changed in SConfig::AutoSetup, so we need to save it before that is called.
2014-03-16 20:05:09 -04:00
Lioncash 110f603cb6 Remove an unnecessary wx translation underscore macro from PHackSettings.
Also removed an unnecessary string -> wx string conversion.
2014-03-16 19:05:57 -04:00
Pierre Bourdon fe37a772a4 Merge pull request #178 from lioncash/phack-cleanup
Clean up a little bit of the PHackSettings.
2014-03-16 23:49:12 +01:00
Lioncash 291c95b780 Cleanup a little bit of the PHackSettings. 2014-03-16 18:42:56 -04:00
Pierre Bourdon 09dc5c9703 Merge pull request #177 from lioncash/videoconfig-inheritance
Prevent VideoConfig inheritance.
2014-03-16 22:16:37 +01:00
Tillmann Karras a9a15690a2 UCode_AX: don't always call NotifyAXThread()
StartWorking() already does this if needed
2014-03-16 22:05:59 +01:00
Lioncash a9adaa5601 Prevent VideoConfig inheritance. 2014-03-16 17:00:29 -04:00
Lioncash bd1ce18f90 Simplify file tree building for the filesystem view.
Technically this also simplifies on disc filename building in general.
2014-03-16 16:54:00 -04:00
Pierre Bourdon 927a97c2a5 Merge pull request #166 from Sonicadvance1/Android-config
Fix the Android build's configuration setting/getting
2014-03-15 18:11:20 +01:00
Ryan Houdek 7b86716c65 Due to the removal of our char* IniFile setters/getters this broke Android build which relied on that.
Convert our C-strings to std::strings before using
2014-03-15 12:09:49 -05:00
Pierre Bourdon 880bbe185d Merge pull request #172 from Linktothepast/extra_parameter
Remove the extra parameters field from the PH.
2014-03-15 16:46:37 +01:00
Linktothepast 82f772fdcc Remove the extra parameters field from the PH.
Metroid: Other M was the only game which required this field, but the
issue in that game can be fixed properly by enabling format change
emulation. Hence, there's no point in having this around anymore.
Fixes issue 6644.
2014-03-15 15:04:39 +02:00