Commit Graph

513 Commits

Author SHA1 Message Date
Sacha
663f888a54 Sonic: Fix encoding in VADD (cross-project merge). 2013-07-30 04:37:47 +10:00
Sacha
3fb76106fd Merge Sonic's ArmCpuDetect changes (cross-project merge). 2013-07-30 04:31:35 +10:00
Henrik Rydgård
c68f5f78fb Merge pull request #2970 from raven02/patch-5
Assign HW select button on X360 to "SELECT" button
2013-07-29 09:32:05 -07:00
Sacha
a046448596 Buildfix. 2013-07-29 19:46:22 +10:00
Unknown W. Brackets
b46ab5f5a4 Always defined WIN32_LEAN_AND_MEAN.
Might as well, less mess everywhere else.
2013-07-28 21:04:20 -07:00
Unknown W. Brackets
7b7801d59a Switch to including Windows.h from an intermediate.
This makes it easier for Xbox which uses a separate header.
2013-07-28 21:04:19 -07:00
Unknown W. Brackets
0b5bdeb1d3 Fix some compile failures under big endian. 2013-07-28 21:04:17 -07:00
Unknown W. Brackets
9ae32f641a Move swap_struct_t to its own file.
This way bswap32() and friends are already defined.  Otherwise there are
errors.
2013-07-28 21:03:44 -07:00
Unknown W. Brackets
524064a02e Improve the auto-swapping struct a bit.
Specifically:
 * Don't override &&/|| - that kills short circuiting.
 * Consistently return a swapped type from operators.
 * Add a few more missing operators.
2013-07-28 21:03:44 -07:00
Ced2911
f5dc650fd3 more on endian types 2013-07-28 21:03:44 -07:00
Ced2911
47e1c8143a endian struct 2013-07-28 21:03:43 -07:00
raven02
9108bf4771 Rename 360 and Pad to "Xbox 360 Pad" and "DirectInput Pad" respectively 2013-07-29 07:56:11 +08:00
raven02
c1bdd8b0db Assign HW select button on X360 to "SELECT" button 2013-07-29 07:31:19 +08:00
Unknown W. Brackets
a9e7a9ce3d Improve performance of File::GetSize(). 2013-07-28 13:16:03 -07:00
Unknown W. Brackets
d644dacced Fix a potential crash in localtime_r win32.
Using localtime_s anyway.  Both ways it was actually threadsafe.
2013-07-28 12:33:21 -07:00
Unknown W. Brackets
fa7182ec34 Consider F:\ a valid recent iso.
File::Exists didn't like it, since it turned it into "F:".
2013-07-28 12:33:21 -07:00
The Dax
528d81151a Initial support for disabling logging, to provide a possible boost in performance for games that spam the log like crazy. 2013-07-27 19:39:49 -04:00
Unknown W. Brackets
0cd5766f50 Support clang as well as gcc for Android/Linux. 2013-07-26 22:13:57 -07:00
Henrik Rydgård
3c861419b9 Merge pull request #2931 from unknownbrackets/endian
Improve endian define handling and fix a couple typos
2013-07-26 12:04:34 -07:00
Henrik Rydgård
cc8bba1b10 Merge pull request #2924 from thedax/master
Add initial support for native Visual Studio 2012(and above) compilation.
2013-07-26 12:03:21 -07:00
Unknown W. Brackets
8da6259aff More carefully check defines for endianness. 2013-07-25 22:25:50 -07:00
Henrik Rydgard
1533b588e3 Argh, this really shouldn't be needed but is. 2013-07-26 01:18:40 +02:00
The Dax
e00364bfa5 Add initial support for native Visual Studio 2012(and above) compilation. Just upgrade the SLN, and go. 2013-07-25 18:34:55 -04:00
Henrik Rydgard
5e791fad51 Try to fix the bigendian defines 2013-07-25 23:39:41 +02:00
Henrik Rydgård
9fc57894ab Mac build fix (weird, BIG_ENDIAN really shouldn't be defined) 2013-07-25 19:21:43 +02:00
Unknown W. Brackets
f3fc9562ff Oops, need floating point types too. 2013-07-25 08:04:36 -07:00
Unknown W. Brackets
f1c354607e Add special u32_le/etc. types to mark endianness.
Might even want u32_be...
2013-07-25 08:04:34 -07:00
papel
a150fdd6ae Continue ignoring savestate incompatibility for now. 2013-07-18 15:33:13 -03:00
papel
99754bcd7a Merge branch 'master' of https://github.com/hrydgard/ppsspp 2013-07-17 02:33:53 -03:00
papel
9b6f1abed8 Version to savestate and open other game in other screens. 2013-07-17 02:33:26 -03:00
Henrik Rydgard
81411a74ed Experimental: Make orientation change possible on Android. 2013-07-16 22:51:25 +02:00
papel
314d286e37 Changed pause and speed shortcuts. Fixed disabled run on load. 2013-07-09 21:54:42 -03:00
papel
22de16d178 Improving shortcuts of Windows version. 2013-07-09 17:25:29 -03:00
Henrik Rydgard
b879f32284 Fix further Android joystick issues, including flickering pause menu. Fixes #2708 2013-07-08 17:47:22 +02:00
Henrik Rydgard
67b79a5933 On Android, set the default keymap to be the standard controller map. Should make things work instantly on sixaxis and shield for example. 2013-07-08 17:19:39 +02:00
Henrik Rydgard
f2e739992d More mousewheel support 2013-07-08 12:35:08 +02:00
Henrik Rydgård
476382d2cc Merge pull request #2692 from unknownbrackets/keymap-axis
Do axis keymap as well (should replace right stick bind)
2013-07-08 01:14:02 -07:00
Henrik Rydgård
87b5f72932 Merge pull request #2698 from unknownbrackets/warnings
Warning fixes
2013-07-08 00:32:11 -07:00
Unknown W. Brackets
a32cf817ff Fix some minor warnings. 2013-07-07 20:31:04 -07:00
Unknown W. Brackets
bc6feed6a0 Fix memory allocation when swapping to a remaster. 2013-07-07 20:28:47 -07:00
Unknown W. Brackets
0019666939 Fix null pointer typo, breaking savestates. 2013-07-07 17:58:37 -07:00
Unknown W. Brackets
facad022ee Reverse default DirectInput Y mapping.
As it was before.
2013-07-07 17:18:24 -07:00
Unknown W. Brackets
d9bfcce0de Switch to buttons instead of A/B/X/Y for dinput.
This way people don't say "but my X button shows up as L1."
2013-07-07 17:05:03 -07:00
Unknown W. Brackets
fc50094725 Add back the right stick, but no UI.
Not sure where to fit it...
2013-07-07 16:17:04 -07:00
Unknown W. Brackets
fb2ca2bb82 Add default mappings for left analog sticks. 2013-07-07 16:10:20 -07:00
Unknown W. Brackets
8e5d115c8e Get basic axis mapping working. 2013-07-07 16:10:20 -07:00
Unknown W. Brackets
ef8ce2d05c Add some missing key names. 2013-07-07 09:26:30 -07:00
Henrik Rydgard
b581b73757 Make even more keys mappable 2013-07-07 14:38:10 +02:00
Henrik Rydgard
ab1b7e7288 Get rid of remaining legacy key mappings. Make Pause and F3 mappable, add default mappings. You may need to manually map these if you have an old ppsspp.ini. 2013-07-07 14:08:08 +02:00
Henrik Rydgard
7cd45d9375 Make some more keys mappable in Windows. 2013-07-07 12:03:11 +02:00
Henrik Rydgard
19a6edd6cc Let the user map unthrottle and rapidfire. Make more keys mappable. 2013-07-07 11:25:19 +02:00
Henrik Rydgard
47dae8c004 Fix bug with unthrottle as virtual key. Add button to restore default key mappings. 2013-07-07 11:25:19 +02:00
Henrik Rydgard
cee45d0ad2 Win32: Switch to RawInput for keyboard processing. Lets us distinguish LSHIFT/RSHIFT and LCTRL/RCTRL. 2013-07-07 11:25:18 +02:00
Henrik Rydgård
3e8cb98a40 Merge pull request #2672 from unknownbrackets/ctrl-rapid
Add back rapid fire, make it possible to use on other platforms
2013-07-07 00:49:37 -07:00
Unknown W. Brackets
efb2ab52b4 Add a rapid fire virtual key, like before. 2013-07-06 23:06:34 -07:00
Unknown W. Brackets
b9c2e21105 Improve performance of syscall resolving.
This was actually kinda slow (noticeably) in God Eater Burst.
2013-07-06 15:14:50 -07:00
Henrik Rydgard
a793688005 Clear controller mapping sections in the ini to prevent them from growing out of control heh 2013-07-06 21:30:27 +02:00
Henrik Rydgard
b0ee3a173a Add mechanism for unlimited mappable virtual keys (not restricted by some bitfield). Use it to implement X/Y analog key mapping. 2013-07-06 20:45:44 +02:00
Henrik Rydgard
cc58e34cf8 Remove legacy key mapping and associate devices with keys (DInput has been left behind for now, will be fixed up soon). Saving is broken, will be fixed soon. 2013-07-06 20:45:44 +02:00
Henrik Rydgård
8988d697e3 Merge pull request #2647 from unknownbrackets/jit-minor
Fix x64 jit bugs (memchecks and lwl/lwr/swl/swr)
2013-07-06 09:35:12 -07:00
Henrik Rydgard
a599bf7500 Assorted warning fixes and cleanups 2013-07-06 11:09:19 +02:00
Unknown W. Brackets
662ae77214 Save regs before/after 3-arg func calls on x86.
This fixes bugs only on x64 when ABI_CallFunctionACC and etc. were used.
This was breaking things since R8 was not being saved (arg 3.)
2013-07-06 00:54:53 -07:00
The Dax
4338a43461 Fix Select button on Windows. 2013-07-05 05:04:39 -04:00
Daniel Dressler
6d290f4530 Make key map screen hint which map conflicts 2013-07-03 22:29:18 -07:00
Daniel Dressler
460c03a00d Make key map defaults match old mapping 2013-07-03 22:00:55 -07:00
The Dax
ab8c1f5b5f Fix multiple compilation issues for all platforms. 2013-07-03 14:37:31 -04:00
Henrik Rydgård
c01a69df30 Merge branch 'master' of https://github.com/daniel-dressler/ppsspp into daniel-dressler-master
Conflicts:
	CMakeLists.txt
2013-07-03 17:59:44 +02:00
Daniel Dressler
20399b9d6c Make key mapping screen save changes 2013-06-30 22:48:15 -07:00
Henrik Rydgard
604ad0181b Merge branch 'new-ui'. Still incomplete. Enable by setting NewUI=True in ppsspp.ini
Conflicts:
	UI/MenuScreens.cpp
2013-06-27 16:28:38 +02:00
Daniel Dressler
14bce01a33 Fix key map settings screen using wrong enums 2013-06-26 20:22:45 -07:00
Daniel Dressler
6294e36c95 Make KeyMap use native keycodes and Core PS btns 2013-06-24 22:08:23 -07:00
Daniel Dressler
29271f67d7 Sync KeyMap to native changes 2013-06-24 21:34:14 -07:00
Jake Traynham
771de1c3a3 pulled down update to ffmpeg 2013-06-24 17:48:37 -05:00
The Dax
7884df8013 Simplify error message via better translation key/message. 2013-06-24 04:47:12 -04:00
The Dax
a341d39720 Make failure reasons translatable. 2013-06-24 04:24:34 -04:00
The Dax
1a7cce2fc5 Fix a comment and remove an old comment. 2013-06-24 04:00:10 -04:00
The Dax
810dfac704 Restructure load/save failure message by reverting it back to the original and add a translation ini key instead. Much simpler, and cleaner. 2013-06-24 03:58:29 -04:00
The Dax
fe8c439614 Clean up slightly. 2013-06-24 03:08:24 -04:00
The Dax
3a0fe2f374 Add failure messages to savestates loading/saving. It's misleading to always say "Loaded state" or "Saved state", even if it fails. Plus, result was unused up to this point. 2013-06-24 02:58:21 -04:00
Daniel Dressler
83a5609f22 Move keyboard key codes into native 2013-06-23 22:08:45 -07:00
Daniel Dressler
7d4ab6e786 Fix function declarations missing from namespace 2013-06-23 21:18:00 -07:00
Daniel Dressler
eefcc9ba83 Merge branch 'master' of github.com:hrydgard/ppsspp 2013-06-20 18:56:53 -07:00
Jake Traynham
e89b2055a6 Reenabled armv7s for iOS with JIT fixes 2013-06-20 11:44:59 -05:00
Henrik Rydgård
bfb9b2fd6d Warning fix 2013-06-19 15:06:04 +02:00
Henrik Rydgard
c021c93883 More minor audio optimizations 2013-06-19 13:13:02 +02:00
Henrik Rydgard
7dac11922d Some minor optimization of audio channel queues and mixing 2013-06-19 12:00:24 +02:00
Sacha
45775d4fc2 Fix for non-ffmpeg platforms. Thanks unknownbrackets!
Can now get past videos on platforms such as Meego and Symbian.
Also fix some spacing and type issues.
2013-06-19 01:14:14 +10:00
Daniel Dressler
c4cf35f782 Merge branch 'master' of github.com:hrydgard/ppsspp 2013-06-17 20:51:17 -07:00
Sacha
490f841093 Integer division is not guaranteed for VFPv4 devices. Example: Cortex-A5. 2013-06-18 01:42:36 +10:00
Daniel Dressler
0befec3358 Merge branch 'master' of github.com:hrydgard/ppsspp 2013-06-15 18:37:08 -07:00
aquanull
bb5fce600e Fix/prevent crashes when MainWindow is closed before LoadFile() completes, or when it gets certain messages before TheThread completes initialization.
Fix missing ppsspp.ini loading log (only 1 unimportant line though).
Fix loading ui_atlas.zim failure when [General]Browse = True is set in ppsspp.ini.
Some other minor fixes as well.
2013-06-15 13:06:43 +08:00
Daniel Dressler
f79de79a9d Fix missing ; 2013-06-13 20:37:50 -07:00
Daniel Dressler
cd69ec3acb Merge branch 'master' of github.com:hrydgard/ppsspp 2013-06-13 20:31:09 -07:00
Daniel Dressler
79e6d4975b Fix inconsistent namespace usage 2013-06-13 20:30:02 -07:00
Sacha
637d75f47d Unlock the other 16 regs that are available for NEON. 2013-06-09 23:15:59 +10:00
Sacha
29d1e40c79 Buildfix for Blackberry, Linux, Symbian, non-ffmpeg platforms, Meego, ... 2013-06-09 22:53:22 +10:00
Henrik Rydgard
df6199d353 Move some stuff to native. Show game icon on newui game screen. Turn it off again (oops) 2013-06-09 13:42:00 +02:00
Sacha
583927988c Armjit Update: Improvements
Implement vsat0 and vsat1
Introduce VMOV for immediates.  Use in MOVI2F where possible by detecting if float val can be encoded.
Combine some vneg ops in ApplyPrefixST.
2013-06-09 21:27:16 +10:00
Henrik Rydgard
2afbc94734 Turn off RTTI, simulate it where needed. 2013-06-09 13:02:16 +02:00
Sacha
f21218c3f9 Armjit: Combine mul.s + neg.s to VNMUL. Implement VNMUL, VNMLA, VNMLS.
I had implemented mul.s + add/sub.s + add/sub.s -> VADD/VSUB + V(N)ML(A/S). Turns out it doesn't happen enough though (once or twice per game).
2013-06-08 16:39:59 +10:00
Sacha
10c976b2af Armjit: Improve ApplyPrefixD. Add VABD to emitter. 2013-06-06 03:08:58 +10:00
Henrik Rydgard
a7f7410668 Merge branch 'master' into plugindownload 2013-06-05 16:13:55 +02:00
Sacha
6712de1136 Armjit: Implement wsbh and wsbw (rev16 and rev). Fix encoding for rev16. 2013-06-05 11:32:44 +10:00
Henrik Rydgard
0c7833796b Merge branch 'master' into plugindownload
Conflicts:
	Core/Core.vcxproj
	Windows/PPSSPP.vcxproj
	native
2013-06-03 23:42:49 +02:00
Henrik Rydgard
f6793b30da Some more UI stuff. 2013-06-02 23:46:03 +02:00
Henrik Rydgard
b3f3305068 vcproj update: enable multithread build 2013-06-02 23:45:44 +02:00
Sacha
f825a07650 Move C++11 functions to std namespace. 2013-06-02 22:27:37 +10:00
Unknown W. Brackets
d6c94eb9a4 Keep only one actual console writer thread.
Fixes issues with colors when multiple log types (e.g. HLE and ME or G3D)
were used nearby each other.  Oops.
2013-06-01 22:18:21 -07:00
Sacha
b39a572043 Buildfixes.
Fix C++11 usage.
Remove redundancy.
Fix st_*time re-usage.
2013-06-02 13:26:39 +10:00
Henrik Rydgard
572eb26305 Merge branch 'master' into makotech222-cwcheat
Conflicts:
	Core/Core.vcxproj.filters
	Core/HLE/__sceAudio.cpp
	Core/HLE/sceKernel.cpp
2013-05-30 19:11:20 +02:00
King_DuckZ
61500281a9 Warning fix on Intel compiler. 2013-05-30 15:42:11 +02:00
King_DuckZ
1455452850 Trailing whitespaces removed. 2013-05-30 15:42:11 +02:00
Daniel Dressler
6eb9db7ac9 Merge branch 'master' of github.com:hrydgard/ppsspp 2013-05-25 21:03:44 -07:00
Daniel Dressler
a9d6916cde Fix key map resolution only checking user settings
Alone the way a few other bugs got squashed
2013-05-25 20:29:52 -07:00
Unknown W. Brackets
d1b7b9ac63 Save XMM regs as required by the Windows x64 ABI.
Fixes jitter in analog in recent builds, possibly other bugs.
2013-05-25 00:34:19 -07:00
Daniel Dressler
b219dee8b4 Fix static keyword hiding functions 2013-05-23 21:05:41 -07:00
Sacha
a14a2fafa9 ARMJIT: Fix and use DIV, DIVU, INS and EXT (ARMv7 and VFPv4 implementations). 2013-05-24 08:26:19 +10:00
Henrik Rydgard
08e0881c94 Merge branch 'cwcheat' of https://github.com/makotech222/ppsspp into makotech222-cwcheat
Conflicts:
	Core/Config.cpp
	Core/Config.h
	Core/Core.vcxproj.filters
	Core/HLE/sceKernel.cpp
2013-05-22 21:04:12 +02:00
Henrik Rydgard
0ed09532f9 Quick sceMd5 implementation, needs tests 2013-05-22 11:05:30 +02:00
Steven Cherry
9d2667fc0d Second to last commit
Everything but getting ISO name
2013-05-18 17:04:01 -05:00
Sacha
77586e678c Correct permissions on Blackberry.
The settings I originally tested it with and found to be working. Sorry for changing it.
2013-05-16 23:11:58 +10:00
Sacha
4e75840d81 Fix permissions on Blackberry.
Currently only the app can modify/delete important data like saves in PSP folder.
On Blackberry, the app is the user account (app_10283782). The currently logged in user is the group (shared_1000). Then other will be all users on the system.
So let's make it that the user can modify their own data.
2013-05-16 13:54:15 +10:00
Sacha
d97f2268ca Improve CPU detection. Enable VFPv4 for Blackberry devices which support it. 2013-05-15 04:40:24 +10:00
Henrik Rydgård
d8f9790abc Some Mac build fixes from vit9696 and some more. Update submodules. 2013-05-07 00:08:57 +02:00
Sacha
8cb0423f32 Avoid name collision with ThreadPool on Windows hosts. Fixes all Linux/Unix cross-compiles from Windows, including Harmattan and Blackberry. 2013-05-03 16:31:53 +10:00
Sacha
2396574f45 Avoid name collision with StringUtil on Windows hosts. Fixes all Linux/Unix cross-compiles from Windows, including Harmattan and Blackberry. 2013-05-03 16:22:15 +10:00
Sacha
8dd683f63f Fix name collision when building on Windows. Was preventing Blackberry from building. 2013-05-03 16:10:23 +10:00
Sacha
6a2a308069 Buildfix for Symbian. 2013-05-02 17:06:09 +10:00
Unknown W. Brackets
c73657e39a Buildfix for iOS and Android. 2013-05-01 23:31:18 -07:00
Sacha
ae9490ad30 Use boost to do C++11 features on Symbian. Use namespaces. 2013-05-02 15:46:41 +10:00
Peter Thoman
0ef103525f Added Global Threadpool to common 2013-05-01 14:12:09 +02:00
Peter Thoman
af68180319 Parallelized texture scaling 2013-05-01 14:12:09 +02:00
Unknown W. Brackets
1e6e333d38 Fix savestates not even trying on diff version.
Also, update native.
2013-04-29 23:40:12 -07:00
Unknown W. Brackets
acd0b471e7 Make sure that x64 uses all the same opt settings.
There were some differences.  Also, make debug use the same sse mode
release does so they have parity.
2013-04-28 22:22:01 -07:00
Henrik Rydgard
660d5700e7 Unify some VS project settings 2013-04-27 19:34:41 +02:00
Henrik Rydgard
2a39a3b972 JIT: Get rid of one memory access per dispatch, and get rid of blockcodepointers. 2013-04-27 01:32:03 +02:00
Yao Wei
c675a9bd79 include stdarg.h in Common/Common.h
Fixes gcc 4.7 compile error
2013-04-24 02:51:12 +08:00
Sacha
12d50f25bf Define vasprintf in native for Blackberry instead (as it is also used there). Remove some redundancy in Settings.pri. 2013-04-22 14:23:13 +10:00
aquanull
b3bf849a89 Fix showing/hiding Log Console on Windows
It appears to me that sometimes the first call to ShowWindow() is hindered by STARTUPINFO or something, so I just "neutralize" them with a dummy call. There might be better solutions, but this works for now.
2013-04-22 02:59:27 +08:00
danieru
26991af45b Fix reference to "FAKE" analog keys 2013-04-20 15:10:28 -06:00
danieru
16bbae440f Fix inconsistent indentation 2013-04-20 14:35:25 -06:00
danieru
432f10b9bf Fix comment syntax 2013-04-20 14:33:12 -06:00
danieru
26c2a6a173 Use unicode symbols for psp button names
Instead of approximating with ansi chars.
2013-04-20 13:19:13 -06:00
danieru
f63ea38af8 Remove "FAKE" modifier for primary analog keys
Since KeyMap only handles descrete keys it is
inaccurate to call them analog. Let no
developer should get confused since the cardinal
directions indicate the descrete natures.
2013-04-20 13:11:51 -06:00
danieru
6121819856 Extend KeyMap supported keys
Uppercase latin,
Fastforward,
Alt analog stick,
2013-04-20 13:09:56 -06:00
danieru
cbbed0f18b Implement platform specific keymap registration 2013-04-20 13:01:15 -06:00
danieru
c2cf28e4b8 Fix typo capitalization of lower case b's name 2013-04-20 12:54:40 -06:00
danieru
8ea13cd3ed Add KeyMap key translation layer 2013-04-19 22:52:54 -06:00
Henrik Rydgard
32f344d6bd Very basic internationalization. Does not work on Android yet due to location of ini files. 2013-04-18 12:06:26 +02:00
Sacha
faa9094079 Harmattan: Make temporary RAM file in a folder that already exists. 2013-04-14 17:03:28 +10:00