mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 17:19:56 +00:00
Code Issues Releases Wiki Activity
5558 commits 38 branches 54 tags 122 MiB
Commit graph

154 commits

Author SHA1 Message Date
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
Marc Zinnschlag
ea29b74bb4 added per NPC/creature basic AI-settings (hello, fight, flee, alarm) 2012-06-16 16:17:42 +02:00
Jason Hooks
897a331244 NPC activation 2012-06-13 12:21:51 -04:00
Jason Hooks
20288de685 Post merge 2012-06-11 15:39:57 -04:00
Alexander "Ace" Olofsson
f675d8d039 Merge branch 'master' 2012-06-11 19:09:10 +02:00
Jason Hooks
595b0729da Few things changed 2012-06-10 21:08:58 -04:00
Jason Hooks
fb0a52809d Changing transformation processing 2012-06-09 15:19:15 -04:00
Jason Hooks
fb4e7f02b9 code correction 2012-05-29 22:03:00 -04:00
Marc Zinnschlag
36885b2e40 Issue #176: removed enable/disable functions from Creature, Npc and Light 2012-05-25 17:04:33 +02:00
scrawl
76d71f86bc fixed a faction case folding issue 2012-05-21 03:10:55 +02:00
scrawl
e9ea1fba4e fixed typo getCapacity method 2012-05-15 22:31:52 +02:00
Marc Zinnschlag
fdfddc8be7 some todo comment cleanup 2012-05-15 21:34:32 +02:00
Marc Zinnschlag
7e00fea18b added getEncumbrance function 2012-05-15 21:34:00 +02:00
Marc Zinnschlag
c6493fb133 added getCapacity function 2012-05-15 21:17:00 +02:00
scrawl
4655ec94f0 Merge branch 'master' into physicsaedra2 & fix warnings 
Conflicts:
	apps/openmw/mwworld/scene.cpp
 2012-04-30 18:46:51 +02:00
scrawl
50d79a8815 Merge branch 'next' into tooltips 2012-04-29 17:30:34 +02:00
Alexander "Ace" Olofsson
b1af18e98d Merged next 2012-04-29 09:28:07 +02:00
scrawl
5d4d35a02c Merge branch 'master' into graphics 2012-04-28 20:43:53 +02:00
scrawl
1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp
 2012-04-24 02:02:03 +02:00
Marc Zinnschlag
f4428097f9 removing more cout spam 2012-04-23 15:37:38 +02:00
Marc Zinnschlag
35f478071e Issue #255: deleted the old environment class and using the new one instead 2012-04-23 15:27:03 +02:00
Jason Hooks
1ce759af06 Merging in master 2012-04-17 18:12:05 -04:00
scrawl
cdd4d83d9e moved the tooltip info to the appropriate MWWorld::Class classes 2012-04-16 22:58:16 +02:00
Marc Zinnschlag
afa859a6a6 Merge remote branch 'jhooks/clothingarmor' 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
 2012-04-15 22:06:05 +02:00
gugus
03d6d1fb82 NPC rank is correctly loaded now. Also corrected a potential bug (i think). 2012-04-12 17:08:57 +02:00
Alexander "Ace" Olofsson
290d09de64 Switching creature and npc to using the same id storage as the rest of the records 2012-04-08 18:32:40 +02:00
Jason Hooks
ebab98a8a0 Restructuring things 2012-04-07 22:02:20 -04:00
gugus
be4af711af NPC rank was not loaded. Not sure if it's the right way, but it seems to work. 2012-04-03 17:30:19 +02:00
Jason Hooks
57299571d5 Preparing for clothes/armor 2012-04-02 22:08:46 -04:00
Jason Hooks
b9fabce9c4 Awesome, working 2012-03-27 20:17:54 -04:00
Jason Hooks
18a139cd66 adding up and down move buttons 2012-03-24 22:03:08 -04:00
Marc Zinnschlag
79158b9325 NPCs are using InventoryStore instead of ContainerStore from now on 2012-03-10 12:49:54 +01:00
Marc Zinnschlag
f2972b1ca0 turned ContainerStore from a template into a simple struct 2012-01-28 11:45:55 +01:00
Marc Zinnschlag
8de6761a79 general cleanup 2012-01-27 15:11:02 +01:00
Marc Zinnschlag
c081160591 replaced container store in ref data with new custom data implementation 2012-01-27 14:55:58 +01:00
Marc Zinnschlag
b0256cea34 replaced movement settings in ref data with new custom data implementation 2012-01-27 13:17:30 +01:00
Marc Zinnschlag
aa87bd4030 replaced creature stats in ref data with new custom data implementation 2012-01-26 11:35:47 +01:00
Marc Zinnschlag
c6761e3470 replaced NPC stats in ref data with new custom data implementation 2012-01-25 16:56:49 +01:00
Marc Zinnschlag
9b910dda94 clean up 2012-01-17 15:10:53 +01:00
Jason Hooks
7fde576dd9 actor physics again 2012-01-07 23:21:19 -05:00
Jason Hooks
a615369189 Warning and different physics 2012-01-06 22:52:15 -05:00
Jason Hooks
d855bb4fc6 physics reenabled 2011-12-27 17:52:17 -05:00
Jason Hooks
a6b88b48ec A different way 2011-12-27 00:20:14 -05:00
Jason Hooks
7eee54bcd7 More physics and managing of Animation objects 2011-12-25 01:52:57 -05:00
Jason Hooks
1b835d6702 Cell changing fixes 2011-12-24 21:53:12 -05:00
Jason Hooks
5c48d8fc1e more stuff 2011-12-09 03:02:09 -05:00
Jason Hooks
ee98a2af1a Empty npcs 2011-12-09 00:08:30 -05:00
Jason Hooks
7319f7a8c6 Many bugs fixed related to changing cells 2011-11-19 01:01:19 -05:00
Jason Hooks
15fcdc8b72 Physics working 2011-11-17 19:38:52 -05:00
Jason Hooks
4dc59dfbdd Scenenode flip 2011-11-17 17:10:27 -05:00
Jason Hooks
db57f0a1a5 more corrections 2011-11-13 18:19:29 -05:00
Jason Hooks
bc58ef28cd Made corrections 2011-11-12 15:58:22 -05:00
Jason Hooks
c7dadec840 Updating the rest of mwclass 2011-11-11 23:01:12 -05:00
Jacob Essex
9aac625000 Changes to move the mutable ESM::Position data to RefData 2011-11-08 00:08:00 +00:00
Jason Hooks
56affd018a Some cleanup 2011-06-15 13:09:47 -04:00
Jason Hooks
93f41e25a4 fs-strict 2011-06-08 17:29:28 -04:00
Jason Hooks
65cc0e8317 trying strict 2011-06-08 17:15:13 -04:00
Jason Hooks
3a9007849d Windows fix 2011-06-08 00:35:30 -04:00
Jason Hooks
4d31ca2c86 Leading slashes now work, efficiency changes 2011-06-07 17:17:25 -04:00
Jason Hooks
45453fd7a9 Case insensitive external loader working 2011-06-06 20:11:23 -04:00
Jason Hooks
f2a0fa8af2 Adding files to directory map 2011-06-05 23:46:18 -04:00
Jason Hooks
2aaa0f4578 Backslash working in linux 2011-06-04 01:29:57 -04:00
Jason
b92955763a Introducing Dir Archive 2011-06-03 20:28:47 -04:00
Jason Hooks
51b74c2f05 starting 2011-05-23 19:01:36 -04:00
Marc Zinnschlag
7653caea27 Merge branch 'master' into collision 
Conflicts:
	apps/openmw/mwclass/npc.cpp
 2011-03-22 20:02:03 +01:00
Marc Zinnschlag
72ce493123 non-unique NPC ID workaround 2011-03-18 10:20:14 +01:00
gugus
0fb2107265 Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
 2011-03-15 13:36:25 +01:00
gugus
9b606be4b8 fix direction bug 2011-03-11 19:39:45 +01:00
Jan-Peter Nilsson
12db15d9a2 Reset arm position changed by commit 27f69d0f5b 2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
d68141d203 Remove unused variables 2011-03-07 19:13:24 +01:00
Marc Zinnschlag
151560b882 added missing run flag for NPCs 2011-02-10 11:08:25 +01:00
Marc Zinnschlag
3cd1088695 crash bug fix 2011-02-03 12:16:20 +01:00
Marc Zinnschlag
65232008a5 fixed a crash bug in NPC rendering 2011-02-03 11:47:42 +01:00
Marc Zinnschlag
4468a2b6a8 added movement data to MW references; added movement interface to MWWorld::Class 2011-02-03 11:37:17 +01:00
Marc Zinnschlag
88b0908104 adding physics when insertering objects into the OGRE scene 2011-01-29 17:33:48 +01:00
Marc Zinnschlag
b48a5084be added NPC stances 2011-01-18 10:45:29 +01:00
athile
27f69d0f5b Fix some double-to-float Visual Studio warnings in npc.cpp. Add 'm' prefix to member variables in esm_reader.hpp. 2011-01-10 16:13:32 -07:00
Pieter van der Kloet
dd4d022301 Converted all tabs to four spaces 2011-01-05 22:18:21 +01:00
Jason Hooks
f3ae1ea737 NPC leg appearance changed 2011-01-01 13:00:58 -05:00
Jason Hooks
ba168b22e9 cleanupandupdate 2011-01-01 11:47:12 -05:00
Jason Hooks
11406ae6f3 cleanupandupdate 2011-01-01 11:45:11 -05:00
Jason Hooks
60601682cd Beast races fixed 2010-12-21 21:45:54 -05:00
Jason Hooks
1896a6a2e8 Preliminary npcs4 2010-12-13 16:01:52 -05:00
Jason Hooks
467988455c Preliminary npcs3 2010-12-12 22:05:47 -05:00
Jason Hooks
dfe20033ea Preliminary npcs2 2010-11-25 18:36:25 -05:00
Marc Zinnschlag
be8f852663 implemented skill value handling during character creation (untested) 2010-09-16 10:45:08 +02:00
Marc Zinnschlag
2527fe92a7 implemented creature/NPC level 2010-09-15 15:32:35 +02:00
Marc Zinnschlag
7bb2041418 made rendering more robust (no more crashes, even if Ogre throws an exception) 2010-08-25 09:43:06 +02:00
Marc Zinnschlag
3b49d6c826 added NPC stats 2010-08-19 12:49:13 +02:00
Marc Zinnschlag
6258654383 fixed a very sloppy merge 2010-08-18 09:32:36 +02:00
Marc Zinnschlag
2cfe5f0697 Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
	apps/openmw/mwworld/class.cpp
	apps/openmw/mwworld/class.hpp
 2010-08-18 09:25:07 +02:00
Marc Zinnschlag
d57c984517 added enable and disable functions to class hierarchy; fixed a bug regarding actors in cellings being actived 2010-08-14 11:27:13 +02:00
Marc Zinnschlag
967f85875d reimplemented class-dependend rendering code in MWClass 2010-08-14 10:02:54 +02:00
Marc Zinnschlag
2acfe22975 added test for actor ID 2010-08-08 14:28:35 +02:00
Marc Zinnschlag
7afc8ffd2e Merge branch 'container' 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2010-08-07 20:33:07 +02:00
Marc Zinnschlag
d42747e85b Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2010-08-06 19:20:05 +02:00
Marc Zinnschlag
09c42589cc implemented npc/creature activation (enters dialog gui mode for now) 2010-08-06 18:15:46 +02:00
Marc Zinnschlag
10a63b10b5 Merge branch 'master' into container 
Conflicts:
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/container.hpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
	apps/openmw/mwworld/class.cpp
	apps/openmw/mwworld/class.hpp
 2010-08-06 14:37:53 +02:00
Marc Zinnschlag
7a313f24ab integrated activation into script system 2010-08-05 15:40:03 +02:00