mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 12:49:56 +00:00
Code Issues Releases Wiki Activity
4148 commits 38 branches 54 tags 122 MiB
Commit graph

177 commits

Author SHA1 Message Date
Brother Brick
ff54508633 during cleanup we now delete all plugins created 2012-09-17 11:57:29 +02:00
Brother Brick
44c644dd7b make it statically compilable 2012-09-14 15:30:48 +02:00
scrawl
2b339f6c0f loading screen 2012-09-11 16:37:54 +02:00
scrawl
19ae30ee68 Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwbase/inputmanager.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.hpp
	apps/openmw/mwinput/mouselookevent.cpp
 2012-08-19 22:09:22 +02:00
greye
40c7a850bf fix pmove BB shape origin 2012-08-17 15:19:44 +04:00
scrawl
c4fe2e4e2a Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem 2012-08-12 23:01:25 +02:00
scrawl
97c45455fd fix WindowManager destruction 2012-08-12 21:21:23 +02:00
scrawl
86d6f190bf Input system rewrite 2012-08-12 20:45:02 +02:00
Nikolay Kasyanov
2beaa9d9ae Workaround to allow main loop to know Ogre::Root's mQueuedEnd value 
This change is needed because of changes in exit handling
 2012-08-11 23:26:20 +04:00
Marc Zinnschlag
91f0eed9c4 Merge remote branch 'scrawl/master' 2012-08-11 11:34:40 +02:00
Nikolay Kasyanov
ebf1fe415e tiny fix 2012-08-11 01:11:52 +04:00
Nikolay Kasyanov
225530c690 implemented better main loop for OS X (carbon version). Input feels far less laggy 2012-08-10 23:32:10 +04:00
scrawl
f72956b918 - added a simple main menu (with Return, Options and Exit buttons) 
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
 2012-08-10 15:15:48 +02:00
Marc Zinnschlag
c251fbdf23 Merge branch 'master' into HEAD 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	libs/openengine/ogre/renderer.cpp
 2012-08-02 14:57:35 +02:00
Nikolay Kasyanov
defab0e4b5 Merge remote-tracking branch 'upstream/master' into osx_fix 
Conflicts:
	CMakeLists.txt
 2012-07-31 01:06:18 +04:00
Nikolay Kasyanov
b05dfeae70 bug #348: cleanup 
moved files to appropriate component, moved function to namespace,
added docs
 2012-07-31 01:01:00 +04:00
gugus
d37d0b1947 build fix for windows 2012-07-30 19:45:40 +02:00
Nikolay Kasyanov
e9d4195500 removed cout spam 2012-07-28 02:03:34 +04:00
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
 2012-07-28 01:55:37 +04:00
greye
d5e63a767e replace sprintf() with boost::format 2012-07-26 19:38:33 +04:00
greye
26595f22f6 float* -> Vector3, moveToCell -> copyToCell, fixed placeObject() 2012-07-26 16:14:11 +04:00
greye
9f813aa26c update resource naming in getObjectAABB() 2012-07-25 23:28:42 +04:00
greye
49b1d5e127 fix object placing 2012-07-25 20:31:39 +04:00
greye
87050e48c8 physics getObjectHeight(), MWWorld::Class::getModel() definition 2012-07-25 20:31:39 +04:00
Nikolay Kasyanov
94ce95c679 bug #348: works again on OS X 2012-07-25 00:13:33 +04:00
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
 2012-07-23 15:35:31 +02:00
scrawl
e7ab3544ac removed some redundant code 2012-07-21 13:52:12 +02:00
scrawl
014396e80c remove the plugins.cfg files, do not enforce CG plugin 2012-07-20 16:44:03 +02:00
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
 2012-07-17 10:57:15 -07:00
guidoj
a021165d9f Changed standard C lib includes to C++ format 2012-07-17 09:44:24 +02:00
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
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.
 2012-07-12 20:12:18 -07:00
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
 2012-07-09 15:23:26 +02:00
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
 2012-07-09 10:39:57 +02:00
Jason Hooks
b5edad790d merge 2012-07-07 15:27:04 -04:00
Marc Zinnschlag
c85aaafac2 more include cleanup (most removing Ogre.h) 2012-07-03 15:32:38 +02:00
Marc Zinnschlag
4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 2012-07-03 12:30:50 +02:00
scrawl
87127775e8 fix shutdown crash if ogre was not initialised yet 2012-06-26 19:10:47 +02:00
scrawl
01d1995164 fix compilation against latest bullet svn 2012-06-20 18:22:18 +02:00
Jason Hooks
86d8a07fc7 Switching back to old scaling 2012-06-19 13:28:06 -04:00
Jason Hooks
4d55ecfdbe Deleting scaled shapes; scaleObject() 2012-06-18 13:03:00 -04:00
Jason Hooks
33fe80723c btScaledBvhTriangleMeshShapes 2012-06-17 20:56:10 -04:00
Jason Hooks
ac6b455592 StepSize moved back to 9 2012-06-17 12:57:59 -04:00
Jason Hooks
a1902b4121 Tweaks for high speed 2012-06-16 17:29:03 -04:00
gugus
5397b9dba6 Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling 2012-06-16 11:38:07 +02:00
Marc Zinnschlag
ba38bad46e Merge remote branch 'scrawl/leakfix' 2012-06-15 17:42:32 +02:00
gugus
974585d357 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 2012-06-15 14:53:58 +02:00
gugus
01fefca0a3 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-06-15 14:53:19 +02:00
scrawl
0b850a2cb5 fix crash introduced by last commit 2012-06-15 09:15:37 +02:00
Marc Zinnschlag
0f71439991 Merge remote branch 'garvek/master' 2012-06-15 08:22:56 +02:00