7c24bd67ce
Remove older/crappier TakeScreenShot console cmds.
2013-12-11 19:44:50 -05:00
2d8d42759d
Better Game.TakeScreenShot
...
The new version uses plCaptureRender, so we can take screenshots at any
size that DX can render to...
2013-12-11 19:44:47 -05:00
dd35878465
Begin killing off sprintf
2013-07-09 21:30:42 -04:00
294a398d29
Correct some issues with the pfConsole changes.
2013-02-20 21:33:35 -08:00
25407bf2ca
Fix logic error.
2013-02-10 00:28:06 -08:00
c06cfd1449
Fix some warnings and some errors.
2013-02-10 00:14:10 -08:00
8f67596686
Merge pull request #275 from zrax/file-utils
...
Unify filesystem utilities
2013-01-22 16:27:26 -08:00
2c028c4b07
Remove hsFiles in favor of plFilesystem stuff
2013-01-21 14:48:32 -08:00
cc54fb07be
Finish deprecation of pnUtPath
2013-01-21 14:48:31 -08:00
6e564476b7
Deprecate plFileUtils and parts of pnUtPath
2013-01-21 14:48:28 -08:00
f86b549293
Re-define nil as nullptr, cleaning up some potential issues along the way
2013-01-20 21:12:13 -08:00
1ce553ac80
Add plStatusLog to the list of converted interface, in order to fix my log output dir screw-up
2013-01-19 17:06:27 -08:00
6f6ade2636
Replace hsStream::Open duplicated methods everywhere with a single plFileName interface
2013-01-19 14:21:49 -08:00
2eb3648144
Merge pull request #251 from dpogue/plresmgr-strings
...
Convert plRegistryNode stuff to plString.
2013-01-07 21:59:09 -08:00
ad6b0bf3c8
Merge pull request #252 from dpogue/pljpeg
...
Move plJPEG into plGImage.
2013-01-05 21:10:57 -08:00
c77cb10c20
Move plJPEG into plGImage.
...
This matches what was done for plPNG.
2013-01-05 20:34:01 -08:00
4dd06d1e7e
Convert plRegistryNode stuff to plString.
2013-01-05 20:21:33 -08:00
bc0d04da48
Deprecate and remove NEWZERO macro
2013-01-05 18:33:47 -08:00
fd8541e18d
Get rid of GuidGenerate calls.
2013-01-04 21:01:14 -08:00
74e06e3984
Deprecate and remove hsStlSortUtils
2013-01-01 21:35:11 -08:00
8158a43dfe
Fully remove hsStlUtils, as it is now completely unused
2013-01-01 21:35:11 -08:00
60021923a2
Deprecate and remove xtl::format in favor of plString::Format
2013-01-01 21:35:10 -08:00
f510b529f8
Remove unused headers from hsStlUtils.h (and push them downstream where needed)
...
Also fix a couple of plString and header issues identified by Paradox on GCC/Clang
2013-01-01 21:35:10 -08:00
d40e7a5ca5
Move file stuff back to plFile for gcc.
2013-01-01 21:05:32 -08:00
bb4d36e69d
Remove windoze include from hsThread.h
2012-12-22 17:16:01 -05:00
7785c9c85e
Remove global Windows.h include
...
This is the beginning of efforts to reduce the scope of Windows.h. I have
shuttled it into hsWindows.h (again) and fixed the compilation of the
major apps. There is still some scope work that needs to be done, and the
Max plugin has not yet been addressed.
2012-12-22 17:15:14 -05:00
49dfb4e546
Convert SDL (mostly) to plStrings
2012-12-13 02:06:41 -08:00
b219c3c3cc
Alright, this _TEMP_CONVERT_ stuff was a stupid idea
2012-11-13 18:40:13 -08:00
9cc3f404af
Add Short-String Optimization to plString
2012-11-12 19:06:53 -08:00
041b1985e4
Fix paths and move GetSecureEncryptionKey so things compile again
2012-11-12 18:31:07 -08:00
3c2a8c66e7
Remove more empty source files
2012-11-11 23:00:24 -08:00
2531dba66c
Make Python.Cheat little bit safer
2012-10-02 19:26:10 +02:00
8fc79f280c
Remove Python.RunFile
2012-10-02 19:26:09 +02:00
bc3c409094
Merge pull request #217 from Hoikas/hdr-cleanup
...
Header Cleanups
2012-08-13 17:20:01 -07:00
27ab9ef129
Display SO name in spawn list
2012-07-25 21:06:44 +02:00
a709e17069
Obliterate hsBool
2012-07-14 18:46:27 -04:00
4c851fa640
Fix console documentation.
2012-05-08 07:41:46 -04:00
ad66286a17
Fix several errors and warnings from GCC compilation
2012-02-09 01:09:11 -08: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
e0567a2ec9
Merge pull request #141 from branan/mingw
...
Compilation fixes for mingw
If it breaks, blame Zrax because he was the unlucky guy who got caught AFK.
--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 16:27:16 -08:00
02118488bd
prevent pfConsole from crashing when inserting text into a max length line
2012-02-01 20:44:49 -05:00
be9dca97e8
Separated line histories for python and normal console modes
2012-02-01 00:25:32 -05:00
2493cf8f73
Some fixes for pfConsole.
2012-01-30 23:59:20 -08:00
84849b2238
Lined up the input line with the output buffer
2012-01-31 02:40:29 -05:00
6750a033d2
Fixed python multi-line entry by preventing double enter events
2012-01-31 02:40:00 -05:00
85b5842ece
Fix all the packed structures.
...
Now we actually build a significant amount of stuff on Linux.
2012-01-29 00:19:37 -08:00
c339f947ba
Merge remote-tracking branch 'origin/master' into plString
...
Conflicts:
Sources/Plasma/CoreLib/hsStream.h
Sources/Plasma/FeatureLib/pfAudio/plListener.cpp
Sources/Plasma/FeatureLib/pfConsole/pfConsoleCommands.cpp
Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp
Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
Sources/Plasma/FeatureLib/pfPython/cyMisc.cpp
Sources/Plasma/FeatureLib/pfPython/cyMisc.h
Sources/Plasma/FeatureLib/pfPython/cyMiscGlue4.cpp
Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.cpp
Sources/Plasma/FeatureLib/pfPython/plPythonFileMod.h
Sources/Plasma/FeatureLib/pfPython/pyImage.cpp
Sources/Plasma/FeatureLib/pfPython/pyJournalBook.cpp
Sources/Plasma/FeatureLib/pfPython/pyNetServerSessionInfo.h
Sources/Plasma/NucleusLib/pnKeyedObject/plFixedKey.cpp
Sources/Plasma/NucleusLib/pnKeyedObject/plKeyImp.cpp
Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.cpp
Sources/Plasma/NucleusLib/pnKeyedObject/plUoid.h
Sources/Plasma/NucleusLib/pnMessage/plMessage.h
Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h
Sources/Plasma/PubUtilLib/plAvatar/plCoopCoordinator.cpp
Sources/Plasma/PubUtilLib/plDrawable/plDrawableSpansExport.cpp
Sources/Plasma/PubUtilLib/plDrawable/plDynaDecalMgr.cpp
Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp
Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
Sources/Plasma/PubUtilLib/plNetClient/plNetClientMgr.h
Sources/Plasma/PubUtilLib/plNetCommon/plClientGuid.h
Sources/Plasma/PubUtilLib/plNetMessage/plNetMessage.cpp
Sources/Plasma/PubUtilLib/plNetMessage/plNetMsgHelpers.h
Sources/Plasma/PubUtilLib/plNetTransport/plNetTransportMember.h
Sources/Plasma/PubUtilLib/plPhysX/plSimulationMgr.cpp
Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
Sources/Plasma/PubUtilLib/plPipeline/plPlates.cpp
Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.cpp
Sources/Plasma/PubUtilLib/plResMgr/plKeyFinder.h
Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.cpp
Sources/Plasma/PubUtilLib/plResMgr/plRegistryNode.h
Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.cpp
Sources/Plasma/PubUtilLib/plScene/plRelevanceMgr.h
Sources/Plasma/PubUtilLib/plSurface/plGrassShaderMod.cpp
2012-01-28 17:20:01 -08:00
e34414889f
Convert plUoid's object name to a plString
2012-01-28 16:24:20 -08:00
442a733fbb
Add more temporary hack macros to help speed up conversion and testing
2012-01-25 22:43:18 -08:00
