081adc92c0
Merge pull request #2152 from lioncash/timer
...
DolphinWX: Clean up some wxTimer code
2015-03-01 15:13:53 +11:00
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
4fd980e6d4
Merge pull request #2143 from lioncash/cast
...
PixelShaderManager: Remove unnecessary casts.
2015-02-28 10:05:48 +01:00
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
c792d45d89
Merge pull request #2134 from JosJuice/delete-ph-presets
...
Delete PH_PRESETS.ini
2015-02-27 16:00:37 -08:00
4dd0813dcf
Merge pull request #2133 from randomstuff/hotkeys
...
Fix hotkeys for Linux
2015-02-28 10:59:18 +11:00
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
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
60591f51e1
Merge pull request #2137 from waddlesplash/patch-1
...
Enet: ensure CMAKE_REQUIRED_LIBRARIES is empty.
2015-02-27 19:37:47 +01:00
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
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
f95c55f26c
Enet: ensure CMAKE_REQUIRED_LIBRARIES is empty.
2015-02-26 23:06:58 -05:00
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
2a41ac4072
Merge pull request #2123 from RachelBryk/nonmodal-isoprops
...
Make iso properties non modal.
2015-02-27 13:25:46 +11:00
85359d5169
Merge pull request #2124 from RachelBryk/framelimit-hotkeys
...
Fix order of some hotkeys
2015-02-27 13:24:32 +11:00
2e02c10b0c
Manual de-duplication of game INIs
...
That took a few hours...
2015-02-26 21:53:55 +01:00
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
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
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
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
b68cb8e0ea
Delete PH_PRESETS.ini
...
It doesn't seem to be used anywhere.
2015-02-26 10:23:34 +01:00
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
779f275486
Added TraversalServer.cpp to Core/Common
2015-02-25 18:28:27 -08:00
619a3a5171
Added all of enet lib, changed Cmake files accordingly
2015-02-25 18:28:27 -08:00
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
1dea3780a7
Fixed issue where players were not disconnecting correctly
2015-02-25 18:28:26 -08:00
074d688884
Change netplay initial gctime to be determined by the hosts initial time
2015-02-25 18:28:26 -08:00
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
461a54338b
Switched tcp over to enet
2015-02-25 18:17:50 -08:00
3f367c22ee
Adding enet library for future replacement of tcp
2015-02-25 18:17:49 -08:00
f71f376371
Merge pull request #2117 from lioncash/id
...
DolphinWX: Remove unnecessary control IDs
2015-02-26 12:49:07 +11:00
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
13d43c0cde
Fix linux hotkeys
...
Backticks are necessary when the key is not /^[A-Za-Z]*$/.
2015-02-26 01:29:52 +01:00
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
7408de7e79
Merge pull request #2058 from Stevoisiak/Codemaid-Cleanup-Take2
...
Basic Formatting/Whitespace Cleanup
2015-02-25 18:07:56 -05:00
b1fbf205ec
Merge pull request #2122 from Tilka/intrinsics
...
Intrinsics: drop custom _mm_shuffle_epi8()
2015-02-25 10:48:34 -08:00
eb29077ef0
Gameini updates.
...
It removes settings that were removed from dolphin to clean up the
database. Modifies some gameinis to use the new 3 letter gameid. Adds
Hyrule field speedup hack for Japanese and American version of Twilight
Princess for wii. Removes efb to ram from Twilight Princess, Tony Hawk's
Pro Skater 3, Tony Hawk's Pro Skater 4, Prince of Persia Forgotten
Sands, Mario Superstar Baseball, Okami, FFCC the Crystal Bearers and The
Simpsons due to the recent dolphin changes. Enables efb to ram for The
Magic Obelisk because it needs it and some more minor changes.
2015-02-25 18:15:43 +01:00
d6fcd85110
Merge pull request #2127 from lioncash/aui
...
DolphinWX: Relocate the address search into the code window
2015-02-25 10:36:07 -06:00
93b16a4a2d
Formatting/Whitespace Cleanup
...
Various fixes to formatting and whitespace
2015-02-25 10:48:21 -05:00
d6ccbb1f9c
Merge pull request #2004 from randomstuff/stringutil-c-locale
...
Use the C locale for non-Windows CharArrayFromFormatV() and StringFromFormat()
2015-02-25 13:17:04 +01:00
ca6e154f0b
Fix a bug on user path re-assignment.
...
The Load directory wasn't being properly reassigned when the user path changed, which causes a bunch of issues with things loading from the wrong
place when using the -U option in Dolphin.
2015-02-25 05:45:25 -06:00
db06f058e4
Move user directory detection location to UICommon.
...
The UI should decide on where it wants the user directory, not our core system.
This is in anticipation of some upcoming work on Android which will need proper user directory setting.
2015-02-25 03:31:59 -06:00
2c54ca0f84
Fix order of some hotkeys
2015-02-25 00:42:40 -05:00
ce4b73388a
DolphinWX: Relocate the address search into the code window
...
It's only function is in this pane. Leaving it on the main application toolbar not only looks gross, but subverts what a user might think it applies to.
2015-02-25 00:16:17 -05:00
792e166f87
Merge pull request #2118 from lioncash/aui
...
DolphinWX: Use AUI in the code window.
2015-02-24 21:45:16 -05:00
fd11f8fd29
DolphinWX: Use AUI in the code window.
...
Allows for resizing of the callstack, function call/callers windows etc.
First step in slightly improving the code window.
2015-02-24 21:31:28 -05:00
f4e42b394c
Merge pull request #2106 from magumagu/elf-translation-registers
...
Correctly set up MSR and BAT registers for ELF loading.
2015-02-25 12:42:48 +11:00
084ff7d305
Merge pull request #2126 from dolphin-emu/consi
...
VideoConfigDiag: Use consistent spelling of nouns.
2015-02-24 20:03:43 -05:00
ec47be7884
VideoConfigDiag: Use consistent spelling of nouns.
2015-02-25 01:58:47 +01:00
2df8190e1a
Make iso properties non modal.
2015-02-24 19:11:03 -05:00
skidau