Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-24 22:10:01 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
14,357 Commits 72 Branches 122 Tags 683 MiB
215abfb951
Commit Graph

1375 Commits

Author SHA1 Message Date
The Dax
f6ee9c77f4 Buildfix. 2014-06-16 14:18:49 -04:00
The Dax
92882b6384 Throw "Disable Alpha Test" into the pile of options to be disabled. 2014-06-16 14:18:49 -04:00
The Dax
f0dc4f7693 Do it for post-processing and resolution too, to be consistent. 2014-06-16 14:18:49 -04:00
The Dax
120e5e8cbe Disable more stuff, and use cached booleans instead. 
Conflicts:
	UI/GameSettingsScreen.cpp
 2014-06-16 14:18:49 -04:00
The Dax
98ebe26e33 GameSettingsScreen: Disable a bunch of options when software rendering is enabled. 
They don't do anything when software rendering is enabled, so there's bound to be confusion caused by these options continuing to be enabled.

Conflicts:
	UI/GameSettingsScreen.cpp
 2014-06-16 14:18:48 -04:00
Unknown W. Brackets
913914a4c1 Fix some type conversion warnings. 2014-06-15 10:01:54 -07:00
Henrik Rydgard
e3bbf26731 Improve input event handling. Can now map volume keys on Android without issues. 2014-06-15 13:04:59 +02:00
Henrik Rydgard
7febcd5d91 Have the Native* input functions return boolean to match new interface. 
This is preparation for being able to tell the app that we handled the key or not.

This will make it possible to map android hardware keys like volume without them misbehaving.
 2014-06-15 12:15:06 +02:00
Henrik Rydgård
ad70cfdcb3 Merge pull request #6325 from unknownbrackets/ui-tweaks 
Support drag-and-drop of savestate files
 2014-06-15 08:34:46 +02:00
Unknown W. Brackets
063e8508df Support drag-and-drop of savestate files. 
Most likely you want to load the state, not see an error message.
 2014-06-14 16:13:35 -07:00
Henrik Rydgard
3b2fed472e Correct timing on resume, avoids small speed burst when resuming gameplay from pause 2014-06-14 23:56:16 +02:00
Henrik Rydgard
aa31b9ace9 The "fallback" title is already set, don't need to set it again 2014-06-14 00:19:09 +02:00
Henrik Rydgard
3e97713d16 Revert "Remove option" (disable alpha test) 
Fixes issue #6286.

This reverts commit d2ce635bbf.
 2014-06-10 23:13:42 +02:00
Sacha
37b7667038 Remove some unnecessary #ifdef's relating to Symbian. 2014-06-10 23:06:00 +10:00
Henrik Rydgard
c39c36ddea Improve layout of control mapping screen 2014-06-09 22:26:23 +02:00
Sacha
3e50086d19 Travis: update. Fix screenshots in Qt 2014-06-10 02:51:23 +10:00
Henrik Rydgard
e8433f6fef cheat screen: Add shortcut to launch notepad with the current cheat file 2014-06-09 00:13:59 +02:00
Henrik Rydgard
77c85bccdd Don't lose focus after mapping a control. 
Makes it a lot less aggravating to remap more than one control using a controller.

Also fixes a race condition.
 2014-06-08 15:38:13 +02:00
mildlysec
c3dfb64839 Added ability to press analog keys lightly using shift button 2014-06-07 22:21:54 +02:00
Sacha
ed96d73187 Use OpenCPPFile for iostream open without the ifdef's. 2014-06-06 00:22:43 +10:00
The Dax
285640dbdf CWCheats: Make sure to convert paths properly so that non-English paths are supported. 2014-06-04 23:01:03 -04:00
Unknown W. Brackets
0daaf70ee3 Add UI for realtime sync option. 2014-06-03 01:36:20 -07:00
sum2012
6ed269d16b Attempt to solve Travis CI build 2014-06-02 18:28:16 +08:00
sum2012
d3c511e793 Use TextView instead of Choice 2014-06-02 18:21:34 +08:00
sum2012
c9219e1d0c Add missing "F" 2014-06-02 16:40:37 +08:00
sum2012
93827b383d OSK for network setting for non-windows 
Fix windows 's full screen problem too
 2014-06-02 14:15:07 +08:00
The Dax
4ab69656fe Win32 buildfix. 2014-05-30 18:21:40 -04:00
Sacha
5394eb29c8 Fix #6169. variable was defined in class but treated as local to function in parts. This meant it wasn't being cleared properly when view was recreated (eg. changing language). 2014-05-28 17:05:15 +10:00
Unknown W. Brackets
a5e3623742 Skip cpu change when game not running. 
Oops, this happened when changing settings.  Fixes #6167.
 2014-05-27 23:03:08 -07:00
raven02
608d43898d Remove AlphaMaskHack 2014-05-27 22:11:18 +02:00
lioncash
ee520d0974 Fix a typo in GameSettingsScreen 2014-05-27 12:41:55 -04:00
Unknown W. Brackets
ccb0e84631 Oops, forgot to move this, darn it. 2014-05-27 00:39:36 -07:00
Unknown W. Brackets
a70b5abfb9 Allow jit to be enabled/disabled at runtime. 2014-05-27 00:02:51 -07:00
Unknown W. Brackets
b2e66d0b6a Clear jit when changing "fast memory". 
This way it takes effect immediately.
 2014-05-26 23:39:53 -07:00
Henrik Rydgård
548d27e95c Merge pull request #6133 from sum2012/UI 
Add a network setting and Windows OSK keyboard option
 2014-05-26 00:22:43 +02:00
sum2012
22e198962f Fix translate 2014-05-25 17:47:56 +08:00
sum2012
ce2abe44d0 Add a space 2014-05-25 17:14:07 +08:00
Henrik Rydgard
90f2d06697 Add setting to enable/disable GPU block transfer 2014-05-25 10:18:14 +02:00
sum2012
9138fec3c1 Add a network setting 
Non-windows setting cannot change
 2014-05-25 13:19:56 +08:00
sum2012
9658b3a1b8 Add a Windows OSK keyboard option 2014-05-25 09:26:30 +08:00
Unknown W. Brackets
42e6dc2e2f Fix Symbian build (avoid range for.) 2014-05-21 08:40:14 -07:00
Unknown W. Brackets
b596e952bf Attempt to make range-for work in 4.6.3... 2014-05-21 08:11:11 -07:00
Unknown W. Brackets
0a92d377b0 Avoid a race condition during game shutdown. 
Hoping this is it.
 2014-05-21 01:13:40 -07:00
Henrik Rydgard
b65e90e71d Forgot to make translatable 2014-05-19 23:43:59 +02:00
Henrik Rydgard
3023f7d06b Android: Switch dpad default to use HAT X/Y +/- instead of "dpad", as documented. 
Add a simple "autoconfigure" facility for input devices, that lets the user choose
if several are connected.

Can be expanded in the future to provide custom default mapppings for various devices as long as we manage to identify them.

Ideally, key mappings should be unique per device but they aren't yet.
 2014-05-19 23:31:11 +02:00
Unknown W. Brackets
14be491aa8 Don't set pending boot flag on "stop". 
And rename to boot pending, not "boot successful."
 2014-05-15 22:17:19 -07:00
Unknown W. Brackets
bfa02f8fa1 Fix some spurious resets on stopping a game. 2014-05-11 10:58:33 -07:00
Henrik Rydgård
d3ab35673b Merge pull request #6036 from thedax/gameSettingsScreen-ui-fix 
GameSettingsScreen: Adjust the "Show Touch Pause Menu Button" enabling logic slightly.
 2014-05-08 13:34:03 +02:00
Henrik Rydgård
155dcee5a6 Merge pull request #5975 from raven02/patch-32 
Audio : add low/medium/high audio latency mode
 2014-05-08 11:00:01 +02:00
Henrik Rydgård
9dfe12dc2a Merge pull request #6035 from thedax/egl-extensions-tab 
SystemInfoScreen: Don't show the EGL Extensions tab if there are none to show.
 2014-05-08 10:47:03 +02:00
Henrik Rydgård
fcaaedebbd Merge pull request #5951 from raven02/patch-23 
Medium quality mode for spline patch
 2014-05-06 23:05:27 +02:00
The Dax
e311e6a7b0 Update the alternative speed slider to use the new stepping system. 
Also, no need to use floats at all with a revised formula.
 2014-05-06 04:49:23 -04:00
The Dax
8320cee1bc GameSettingsScreen: Adjust the "Show Touch Pause Menu Button" enabling logic slightly. 
We don't want it to be enabled in-game, but there's also no point enabling the option if the user isn't showing touch controls to begin with.
 2014-05-06 01:11:27 -04:00
The Dax
09d7dc30ff SystemInfoScreen: Don't show the EGL Extensions tab if there are none to show. 2014-05-06 00:26:51 -04:00
Henrik Rydgård
8bab8dac9b Merge pull request #6027 from unknownbrackets/ui-tweaks 
Improve reset (and delay) and boot of another game
 2014-05-05 08:31:09 +02:00
Unknown W. Brackets
6183dadc31 Improve reset (and delay) and boot of another game. 
Fixes #6023.
 2014-05-04 19:58:36 -07:00
The Dax
4fce3e4588 Alt speed slider: Remove the rounding, since native does it automatically. Don't use an integer divide. 2014-05-04 15:44:22 -04:00
The Dax
eacd4c3e19 Allow the speed to go as low as 0% (at which point it becomes unlimited, since zero FPS limit in the code means unthrottle). 2014-05-03 16:35:36 -04:00
The Dax
1dd10ef536 Switch to a slider for alternative speed, and make its range 5-600%. 2014-05-03 16:26:05 -04:00
The Dax
37fd7a95db Let desktop SDL builds see the fullscreen option, too. There's no reason they can't. 2014-04-27 16:22:22 -04:00
raven02
eda3d48d53 Switch to low/medium/high audio latency mode 2014-04-27 22:11:26 +08:00
The Dax
d3f82ff179 Fix Linux build, again. 2014-04-26 02:32:43 -04:00
The Dax
731a27dd58 Instead of using escape only, allow anything mapped to "Pause" to exit as well. 2014-04-26 02:02:54 -04:00
The Dax
a7a2bb3b28 Fix Linux build. 2014-04-26 01:14:08 -04:00
The Dax
6bedad2aa5 Enable --escape-exit for all relevant platforms. It makes PPSSPP more front-end friendly by letting escape quit the emu. 2014-04-26 01:00:45 -04:00
raven02
aa08944528 Medium Quality mode for spline patch 2014-04-26 12:04:26 +08:00
The Dax
847895320d Don't allow switching between JIT/interpreter when a game is running. 
It doesn't work, anyway.
 2014-04-22 00:27:31 -04:00
Unknown W. Brackets
4dcf1d86ed Don't count all files as savedata if id blank. 2014-04-20 20:50:45 -07:00
Unknown W. Brackets
63b5ec3d85 Allow specifying a root path for host0:/. 
This way, similar to the PSP, we can have a root path outside the test.
 2014-04-19 21:43:09 -07:00
vnctdj
9b825ffde3 Changed translation category 
"Audio hacks" is not a "Main Setting", it should belong to "Audio".
 2014-04-15 23:25:04 +02:00
Henrik Rydgård
45246ad9d3 Merge pull request #5891 from raven02/kill-alpha 
Remove 'DisableAlphaTest' option
 2014-04-15 22:00:18 +02:00
raven02
d2ce635bbf Remove option 2014-04-16 03:57:57 +08:00
kaienfr
cc933d6fc9 Merge remote-tracking branch 'origin/master' into Universal_Audio_Branch 2014-04-14 11:49:27 +02:00
Klimis Ioannidis
a758781544 Blacklist GLTools (Chainfire3D-like app for 3.0+) 2014-04-13 23:25:56 +03:00
kaienfr
e25bc6908a Fix nonsmooth sound issue and incomplete frame at the end of source and pcm buffers. 
using a std::string to save the source buffer, and changing the loading strategy so as we will not get any incomplete frame.
 2014-04-12 23:16:38 +02:00
kaienfr
d5c1d58506 Audio Speed Hack (fill pcm buffer) 
Dead or alive will be better to using this hack, but some other games will be too fast.
So, it's optional.
 2014-04-12 17:16:31 +02:00
Henrik Rydgård
6c406823c0 Enable the better looking vertical mode for the homescreen in portrait mode 2014-04-03 22:44:18 +02:00
Henrik Rydgard
efa7ba5570 Set both Default-NAN and FZ on ARM. See comments. 
http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0274h/Babffifj.html
 2014-03-23 10:07:20 +01:00
Henrik Rydgard
f549ce9b2a Shouldn't check for ANDROID here. 2014-03-23 00:05:58 +01:00
Henrik Rydgard
bc121242b3 Use fast_math matrix multiplication for culling and sw transform 2014-03-22 14:40:09 +01:00
Henrik Rydgard
d7b0287e7a Make a string translatable in tilt settings dialog 2014-03-20 00:29:34 +01:00
Unknown W. Brackets
1e1ebb3dbf Execute android profiler on Exit. 2014-03-18 23:55:17 -07:00
Unknown W. Brackets
c9be2f606c Fix a type conversion warning. 2014-03-15 10:41:13 -07:00
Henrik Rydgard
4df49a72ab Add yet another hack setting to work around the 3rd Birthday problem. 
Hopefully temporary...
 2014-03-13 19:00:35 +01:00
Henrik Rydgård
8bc717cf67 Take care of #5639 without hardcoding the array size. 2014-03-13 08:15:22 +01:00
Henrik Rydgård
6b709a601d Update native 2014-03-10 23:21:21 +01:00
The Dax
8efd67280d Show unknown.png regardless of PARAM.SFO when an ISO lacks the file. 
It's better than showing a black rectangle with nothing in it for broken or homebrew ISOs.
 2014-03-06 08:25:40 -05:00
Henrik Rydgård
30e58d9848 More work on smoother keyboard focus 2014-03-03 12:56:01 +01:00
Henrik Rydgård
36c8d7f408 Focus the start button on the pause screen. Update native with focus fixes. 2014-03-03 11:39:42 +01:00
Unknown W. Brackets
a3ad15b295 Allow screenshot out of game. 2014-03-01 13:55:17 -08:00
Sacha
ed4f5054c6 Qt: Clean up QtHost. 2014-03-02 01:09:38 +10:00
The Dax
8c31e1ca21 Add a basic decrypted EBOOT.BIN dump function. 
It won't dump already decrypted EBOOTs.
 2014-02-27 01:35:17 -05:00
The Dax
ffcae56209 Actually force the pause button on Symbian, iOS, and Meego Harmattan. 
Instead of leaving a loophole open which could allow an ini edit, just force it on for these.
 2014-02-25 01:57:32 -05:00
The Dax
57ed2149ef Let the touchscreen pause/menu button be available for everybody. 
It's still forced ON on iOS, Symbian, and Meego Harmattan.
 2014-02-25 01:39:10 -05:00
Sacha
c520884888 Blackberry/Symbian: Improve tilt. 2014-02-20 04:00:22 +10:00
Henrik Rydgard
e561f576b5 Windows screenshots: Name the files after the game ID. Implements #5504 2014-02-17 23:43:58 +01:00
Unknown W. Brackets
df1a26793b When the language changes, recreate all views. 
Not just the current screen's views.  Fixes language not switching on main
screen when changed in settings.
 2014-02-17 11:40:59 -08:00
Unknown W. Brackets
3dea6fdd86 Cache reporting support to avoid slowdown. 
Turns out checking flash0:/ was not fast, oops, but especially when
disabled.

Also, make the box show as disabled when it's been disabled during the
session, and make it not do that in the menu.
 2014-02-15 20:34:03 -08:00
Henrik Rydgard
3ba629081b Temporary: Exit "hard" on Android again. 
This is to prevent more unforeseen issues like the rotation lock
problem in the bugfix release.

Will be reverted again later.
 2014-02-15 10:00:29 +01:00
Henrik Rydgård
0dd9e2dbaf Merge pull request #5452 from unknownbrackets/win-fixes 
Clean up some Windows leaks, optimize symbol map a bit
 2014-02-15 09:31:37 +01:00
Unknown W. Brackets
75de50123a Don't need to check inited for PSP_Shutdown() now. 2014-02-14 23:02:29 -08:00
Henrik Rydgård
0f1032841b Merge pull request #5380 from ufdada/patch-2 
Only enable autoframeskip if frameskipping != 0
 2014-02-14 13:27:55 +01:00
Henrik Rydgard
002a4f2f72 Prevent messages from getting lost by adding a queue. Fixes #5431 2014-02-13 17:48:33 +01:00
The Dax
72546b83a7 Allow the language ini path to be overridden for translation testing purposes. 2014-02-12 18:31:54 -05:00
Unknown W. Brackets
ab8a8a61dc Shut down emulation when the game exits. 
Fixes #5421.
 2014-02-12 08:06:53 -08:00
ufdada
76e81c182a another approach 2014-02-11 18:32:26 +01:00
Henrik Rydgård
1e1cd730bd Fix crash on exit in SDL builds and possibly others. 
This was caused by NativeShutdown getting called twice.

Native* functions should not be called by the app directly, they should
always be called by the platform abstraction. Dunno what I was thinking
here.
 2014-02-11 11:32:54 +01:00
Henrik Rydgard
8a2b50af64 Fix bug causing the screen to go blank when resizing the window using scale factors on Windows. 2014-02-10 16:22:16 +01:00
Henrik Rydgard
984554fe7c Make the UI scale and move correctly when the UI bounds are modified. 2014-02-10 16:08:19 +01:00
Henrik Rydgard
ca9d0ea5cf Remove more bad uses of dp_xres. Fix a data flow issue 
(could end up with "feedback" if modifying the screen bounds)
 2014-02-10 15:55:21 +01:00
Henrik Rydgard
c6caff61bf Update native with buildfix. Fix some resizing issues. 2014-02-10 15:14:45 +01:00
Henrik Rydgard
4d00a9b4bc Reduce use of display.h (dp_xres, dp_yres) now that uicontext has bounds 2014-02-10 12:44:36 +01:00
Henrik Rydgard
8b6b491820 Remove obsolete outputWidth/outputHeight 2014-02-10 12:44:35 +01:00
Henrik Rydgård
25bf95fcf3 Merge pull request #5388 from unknownbrackets/reporting 
Adjust reporting to track and send more things
 2014-02-10 09:48:20 +01:00
Unknown W. Brackets
739da04322 Also need this to prevent double-shutdown. 
That exit(0) before was skipping a lot of stuff..
 2014-02-09 18:18:36 -08:00
Unknown W. Brackets
b46ca9f94b Lock out reporting if harmful settings are used. 
Before, if you turned it on, broke stuff, and then turned it off, we
reported the broken stuff.  This could be responsible for various
messages that have seemed strange.
 2014-02-09 17:39:16 -08:00
Unknown W. Brackets
274160bc22 Centralize game background drawing code. 
No need to duplicate it everywhere.
 2014-02-09 17:39:15 -08:00
Henrik Rydgard
ca500b0bf4 Add setting for Kitkat Immersive Mode on Android. 2014-02-09 23:16:08 +01:00
ufdada
bf580ec2e1 Only enable autoframeskip if frameskipping != 0 
Referencing #5373.
 2014-02-09 13:20:38 +01:00
Unknown W. Brackets
7add81fbd2 Use USING_WIN_UI instead of _WIN32 for differences. 
Just makes the code clearer and probably helps other UIs work on Windows
more easily.
 2014-02-08 16:38:45 -08:00
Unknown W. Brackets
cd4cd77938 Clean up defines in MSVC project files. 
This way they're all basically the same.  A lot of cases where
debug/release/etc. where inconsistent...

Also, define USING_WIN_UI.
 2014-02-08 16:38:44 -08:00
Unknown W. Brackets
d2108a962e Switch from USING_GLES2 to MOBILE_DEVICE. 
Still using USING_GLES2 for, well, GLES2.  But for things that are really
about mobile, we need a new define.  Devices are coming that don't use
GLES2.
 2014-02-08 16:37:58 -08:00
Unknown W. Brackets
2c204e8028 Update project to MSVC 2013 tools. 
Retaining XP support, using SDK 7.1a (v120_xp.)  Disables SSE2 flag on x64
since it's implied and causes compile warnings.
 2014-02-08 13:41:28 -08:00
ufdada
0fc8c35297 Fix language selection list 
You can´t choose any language on android, probably because of a bugfix (see ca8311b4b8)
 2014-02-04 17:24:28 +01:00
Henrik Rydgård
8bc6e3f861 Add a setting in System to set the screen rotation. Default is locked to landscape. 2014-02-04 12:58:37 +01:00
Henrik Rydgård
536fcbd719 Add support for new "native-method" NativeQueryConfig, which will be 
used to implement settings like rotation lock where the implementation
is on the Java side on Android.
 2014-02-04 12:09:14 +01:00
The Dax
73f61d908c Use [Unknown]'s suggested method instead. 2014-01-31 00:54:38 -05:00
The Dax
910abacb3f Skip showing the info menu if the RMB is bound. 2014-01-31 00:48:25 -05:00
The Dax
87c2201873 Don't crash when enable debug stats is enabled in a game, then turned off after exiting a game. 2014-01-27 23:34:02 -05:00
Henrik Rydgård
289729f43c Merge pull request #5216 from DanyalZia/frameskip 
Separates out auto-skip from frameskiping
 2014-01-26 14:06:45 -08:00
DanyalZia
251b0e86ee Separates out auto-skip from frameskipping 2014-01-26 00:50:00 +05:00
Unknown W. Brackets
8f98fa78aa Allow right click / triangle on a game item. 
Fixes #3866, makes keyboard navigation a bit better.
 2014-01-25 11:24:06 -08:00
Unknown W. Brackets
d820768396 Properly exit error screen when hitting cancel. 
Fixes #3351.
 2014-01-25 00:40:14 -08:00
Unknown W. Brackets
eeaeb91610 Disable scaling to odd multiples when unsupported. 
May help #4000.
 2014-01-19 21:14:21 -08:00
Unknown W. Brackets
a73b15b963 In multithreadead, load the game async. 
This way if it takes time to load, things aren't frozen while it's doing
that.  This allows us to show any sort of loading animation or etc. we
want.

Before, it might show a odd looking game select screen while loading, and
then finally go to black.  Now it immediately goes to black.

Fixes #2030.
 2014-01-19 14:41:01 -08:00
adrian17
c52c2375c0 Removed dead code from UI 2014-01-19 13:51:24 +01:00
Henrik Rydgard
c55578367f Add option "Small Display", useful for large tablets to avoid overlapping touch controls with the screen. 
Will later replace with a multiselect of different sizes, or something more advanced
like multitouch drag & zoom of the screen to get it exactly where you want it.
 2014-01-16 00:22:39 +01:00
raven02
a4ac0de131 0 is FAT and 1 is SLIM 2014-01-13 20:45:28 +08:00
raven02
30181fab43 Option to select PSP models (1000, 2000/3000) 2014-01-13 20:04:15 +08:00
Unknown W. Brackets
79864a5ee0 Fix some initialization order warnings. 2014-01-10 22:21:24 -08:00
Henrik Rydgård
51484e48a9 Merge pull request #5043 from thedax/win32IgnoreWindowsKeyOption 
Win32: Add an option to disable the Windows key when the emulator is the active window.
 2014-01-08 10:46:47 -08:00
The Dax
f6606e2e2b Win32: Add the option to the Game Settings menu, too, and add a separator in NewUI. 2014-01-07 16:08:11 -05:00
The Dax
9d2868b7ce Win32: Add option to disable the Windows key. 2014-01-07 16:02:00 -05:00
zack-vii
26fbb4c32c "Next Slot" control mapping 
-added "Next Slot" to control mapping menu
-added VIRTKEY_NEXT_SLOT -> incremented VIRTKEY_TOGGLE_FULLSCREEN
-added SaveState::NextSlot(); as replacement for code in
WndMainWindow
-added entry in EmuScreen using SaveState::NextSlot();
 2014-01-07 15:56:04 +01:00
Henrik Rydgard
a387f6dd8b Also disable some weird axis events we get on Ouya from mapping. 2014-01-07 00:01:41 +01:00
Henrik Rydgard
5f2954bc69 Prevent the accelerometer from being mapped to controls directly until we can create sane UI for that. 2014-01-06 23:58:59 +01:00
Henrik Rydgård
53deef19c5 Merge pull request #4998 from ufdada/master 
disable some settings if sound isn´t enabled
 2014-01-03 12:06:55 -08:00
ufdada
028bbbeb0b value already bool, no need to cast it 2014-01-03 21:03:57 +01:00
ufdada
70a8391d90 disable some settings if sound isn´t enabled 2014-01-03 20:58:59 +01:00
Henrik Rydgård
c51b117ba2 Merge pull request #4991 from ufdada/master 
Also disable vertex cache option if hw transform is disabled
 2014-01-03 10:11:14 -08:00