Marc Zinnschlag
c471aa950f
re-enabled batching for statics; fixed a misplaced assert
2012-02-06 09:42:24 +01:00
Marc Zinnschlag
ee02154805
lights without a mesh were not rendered
2012-02-04 10:48:15 +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
0902a3db89
Filled out NpcAnimation and CreatureAnimation classes
2011-12-11 22:40:00 -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
835c3f2603
Working towards npc rendering
2011-11-27 02:27:06 -05:00
Jason Hooks
7bd911b401
Problems with handles
2011-11-24 23:13:34 -05:00
Jason Hooks
16ff2a7a1b
Changing to Actors;NPCAnimation;CreatureAnimation
2011-11-24 01:48:54 -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
a0947cd432
Player handle changed;Interior removed;Exterior removed;Cellimp removed; Probe fixed
2011-11-16 21:15:49 -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
0b3bb2719f
Fixing some errors
2011-11-12 00:19:22 -05:00
Jason Hooks
c7dadec840
Updating the rest of mwclass
2011-11-11 23:01:12 -05:00
Jason Hooks
62d8d1add2
more recommended changes
2011-11-11 14:37:42 -05:00
Jason Hooks
f4e7bd6dfd
Made some recommended changes
2011-11-11 00:20:53 -05:00
Jason Hooks
042bceb547
Changes to insertObjectRendering; Proposed insertObject
2011-11-09 18:06:55 -05:00
Jason Hooks
1faa07b279
insertObjectRendering proposed
2011-11-09 15:47:06 -05:00
Jacob Essex
9aac625000
Changes to move the mutable ESM::Position data to RefData
2011-11-08 00:08:00 +00:00
Marc Zinnschlag
8446619ac4
Merge branch 'components_namespaces' into next
...
Conflicts:
apps/openmw/mwrender/interior.cpp
components/bsa/bsa_archive.cpp
2011-06-19 20:22:29 +02:00
Lukasz Gromanowski
90985e849e
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/misc into Misc namespace.
Note: Misc namespace introduced conflict with ESM::Misc and MWClass::Misc
classes, so both of them are renamed to ESM::Miscellaneous
and MWClass::Miscellaneous.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2011-06-19 18:14:03 +02:00
Marc Zinnschlag
bc92b7b1fa
Merge branch 'directories' into next
...
Conflicts:
components/files/multidircollection.hpp
components/nifogre/ogre_nif_loader.hpp
2011-06-15 22:40:24 +02:00
Marc Zinnschlag
0f2df4e2b8
more cleanup
2011-06-15 22:33:31 +02: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
7192bc4f89
added static flag
2011-05-23 19:12:28 +02:00
Jason Hooks
92509d3b70
Trying to animate creatures
2011-04-13 20:35:44 -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
Marc Zinnschlag
42ef7a61a0
Merge branch 'script'
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwworld/world.cpp
apps/openmw/mwworld/world.hpp
2011-01-09 20:56:21 +01:00
Pieter van der Kloet
dd4d022301
Converted all tabs to four spaces
2011-01-05 22:18:21 +01:00
Marc Zinnschlag
4a12be11bf
moved PlayerPos class from MWRender to MWWorld and renamed it to Player
2011-01-04 15:58:22 +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
1dc805d0d4
Merge branch 'master' into exterior
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2010-09-08 15:38:19 +02:00
Marc Zinnschlag
61c4fa0630
blocked using of locked doors (keys are not considered yet)
2010-08-30 12:02:47 +02:00
Marc Zinnschlag
459dd82896
implemented locking/unlocking for doors (can not be invoked by user interaction yet)
2010-08-30 11:56:55 +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
67a067e49c
changed name of teleport doors to the name of the destination cell
2010-08-19 13:19:23 +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
6f28bd9adf
handle sounds when enabling/disabling
2010-08-14 11:39:32 +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
8086933282
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-08 14:14:43 +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
a7fe28ecbe
implemented take action
2010-08-07 20:25:17 +02:00
Marc Zinnschlag
0a60bde834
added insertIntoContainer function to class hierarchy
2010-08-06 22:20:20 +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
Marc Zinnschlag
ee7570f7e7
added containerstore
2010-08-04 14:37:23 +02:00
Marc Zinnschlag
002345270b
implemented teleport doors (only for the player for now)
2010-08-03 18:44:52 +02:00
Marc Zinnschlag
239498bcd4
added getName function
2010-08-03 17:11:41 +02:00
Marc Zinnschlag
f50ced4616
added missing record classes
2010-08-03 15:24:44 +02:00
Marc Zinnschlag
bfc282779b
added item health interface
2010-08-03 14:14:04 +02:00
Marc Zinnschlag
93754b2851
moved some includes around
2010-08-03 13:32:37 +02:00
Marc Zinnschlag
33b6a0b800
moved concrete record classes to separate sub-system (mwclass)
2010-08-03 13:17:31 +02:00
Marc Zinnschlag
9d6e658e05
previous commit was missing some files
2010-08-03 13:03:08 +02:00