Commit Graph

191 Commits (fb1f8082d2191b0194f856016870f5a974e805bc)

Author SHA1 Message Date
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
scrawl 33f360f52f transparency fix 13 years ago
scrawl 944654f263 image rotating function 13 years ago
scrawl 75dd651205 Merge branch 'terraincollision' into physicsterrain
Conflicts:
	apps/openmw/mwworld/physicssystem.cpp
13 years ago
Jason Hooks 74deb5588d Post merge 13 years ago
scrawl bc636f036c made it compile 13 years ago
scrawl 9e1a9e5758 Merge branch 'master' into physicsaedra2
Conflicts:
	apps/openmw/mwinput/inputmanager.cpp
	libs/openengine/bullet/physic.cpp
13 years ago
Jason Hooks 57299571d5 Preparing for clothes/armor 13 years ago
scrawl c0af3c7241 Merge branch 'master' into terraincollision
Conflicts:
	apps/openmw/mwworld/scene.cpp
13 years ago
Roman Melnik d09f0610ea Add basic windows pinning
Create WindowPinnableBase class for windows which should be
allowed to be pinned.

Add skin for pinnable windows - currently just a copy of normal
window with 1 extra button (hopefully this can be improved later).

Handle clicking on PinToggle button (pinning/unpinning a window).
13 years ago
Jason Hooks 0021ccf862 Merge remote-tracking branch 'upstream/master' 13 years ago
Marc Zinnschlag 40310f3663 Merge remote branch 'scrawl/occlusionquery' 13 years ago
scrawl a4576f043d fixed the physics debug rendering now activates/deactivates properly 13 years ago
scrawl 58f7a03626 Merge branch 'terrain18' into terraincollision
Conflicts:
	apps/openmw/mwworld/scene.cpp
13 years ago
scrawl 8bbb02a1bd ogre 1.8 fixes 13 years ago
Jason Hooks b9fabce9c4 Awesome, working 13 years ago
scrawl 72ff7ec030 Merge branch 'next' into occlusionquery
Conflicts:
	apps/openmw/mwrender/sky.cpp
13 years ago
Jason Hooks 318355f1be Bouncy effect gone 13 years ago
scrawl 18c2b5eb0a Merge branch 'next' into occlusionquery 13 years ago
Lukasz Gromanowski 5185a28b60 Issue #225: Initialize all class members in constructor. 13 years ago
Lukasz Gromanowski d3b88b9e34 Issue #225: Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader. 13 years ago
Lukasz Gromanowski a7ac0e526e Issue #225: Added cleanup of parts of PhysicEngine.
Added cleanup of CMotionState inserted to RigidBody,
and btSortedOverlappingPairCache inserted to btDbvtBroadphase
in PhysicEngine.
13 years ago
Lukasz Gromanowski 633e80cded Issue #225: Added cleanup of maps used in PhysicEngine. 13 years ago
Chris Robinson f8f749dbec Merge remote branch 'zini/next' into sound-rewrite 13 years ago
scrawl 382fa6ac68 fixes 13 years ago
Jason Hooks e4251be529 Down gravity 13 years ago
scrawl 53d4be5cf6 object pickup should work everywhere 13 years ago
scrawl 17a4adfe88 add raycast method that returns _all_ objects that were hit 13 years ago
Jason Hooks 18a139cd66 adding up and down move buttons 13 years ago
Chris Robinson 2bc81a778b Merge remote branch 'zini/next' into sound-rewrite 13 years ago
scrawl f959a5cbeb auto adjust size of map window title bar 13 years ago
scrawl 99b2b6b648 ogre 1.8 fixes 13 years ago
scrawl 64212c0ee6 replaced all the StaticImage and StaticText in code 13 years ago
scrawl b0b41a9199 should now compile warning free 13 years ago
scrawl d451d7bb67 compile fixes for mygui 3.2 13 years ago
Chris Robinson 74e79bb4af Merge remote branch 'zini/master' into sound-rewrite
Conflicts:
	apps/openmw/mwsound/soundmanager.cpp
	apps/openmw/mwsound/soundmanager.hpp
13 years ago
Jason Hooks 2b3e75718c Updating everything 13 years ago
Jason Hooks ed7cb1dc67 restarting 13 years ago
Marc Zinnschlag 655f9fe920 Merge remote branch 'k1ll/staticogre' 13 years ago
k1ll b83b7d0650 Added OGRE_STATIC as cmake option and removed the code for the BSPSceneManager plugin. 13 years ago
Chris Robinson 42b445383f Remove Mangle- and OpenEngine-related sound code
Start of the sound code refactoring. Currently there is no sound, but it will
be added back.
13 years ago
k1ll b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 13 years ago
Michael Papageorgiou 3b6826b1ac Set the attenuation model to linear, to be more in line with the vanilla game 13 years ago
scrawl 9612ce595b Merge branch 'master' of https://github.com/zinnschlag/openmw into terraincollision
Conflicts:
	CMakeLists.txt
13 years ago
Michael Papageorgiou 836732096e Fix both relative and 3D sounds 13 years ago
Nikolay Kasyanov b4343431c6 Merged openengine into openmw 13 years ago
Nikolay Kasyanov 48c12e9d5c Merge mangle into openmw 13 years ago
Marc Zinnschlag 4c240c644f OpenEngine update (log fix) 13 years ago
Marc Zinnschlag e7fa1d94b8 Merge remote branch 'scrawl/shapefix' 13 years ago
scrawl ba0365a427 collision shape scale fix 13 years ago
Marc Zinnschlag 12b7c6f1ac Merge remote branch 'corristo/master' 13 years ago
Marc Zinnschlag be70d197e5 Merge branch 'next'
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
13 years ago
Nikolay Kasyanov 70da2a2a99 removed tabs 13 years ago
Nikolay Kasyanov fa3fbf940c Fix for OS X 10.6 support 13 years ago
scrawl f2b807142a update mangle 13 years ago
scrawl f2c3616638 Merge branch 'next' into terrain_next
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	cmake/FindOGRE.cmake
13 years ago
Marc Zinnschlag 1652680e9b mangle update (music workaround) 13 years ago
Nikolay Kasyanov cb780720bb fix for string.h: use our own strnlen only on OS X < 10.7 13 years ago
Marc Zinnschlag 69a00df01a submodule update (uncommon crash fix) 13 years ago
Marc Zinnschlag db205cf8aa Merge remote branch 'scrawl/next' into test
Conflicts:
	libs/openengine
13 years ago
scrawl 60856b46e6 moved the renderer update call from OMW::Engine to RenderingManager 13 years ago
scrawl f81b615976 implemented script functions FadeIn, FadeOut, FadeTo 13 years ago
Marc Zinnschlag 4fcb721054 openengine update (physics crash workaround 13 years ago
Marc Zinnschlag 258ab0218a submodule update (issue #131) 13 years ago
Marc Zinnschlag 7a1799d529 submodule update 13 years ago
Marc Zinnschlag 7c8853f6fe post-merge fixes 13 years ago
Marc Zinnschlag 960654e58f using new openengine version 14 years ago
Jan-Peter Nilsson 6aa1f3efdd Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline) 14 years ago
Marc Zinnschlag 57c3414fcd OpenEngine update (bug-fix) 14 years ago
Marc Zinnschlag 615f10b8c0 OpenEngine update 14 years ago
Marc Zinnschlag bd08e308f8 mangle update 14 years ago
Marc Zinnschlag 68004630e9 OpenEngine update 14 years ago
Marc Zinnschlag 647e88003e build and activation fix 14 years ago
Marc Zinnschlag c82a2fe37d OpenEngine enhancements 14 years ago
gugus 40193253b0 fix some time bug 14 years ago
Marc Zinnschlag bf10471668 various OpenEngine improvements (don't forget to update your submodules) 14 years ago
Jan-Peter Nilsson e290f2f82f Get physic fix in openengine and build nifbullet 14 years ago
Marc Zinnschlag 1e9dc4b435 de-Windownizing and some build-fixes 14 years ago