Peter Thoman
49fbf2b177
Fixed merging messup
2013-05-03 02:57:23 +02:00
Peter Thoman
edf94091db
Final Hybrid scaling adjustments & remove debug output
2013-05-03 02:51:07 +02:00
Peter Thoman
39f0b6e6cf
Adapt non-windows UI to new config names
2013-05-03 02:46:34 +02:00
Peter Thoman
ed870dbcc9
Better alpha component fix for xbrz
2013-05-03 02:44:27 +02:00
Peter Thoman
d8df8a6796
Merge branch 'master' of https://github.com/hrydgard/ppsspp
...
Conflicts:
Core/Config.cpp
Core/Config.h
2013-05-03 00:24:03 +02:00
Peter Thoman
c692aaa936
remove outdated config parameters
2013-05-03 00:20:38 +02:00
Unknown W. Brackets
4665226064
Fix typo breaking XBRZ option.
2013-05-02 14:32:45 -07:00
Henrik Rydgard
cd55068026
iFrameSkip should be an int.
2013-05-02 21:36:36 +02:00
Henrik Rydgard
0ccebacbd6
Turn off screensavers. Note that this won't work on Vista+ when there's a password.
2013-05-02 20:58:50 +02:00
Henrik Rydgård
51493ab8cb
Merge pull request #1633 from raven02/patch-1
...
Fix message dialog oversize
2013-05-02 11:27:36 -07:00
Henrik Rydgård
10b4b0acf8
Merge pull request #1632 from unknownbrackets/config
...
Stick to a single config entry per option
2013-05-02 11:27:22 -07:00
Henrik Rydgard
6d66577f17
Don't write to transformedvertex.color1[4], it doesn't exist.
2013-05-02 20:18:46 +02:00
Peter Thoman
ec52816c17
Merge
2013-05-02 20:09:43 +02:00
Peter Thoman
e352432aab
Hybrid scaling works now
2013-05-02 20:05:41 +02:00
Peter Thoman
64146f343a
xbrz: fixed byte order, made distance function alpha-aware
2013-05-02 18:24:23 +02:00
raven02
e1587744e4
Fix message dialog oversize
2013-05-02 23:24:59 +08:00
Unknown W. Brackets
a1cb85cd05
Stick to a single config entry per option.
...
We don't need a bool in the ini AND an int setting.
This should also fix the anistropy setting, which appears to have been
pretty much broken. Also makes frameskip enable even if you don't tap
auto, which is what I'd assumed it did before.
2013-05-02 08:15:50 -07:00
Henrik Rydgård
45b6670310
Merge pull request #1629 from raven02/xbrz
...
Add xBRZ texture scaling to Android/iOS
2013-05-02 06:13:27 -07:00
raven02
773864566a
Take out above 3x
2013-05-02 21:01:20 +08:00
Jacky TSUI
3d27799601
Add xBRZ texture scaling to Android/iOS
2013-05-02 20:51:02 +08:00
Peter Thoman
d70641d3f2
Manual merge
2013-05-02 14:25:18 +02:00
Peter Thoman
7ae3894365
Added functionality for hybrid scaling (not yet working)
2013-05-02 14:09:46 +02:00
Henrik Rydgård
c84ca2968e
Merge pull request #1626 from tpunix/master
...
DLC bug fix
2013-05-02 03:30:48 -07:00
tpu
f3d6cffd72
npdrmLseek/npdrmRead BUG fix
2013-05-02 17:47:34 +08:00
Henrik Rydgard
42a4a1e4ba
Brightness fix for scaled RGB565 and RGB5551 textures. Fix broken color conversion in DecodeTexture (which is not normally used).
2013-05-02 10:59:45 +02:00
Henrik Rydgard
a125da7af6
Don't scale textures in "kernel" memory (like the 2048x2048 PPGe texture).
2013-05-02 10:18:26 +02:00
Henrik Rydgård
837e249aa4
Merge pull request #1624 from unknownbrackets/windows
...
Clean up some menu options / consistency in Windows menus
2013-05-02 01:07:04 -07:00
Henrik Rydgård
29121588ae
Merge pull request #1625 from raven02/patch-15
...
Android : Shorter sound delay
2013-05-02 01:06:41 -07:00
raven02
79b9023461
Android : Shorter sound delay
2013-05-02 15:59:09 +08:00
Unknown W. Brackets
f74c4617ad
Clean up some menu options and consistency.
...
Fixes cases where the & is already used, uses title case consistently,
and moves a couple options around to make the menu shorter and more
organized so related options are near each other.
2013-05-02 00:39:10 -07:00
Sacha
a9529f831d
Hack for Meego. For some reason it's not compiling ThreadPool.cpp
2013-05-02 17:34:57 +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
Unknown W. Brackets
64bdc6374d
Merge pull request #1621 from raven02/patch-14
...
Buildfix (non-windows)
2013-05-01 22:33:54 -07:00
raven02
c2e8e852a3
Buildfix (non-windows)
2013-05-02 09:06:35 +08:00
Peter Thoman
3e5023ea97
Refactored Texture Scaling, changed options & gui to separately select scaling level and method
2013-05-01 23:55:34 +02:00
Henrik Rydgård
51a2d3d44c
Merge pull request #1620 from nachume/jpnfont
...
FIX unintelligible sequence of decimal characters on savedialog.
2013-05-01 13:12:55 -07:00
Henrik Rydgard
90f8d48da1
Update native
2013-05-01 20:52:41 +02:00
Henrik Rydgård
dcff4970bd
Merge pull request #1616 from PeterTh/master
...
Add global threadpool, use it for texture scaling parallelization
2013-05-01 11:51:01 -07:00
Peter Thoman
1f7a3776b3
Only scale textures which were never invalidated
2013-05-01 20:31:57 +02:00
nachume
15a05e56ad
Merge branch 'master' of https://github.com/hrydgard/ppsspp into jpnfont
2013-05-02 01:11:14 +09:00
nachume
c95c85ea8d
I'm sorry. Comment was unnecessary
...
and sceAtrac too.
2013-05-02 01:05:22 +09:00
Henrik Rydgård
403f62844e
Merge pull request #1618 from unknownbrackets/gpu-minor
...
Approximate better with two fixed blend colors
2013-05-01 08:29:17 -07:00
nachume
eac08a496c
FIX unintelligible sequence of decimal characters on savedialog.
...
ppge_atlas JPN font define ShiftJIS -> UTF8 is all ok.
but, cannot use all of chinese character. bacause blockAlloc failed.
So no change drawing Kanji.
you can try to change native/tools/atlastool.cpp USE_LEVEL for all of chinese character.
FIX savedialog XXXGetStatus() loop. for daungeon traveler 2.
Can now be saved it.
FIX sceAtrac getCodec InvalidMemory
2013-05-02 00:14:41 +09:00
Unknown W. Brackets
d412cf5c64
Approximate better with two fixed blend colors.
...
Having one be constant, or having a nearby blend, is better than fixing
both to 1.0 or 0.0.
2013-05-01 08:00:52 -07:00
Peter Thoman
e19442a8c1
Eliminated C++11 lambdas
2013-05-01 16:31:28 +02:00
Peter Thoman
95e6a5c4ea
Adjusted Texture Scaler to use global threadpool
2013-05-01 14:12:10 +02: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