Nikolay Kasyanov
defab0e4b5
Merge remote-tracking branch 'upstream/master' into osx_fix
...
Conflicts:
CMakeLists.txt
13 years ago
Nikolay Kasyanov
b05dfeae70
bug #348 : cleanup
...
moved files to appropriate component, moved function to namespace,
added docs
13 years ago
Nikolay Kasyanov
e9d4195500
removed cout spam
13 years ago
Nikolay Kasyanov
fbe9a94568
bug #348 : fixed OS X deployment
...
just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search
plugins inside application bundle instead of Ogre prefix
13 years ago
greye
d5e63a767e
replace sprintf() with boost::format
13 years ago
greye
26595f22f6
float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()
13 years ago
greye
9f813aa26c
update resource naming in getObjectAABB()
13 years ago
greye
49b1d5e127
fix object placing
13 years ago
greye
87050e48c8
physics getObjectHeight(), MWWorld::Class::getModel() definition
13 years ago
Nikolay Kasyanov
94ce95c679
bug #348 : works again on OS X
13 years ago
scrawl
f8d6a36196
Merge branch 'master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/sky.cpp
apps/openmw/mwrender/sky.hpp
components/nifogre/ogre_nif_loader.cpp
components/nifogre/ogre_nif_loader.hpp
13 years ago
scrawl
e7ab3544ac
removed some redundant code
13 years ago
scrawl
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
13 years ago
Chris Robinson
6047dc6a0c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/animation.hpp
apps/openmw/mwrender/creatureanimation.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/npcanimation.hpp
components/nifogre/ogre_nif_loader.hpp
13 years ago
guidoj
a021165d9f
Changed standard C lib includes to C++ format
13 years ago
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
13 years ago
Chris Robinson
b4c8375f3c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/bsa/bsa_archive.cpp
13 years ago
Chris Robinson
b353cfd457
Remove unused Mangle::VFS
13 years ago
Chris Robinson
bd68f7bd33
Remove final direct uses of Mangle::Stream
13 years ago
Chris Robinson
2a3ce5ee6d
Remove Mangle::Stream
...
The base Stream class is left because some part of the terrain esm land factory
inherits from it, though it's largely unused (few of the methods work, and none
actually do anything).
13 years ago
Chris Robinson
386ac56bda
Remove the NIF loader and code to manually transform the vertices
...
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
13 years ago
gugus
feec67094f
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwworld/physicssystem.cpp
13 years ago
gugus
03f7740474
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/worldimp.hpp
13 years ago
Jason Hooks
b5edad790d
merge
13 years ago
Marc Zinnschlag
c85aaafac2
more include cleanup (most removing Ogre.h)
13 years ago
Marc Zinnschlag
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
13 years ago
scrawl
87127775e8
fix shutdown crash if ogre was not initialised yet
13 years ago
scrawl
01d1995164
fix compilation against latest bullet svn
13 years ago
Jason Hooks
86d8a07fc7
Switching back to old scaling
13 years ago
Jason Hooks
4d55ecfdbe
Deleting scaled shapes; scaleObject()
13 years ago
Jason Hooks
33fe80723c
btScaledBvhTriangleMeshShapes
13 years ago
Jason Hooks
ac6b455592
StepSize moved back to 9
13 years ago
Jason Hooks
a1902b4121
Tweaks for high speed
13 years ago
gugus
5397b9dba6
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
13 years ago
Marc Zinnschlag
ba38bad46e
Merge remote branch 'scrawl/leakfix'
13 years ago
gugus
974585d357
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
13 years ago
gugus
01fefca0a3
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
13 years ago
scrawl
0b850a2cb5
fix crash introduced by last commit
13 years ago
Marc Zinnschlag
0f71439991
Merge remote branch 'garvek/master'
13 years ago
scrawl
b6744e6195
Merge branch 'master' into leakfix
13 years ago
scrawl
e498495589
fix a leak: physics heightfield was only destroyed on cell change and not on exit
13 years ago
Sylvain THESNIERES
9f84518910
Remove dead code
...
Object class is quake specific stuff and these parts were *dead*. There is more references to the pointer but it is commented and seems to be used as "reference code" for future implementation of player functions, so I prefered not touching them.
13 years ago
Jason Hooks
c4c8288af8
Seven digit scales
13 years ago
Jason Hooks
5028f9926d
Bullet scale solution
13 years ago
Jason Hooks
10810ee311
Outputting formatted string with scale
13 years ago
Jason Hooks
20288de685
Post merge
13 years ago
Jason Hooks
595b0729da
Few things changed
13 years ago
scrawl
447158e9d6
shutdown crash fix
13 years ago
Sylvain THESNIERES
0c7476b88c
Fix build in DEBUG mode for MSVC
...
- commented stall code
13 years ago
scrawl
42e44ac1b5
fixed some leaks
13 years ago