ccf5f59fda
Merge pull request #149 from Hoikas/physx
...
More PhysX Fixes
2012-02-13 18:13:23 -08:00
40933d6612
Merge pull request #144 from Deledrius/vault_png
...
More PNG support (Vault and Python)
2012-02-13 08:52:17 -08:00
3e15b5d318
Fixed memory leak, plString is nice
2012-02-13 01:36:50 -08:00
80213f3edd
Fix weird jitters when jumping and kicking
...
NOTE: If you are using a version of PhysX prior to 2.6.4, then you should
test very carefully if you should keep this commit. This change fixed a
bug that caused avatars to get stuck falling against certain colliders. It
seems to no longer be needed.
2012-02-13 01:34:46 -05:00
7dcf2e66a3
Greatly simplify collision detectors
2012-02-13 01:34:45 -05:00
1b0e139ae5
Only send out one collide msg per frame
...
This addresses a "PhysX turd" that some Cyan programmer noted in
plCollisionDetector. Cleaning up that cruft is pending...
2012-02-13 01:34:35 -05:00
9795b4e7fc
Fix unsafe cleanup in ~plCameraRegionDetector
...
Deleting an hsRefCnt is evil, we should ALWAYS hsRefCnt_SafeUnRef (we
might have a nullptr) it because someone might ref it. hsRefCnt will explictly crash if you delete it when the refcnt != 1.
Also, take this opportunity to vector-ize things.
2012-02-13 01:33:16 -05:00
8ec1a92359
Rewrite kickable force stuff...
...
Cyan's old code was confusing and would allow you to walk on top of small
kickables. Now, we impart force to these small kickables up to a certain
point where imparting force to them becomes somewhat risky.
2012-02-13 01:33:16 -05:00
0689901c5e
Band-aid for poorly modelled stairs
...
Looks like the Cyan modellers didn't extend the stair ramps all the way
down in some places. To compensate, we can now take higher steps but can't
walk on slopes quite as steep as before. I think this should balance out
nicely.
2012-02-13 01:33:15 -05:00
b907f8978a
Fix landing behaviors
...
Looks like Cyan broke these when they fixed superjumps. It appears that
LinearVelocity is only good while the PhysicalControllerCore is updating,
and it stashes the result for later so nothing else can touch it.
Regardless, we need to test AchievedLinearVelocity outside of the update
proc.
2012-02-13 01:33:15 -05:00
a2a7bd7e77
Merge pull request #150 from dpogue/pnEncryption
...
Refactor hash digest code
--HG--
rename : Sources/Plasma/PubUtilLib/plMath/plRandom.h => Sources/Plasma/NucleusLib/pnEncryption/plRandom.h
2012-02-12 22:06:06 -08:00
e985616107
Fix errors.
2012-02-12 18:32:07 -08:00
ee338c9adf
Fix some casting errors.
2012-02-12 15:26:47 -08:00
39e8dd1b3c
Remove all the Digest stuff from pnUtCrypt.
2012-02-12 15:23:31 -08:00
7a5d61f7c8
Move plRandom into pnEncryption.
...
--HG--
rename : Sources/Plasma/PubUtilLib/plMath/plRandom.h => Sources/Plasma/NucleusLib/pnEncryption/plRandom.h
2012-02-12 15:23:02 -08:00
4a1b36b284
Move half of the Challenge Hash stuff.
2012-02-12 01:19:22 -08:00
c9b4c0a92d
NewKey can take a plString, so no need to convert to const char*
2012-02-12 04:18:24 -05:00
1b22f044f0
Fix conflicting ShaDigest types.
2012-02-11 23:15:06 -08:00
404cd09f1c
Move plEncryption to pnEncryption.
...
--HG--
rename : Sources/Plasma/PubUtilLib/plEncryption/plChecksum.cpp => Sources/Plasma/NucleusLib/pnEncryption/plChecksum.cpp
rename : Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h => Sources/Plasma/NucleusLib/pnEncryption/plChecksum.h
2012-02-11 23:14:11 -08:00
0bede93022
Merged with master and plString
2012-02-12 01:57:16 -05:00
d2243c459b
Added plSHA project, and clean up pnUtCrypt usage.
2012-02-11 22:31:29 -08:00
f4878166d5
Don't use pnUtils for MD5 checksumming.
...
On the other hand, have we ever figured out exactly what this code is
supposed to do? Mark added it for something, but it's not really clear
what the purpose is.
2012-02-11 21:58:30 -08:00
76a754f55a
Added plSHAChecksum and plSHA1Checksum.
2012-02-11 21:57:28 -08:00
4b8b5027be
Build plMD5.
...
Refs #1 .
2012-02-11 19:52:36 -08:00
b29eb95acc
Zrax fails
2012-02-11 14:35:31 -08:00
053600d952
Merge pull request #146 from zrax/plString
...
plString (take two)
2012-02-11 14:07:49 -08:00
6b259f4699
Merge remote-tracking branch 'origin/master' into plString
...
[AMEND] Fixed one new case which came in from master
2012-02-11 14:02:30 -08:00
4b70d592c9
Fix some %s errors in plPhysX
2012-02-11 13:31:43 -08:00
036a1d38fc
Clean up python binding for image-loading functions.
2012-02-10 13:53:04 -08:00
deb28a85a5
Merge pull request #145 from Hoikas/physx
...
PhysX (Contined)
2012-02-10 10:13:25 -08:00
8f2d4a6712
Revert hacks and do it right.
...
Now that we properly suspend/resume the simulation AND filter out false
positives in the PanicLink region, we can use the correct PhysX apis have
have regions that work 100%
2012-02-10 12:47:35 -05:00
e733ca824b
More panic link fixes
...
Now, we check the armature mod to see if we're REALLY linked in (the screen
is not black). That way, we can be sure all delayed transforms and false
hits (like how we initially spawn into the AhnySphere04 panic region) don't
panic link us.
2012-02-10 12:45:14 -05:00
3b22256085
Add python function glue to allow loading PNG images from disk.
2012-02-10 00:12:52 -08:00
cb697523f9
Add PNG support to the VaultImageNode functions.
2012-02-09 23:50:55 -08:00
08fa25a737
Fix a potential crash in pyVaultImageNode.
...
Fixes a crash which can occur when attempting to fetch
an unsupported image type.
2012-02-09 23:47:22 -08:00
1511459ffd
Fix String concatenation dereference bug
2012-02-09 22:44:57 -08:00
247749934b
Fix pnUUID compilation on Linux
2012-02-09 21:29:23 -08:00
77cd055a27
Merge remote-tracking branch 'origin/master' into plString
2012-02-09 20:57:21 -08:00
ad66286a17
Fix several errors and warnings from GCC compilation
2012-02-09 01:09:11 -08:00
b2d2a0cc2f
Merge pull request #143 from Hoikas/unlock-framerate
...
Unlock framerate
2012-02-08 22:51:42 -08:00
3788ef10a3
The eap sucks commit!
...
It turns out that eap (I know it was him... look at those weird comments
between the functions) was calling plClient::IDraw for every KeyedObject we
loaded in order to update the progress bar. For some reason, some stooge
added a framerate limit to the MAIN DRAW LOOP instead of this function.
*Sigh*. Either way, the framerate limit is a HACK. We should really be
loading resources in another thread.
2012-02-09 00:29:24 -05:00
d4dabfb047
That looks dangerous...
...
PhysX is nicely capable of clamping for us without those nasty hacks, so
let's allow PhysX to do it for us. Hopefully, this will keep anything too
insane from happening when I disable the framerate limit.
2012-02-09 00:29:23 -05:00
436729d6d0
Merge pull request #142 from Hoikas/physx
...
Really fix those bizarre panic links, and a memory leak, and those f*****g gira baskets
2012-02-06 19:02:55 -08:00
54b5e4cf24
Fix Gira basket explosions
...
Tweak the GZ marker detector region fix to only wake up kinematic detector
regions... waking up regular dynamic actors before we position them causes bad
things to happen.
2012-02-06 21:44:13 -05:00
8cbde377ef
Fix an obvious memory leak.
...
This thing was pissing me off, which made me piss off a lot of other people,
which pissed off even more people, so the entire planet got pissed off and
nuclear warfare began. So, let's not do stupid crap and piss me off, okay?
2012-02-06 21:17:08 -05:00
9fea5d1edd
Merge pull request #139 from Hoikas/pfpy-strex
...
ptStatusLog Unicode Support
2012-02-06 16:10:13 -08:00
33dbdce2f1
Really fix those bizarre panic links
...
Looks like Cyan never actually stopped simulating, so we simulate through
adding objects to the scene and positioning them. This is a bad thing(TM),
so now we suspend/resume the simulation on plAgeLoadedMsg.
2012-02-06 18:51:36 -05:00
e6ebf7ffaf
Merge remote-tracking branch 'origin/master' into plString
...
Conflicts:
Sources/Plasma/FeatureLib/pfPython/pyVault.cpp
Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSubst.cpp
Sources/Plasma/PubUtilLib/plAvatar/plAvatarMgr.cpp
Sources/Plasma/PubUtilLib/plPipeline/plDXDeviceRefs.cpp
Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
--HG--
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxStr.cpp => Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxStr.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxSync.cpp => Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxSync.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Unix/pnUtUxUuid.cpp => Sources/Plasma/NucleusLib/pnUtils/Unix/pnUtUxUuid.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/W32Int.h => Sources/Plasma/NucleusLib/pnUtils/Win32/W32Int.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Addr.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Addr.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Dll.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Dll.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Misc.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Misc.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Path.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Path.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Str.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Str.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Sync.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Sync.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Time.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Time.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/Win32/pnUtW32Uuid.cpp => Sources/Plasma/NucleusLib/pnUtils/Win32/pnUtW32Uuid.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAddr.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAddr.h => Sources/Plasma/NucleusLib/pnUtils/pnUtAddr.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtAllIncludes.h => Sources/Plasma/NucleusLib/pnUtils/pnUtAllIncludes.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtArray.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtArray.h => Sources/Plasma/NucleusLib/pnUtils/pnUtArray.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtBase64.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBase64.h => Sources/Plasma/NucleusLib/pnUtils/pnUtBase64.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtBigNum.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtBigNum.h => Sources/Plasma/NucleusLib/pnUtils/pnUtBigNum.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtCmd.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCmd.h => Sources/Plasma/NucleusLib/pnUtils/pnUtCmd.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCoreLib.h => Sources/Plasma/NucleusLib/pnUtils/pnUtCoreLib.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtCrypt.h => Sources/Plasma/NucleusLib/pnUtils/pnUtCrypt.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtHash.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtHash.h => Sources/Plasma/NucleusLib/pnUtils/pnUtHash.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtList.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtList.h => Sources/Plasma/NucleusLib/pnUtils/pnUtList.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMath.h => Sources/Plasma/NucleusLib/pnUtils/pnUtMath.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtMisc.h => Sources/Plasma/NucleusLib/pnUtils/pnUtMisc.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPath.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtPath.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPath.h => Sources/Plasma/NucleusLib/pnUtils/pnUtPath.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPragma.h => Sources/Plasma/NucleusLib/pnUtils/pnUtPragma.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtPriQ.h => Sources/Plasma/NucleusLib/pnUtils/pnUtPriQ.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRand.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtRand.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRand.h => Sources/Plasma/NucleusLib/pnUtils/pnUtRand.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtRef.h => Sources/Plasma/NucleusLib/pnUtils/pnUtRef.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSort.h => Sources/Plasma/NucleusLib/pnUtils/pnUtSort.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtSpareList.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSpareList.h => Sources/Plasma/NucleusLib/pnUtils/pnUtSpareList.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtStr.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtStr.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtStr.h => Sources/Plasma/NucleusLib/pnUtils/pnUtStr.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtSync.h => Sources/Plasma/NucleusLib/pnUtils/pnUtSync.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTime.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtTime.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTime.h => Sources/Plasma/NucleusLib/pnUtils/pnUtTime.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTls.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtTls.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtTls.h => Sources/Plasma/NucleusLib/pnUtils/pnUtTls.h
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.cpp => Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.cpp
rename : Sources/Plasma/NucleusLib/pnUtils/Private/pnUtUuid.h => Sources/Plasma/NucleusLib/pnUtils/pnUtUuid.h
2012-02-05 22:12:00 -08:00
be4b0732d5
Fix string usage that was broken from enabling the Max plugin build
2012-02-05 21:53:54 -08:00
b2e8edb725
I blame the QA Kitty for letting this one slip through...
2012-02-05 19:59:15 -05:00
