Darryl Pogue
b45ad14b78
Fix NxMath conflicts.
13 years ago
Michael Hansen
77a31686da
Fix the plString stuff that didn't get caught in the merge
13 years ago
Michael Hansen
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
13 years ago
Darryl Pogue
3f22efda98
Make sure all the InputKeys exist for *nix.
...
Although it really doesn't matter what they are defined as, as long as
they exist.
This allows pfGameGUIMgr to compile on Linux.
13 years ago
Darryl Pogue
46c3c9c049
Fix some includes for non-MSVC.
13 years ago
Michael Hansen
e34414889f
Convert plUoid's object name to a plString
13 years ago
Joseph Davies
7c2cb067ad
Merge pull request #124 from cwalther/gotopage
...
Fix Relto books not remembering last open page
13 years ago
NadnerbD
766df693c6
Merge pull request #122 from Hoikas/modern-malloc
...
Modern malloc MERGED
13 years ago
Adam Johnson
29064590c5
Add PyUnicode support to ptPlayer.__init__
13 years ago
Adam Johnson
4bf0c485ce
Fix #121 by removing axfres.h include
13 years ago
Adam Johnson
f7d5432584
Fix release mode compile error
13 years ago
Christian Walther
3a6063bc7a
Fix inability to go to a higher page in a book than the next after what has already been displayed.
...
Fixes books on the Relto bookshelf not remembering their last open page beyond the second.
13 years ago
Michael Hansen
442a733fbb
Add more temporary hack macros to help speed up conversion and testing
13 years ago
Michael Hansen
a1852ad385
Convert plUUID and its cascade of dependencies to plString
13 years ago
Michael Hansen
acd47d9f91
Re-add plString with some cleanup
13 years ago
Adam Johnson
906b16d28e
Remove stupid
13 years ago
Adam Johnson
91fc595407
Completely kill off CoreLibExe
13 years ago
Darryl Pogue
63a9eea771
Kill hsMalloc to the best of our ability.
13 years ago
Darryl Pogue
a14a171774
Replace MemMove, MemCopy, and MemCmp.
13 years ago
Darryl Pogue
eb946f76a4
Get rid of MemAlloc.
13 years ago
Darryl Pogue
72fdf8de32
Replace MemZero with memset.
13 years ago
Darryl Pogue
7d7d7d273f
Get rid of ALLOCZERO macro.
13 years ago
Darryl Pogue
f4ff65ccbc
Replace MemSet with memset.
13 years ago
Darryl Pogue
12ac9a79be
Remove TRACKED_NEW from tools.
13 years ago
Darryl Pogue
5013a978eb
Get rid of NEW(), TRACKED_NEW, and ZERO().
13 years ago
Darryl Pogue
30430d3024
Replace ZEROPTR() with memset.
13 years ago
Darryl Pogue
3c5ed83020
Replace calls to ALLOC() macro with malloc.
13 years ago
Darryl Pogue
1fa1197c3e
Get rid of ALLOCFLAGS() macro.
13 years ago
Darryl Pogue
4159663415
Get rid of MEMDUP() macro.
13 years ago
Darryl Pogue
b3f75a5ae7
Get rid of REALLOC(), REALLOCFLAGS(), and CALLOC()
13 years ago
Darryl Pogue
48b8cd8ad0
Get rid of FREEFLAGS() which ignored the flags >.>
13 years ago
Darryl Pogue
6cdcf6a95e
Get rid of most _alloca use and remove ALLOCA().
13 years ago
Darryl Pogue
8a3f0cfd5b
Get rid of DEL() and FREE() macros.
...
Part of CoreLibExe must die.
13 years ago
Adam Johnson
be26b145df
HeadSpin.h is now the core header.
...
Rearrange some things so such that low-level CoreLib headers aren't quite
so crazy. For higher level stuff, you still need to include the
appropriate header.
13 years ago
Adam Johnson
2f53a10fb6
Convert hsConfig defines to cmake -- fixes #93
13 years ago
Adam Johnson
4bb94f34b8
Remove obviously unused stuff
13 years ago
Adam Johnson
e020651e4b
Eliminate hsScalar and hsFixed
...
Modern CPUs support floats just fine... hsFixed was crazy.
13 years ago
Adam Johnson
5027b5a4ac
Convert custom HeadSpin integer types to standard types from stdint.h
13 years ago
Branan Purvine-Riley
a0d54e2644
Merge pull request #120 from cwalther/returnkey
...
Fix use of the return key as a control key
13 years ago
Christian Walther
cec6d75f94
Fix a warning while I'm at it.
13 years ago
Christian Walther
12d114b63a
Allow typing tabs (MOULa does too).
13 years ago
Christian Walther
859aef9e97
Fix use of the return key as a control key
...
broken by revision f251606
13 years ago
Branan Purvine-Riley
1c2defef26
Merge pull request #119 from branan/loceditor
...
Import plLocalizationEditor
13 years ago
Branan Purvine-Riley
7500c9f992
Import plLocalizationEditor
13 years ago
Branan Purvine-Riley
be472ddb62
Merge pull request #118 from Hoikas/physx
...
PhysX Fixes
13 years ago
Joseph Davies
02e38f981e
Fix mouse recentering.
...
Existing fix didn't apply until after SecurePreloader completed.
This disables the mouse recentering earlier.
13 years ago
Joseph Davies
73ec6b4601
Merge pull request #55 from Deledrius/l10n
...
Re-enable Localization.
Fixes #12
13 years ago
Adam Johnson
b4e1dc352e
Fix player and CGZ marker games
13 years ago
Adam Johnson
3bf8df58d8
Band-aid for the "Michael Jackson" bug
13 years ago
Adam Johnson
64a0c49439
Bonus: Some cleanups for collision message handling and slightly improved
...
logging
13 years ago