ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,657 Commits 5 Branches 11 Tags 1.3 GiB
Commit Graph

19657 Commits

Author SHA1 Message Date
Jules Blok 8bda12bcfd Revert "Merge pull request #3076 from void-ghost/stereo3d_presets" 
This reverts commit 81414b4fa2, reversing
changes made to b926061f64.

Conflicts:
	Source/Core/DolphinWX/Frame.cpp
	Source/Core/VideoCommon/VideoConfig.cpp
	Source/Core/VideoCommon/VideoConfig.h
 2015-12-23 00:35:19 +01:00
Markus Wick a55af16131 Merge pull request #3350 from Armada651/video-stereoscopy 
VideoConfig: Move all stereoscopy options to the stereoscopy section.
 2015-12-23 00:20:37 +01:00
Scott Mansell 14e976a5f1 Merge pull request #3380 from lioncash/fb 
FramebufferManager: Get rid of raw new and delete
 2015-12-23 12:16:28 +13:00
Lioncash e422af9cce FramebufferManager: Get rid of raw new and delete 2015-12-22 18:06:05 -05:00
Jules Blok 7b4c4bfc5e VideoConfig: Fix stereoscopy preset settings. 
PR #3076 looks to be pretty poor quality and should be reverted.
 2015-12-22 23:24:05 +01:00
Jules Blok 2c5965be88 UserPreferences: Move all stereoscopy options to the stereoscopy section. 2015-12-22 23:16:28 +01:00
Jules Blok fa207ef8a0 VideoConfig: Move all stereoscopy options to the stereoscopy section. 2015-12-22 23:16:27 +01:00
Jules Blok 9a1b2f68cc ISOProperties: Replace the ConvergenceMinimum option by the Convergence option. 
The ConvergenceMinimum was replaced by Convergence in the GameINI.
 2015-12-22 23:16:27 +01:00
Jules Blok c49bb57e09 VideoConfig: Move all GameINI stereoscopy options to the stereoscopy section. 2015-12-22 23:16:27 +01:00
JosJuice ed8fa5ba77 DolphinWX: Add missing m_ListElfDol cases 2015-12-22 16:26:31 +01:00
Mathew Maidment 1b69743ba1 Merge pull request #3362 from lioncash/memory 
NANDContentLoader/WiiWAD: Get rid of raw delete and new
 2015-12-22 06:39:12 -05:00
Mathew Maidment 98c0c79895 Merge pull request #3376 from spxtr/DQt2 
Use const reference, explicit, final, and override consistently in DQt2
 2015-12-22 06:33:37 -05:00
spxtr 21032d76a8 Use const reference, explicit, final, and override in DQt2. 2015-12-21 19:46:03 -08:00
Scott Mansell ce6de78854 Merge pull request #3250 from JosJuice/loadgameini-condition 
BootManager: Remove unnecessary LoadGameIni condition
 2015-12-22 13:24:09 +13:00
JosJuice 1b946c2ff3 BootManager: Remove unnecessary LoadGameIni condition 2015-12-22 00:54:54 +01:00
Scott Mansell a691e1fb6d Merge pull request #2621 from AdmiralCurtiss/config-cache-methods 
BootManager: Slightly clean up the config_cache.
 2015-12-22 12:52:16 +13:00
Scott Mansell 1ce9c33f6c Merge pull request #3373 from JosJuice/temp-settings-ini-hotfix 
Config Hotfix: Prevent per-game settings (ie. GameINI) being stored to the global user configuration.
 2015-12-22 12:37:22 +13:00
Admiral H. Curtiss 4d2e9abba7 BootManager: Slightly clean up the config_cache stuff by pulling the save and restore into their own methods. 2015-12-22 00:30:25 +01:00
Admiral H. Curtiss 3149140052 Config: Hotfix to prevent per-game settings from ie. GameINIs being stored to the global user configuration. 2015-12-22 00:16:29 +01:00
Pierre Bourdon 4c428ed019 Merge pull request #3372 from lioncash/framebuffer 
FramebufferManagerBase: Get rid of explicit delete and new
 2015-12-21 22:48:13 +01:00
Lioncash f448c6e291 FramebufferManagerBase: Get rid of explicit delete and new 2015-12-21 15:57:48 -05:00
Pierre Bourdon 9039cc5860 Merge pull request #3371 from lioncash/streambuffer 
StreamBuffer: Minor changes
 2015-12-21 18:56:08 +01:00
Mathew Maidment 4c62a5c0a4 Merge pull request #3370 from rohit-n/warnings 
Silence -Wshadow and -Wmaybe-uninitialized warnings.
 2015-12-21 11:44:51 -05:00
Mathew Maidment 44a3578993 Merge pull request #3367 from spxtr/DQt2 
DQt2: Use a separate INI file for UI settings
 2015-12-21 11:33:56 -05:00
Rohit Nirmal aaa89d4f73 Silence -Wshadow and -Wmaybe-uninitialized warnings. 2015-12-21 10:06:07 -06:00
Lioncash d20ba76ab3 StreamBuffer: Make factory function return a std::unique_ptr 2015-12-21 10:21:38 -05:00
Lioncash ec71452706 StreamBuffer: Correct function casing 2015-12-21 10:09:03 -05:00
Lioncash 1eea95a5be StreamBuffer: Use std::array for fences 2015-12-21 10:07:56 -05:00
Lioncash 7b69fec8e7 StreamBuffer: Remove unnecessary inline specifiers 
Methods defined directly in class bodies are inline by default
 2015-12-21 10:04:14 -05:00
Mathew Maidment 365a326798 Merge pull request #3369 from lioncash/unique 
VideoBackends: Simplify initialization and deinitialization of resources
 2015-12-21 01:57:37 -05:00
Lioncash f295182833 VideoBackends: Simplify initialization and deinitialization of resources 
Approximately three or four times now, the issue of pointers being
in an inconsistent state been an issue in the video backend renderers
with regards to tripping up other developers.

Global (ugh) resources are put into a unique_ptr and will always have a
well-defined state of being - null or not null
 2015-12-20 22:40:37 -05:00
Mathew Maidment 1fbab188ad Merge pull request #3368 from hdcmeta/dx11_cleanup 
Set g_vertex_manager to nullptr on DX11 backend shutdown
 2015-12-20 21:41:26 -05:00
hdcmeta 50b9ab4541 Set g_vertex_manager to nullptr on DX11 backend shutdown.. OGL backend already does this 2015-12-20 17:02:36 -08:00
spxtr 3a4a60f937 Use a separate INI file for UI settings. 2015-12-20 15:36:39 -08:00
Pierre Bourdon 2842897d55 Merge pull request #3363 from lioncash/tmd 
Volume: Make GetTMD return a vector
 2015-12-20 09:54:24 +01:00
Mathew Maidment 6b9d37b6ef Merge pull request #3365 from spxtr/DQt2 
DQt2: Move menu bar into its own file.
 2015-12-20 00:30:47 -05:00
spxtr f9f2b2fd36 Move the menu bar into its own file. 2015-12-19 21:24:48 -08:00
Stenzek a61fc372bb VideoCommon: Change PokeEFB to take a pointer rather than a vector 
This saves allocating a vector for the pass-through path.
 2015-12-20 14:42:14 +10:00
Lioncash cbeb7034eb Volume: Make GetTMD return a vector 2015-12-19 18:00:44 -05:00
Lioncash c78c54c546 NANDContentLoader/WiiWAD: Get rid of raw delete and new 2015-12-19 17:37:09 -05:00
Stenzek 7b628c99ec D3D: Implement vectored efb pokes, increase util vertex buffer size to 64KiB 2015-12-20 00:31:58 +10:00
Ryan Houdek c683b54921 Merge pull request #3358 from degasus/test 
VideoSW: Clear normal vertex data.
 2015-12-19 05:16:16 -05:00
degasus 5e9ab28ed1 VideoSW: Clear normal vertex data. 
This data might not be initialized but used for lighting.
This matches our ShaderGen usage in VertexShaderGen.cpp:166.
 2015-12-19 10:51:42 +01:00
Markus Wick e638775bc7 Merge pull request #3351 from degasus/wip 
Real Wiimote: Don't delay speaker data.
 2015-12-18 15:30:49 +01:00
Pierre Bourdon de21da5fb2 Merge pull request #3315 from degasus/test 
ShaderGen: Toggle value of uninitialized color.
 2015-12-18 14:21:37 +01:00
Scott Mansell ebe3c49c5f Merge pull request #3332 from degasus/master 
MSAA: Store samples in ini files.
 2015-12-19 01:37:10 +13:00
Mathew Maidment 7a78df2624 Merge pull request #3349 from JosJuice/am-baseboard 
DolphinWX: Change "AM-Baseboard" string to "AM Baseboard"
 2015-12-17 18:25:54 -05:00
Mathew Maidment 15580e6a3d Merge pull request #3305 from spxtr/DQt 
DQt2: Refactors.
 2015-12-17 18:24:52 -05:00
degasus 94ae134bf4 Real Wiimote: Don't delay speaker data. 2015-12-17 23:48:43 +01:00
Mathew Maidment c1b2eba82b Merge pull request #3348 from JosJuice/u64 
DolphinQt: Attempt at fixing issue 9170
 2015-12-17 16:45:24 -05:00