krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
5810 commits 35 branches 0 tags 65 MiB
Commit graph

264 commits

Author SHA1 Message Date
scrawl
32de090079 Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities 2012-09-19 19:34:02 +02:00
Marc Zinnschlag
a3c680d20a Merge remote-tracking branch 'scrawl/sleep_wait' into next 2012-09-19 09:41:32 +02:00
scrawl
bf5e30b24f everything done except health/mana restore 2012-09-19 02:53:06 +02:00
scrawl
4829f47a4f rewrote the fader to use Rectangle2d instead of overlay, in order to not cover the UI 2012-09-18 21:04:43 +02:00
Marc Zinnschlag
4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 2012-09-18 11:25:09 +02:00
Jason Hooks
f01aae138f Removing void 2012-09-17 17:23:26 -04:00
Marc Zinnschlag
b96485284a removed some unneeded return values 2012-09-17 13:41:15 +02:00
Brother Brick
05c3936797 Merge remote-tracking branch 'upstream/master' into static 2012-09-17 11:57:38 +02:00
Brother Brick
ff54508633 during cleanup we now delete all plugins created 2012-09-17 11:57:29 +02:00
Jason Hooks
05687c120f protection for null cast 2012-09-16 17:48:18 -04:00
Jason Hooks
0fa1dea6c1 Box size set; Set speed 2012-09-16 17:29:16 -04:00
Jason Hooks
192d634098 Movement keys; View angles 2012-09-16 13:19:38 -04:00
Marc Zinnschlag
4eae810de3 Merge remote-tracking branch 'edmondo/master' 2012-09-16 10:37:45 +02:00
Jason Hooks
76f2a82884 More pmove stuff; Turned off broadphase, we could not fall in exteriors 2012-09-15 22:48:24 -04:00
Jason Hooks
f6384574da Starting to introduce pmove 2012-09-15 18:17:42 -04:00
Jason Hooks
f586f53a42 positioning 2012-09-15 16:45:50 -04:00
Edmondo Tommasina
f21faf197c selectionbuffer.cpp: fix ‘runtime_error’ is not a member of ‘std’ 2012-09-15 22:19:44 +02:00
Michael Mc Donnell
c161a3850f Use correct type for iterator 
Fixes building on Windows with vs2010.
 2012-09-15 15:37:18 -04:00
Jason Hooks
02bca98e9f Setrotate working 2012-09-15 13:23:49 -04:00
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
 2012-09-15 00:57:29 +02:00
Brother Brick
44c644dd7b make it statically compilable 2012-09-14 15:30:48 +02:00
scrawl
565aad3783 changed a method for ogre 1.8.0 2012-09-14 14:49:56 +02:00
scrawl
1f7e044fad removed some debug stuff 2012-09-14 14:41:19 +02:00
scrawl
6ac2a12296 item selection working on the preview 2012-09-14 14:34:18 +02:00
scrawl
eef750e6b0 race selection preview 2012-09-13 19:03:31 +02:00
Jason Hooks
a1a7733730 Set scale implemented 2012-09-12 18:30:32 -04:00
scrawl
2b339f6c0f loading screen 2012-09-11 16:37:54 +02:00
Jason Hooks
c5b25ef70b Very basic actor physics (no set scale/rotate functions) 2012-09-10 20:29:24 -04:00
Jason Hooks
3e3437f9c3 Revised create and adjust rigid body functions 2012-09-06 20:11:59 -04:00
Jason Hooks
23777033fd Starting to implement new PhysicActor 2012-09-05 17:44:11 -04:00
Jason Hooks
2efceba1fc Tearing apart PhysicActor 2012-09-03 20:32:20 -04:00
Jason Hooks
0697c7f7f4 Finally merged in master 2012-09-01 17:28:12 -04:00
Jason Hooks
b7697a62ad Position set back to zero 2012-08-29 18:35:39 -04: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
Jason Hooks
8762f4a47a boxrotation nif field; commented functions 2012-08-15 16:47:26 -04:00
Jason Hooks
7b8b4c366d Set angle now working for npcs and creatures 2012-08-14 20:29:48 -04:00
Jason Hooks
1f5bc229e0 Separate adjustRigidBody function 2012-08-14 18:04:58 -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
Jason Hooks
e7329d5f8b Creatures now have a properly positioned box shape 2012-08-12 00:36:49 -04: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
Jason Hooks
083e3537b4 post merge 2012-08-09 17:21:59 -04:00
Jason Hooks
cacf0bd10d Basic collision with npcs 2012-08-04 15:43:33 -04: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
Jason Hooks
7375035fef Counter changed back to 10 2012-07-09 17:54:15 -04: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
scrawl
b6744e6195 Merge branch 'master' into leakfix 2012-06-14 21:28:24 +02:00
scrawl
e498495589 fix a leak: physics heightfield was only destroyed on cell change and not on exit 2012-06-14 21:27:55 +02:00
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.
 2012-06-14 08:09:03 +02:00
Jason Hooks
c4c8288af8 Seven digit scales 2012-06-13 19:34:13 -04:00
Jason Hooks
5028f9926d Bullet scale solution 2012-06-12 18:09:58 -04:00
Jason Hooks
10810ee311 Outputting formatted string with scale 2012-06-11 19:55:10 -04:00
Jason Hooks
20288de685 Post merge 2012-06-11 15:39:57 -04:00
Jason Hooks
595b0729da Few things changed 2012-06-10 21:08:58 -04:00
scrawl
447158e9d6 shutdown crash fix 2012-06-09 19:15:11 +02:00
Sylvain THESNIERES
0c7476b88c Fix build in DEBUG mode for MSVC 
- commented stall code
 2012-06-08 19:56:27 +02:00
scrawl
42e44ac1b5 fixed some leaks 2012-06-06 21:08:20 +02:00
scrawl
c85c794c86 fixed some cppcheck issues 2012-06-06 20:29:30 +02:00
gugus
0012d7eb58 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-06-03 12:53:23 +02:00