archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-22 12:21:41 +02:00
Code Issues Projects Releases Packages Wiki Activity
10635 commits 5 branches 11 tags 1.3 GiB
Commit graph

10635 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Parlane
4ac0fb0a3e Remove unneeded polarssl files. 2013-08-16 21:36:36 +12:00
Matthew Parlane
17918472ae Fix random d... 2013-08-16 19:26:34 +12:00
Matthew Parlane
9de7611ff9 Merge branch 'master' into wii-network 
Conflicts:
	CMakeLists.txt
	Source/Core/Core/Core.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
	Source/Dolphin_2010.sln
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props
 2013-08-16 19:17:07 +12:00
Lioncash
82e9bed20e [Android] Fix a bug where the name would display incorrectly in the game list. 
Completely missed the 'this.' on the variable. My bad.
 2013-08-15 20:34:05 -04:00
Pierre Bourdon
c3065ecb66 Fix compatibility with the SDL2.0 release. 
SDL2.0 removed SDL_HAPTIC_SQUARE because of ABI issues (see comment #7 on issue
6491 by Ryan C. Gordon from the SDL project). It will be reintroduced again in
2.1, so keep the code and #ifdef it away.
 2013-08-15 22:18:40 +02:00
Rodolfo Bogado
1de39a4a6e Revert wrong indentation of some files. sorry for that one i was really convinced that i read that spaces must be used instead of tabs :) 2013-08-15 15:40:57 -03:00
Rodolfo Bogado
08a6b8920b re indentation to follow emulators code rules in some files I'm modifying 2013-08-15 15:16:32 -03:00
Ryan Houdek
10f6117905 Add some ifdef magic to GLFunctions.cpp to make it not directly dependant on GLESv3. 2013-08-15 18:15:55 +00:00
Rodolfo Bogado
8e9bbdeb2f some fixes for point rendering 2013-08-15 15:14:48 -03:00
Ryan Houdek
06620ff364 [Android] Fall back to using dlsym on ourselves to pull in OpenGL Functions when eglGetProcAddress fails. This fixes an issue on the Chromebook where I was forced to link to libGLESv2 and pull in the functions statically since eglGetProcAddress wouldn't return any GLESv3 functions. This also changes glMapBuffer to glMapBufferOES because glMapBuffer isn't actually part of the OpenGL ES 3 spec... 2013-08-15 18:07:56 +00:00
Rodolfo Bogado
a5e34dd5cb merge changes from other back ends to the PerfQuery functionality 2013-08-15 14:45:18 -03:00
Rodolfo Bogado
ba6a67a5f1 Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix 2013-08-15 13:49:53 -03:00
Jasper St. Pierre
863fb9f95b D3DBase: Fall back to creating a normal context when debug fails 
This can happen if the user does not have an up to date version of
the DirectX SDK, as Microsoft intentionally broke it and requires
users to install the W8 SDK.
 2013-08-15 10:19:14 -04:00
Jasper St. Pierre
605e3e8f65 Revert "D3DBase: Don't pass the DEBUG flag when creating a device" 
This reverts commit 0e6b5bc5c8.
 2013-08-15 10:07:52 -04:00
Matthew Parlane
417552b21e Not sure what that was. 2013-08-16 01:06:44 +12:00
Pierre Bourdon
c6d8d52041 Fix a warning introduced by the recent netplay UI changes 2013-08-15 15:05:20 +02:00
Matthew Parlane
d6ec6ae97a Fix polarssl on Windows. 2013-08-16 00:24:10 +12:00
Jack Frost
d16f089e88 properly clean up PerfQuery on OGL 2013-08-15 13:52:31 +02:00
Matthew Parlane
d8b39b9dcf Support PolarSSL on *nix 
Removed unneeded PolarSSL directories.
Remove duplicate sha1 and md5 files.
Define out SSL test file writing.
Fix format string bug and warning.
 2013-08-15 23:36:17 +12:00
Matthew Parlane
e1f8146d96 Use explicit output dir for PolarSSL 2013-08-15 21:53:52 +12:00
Matthew Parlane
b93d62dcb8 Remove LTCG and platform toolset, fix code style. 2013-08-15 21:43:43 +12:00
Matthew Parlane
fede38985e Replace OpenSSL with PolarSSL 
Works on windows, not yet cmake.
 2013-08-15 20:47:47 +12:00
Rodolfo Bogado
979718484f Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix 2013-08-15 00:21:28 -03:00
Lioncash
072fac4a74 [Android] Remove a redundant LinearLayout in one of the layout files. 2013-08-14 20:49:26 -04:00
Lioncash
3e6f9d22db [Android] Add a faint divider line between each folder browser item. 
See here for how it looks: http://i.imgur.com/CGX9NTt.png
 2013-08-14 20:43:29 -04:00
Jasper St. Pierre
3380e47ca7 MemArena: Free memory for 64-bit machines 
Make the logic here a lot simpler. Patch contributed by Google Code
user plbl4ster.
 2013-08-14 20:34:15 -04:00
Lioncash
9c27fedd6d [Android] Remove the subtitles on all folders in the folder browser. No need to have the subtitle "Folder" when it's visibly indicated by the icon of a folder next to it. 
Now it looks like this: http://i.imgur.com/CbUSqgg.png
 2013-08-14 19:49:39 -04:00
Jasper St. Pierre
1826fce946 NetPlay: Make sure the server knows it's stopped when it's stopped 
This is embarassing.
 2013-08-14 18:36:09 -04:00
Pierre Bourdon
7622d5b354 Only call SetGenerationMode from BPWritten if the cull mode changed. 
Should decrease CPU usage on the GPU thread by a bit in the OGL backend.
 2013-08-15 00:26:03 +02:00
Jasper St. Pierre
998194246c NetPlay: Disable the "Start" button while the game is running 2013-08-14 18:16:07 -04:00
Jasper St. Pierre
1c74e412e2 NetPlay: Remove the "Stop" button 
Now that the host can simply close the window, there's no need for this extra control.
 2013-08-14 18:16:06 -04:00
Jasper St. Pierre
5241deaebe NetPlay: Allow hosts to stop the game by closing the game window 2013-08-14 18:16:05 -04:00
Jasper St. Pierre
92f8d79574 NetPlay: Set the pad buffer size on server creation 
If we don't do this, then when the game starts we'll send out the
buffer size to clients being a super large value of junk, and they'll
hang forever trying to accumulate an input buffer a size that they'll
never ever reach in a million years.

This never manifested in release builds for some reason.
 2013-08-14 18:15:28 -04:00
Jasper St. Pierre
0e6b5bc5c8 D3DBase: Don't pass the DEBUG flag when creating a device 
In order for this flag to not fail, you either need a Windows 8 machine
or upgrade to the paid version of Visual Studio 2012. Not gonna happen.
 2013-08-14 18:04:44 -04:00
Pierre Bourdon
e60e50a198 Respect ShouldEmulate() in PerfQuery implementations for DX11 and OGL (ugly implem, but the current state of VideoCommon does not allow much better) 2013-08-14 23:18:00 +02:00
Pierre Bourdon
c322bedf0e Enable performance queries for Super Mario Sunshine 2013-08-14 23:18:00 +02:00
Pierre Bourdon
26f58e1ba5 Add an option to enable performance queries in gameini files, disable it by default 2013-08-14 23:16:46 +02:00
Pierre Bourdon
ffdd79df36 Move VideoBackendBase from Common to VideoCommon 2013-08-14 23:16:46 +02:00
Lioncash
94397a44cc [Android] General formatting clean-up. 
Made some class variables final, since they should convey that they cannot be changed after the first assignment.
Made the formatting consistent between files.
 2013-08-14 15:03:07 -04:00
Lioncash
6f1612d99c [Android] Fix the gamepad settings view inflation. 
In some cases, it would fail to inflate correctly in the sense that it would only show the binding status and not the name of the actual control that was being binded.
 2013-08-14 14:33:47 -04:00
NeoBrainX
0cd94b5bc7 VertexShaderGen: Cleanup. 2013-08-14 11:47:23 +00:00
Lioncash
39eeb37032 [Android] Correct the accessibility scope of a method and variable in InputConfigFragment.java. 
Also, join a variable's declaration and assignment in the onMotionEvent() function.

If no explicit accessibility term (private, protected, public, etc) is given, then the permission level is set to something called 'package-private' which means it is set to the scope of the whole package. So technically any class could have access to this method and variable, which is likely not what we want.
 2013-08-14 07:33:17 -04:00
Lioncash
0142efbb2a [Android] Add 'final' to all of the class declarations. 
This prevents inheritance of the classes (will throw a compiler error if you try and extend any of the classes).
This is mainly syntactical sugar and form. Nothing major.
 2013-08-14 07:17:45 -04:00
Rodolfo Bogado
0ec92f986b small correction, we cannot use dual source blending if separate alpha function is not supported 2013-08-13 17:31:50 -03:00
Rodolfo Bogado
85f91d66ba Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix 2013-08-13 17:30:22 -03:00
John Chadwick
a791733c27 Fix invalid C++ code (returning reference to local) - thanks devm33. 2013-08-13 14:47:32 -04:00
Lioncash
3cc8f7747e [Android] Main title text for the file browser items are bolded again. Must have removed it accidentally during the previous large refactor. 2013-08-13 14:32:46 -04:00
Lioncash
53bf55b1e9 [Android] Make the file browser look much more nice and user friendly to use. 
This is what it now looks like: http://i.imgur.com/KOZgA1i.png

As usual, if any bugs arise from this rather large change. Please report it so I can fix it.
 2013-08-13 13:05:42 -04:00
Lioncash
8fbf11a0d9 [Android] Add translatable="false" to the names of the string arrays in prefvalues.xml. 2013-08-13 12:10:42 -04:00
Lioncash
a8fcd50cd7 [Android] Integer.toString isn't required in this string declaration. Concatenation handles this. 
For example: "string" + 1 will just be concatenated as "string1" implicitly.
 2013-08-13 10:09:42 -04:00