mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity
11,880 Commits
38 Branches
54 Tags
121 MiB
0.8.1
master
0.8.2
0.8.1-vr
0.8.0-vr
0.8.0
0.7.1-build-fixes
0.7.0
ffi-server-rewrite
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
tes3mp-0.8.0
tes3mp-0.8.1
tes3mp-0.8.1-vr
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '8f8fdedcde'
${ noResults }
Commit Graph

468 Commits (8f8fdedcde09552f79114357d78ed3bda2f2eba7)

Author SHA1 Message Date
scrawl 6c1ff8caca Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwworld/weather.cpp
	components/fileorderlist/model/datafilesmodel.cpp
 12 years ago
scrawl f84db69ade Remove the background window trick, which currently doesn't serve any purpose 12 years ago
scrawl 84afd87321 Placeable objects should not collide unless they have a NiRootCollisionNode 12 years ago
scrawl d7c4a622cf Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack 12 years ago
scrawl d696da7677 Fix selection buffer 12 years ago
Marc Zinnschlag 7e100c36b5 Merge remote-tracking branch 'gus/AI' 12 years ago
gus 5938e19362 Clean up 12 years ago
gus 48b3f1e0cf Clean up. But still a little hacky 12 years ago
scrawl 5341bf9504 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
Marc Zinnschlag 3e97943e06 Merge remote-tracking branch 'scrawl/includes' 12 years ago
scrawl 05bd94effb Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
gus 7fb2ff18a3 Fix bug induced by previous commit (player orientation wasn't stored correctly), and fix NPC not beeing able to move with certain angles (like angle Z 70) because the trace function was hitting NPC own hitboxes. The solution prposed here is a little hacky, but i works. Need a little clean up(mBody shouldn't be public) 12 years ago
scrawl 9a84f6744f Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr) 12 years ago
scrawl 0f6fd80294 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwrender/npcanimation.cpp
	files/mygui/openmw_settings_window.layout
 12 years ago
Nathan Jeffords 109dff2d29 renamed high level NIF files... 12 years ago
scrawl 9810eafe23 Removing now unused oengine/imagerotate 12 years ago
scrawl d8f2d0195a Got rid of the texture rotation hack by rendering the cursor manually. 12 years ago
scrawl d4264353a3 Merge branch 'z-up' into graphics 
Conflicts:
	apps/openmw/mwrender/localmap.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/water.cpp
	files/materials/water.shader
 12 years ago
scrawl 2e7bc1a368 Z-up conversion: local map, fix tcg 12 years ago
scrawl cacdb33b42 Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
 12 years ago
Chris Robinson fe6fa9ebe7 Simplify newtrace a bit 12 years ago
Chris Robinson 66743ecee7 Remove some unused trace fields 12 years ago
Chris Robinson 86f6491bc8 Remove unused pmove code 12 years ago
Chris Robinson 89fabdb3a9 Update the PhysicActor's RigidBody when moving 
This works, but is less than ideal. As it is now, the rigid body gets updated
twice as the position and rotation are set separately. They should instead be
updated together.
 12 years ago
Chris Robinson 5a1a0b7338 Add and use an MWWorld::isFlying method 12 years ago
scrawl 5d403ebdd3 Fix collision debug drawer (tcg) 12 years ago
Chris Robinson 6356d3a385 Start actors with collision enabled 
NPCs are now affected by gravity. The player still starts in no-collision mode
though, since they start in the void rather than a door marker.
 12 years ago
Chris Robinson 735c1ec2ae Cleanup trace.cpp/h 12 years ago
Chris Robinson d47d2216f2 Use some const references where appropriate 12 years ago
Chris Robinson cbdd459500 Remove unneeded playerMove from PhysicActor 12 years ago
Chris Robinson 923d0d6eb4 Fix up some header includes 12 years ago
Chris Robinson e577ee2de8 Add a method to set/retrieve being on the ground 12 years ago
scrawl 608c112f34 Supply the new render window to mygui 12 years ago
scrawl 31f760ccce Fixing issues from last commit: restored input and occlusion queries 12 years ago
scrawl c4d518132f With the 1x1 background window trick, we can apply VSync without restart. Some issues left though. 12 years ago
Chris Robinson a782a9109b Store the vertical velocity in the physic actor 12 years ago
Chris Robinson 82e4da4e64 Get the half-extents from the physicactor 12 years ago
scrawl 5334934612 Listen to render window updates and properly activate/deactivate occlusion queries pre/post update. 12 years ago
scrawl 15e51b76de Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth 12 years ago
Jordan Milne 10a3caa504 more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine 12 years ago
Jordan Milne 043e29c620 Have SDL manage the window instead of OGRE to work around SDL Windows bugs (grumble) 12 years ago
scrawl e4f140841e Make OpenMW work with Ogre 1.9 12 years ago
Jordan Milne 917bbc4e11 Create static and non-discardable textures with the right parameters (should fix Issue 443) 12 years ago
Nathan Jeffords 3c91f7793b overrode MyGUI::DataManager::isDataExist 
Created a override of MyGUI::DataManager::isDataExist to fix a
performance issue with MyGUI startup. This required moving the
functionality of MyGUI::OgrePlatform into OEngine::GUI::MyGUIManager so
that a new version of the MyGUI::DataManager could be created.
 12 years ago
scrawl 1718d735b5 Fix menu/journal/book/scroll buttons when using localised MW-installations 
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
 12 years ago
Nathan Jeffords a842fc2c11 added hack to fix an alignment issue in MSVC 2010 
The default allocator in Visual Studio 2010 does not respect the
alignment requirements of classes it is allocating memory for. This
results in a potential crash when using OEngine::Physics::PhysicActor
that has been allocated on the heap if it is built against a version of
Bullet that has SSE intrinsics enabled.
 12 years ago
scrawl 867fb620c3 part 2 12 years ago
scrawl 00a2de432a fix BulletShapeLoader namespace 12 years ago
scrawl 4ca0eb93ee fix markers used for raycasting and blocking activation 12 years ago
scrawl c64eb96952 Merge branch 'Travel_Dialogue' into training_travel 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwrender/globalmap.cpp
	files/mygui/CMakeLists.txt
 12 years ago
Marc Zinnschlag 35d099a638 disabling gcc extensions 12 years ago
scrawl 044ab3d2b6 fix error in framelistener with tcg enabled 12 years ago
scrawl 1cb1259e18 fixing some unrelated warnings 12 years ago
Marc Zinnschlag 9d1a9520fc Merge remote-tracking branch 'jhooks/physicsaedra3' into next 12 years ago
Jason Hooks f365cab824 Possible fix for a issue 12 years ago
scrawl 845dddbab8 fix a weird problem with the fading overlay 12 years ago
Marc Zinnschlag 87a9373a56 Merge remote-tracking branch 'scrawl/gamma' into next 12 years ago
scrawl 32de090079 Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities 12 years ago
Marc Zinnschlag a3c680d20a Merge remote-tracking branch 'scrawl/sleep_wait' into next 12 years ago
scrawl bf5e30b24f everything done except health/mana restore 12 years ago
scrawl 4829f47a4f rewrote the fader to use Rectangle2d instead of overlay, in order to not cover the UI 12 years ago
Marc Zinnschlag 4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 12 years ago
Jason Hooks f01aae138f Removing void 12 years ago
Marc Zinnschlag b96485284a removed some unneeded return values 12 years ago
Brother Brick 05c3936797 Merge remote-tracking branch 'upstream/master' into static 12 years ago
Brother Brick ff54508633 during cleanup we now delete all plugins created 12 years ago
Jason Hooks 05687c120f protection for null cast 12 years ago
Jason Hooks 0fa1dea6c1 Box size set; Set speed 12 years ago
Jason Hooks 192d634098 Movement keys; View angles 12 years ago
Marc Zinnschlag 4eae810de3 Merge remote-tracking branch 'edmondo/master' 12 years ago
Jason Hooks 76f2a82884 More pmove stuff; Turned off broadphase, we could not fall in exteriors 12 years ago
Jason Hooks f6384574da Starting to introduce pmove 12 years ago
Jason Hooks f586f53a42 positioning 12 years ago
Edmondo Tommasina f21faf197c selectionbuffer.cpp: fix ‘runtime_error’ is not a member of ‘std’ 12 years ago
Michael Mc Donnell c161a3850f Use correct type for iterator 
Fixes building on Windows with vs2010.
 12 years ago
Jason Hooks 02bca98e9f Setrotate working 12 years ago
scrawl 2793096b50 Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
 12 years ago
Brother Brick 44c644dd7b make it statically compilable 12 years ago
scrawl 565aad3783 changed a method for ogre 1.8.0 12 years ago
scrawl 1f7e044fad removed some debug stuff 12 years ago
scrawl 6ac2a12296 item selection working on the preview 12 years ago
scrawl eef750e6b0 race selection preview 12 years ago
Jason Hooks a1a7733730 Set scale implemented 12 years ago
scrawl 2b339f6c0f loading screen 12 years ago
Jason Hooks c5b25ef70b Very basic actor physics (no set scale/rotate functions) 12 years ago
Jason Hooks 3e3437f9c3 Revised create and adjust rigid body functions 12 years ago
Jason Hooks 23777033fd Starting to implement new PhysicActor 12 years ago
Jason Hooks 2efceba1fc Tearing apart PhysicActor 12 years ago
Jason Hooks 0697c7f7f4 Finally merged in master 13 years ago
Jason Hooks b7697a62ad Position set back to zero 13 years ago
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
 13 years ago
greye 40c7a850bf fix pmove BB shape origin 13 years ago
Jason Hooks 8762f4a47a boxrotation nif field; commented functions 13 years ago
Jason Hooks 7b8b4c366d Set angle now working for npcs and creatures 13 years ago
Jason Hooks 1f5bc229e0 Separate adjustRigidBody function 13 years ago
scrawl c4fe2e4e2a Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem 13 years ago
scrawl 97c45455fd fix WindowManager destruction 13 years ago
scrawl 86d6f190bf Input system rewrite 13 years ago
Jason Hooks e7329d5f8b Creatures now have a properly positioned box shape 13 years ago
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
 13 years ago
Marc Zinnschlag 91f0eed9c4 Merge remote branch 'scrawl/master' 13 years ago
Nikolay Kasyanov ebf1fe415e tiny fix 13 years ago
Nikolay Kasyanov 225530c690 implemented better main loop for OS X (carbon version). Input feels far less laggy 13 years ago
scrawl f72956b918 - added a simple main menu (with Return, Options and Exit buttons) 
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
 13 years ago
Jason Hooks 083e3537b4 post merge 13 years ago
Jason Hooks cacf0bd10d Basic collision with npcs 13 years ago
Marc Zinnschlag c251fbdf23 Merge branch 'master' into HEAD 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	libs/openengine/ogre/renderer.cpp
 13 years ago
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
gugus d37d0b1947 build fix for windows 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
Jason Hooks 7375035fef Counter changed back to 10 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
scrawl c85c794c86 fixed some cppcheck issues 13 years ago
gugus 0012d7eb58 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 13 years ago
Jason Hooks d081f7ea83 Don't run up walls 13 years ago
Edmondo Tommasina a9a582f858 renderer.cpp: fix std::runtime_error compile error 13 years ago
Jason Hooks fb4e7f02b9 code correction 13 years ago
scrawl c5a685d11f addition to last commit: show the selected weapon/spell names as inventory/spell window caption 13 years ago
gugus a711a3ebe1 Various fixes 13 years ago
scrawl 5d03e86613 added field of view and texture filtering to settings window 13 years ago
scrawl 14f4f09f83 proper resolution switching (reposition GUI & adjust mouse clipping region) 13 years ago
scrawl f6a6684685 when the resolution changes, adjust camera aspect ratio and recreate compositors 13 years ago
scrawl 656a8f1be9 working menu transparency slider 13 years ago
scrawl 343bbaf0fd integrated video settings in the settings file, the launcher is now useless 13 years ago
scrawl a284bfb4d0 Merge branch 'master' into inventoryGUI 13 years ago
gugus 09ec1da0f6 fix the latest commit: objects activation works again. 13 years ago
scrawl c5d685c780 added an assert 13 years ago
scrawl 78b06d0ebf inventory window pinning 13 years ago
scrawl a4d6d1baff added a utility for creating texture atlas at runtime 13 years ago
scrawl c4b63bdb2f .gitmodules 13 years ago
scrawl 04ead5eb42 make the no-clip mode move much faster 13 years ago
scrawl 6850f3945c disable those physics debug prints 13 years ago
scrawl a13f542396 disable snapping underwater 13 years ago
scrawl 86b6184f43 pMove in a seperate loop with fixed timestep to prevent frame-dependent movement 13 years ago
scrawl 4655ec94f0 Merge branch 'master' into physicsaedra2 & fix warnings 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 13 years ago
scrawl 50d79a8815 Merge branch 'next' into tooltips 13 years ago
scrawl 2c89306306 Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2 13 years ago
Jason Hooks 8ebae0b706 Solid trace 13 years ago
Jason Hooks 16855291a7 Implementing snapping 13 years ago
Jason Hooks 00260a24ce Water corrections 13 years ago
scrawl 75b336baea Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2 
Conflicts:
	apps/openmw/mwinput/inputmanager.cpp
	apps/openmw/mwworld/player.cpp
	libs/openengine/bullet/physic.cpp
 13 years ago
Jason Hooks 4d07ae7fe0 Swimming working 13 years ago
Jason Hooks 5f9056c45d Better no clip 13 years ago
scrawl 51a76eda92 Merge branch 'master' into graphics 13 years ago
Jason Hooks 1ce759af06 Merging in master 13 years ago
scrawl 14377ba789 window caption fix 13 years ago
scrawl b3dc1931a9 general GUI refactoring, part 1 13 years ago
scrawl 10398723d8 use different image pixel format 13 years ago
Marc Zinnschlag afa859a6a6 Merge remote branch 'jhooks/clothingarmor' 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
 13 years ago
scrawl 52b0b28c78 fixed the mygui output on console 13 years ago
scrawl f2fae770d4 Merge branch 'master' into physicsaedra2 
Conflicts:
	apps/openmw/mwworld/player.cpp
 13 years ago
scrawl 4a6a8e5420 don't write to disk 13 years ago
scrawl 800df7376c use the cursors from morrowind.bsa and remove mwpointer.png 13 years ago