Henrik Rydgard
|
47eece5a21
|
Merge branch 'master' of github.com:hrydgard/ppsspp
|
2013-10-19 23:16:05 +02:00 |
|
Henrik Rydgard
|
8dcb0e270f
|
Update submodules
|
2013-10-19 23:15:36 +02:00 |
|
 SachaandHenrik Rydgard
|
b0fa1a6835
|
Complete Qt5 support on Windows. http://i.imgur.com/uSIrRsp.png
Conflicts:
Qt/Core.pro
Qt/PPSSPP.pro
|
2013-10-19 23:15:16 +02:00 |
|
Henrik Rydgård
|
f381aebe42
|
Merge pull request #4221 from hrydgard/maxim-at3plus
Use FFMPEG to decode Atrac3+ audio, thanks to Maxim's new decoder patch.
|
2013-10-19 14:11:46 -07:00 |
|
Henrik Rydgard
|
faf0402d41
|
Update submodules
|
2013-10-19 23:09:29 +02:00 |
|
 The DaxandHenrik Rydgard
|
c3a69639a3
|
Update FFMPEG submodule with Linux x86 libs based on Maxim's latest patch.
|
2013-10-19 23:09:29 +02:00 |
|
Henrik Rydgard
|
6876d87560
|
Update to ffmpeg with Maxim's latest patch
|
2013-10-19 23:09:28 +02:00 |
|
Henrik Rydgård
|
2f8a78dd7a
|
Clean up SimpleAT3Dec, don't allocate new Frame objects all the time
|
2013-10-19 23:09:28 +02:00 |
|
 The DaxandHenrik Rydgard
|
5f483318bb
|
Define __STDC_CONSTANT_MACROS in CMakeLists.txt so Linux x86 will build.
|
2013-10-19 23:09:28 +02:00 |
|
Henrik Rydgård
|
e266e15c6b
|
One more buildfix
|
2013-10-19 23:09:27 +02:00 |
|
Henrik Rydgård
|
70783eaa48
|
Windows build fixes
|
2013-10-19 23:09:27 +02:00 |
|
Henrik Rydgård
|
2c5adc96cf
|
Rip out the support for the Atrac3+ plugin. It is gone, to never return.
|
2013-10-19 23:09:26 +02:00 |
|
Henrik Rydgård
|
be40289d6c
|
Use ffmpeg for Atrac3+ decoding during video playback as well.
|
2013-10-19 23:09:26 +02:00 |
|
Henrik Rydgard
|
3cefa1ad79
|
Things seem more stable after initializing the AVPacket.
More testing needed though.
|
2013-10-19 23:09:25 +02:00 |
|
Henrik Rydgard
|
f311901e5e
|
Use ffmpeg for decoding Atrac3+ in sceAtrac. Thanks Maxim.
|
2013-10-19 23:09:25 +02:00 |
|
Sacha
|
027ba31752
|
Qt: Fix for audiooutput on qt5. Final fix for arch detection.
|
2013-10-20 02:44:03 +10:00 |
|
Stan Kardach
|
4c3a7f414e
|
Fix __cpuid bug on i386 CPU family
|
2013-10-19 10:04:30 +02:00 |
|
Sacha
|
721bc6f34f
|
Qt: Fix arch detection for Linux. Add ffmpeg for windows.
|
2013-10-19 14:16:28 +10:00 |
|
Kingcom
|
4abda21699
|
Fix messed up logic
|
2013-10-19 02:45:58 +02:00 |
|
Kingcom
|
8f698d552b
|
Handle it for step into too
|
2013-10-19 02:28:49 +02:00 |
|
Kingcom
|
9af9577ad9
|
Add smoother disassembly scrolling for step over
|
2013-10-19 01:19:39 +02:00 |
|
Kingcom
|
ef1e34bffd
|
Only display full disassembly lines
|
2013-10-19 00:58:42 +02:00 |
|
Sacha
|
8de3d882a1
|
Buildfix for Qt, Qt5, Windows on Qt.
|
2013-10-19 05:22:32 +10:00 |
|
Sacha
|
f8e386995f
|
Buildfix for Qt on Windows. Rearrange parts of the Qt project file.
|
2013-10-19 04:03:11 +10:00 |
|
Henrik Rydgård
|
51196742ee
|
Clear symbol map in AttemptLoadSymbolmap on non-windows
|
2013-10-18 18:23:17 +02:00 |
|
Henrik Rydgård
|
2d331cb8c4
|
Revert "Clear the symbol map in LoadExec. Fixes some hangs on switching games,"
This reverts commit 6c3f2155c7.
|
2013-10-18 18:08:18 +02:00 |
|
Henrik Rydgård
|
d8fe69c5cf
|
Merge pull request #4214 from thedax/adjustLogDirectory
Non-USING_GLES2 platforms: Move default log file location.
|
2013-10-18 07:51:50 -07:00 |
|
The Dax
|
c955e07712
|
Clean up FileUtil.h. Remove GetBundleDirectory(I searched master and nothing uses it either).
|
2013-10-18 10:35:28 -04:00 |
|
The Dax
|
26e17e0e7f
|
Disable default logging(--log still works fine), delete CommonPaths.h, and remove unused funcs in FileUtil.
|
2013-10-18 10:35:28 -04:00 |
|
The Dax
|
a9a6e7b384
|
Move default log file to g_Config.memCardDirectory/PSP/SYSTEM/Logs/ppsspp.log.
|
2013-10-18 10:35:28 -04:00 |
|
Henrik Rydgård
|
f85b4a4252
|
Buildfix
|
2013-10-18 15:07:04 +02:00 |
|
Henrik Rydgård
|
6c3f2155c7
|
Clear the symbol map in LoadExec. Fixes some hangs on switching games,
unclear why.
|
2013-10-18 14:40:58 +02:00 |
|
Henrik Rydgård
|
07c818251c
|
Some formatting cleanup.
Yeah, I said we shouldn't do big overhauls..
|
2013-10-18 14:39:04 +02:00 |
|
Henrik Rydgård
|
3742e5fb06
|
Merge pull request #4233 from unknownbrackets/cpudetect
Avoid a divide by zero error on non-Core i cpus.
|
2013-10-18 01:15:24 -07:00 |
|
Unknown W. Brackets
|
267bf97834
|
Avoid a divide by zero error on non-Core i cpus.
Also support Linux and, why not, Android too.
|
2013-10-17 23:12:04 -07:00 |
|
Sacha
|
3c0772a142
|
Change shaders install path for Qt to match up with code.
|
2013-10-18 12:21:23 +10:00 |
|
Henrik Rydgård
|
850b5d2961
|
Merge pull request #4228 from thedax/i7CPUDetection
System Info screen: Add correct core count detection for i7(and maybe i5/i3?) CPUs.
|
2013-10-17 16:27:01 -07:00 |
|
The Dax
|
2e58f04fee
|
Ifdef away the detection on non-Windows for now.
|
2013-10-17 19:16:18 -04:00 |
|
The Dax
|
0400a61d51
|
Add correct core count detection for i7(and maybe i5/i3?) CPUs, and update the SysInfo screen to show more information about threads on x86/x64.
|
2013-10-17 19:03:33 -04:00 |
|
Unknown W. Brackets
|
9a707f6c00
|
Fix typo, ARM build.
|
2013-10-17 15:28:50 -07:00 |
|
Henrik Rydgård
|
0ba988d14e
|
Merge pull request #4224 from shenweip/patch-6
Add a function to change log channel level for convenience.
|
2013-10-17 12:00:35 -07:00 |
|
shenweip
|
4489547073
|
Add a function to change log channel for convenience.
|
2013-10-18 00:23:57 +08:00 |
|
Sacha
|
a4ef688991
|
Install langregion and shaders for iOS and other CMake builds.
|
2013-10-18 02:09:44 +10:00 |
|
Henrik Rydgård
|
f48f458397
|
Merge pull request #4222 from unknownbrackets/mips-jalr
Write the retaddr to rd, not always ra, in jalr.
|
2013-10-17 07:48:08 -07:00 |
|
Unknown W. Brackets
|
2e8ef3027f
|
Write the retaddr to rd, not always ra, in jalr.
Thanks go entirely to @Kingcom for pointing this out.
Don't know of any games not using RA as the rd.
|
2013-10-17 07:39:33 -07:00 |
|
Sacha
|
e112cf5aff
|
Also install the langregion file on Blackberry & Symbian. Don't auto enable hardware transform on Symbian.
|
2013-10-17 23:24:49 +10:00 |
|
Henrik Rydgård
|
99fec75f06
|
Delete OMAConvert, entirely unused
|
2013-10-17 12:33:57 +02:00 |
|
Henrik Rydgård
|
ac2334386a
|
Move BufferQueue out of the at3 plugin header
|
2013-10-17 12:31:22 +02:00 |
|
Henrik Rydgård
|
fa1858ffaf
|
Fix ab.sh to copy shaders and langregion to assets
|
2013-10-17 12:14:00 +02:00 |
|
Henrik Rydgård
|
ce3d8d132b
|
Fixes to the InnoSetup script
|
2013-10-17 12:14:00 +02:00 |
|