Commit Graph

16632 Commits

Author SHA1 Message Date
magumagu
7f7973efa5 Merge pull request #2148 from Tilka/fifo_cleanup
Small FIFO-related cleanup
2015-03-01 13:06:43 -08:00
magumagu
b4a586f84a Merge pull request #2161 from Tilka/fix_warnings
Fix some warnings
2015-03-01 13:02:37 -08:00
magumagu
aa24dbc56e Merge pull request #2157 from lioncash/leaks
DolphinWX: Allow input subsystems to correctly deinitialize
2015-03-01 12:53:28 -08:00
Tillmann Karras
f75187db3e Add missing newlines at EOF 2015-03-01 17:17:09 +01:00
Tillmann Karras
88264f5712 Fix -Wswitch warning 2015-03-01 16:17:32 +01:00
Tillmann Karras
b0bde31ac0 Fix include order of files outside of Source/Core 2015-03-01 14:54:22 +01:00
Tillmann Karras
4304648a05 Fix -Wreorder warning 2015-03-01 14:54:22 +01:00
Markus Wick
6a211978c1 Merge pull request #1950 from mbc07/master
Missing Game INIs & minor updates
2015-03-01 14:52:44 +01:00
Markus Wick
ba7186b8ae Merge pull request #2158 from degasus/texcache
TexCache: increase TEXTURE_KILL_THRESHOLD
2015-03-01 13:50:07 +01:00
degasus
7ca24f90d1 TexCache: increase TEXTURE_KILL_THRESHOLD
Xenoblade uses more than 40 textures alternately per frame for eg water effects.
So don't try to drop them as aggressive.
2015-03-01 13:41:14 +01:00
Lioncash
3981212031 DolphinWX: Allow input subsystems to correctly deinitialize
Previously InitControllers() would be called every poll duration, setting this boolean to false which would prevent said sybsystems from deinitializing correctly.
2015-03-01 01:23:21 -05:00
Ryan Houdek
d3c9701eb6 Merge pull request #2156 from Stevoisiak/EFB-Copies-To-Texture
VideoConfigDiag: Rename EFB Copies to RAM option
2015-02-28 22:28:11 -06:00
Mateus B. Cassiano
085c79bd5e Game INI updates 2015-03-01 00:13:58 -04:00
skidau
081adc92c0 Merge pull request #2152 from lioncash/timer
DolphinWX: Clean up some wxTimer code
2015-03-01 15:13:53 +11:00
Stevoisiak
cb7b96009d VideoConfigDiag: Rename EFB Copies to RAM option 2015-02-28 23:00:49 -05:00
Lioncash
4cc19ac926 DolphinWX: Clean up some wxTimer code
Technically fixes a memory leak (which wouldn't matter because the timer is only created once and destroyed on shutdown).

Also starting and stopping the timer does not cause leaks.
2015-02-28 20:32:37 -05:00
Tillmann Karras
9493c713dd Fifo: small cleanup 2015-02-28 15:40:01 +01:00
Tillmann Karras
e28c97f6bd Fifo: drop unused functions 2015-02-28 15:40:00 +01:00
Markus Wick
4fd980e6d4 Merge pull request #2143 from lioncash/cast
PixelShaderManager: Remove unnecessary casts.
2015-02-28 10:05:48 +01:00
Lioncash
d10571a86a PixelShaderManager: Remove unnecessary casts.
EFBToScaledXf and EFBScaledYf return a float, so the cast isn't needed here.
2015-02-28 00:04:05 -05:00
magumagu
c792d45d89 Merge pull request #2134 from JosJuice/delete-ph-presets
Delete PH_PRESETS.ini
2015-02-27 16:00:37 -08:00
skidau
4dd0813dcf Merge pull request #2133 from randomstuff/hotkeys
Fix hotkeys for Linux
2015-02-28 10:59:18 +11:00
Pierre Bourdon
48e597359e Merge pull request #2140 from waddlesplash/patch-1
Make sure we unset the CMAKE_REQUIRED_LIBRARIES variable.
2015-02-27 21:07:50 +01:00
Augustin Cavalier
54072b9c8a Make sure we unset the CMAKE_REQUIRED_LIBRARIES variable.
If we don't unset it, all the CMake checks will run with PortAudio
in the library list. This didn't affect those who had PortAudio,
but for select Debian systems without it, it breaks everything.
2015-02-27 20:00:02 +00:00
Markus Wick
60591f51e1 Merge pull request #2137 from waddlesplash/patch-1
Enet: ensure CMAKE_REQUIRED_LIBRARIES is empty.
2015-02-27 19:37:47 +01:00
Markus Wick
4f9fcbaba9 Merge pull request #2120 from JosJuice/show-default-gameini
ISOProperties: Allow opening region-free INIs with "Show Defaults" button
2015-02-27 17:58:42 +01:00
Markus Wick
4489c21b18 Merge pull request #2136 from JosJuice/gameini-less-regions
Use the new game INI naming format for as many games as possible
2015-02-27 17:43:56 +01:00
Augustin Cavalier
f95c55f26c Enet: ensure CMAKE_REQUIRED_LIBRARIES is empty. 2015-02-26 23:06:58 -05:00
skidau
1dcd0ad879 Merge pull request #2129 from Sonicadvance1/shuffle_user_dir
Move user directory detection location to UICommon.
2015-02-27 14:07:06 +11:00
skidau
2a41ac4072 Merge pull request #2123 from RachelBryk/nonmodal-isoprops
Make iso properties non modal.
2015-02-27 13:25:46 +11:00
skidau
85359d5169 Merge pull request #2124 from RachelBryk/framelimit-hotkeys
Fix order of some hotkeys
2015-02-27 13:24:32 +11:00
JosJuice
2e02c10b0c Manual de-duplication of game INIs
That took a few hours...
2015-02-26 21:53:55 +01:00
JosJuice
49f1aad707 Use three-character names for game INIs that don't have region siblings
This will make some game INIs cover more regions.
For INIs with AR codes or patches, I manually created a region-free
file without region-specific data while keeping the original.
2015-02-26 21:53:52 +01:00
skidau
ae9a63479f Merge pull request #2135 from lioncash/sizer
DolphinWX: Remove an unnecessary sizer from the watch window
2015-02-27 07:43:34 +11:00
Lioncash
d50c56c2e4 DolphinWX: Remove an unnecessary sizer from the watch window
The AUI manager already has the grid in place. Setting the sizer isn't needed.
2015-02-26 09:58:38 -05:00
Markus Wick
6f01b4226a Merge pull request #2131 from JosJuice/gameini-2015-02-25
Gameini updates. (PR #2130 fixed and rebased)
2015-02-26 15:52:01 +01:00
JosJuice
b68cb8e0ea Delete PH_PRESETS.ini
It doesn't seem to be used anywhere.
2015-02-26 10:23:34 +01:00
skidau
b1830edaff Merge pull request #1995 from Ziek/master
Added Enet and move traversal code from old netplay branch
2015-02-26 14:50:34 +11:00
Ziek
779f275486 Added TraversalServer.cpp to Core/Common 2015-02-25 18:28:27 -08:00
Ziek
619a3a5171 Added all of enet lib, changed Cmake files accordingly 2015-02-25 18:28:27 -08:00
Ziek
a629555e6b Added Gui elements in Netplay Setup Diag so a person can choose a traversal server
Fixed bug with UPnP so that it will grab the proper address and protocal
Fixed bug that caused dolphin to freeze when host codes were to large
2015-02-25 18:28:26 -08:00
Ziek
1dea3780a7 Fixed issue where players were not disconnecting correctly 2015-02-25 18:28:26 -08:00
Ziek
074d688884 Change netplay initial gctime to be determined by the hosts initial time 2015-02-25 18:28:26 -08:00
Ziek
4cdc307b87 Moved Traversal Client code over from old netplay
Moved over gui code for copying host code
added gui to netplay diag setup to switch between direct and traversal connection
2015-02-25 18:28:25 -08:00
Ziek
461a54338b Switched tcp over to enet 2015-02-25 18:17:50 -08:00
Ziek
3f367c22ee Adding enet library for future replacement of tcp 2015-02-25 18:17:49 -08:00
skidau
f71f376371 Merge pull request #2117 from lioncash/id
DolphinWX: Remove unnecessary control IDs
2015-02-26 12:49:07 +11:00
Gabriel Corona
1cae151c9c Avoid conflicts between hotkeys and global keybindings for Linux
Alt+foo are usually used as global keybindings.
2015-02-26 01:40:06 +01:00
Gabriel Corona
13d43c0cde Fix linux hotkeys
Backticks are necessary when the key is not /^[A-Za-Z]*$/.
2015-02-26 01:29:52 +01:00
Gabriel Corona
c626ce5809 Do not fail to evaluate an expression if some input is missing
My keyboard layout does not have Alt_R but ISO_Level3_Shift. As a
consequence any control expression containing Alt_R fails to evaluate
completely and is unusable. This modification replace the missing term
of the expression by a dummy expression which always evaluate to
0. This way, the keybinding can work even if some keys are not
available.
2015-02-26 01:24:54 +01:00