mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-12 12:38:02 +00:00
Code Issues Projects Releases Wiki Activity
4,293 Commits 17 Branches 65 Tags 494 MiB
721324c1db
Commit Graph

238 Commits

Author SHA1 Message Date
greye
721324c1db rm record inheritance, rework esmtool accordingly 2012-09-30 23:34:53 +04:00
greye
18cc435aa1 resolving conflicts 2012-09-21 13:13:11 +04:00
Marc Zinnschlag
4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 2012-09-18 11:25:09 +02:00
greye
7606ebafd6 resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
Marc Zinnschlag
835c530e06 Merge branch 'ingredients' 2012-09-13 13:31:46 +02:00
Marc Zinnschlag
5706caa141 Issue #356: added ingredient eating sound effect 2012-09-13 13:30:57 +02:00
Marc Zinnschlag
fe68a252d5 Issue #356: Implemented ingredient eating 2012-09-13 13:02:26 +02:00
Marc Zinnschlag
9de7b3bf90 Issue #356: Properly support ingredients effect in ActiveSpells (hopefully) 2012-09-13 11:30:59 +02:00
scrawl
89ad2af1d9 key usage to open doors or containers 
to test: player->additem, "key_arrile", 1 (door in arille's tradehouse)
player->additem, "key_alvur", 1 (chest in the back of beshara)
 2012-09-10 17:44:59 +02:00
scrawl
fdc2a7433c remove the wrong container open sound 2012-09-10 15:01:51 +02:00
Marc Zinnschlag
273ac0a97f Merge branch 'spellbuying' 2012-09-10 13:16:02 +02:00
Marc Zinnschlag
6c928e93d3 added missing initialisation of NPC/creature spell lists from ESX records 2012-09-10 13:04:00 +02:00
scrawl
432c089434 fix the spell tooltips to show the spell target 2012-09-09 23:06:24 +02:00
Jason Hooks
23777033fd Starting to implement new PhysicActor 2012-09-05 17:44:11 -04:00
Marc Zinnschlag
6813bafbfc added missing sound effect for chest opening; minor cleanup 2012-09-04 15:42:41 +02:00
Jason Hooks
0697c7f7f4 Finally merged in master 2012-09-01 17:28:12 -04:00
greye
a90547bbbe code formatting 2012-08-29 21:35:06 +04:00
Douglas Diniz
5cbb08fee1 Task 339 - Moving all sounds to actions 2012-08-26 11:47:45 -03:00
Douglas Diniz
82e7c04c0a Changing sounds to Action. 
Adding onActor to Action to choose between playSound and playSound3D.
 2012-08-19 20:11:50 -03:00
Jason Hooks
63a40e9ba3 npc xy disabled 2012-08-16 15:41:42 -04:00
Jason Hooks
7b8b4c366d Set angle now working for npcs and creatures 2012-08-14 20:29:48 -04:00
Marc Zinnschlag
6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
Marc Zinnschlag
b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 2012-08-11 17:30:55 +02:00
Jason Hooks
38c2c5d480 Creatures now use object physics 2012-08-09 18:09:11 -04:00
Jason Hooks
083e3537b4 post merge 2012-08-09 17:21:59 -04:00
greye
38b06aee6c resolving conflicts 2012-08-09 21:49:00 +04:00
Marc Zinnschlag
6bd48d12af Issue #107: SoundManager is accessed only through the interface class from now on 2012-08-09 14:33:21 +02:00
Jason Hooks
cacf0bd10d Basic collision with npcs 2012-08-04 15:43:33 -04:00
greye
d6150b7482 high-level implementation, unstable 2012-07-30 23:28:14 +04:00
Marc Zinnschlag
0da3f2cb59 Issue #314: Playing drink sound when using a potion 2012-07-27 12:27:22 +02:00
Marc Zinnschlag
78fe6fdce5 Issue #351: Refactoring Action class 2012-07-27 12:00:10 +02:00
greye
26595f22f6 float* -> Vector3, moveToCell -> copyToCell, fixed placeObject() 2012-07-26 16:14:11 +04:00
greye
e7666d3a7f move responsibility for cell changing from CellStore::insertObject to Class::moveToCell 2012-07-25 20:31:39 +04:00
greye
6a3a728a56 Class::getModel implementation 2012-07-25 20:31:39 +04:00
greye
32b1350b63 CreatureStats class 2012-07-22 18:29:54 +04: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
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
Marc Zinnschlag
573d7e7e45 Issue #314: fix to potion use function (was mixing up potion with potion user) 2012-07-13 15:51:57 +02:00
Marc Zinnschlag
782d417d5b Issue #314: potion usage 2012-07-13 13:09:22 +02:00
Carl Maxwell
e4d046f69c Prepending m to the name of every member variable. 
I made a bunch of changes in apps/openmw/mwrender/animation.cpp
because the scope brackets didn't line up in a bunch of places
    npcanimations.cpp & creatureanimations.cpp were the same kind of
thing
 2012-07-13 03:51:58 -07:00
Marc Zinnschlag
84d846cf07 Issue #314: implemented apply and skillUsageSucceeded functions for MWClass::Npc 2012-07-13 09:16:27 +02:00
gugus
410b693555 setAngle improvement 2012-07-10 11:15:46 +02:00
Jason Hooks
b5edad790d merge 2012-07-07 15:27:04 -04:00
Marc Zinnschlag
d30ba14a17 Issue #324: Finished turning NpcStats into a proper class 2012-07-06 18:23:48 +02:00
Marc Zinnschlag
771863e73b Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue 2012-07-06 15:50:26 +02:00
Marc Zinnschlag
5a7b95bf7a Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp 2012-07-03 13:15:20 +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
Marc Zinnschlag
7fcd41c69d Issue #107: Detemplateised CellStore; some include cleanup 2012-06-29 18:54:23 +02:00
Marc Zinnschlag
76174098c7 Issue #107: CellStore moved from ESMS to MWWorld 2012-06-29 16:48:50 +02:00