Commit graph

2358 commits

Author SHA1 Message Date
scrawl
7cf2fc4009 Merge branch 'master' into shadersystem 2012-07-26 23:11:16 +02:00
scrawl
6077965d27 fix the directx startup issue on windows 2012-07-26 23:09:46 +02:00
Marc Zinnschlag
7725190f89 removed some redundant code 2012-07-26 19:09:45 +02:00
greye
aa5f63ffcc disabled items placing handling 2012-07-26 19:06:48 +04:00
greye
26595f22f6 float* -> Vector3, moveToCell -> copyToCell, fixed placeObject() 2012-07-26 16:14:11 +04:00
greye
b734460dc9 Merge branch 'master' of https://github.com/zinnschlag/openmw 2012-07-26 16:02:58 +04:00
scrawl
06bd2cd919 Merge branch 'master' into shadersystem 2012-07-25 23:54:22 +02:00
greye
cd04911f3c dropping on the ground 2012-07-25 20:31:39 +04:00
greye
49b1d5e127 fix object placing 2012-07-25 20:31:39 +04:00
greye
e7666d3a7f move responsibility for cell changing from CellStore::insertObject to Class::moveToCell 2012-07-25 20:31:39 +04:00
greye
bcc47cd5fb local scripts, move placing to World::placeObject(Ptr, CellStore, Position) 2012-07-25 20:31:39 +04:00
greye
d5fe378a66 Revert "local script registration"
This reverts commit 0686399a306319a4c49e1009d10215a9c0e65ec2.
2012-07-25 20:31:39 +04:00
greye
aff05b9d36 local script registration 2012-07-25 20:31:39 +04:00
greye
e1c7d1f529 fixed item sinking 2012-07-25 20:31:39 +04:00
greye
6a3a728a56 Class::getModel implementation 2012-07-25 20:31:39 +04:00
greye
87050e48c8 physics getObjectHeight(), MWWorld::Class::getModel() definition 2012-07-25 20:31:39 +04:00
greye
71253c64ab moving part 2, adding position parameter, stable 2012-07-25 20:31:39 +04:00
greye
61cb012ee7 moving Scene::insertObject to CellStore::insertObject, part 1 2012-07-25 20:31:39 +04:00
Chris Robinson
9f0c1eeb7b Support playgroup mode 0 2012-07-24 14:54:12 -07:00
Chris Robinson
13ab2baef0 Use a struct to hold the current animation times and remaining loop count 2012-07-24 14:42:01 -07:00
Chris Robinson
fd1e3f6ec5 Add support for playgroup mode 2 2012-07-24 14:14:32 -07:00
Chris Robinson
20121f3b0a Remove some unused stuff 2012-07-24 13:56:28 -07:00
Chris Robinson
9a7a629d0f Add support for playing animation groups 2012-07-24 13:51:48 -07:00
Chris Robinson
f953d7f8c0 Store text keys from base NIF animations 2012-07-23 17:27:35 -07:00
Chris Robinson
36be1536d9 Return text keys from NIFs when creating entities 2012-07-23 17:20:47 -07:00
scrawl
8c8228a15c fix terrain num lights setting 2012-07-24 00:08:53 +02:00
Chris Robinson
44975854e5 Merge remote branch 'zini/master' into nif-cleanup
Conflicts:
	apps/openmw/mwrender/sky.cpp
2012-07-23 13:46:05 -07:00
Chris Robinson
f67983bbee Don't assume one sub-entity for the night sky entities 2012-07-23 13:37:05 -07:00
Marc Zinnschlag
2d080ce4ef compile fix 2012-07-23 21:47:53 +02:00
Marc Zinnschlag
483a6d8605 Merge remote branch 'scrawl/shadersystem' 2012-07-23 21:46:06 +02:00
scrawl
02a52c0ff1 fixed some more settings bugs 2012-07-23 21:39:22 +02:00
scrawl
3ebc6fd590 fixed a settings window bug 2012-07-23 20:50:56 +02:00
scrawl
a70f93b024 fix "Crash when running openmw with --start="XYZ", remove HLSL for windows 2012-07-23 20:12:42 +02:00
scrawl
ab35bfa32c fixed a sky issue 2012-07-23 18:19:34 +02:00
scrawl
cfa0519721 Merge branch 'master' into nif-cleanup 2012-07-23 15:37:08 +02:00
scrawl
1fef086088 Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup"
This reverts commit 546b640022, reversing
changes made to fcaa8aae06.
2012-07-23 15:36:12 +02: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
Marc Zinnschlag
a24e7c9de2 Merge remote branch 'scrawl/shadersystem' 2012-07-23 15:25:11 +02:00
scrawl
2eca27bba9 fix horizon color of the sky reflection 2012-07-23 14:21:40 +02:00
Marc Zinnschlag
2c5d3d8df9 Merge remote branch 'scrawl/shadersystem' into shadersystem
Attention: We have submodules again. Don't forget to update!

Conflicts:
	components/files/configurationmanager.cpp
2012-07-23 14:12:21 +02:00
scrawl
1dbfd60305 Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup 2012-07-23 13:48:12 +02:00
scrawl
afe7c41729 removed some unused code 2012-07-23 13:47:51 +02:00
greye
32b1350b63 CreatureStats class 2012-07-22 18:29:54 +04:00
Chris Robinson
77446a0d58 Fix skipAnim, only skip one animation update 2012-07-21 17:39:57 -07:00
Chris Robinson
e81fc42daa Remove the beast-race special cases from updateParts
The special handling should happen at a much lower level, and prevent the
objects from being equipped in the first place.
2012-07-21 17:12:41 -07:00
Chris Robinson
c5b9098517 Remove an unused field from EntityList 2012-07-21 17:09:16 -07:00
scrawl
546b640022 Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup 2012-07-21 23:50:56 +02:00
Chris Robinson
81ce8dbe12 Combine animation handling into the base class 2012-07-21 14:41:26 -07:00
Chris Robinson
fcaa8aae06 Don't skip animation state updates for NPCs 2012-07-21 11:26:09 -07:00
scrawl
acc5c3bbbf some fixes 2012-07-20 17:08:15 +02:00
scrawl
014396e80c remove the plugins.cfg files, do not enforce CG plugin 2012-07-20 16:44:03 +02:00
scrawl
21728020f6 fixed the water on local map 2012-07-20 14:45:42 +02:00
Chris Robinson
2db80a1504 Rename a couple methods to match their scripting counterparts 2012-07-20 00:53:12 -07:00
Chris Robinson
66860825cf Remove some unused and unneeded bits from the Animation class 2012-07-20 00:36:52 -07:00
Chris Robinson
8b5b74f9ee Add a quick hack to let "playgroup all" work on creatures and NPCs 2012-07-19 22:34:26 -07:00
scrawl
f5ffea4d4b new button, water timescale 2012-07-19 23:30:41 +02:00
scrawl
e077814a8c water 2012-07-19 22:23:07 +02:00
Chris Robinson
a86ed46ec4 Use the race ID specified in the ref base's record instead of the race record
The latter is localized and doesn't match with international versions.
2012-07-19 11:00:26 -07:00
scrawl
739455e6f8 new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc 2012-07-19 16:23:30 +02:00
Chris Robinson
6caa39629d Reimplement the skirt part 2012-07-18 22:32:26 -07:00
Chris Robinson
b505d4ace0 Fix feet and entity part detachment 2012-07-18 21:39:50 -07:00
Chris Robinson
4af1bce659 Restore and fix some missing parts 2012-07-18 20:14:23 -07:00
Chris Robinson
d9b64b77ec Attach skinned parts to the scene node instead of the named bone 2012-07-18 18:38:55 -07:00
Chris Robinson
db948969c9 Attach NPC parts to the proper bone 2012-07-18 11:14:13 -07:00
Chris Robinson
04e496a6ca Store the entity lists for NPC parts 2012-07-18 10:26:25 -07:00
Chris Robinson
6611b0b317 Use an array instead of a bunch of nearly-identical if blocks 2012-07-18 10:09:16 -07:00
Chris Robinson
02d39080c8 Destroy entities when they're done with. 2012-07-18 00:17:39 -07:00
Chris Robinson
4109d0d923 Destroy entities removed from the NPC 2012-07-17 22:47:56 -07:00
Chris Robinson
92546ca18d Move the last bits of code to createEntities 2012-07-17 20:23:09 -07:00
Chris Robinson
94f3e7a6c0 Store the entity list in the object 2012-07-17 16:00:03 -07:00
Chris Robinson
a590db2cf4 Create entities when loading NIFs for the NPC base 2012-07-17 15:43:40 -07:00
Chris Robinson
3efd2030e2 Create entities when loading NIFs for creatures 2012-07-17 14:11:07 -07:00
Chris Robinson
3dedac5cb1 Create mesh entities for objects when loading the NIF 2012-07-17 13:40:03 -07:00
Chris Robinson
c6cc82a51a Handle multiple entities per NPC part 2012-07-17 12:20:52 -07:00
Chris Robinson
89cfe778f0 Support multiple entities for the NPC base 2012-07-17 11:38:50 -07:00
Chris Robinson
0a4a141f2e Support multiple meshes for creatures 2012-07-17 11:23:34 -07: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
scrawl
4434fb640e Merge branch 'master' into shadersystem 2012-07-17 19:12:02 +02:00
Marc Zinnschlag
483b125aad avoid locking up in case actor updates repeatedly throw exceptions 2012-07-17 18:37:20 +02:00
Marc Zinnschlag
6744375636 fixed a logic error in the auto equip code 2012-07-17 18:35:01 +02:00
Marc Zinnschlag
beb18282bb Issue #342: various fixes 2012-07-17 16:44:55 +02:00
Marc Zinnschlag
76de2f7360 Issue #342: handle magic effects 79-82 and 17-20 2012-07-17 15:49:37 +02:00
Marc Zinnschlag
a3652f16ce Issue #342: factored out dynamic stats calculation into a separate function 2012-07-17 12:18:43 +02:00
Marc Zinnschlag
2c70a93553 Merge branch 'master' into potions
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
2012-07-17 10:32:18 +02:00
Marc Zinnschlag
0d3a7d482e Merge remote branch 'modred11/master' 2012-07-17 10:21:46 +02:00
Marc Zinnschlag
4bfed952bc Merge remote branch 'guidoj/master' 2012-07-17 10:17:06 +02:00
Marc Zinnschlag
e9b95d55cd Revert "Proper way to find and use libtbb"
This reverts commit d6bf2b7d29.
2012-07-17 09:49:52 +02: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
Dmitry Marakasov
d6bf2b7d29 Proper way to find and use libtbb 2012-07-17 00:11:56 +04:00
Dmitry Marakasov
0e934a52ca Include soundmanager.hpp for Play_Normal enum 2012-07-16 23:54:24 +04:00
Dmitry Marakasov
1c53add6c4 Include boost/shared_ptr.hpp for boost:shared_ptr 2012-07-16 23:54:21 +04:00
Chris Robinson
a539e98274 Handle all meshes when inserting objects into the scene 2012-07-16 10:48:48 -07:00
scrawl
509e9d7034 Merge branch 'master' into shadersystem 2012-07-15 21:58:45 +02:00
Chris Robinson
b4c8375f3c Merge remote branch 'zini/master' into nif-cleanup
Conflicts:
	components/bsa/bsa_archive.cpp
2012-07-15 12:04:43 -07:00
Marc Zinnschlag
da916cecfb fixed a bug in a cmake script that resulted in some files being compiled twice 2012-07-15 19:29:09 +02:00
scrawl
778e59ee37 terrain as it was before, with about 4x less code 2012-07-15 08:21:43 +02:00
scrawl
29f91753f7 correction 2012-07-14 18:44:03 +02:00
scrawl
93c641efa7 terrain albedo 2012-07-14 18:25:43 +02:00
scrawl
7d5b94709d Merge branch 'master' into shadersystem
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
2012-07-14 11:16:35 +02:00