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

1871 commits

Author SHA1 Message Date
cc9cii
22c544d9d7 Remove unnecessary comment. 2014-03-16 12:51:12 +11:00
cc9cii
fdbd564700 Apparently fall trace needs to be done with the middle of the object. 2014-03-16 08:57:55 +11:00
cc9cii
43757efdc4 Feature #1030 - partial fix to stop creatures unable to walk/fly to come out of water. Does not necessarily handle situations where they are already out of water, however. 2014-03-16 08:09:14 +11:00
Marc Zinnschlag
7bc97fb8b8 reworked code for player positioning on startup and new game 2014-03-13 13:19:32 +01:00
scrawl
072dc6d438 Feature #50: Implement marksman mechanics. 2014-03-08 06:03:45 +01:00
scrawl
12de0afb03 Feature #50: Spawn projectiles 
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
 2014-03-08 01:31:27 +01:00
cc9cii
f36bea03ab Bug #1189 fix by scrawl 2014-03-07 19:36:44 +11:00
scrawl
83b6fcf22e Bug #416: Workaround for page flipping problem 2014-03-05 22:24:05 +01:00
scrawl
1d926816b5 Terrain: background load blendmaps & layer textures. Refactor QuadTree update. 2014-03-05 21:46:37 +01:00
scrawl
edb5a54092 Include some more required Ogre headers explicitely. 2014-03-05 21:46:37 +01:00
scrawl
195071efc7 Terrain: geometry is now loaded in background threads. 
TODO: background load layer textures and blendmaps.
"Distant land" setting has been removed for now (i.e. always enabled).
 2014-03-05 21:46:37 +01:00
scrawl
8730b61362 Render maps after *all* cells have finished loading 
Still not fixing Bug #772, but at least this will allow for background loading of terrain.
 2014-03-05 21:46:36 +01:00
Bret Curtis
ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 2014-03-05 17:08:58 +01:00
Marc Zinnschlag
0ae9cc0106 removed unused function 2014-03-03 08:21:16 +01:00
Marc Zinnschlag
ca30f2af3d minor fix 2014-03-02 11:03:37 +01:00
Marc Zinnschlag
9b18e01507 keep track of which cells have state that needs to be saved 2014-02-24 10:03:04 +01:00
Marc Zinnschlag
bfcd768078 various bits of cleanup 2014-02-23 21:39:18 +01:00
Marc Zinnschlag
83ded18af0 encapsulated reference collections 2014-02-23 21:21:27 +01:00
Marc Zinnschlag
367919200f moved CellRefList into a separate file 2014-02-23 20:11:05 +01:00
Marc Zinnschlag
f220867144 make Ptr a bit more pointer-like 2014-02-23 18:17:41 +01:00
Marc Zinnschlag
b72c1c2c58 encapsulated water level 2014-02-23 17:34:18 +01:00
Marc Zinnschlag
79e723ad06 encapsulated mIds 2014-02-23 16:46:07 +01:00
Marc Zinnschlag
8ea686c6c8 encapsulated mState 2014-02-23 14:26:36 +01:00
Marc Zinnschlag
7693f712bc started making CellStore into a proper class; encapsulated mCell member 2014-02-21 11:35:46 +01:00
Emanuel Guevel
7c981587fc When searching object by id, search in active cells before searching in the player's inventory 2014-02-13 22:58:12 +01:00
Emanuel Guevel
e597328b6b Make enable/disable a no-op for items in containers 2014-02-13 20:24:27 +01:00
scrawl
ffe19e7a52 Feature #50: Handle attach & release of projectiles 2014-02-05 05:18:11 +01:00
Alexander "Ace" Olofsson
e50a393de4 Fix linking issues on Windows using MSVC. 2014-02-02 23:59:57 +01:00
Marc Zinnschlag
1b5301eec0 Merge branch 'savedgame' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
 2014-02-01 18:16:32 +01:00
Marc Zinnschlag
5b04c10e1d added creature/NPC state to saved games (only container/inventory for now) 2014-02-01 17:36:23 +01:00
Marc Zinnschlag
d2ec3ffdc8 handle equipped items when serialising inventory state 2014-02-01 17:31:05 +01:00
Marc Zinnschlag
bcc5894e2d changed implementation functions for container serialisation from free functions to member functions (will need some polymorphism later) 2014-02-01 15:24:01 +01:00
Marc Zinnschlag
dd674566a2 store content of containers in saved game files 2014-01-31 13:25:32 +01:00
Marc Zinnschlag
900532a6ca store additional state of lights in saved game files 2014-01-30 12:37:33 +01:00
Marc Zinnschlag
ec7cb90ca4 added support for serialisation of CustomData state 2014-01-30 11:50:13 +01:00
scrawl
2b15b8b484 Fix gold bugs (Fixes #1145, Fixes #1146) 2014-01-29 15:37:27 +01:00
scrawl
a8a09762ce Don't crash when deleting or disabling a moving door 2014-01-29 15:37:26 +01:00
scrawl
190512156d Use some more GMSTs for enchanting 2014-01-29 15:37:26 +01:00
scrawl
ba67bf45f8 Fix an issue with InventoryStore copy constructor. Don't copy the iterator directly - mContainer will be wrong and comparisons against end() will always fail. 
This caused an exception when looting a creature that had moved cells.
 2014-01-29 15:37:26 +01:00
Marc Zinnschlag
fd5486864a Merge remote-tracking branch 'gus/AIFix2' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/actors.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
 2014-01-28 12:33:31 +01:00
Marc Zinnschlag
29c3a288e3 load and save of reference in cells (without CustomData state) 2014-01-27 13:27:42 +01:00
scrawl
79a9c4e048 Clear mShared before populating it. Fixes an issue with duplicate records (e.g. dialogue keywords) after loading a savegame. 2014-01-25 16:33:39 +01:00
scrawl
bdb03926c2 Fix crash when loading another game after dying 2014-01-25 16:13:45 +01:00
scrawl
f09328ca84 Clear global map overlay when starting/loading a game 2014-01-25 13:34:56 +01:00
gus
707e579dfe Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AIFix2 
Conflicts:
	apps/openmw/mwmechanics/aifollow.cpp
 2014-01-24 19:16:50 +01:00
scrawl
03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
 2014-01-24 18:28:35 +01:00
scrawl
295aed3533 Implement savegame screenshots 2014-01-24 17:49:16 +01:00
scrawl
ac4c904e62 Fix projectile bug 2014-01-24 13:22:30 +01:00
Marc Zinnschlag
460089c0aa ignore deleted references that did not came from a content file 2014-01-23 12:53:55 +01:00
Marc Zinnschlag
419e3a7d30 write references in cells to saved game file 2014-01-23 12:51:42 +01:00
Marc Zinnschlag
22cb4784b5 store cell state in saved game files (no references yet) 2014-01-23 11:29:40 +01:00
scrawl
16f5f5862d Feature #956: Implement blocking melee attacks 2014-01-21 23:25:24 +01:00
Marc Zinnschlag
9ebe66e693 improved cleanup; failed loads will now drop back into the main menu instead of crashing 2014-01-21 14:50:58 +01:00
scrawl
851a7d5014 Feature #957: Handle area effects for "on touch" range 2014-01-21 12:30:15 +01:00
scrawl
42284603f7 Properly handle on target effects with mArea=0 2014-01-20 13:44:38 +01:00
scrawl
205e8aa4e9 Feature #957: Implement area magic 2014-01-20 13:11:29 +01:00
scrawl
ba5300b071 Update the Ptr in SoundManager for references moved to a different cell. Fixes looping sounds not stopping after a moved object was already deleted. 2014-01-20 12:05:13 +01:00
scrawl
5dd3cfa09a Loop projectile sounds 2014-01-20 11:50:52 +01:00
scrawl
1a00f26390 Bug #1126: Golden saints and many other creatures only have "Bip01 Head" 2014-01-19 14:33:41 +01:00
scrawl
589fbbd871 Issue #777: Create InventoryStore for creatures with weapons/shields 2014-01-19 11:43:23 +01:00
scrawl
4c0045b418 Bug #1109: Do not reset water level when loading a plugin with no water level record (for real this time) 2014-01-18 21:11:12 +01:00
Marc Zinnschlag
14e64c180f on load check player record for dangling ID references 2014-01-18 15:06:58 +01:00
Marc Zinnschlag
6584a01d01 reset reference to player NPC record during cleanup 2014-01-18 14:53:25 +01:00
scrawl
9653355cf1 Feature #701: Spawn levelled creatures in cells 2014-01-18 07:26:27 +01:00
scrawl
228254c890 Handle creature attack animations in character controller 2014-01-17 16:31:27 +01:00
scrawl
c76a0448a3 Closes #1123: Implement SlowFall magic effect 2014-01-17 15:47:34 +01:00
Marc Zinnschlag
1b7697a4b2 handle missing player specific state during load/save 2014-01-17 13:07:57 +01:00
scrawl
805843d7ff Closes #1086: Implement blood effects 2014-01-17 11:27:13 +01:00
scrawl
2836c7c927 Do not set owner when adding items to a container, as opposed to NPC/creatures 2014-01-17 10:55:46 +01:00
Marc Zinnschlag
c300cd9375 loading/saving of some player state (cell/coordinates and some other bits) 2014-01-16 12:03:23 +01:00
scrawl
d544551f61 Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization) 
Information provided by Hrnchamd.
 2014-01-15 15:50:45 +01:00
scrawl
da3295d69c Closes #1106: Move stance to CreatureStats, since creatures also have separate run/walk animations. 2014-01-15 14:53:29 +01:00
scrawl
03b2e99802 Remove unused Combat stance 2014-01-15 14:53:29 +01:00
scrawl
d0500e8124 Some unneeded includes cleanup 2014-01-15 14:53:28 +01:00
greye
15d946415e minor cleanup 
Removed case folding via std::transform, excessive lowerCase()
replaced with ciEqual().
 2014-01-14 12:46:53 +04:00
scrawl
52b9ebff9d Closes #1092: Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell. 2014-01-14 07:42:03 +01:00
scrawl
90b92a8f41 Move levelled list code out of ContainerStore 2014-01-14 05:37:06 +01:00
scrawl
6aa56354c0 Revert "Bug #991: Don't autoequip items with harmful permanent enchantments" 
This is no longer needed, since merchants no longer equip items sold to them (2f35e5a04e). Also, items with harmful enchantments that are initially in the NPCs inventory *must* be equipped (e.g. slave bracers)

This reverts commit 71d9755ef1.
 2014-01-14 05:24:58 +01:00
scrawl
9de3abcb5f Closes #1105: Do not reduce magicka if unable to cast 2014-01-14 03:34:30 +01:00
scrawl
3a1b6dd354 Handle fCombatKODamageMult and fCombatCriticalStrikeMult. Fix SelectWrapper Function_Detected. 2014-01-13 10:18:02 +01:00
Marc Zinnschlag
63cd70f810 some junk removal 2014-01-13 10:03:25 +01:00
scrawl
7983b07b10 Get bk_treasuryreport script to work properly: 
- OnPcEquip needs to be set on *using* any item, not just equipping
 - Handle PcSkipEquip
 - Execute item's script once immediately after setting OnPcEquip
 - Do not set OnPcEquip when an item that has skipped equipping sets pcskipequip back to 0 and gets equipped
 2014-01-13 06:20:18 +01:00
Marc Zinnschlag
9025210965 Merge branch 'refnum' into savedgame 
Conflicts:
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/manualref.hpp
	components/esm/cellref.hpp
 2014-01-12 16:58:06 +01:00
gus
0e46c40cb5 Make ACtionTeleport non player specific and teleport actors following the teleporting actor 2014-01-12 14:03:11 +01:00
Marc Zinnschlag
5ea25dc269 player state cleanup 2014-01-11 15:34:32 +01:00
scrawl
a2ba0dde31 Implemented GoToJail 2014-01-11 06:47:58 +01:00
scrawl
9127839cc1 Add a searchPtr method as required for getting an owner, which may already be dead and disposed of. 2014-01-11 03:33:17 +01:00
scrawl
bf6d302fba Confiscate stolen items when caught 2014-01-11 03:29:41 +01:00
scrawl
12944f2459 Fix an auto equipping bug that allowed twohanded weapon and shield at the same time 2014-01-11 03:07:35 +01:00
scrawl
e9f63270d9 Speed fix for "on target" spells 2014-01-10 22:51:42 +01:00
scrawl
3bf36515d5 Implement Trespassing crime 2014-01-10 21:26:24 +01:00
scrawl
6f9113fe88 Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions 2014-01-09 01:49:58 +01:00
scrawl
baf55df7a1 Gold fixes (when did this break?) 2014-01-09 01:34:10 +01:00
scrawl
9bf7bf529c Implement crime-related dialogue globals as they are described in MSFD 2014-01-09 00:40:25 +01:00
scrawl
0f5dc59176 Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure. 2014-01-08 23:37:46 +01:00
scrawl
372cd437d1 Add a utility function for counting items in a container 2014-01-08 23:00:29 +01:00
scrawl
098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 2014-01-08 18:39:44 +01:00
scrawl
728365b48d Remove an unused hook 2014-01-07 21:07:02 +01:00
scrawl
03b6334ceb Get rid of a hack 2014-01-07 20:43:08 +01:00
scrawl
0285d18fc2 Respect items belonging to a faction 2014-01-07 20:24:01 +01:00
scrawl
3c0080d2c1 Implement theft detection 2014-01-07 19:58:17 +01:00
Marc Zinnschlag
48a08c4c4d Merge remote-tracking branch 'endorph/master' 2014-01-07 14:12:15 +01:00
Dmitriy 'Endorph' Shkurskiy
9afa8e952e tabs -> spaces 2014-01-07 14:32:14 +02:00
scrawl
29c823b9d4 Implement awareness check function. Use this for combat AI and GetDetected instruction. 2014-01-07 00:51:09 +01:00
Marc Zinnschlag
fefaec5804 Merge remote-tracking branch 'scrawl/savedgame' into savedgame 2014-01-06 22:30:08 +01:00
scrawl
68b87714bb Addition to 2f35e5a04e: companions should still auto equip 2014-01-06 22:14:11 +01:00
Marc Zinnschlag
43dd3b8ef2 removed redundant deletion flag from CellRef 2014-01-06 13:53:20 +01:00
scrawl
62774fcc4a Merge branch 'master' into HEAD 
Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp
 2014-01-06 00:23:17 +01:00
scrawl
2f35e5a04e Stop merchants from autoequipping items sold to them 2014-01-05 22:43:09 +01:00
scrawl
dde2cd5d5a Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface. 2014-01-05 20:53:45 +01:00
scrawl
45847c67ad Lock NIF cache when loading an interior cell as well. Should improve load performance. 2014-01-05 18:38:21 +01:00
scrawl
ce013315ba Nothing to see here, move along. 
Fine... it's flying cliff racers. But did you really want to know?
 2014-01-05 16:09:06 +01:00
scrawl
c4e4a8fb57 Closes #1083: Fix werewolf change handling 2014-01-04 20:50:18 +01:00
Dmitriy 'Endorph' Shkurskiy
18d4cdb2ac Fix for VS2010-Debug: manual assignment operator and cctor added for MMWorld::ContainerStoreIterator 2014-01-04 07:46:29 +02:00
scrawl
710a1e2f37 Smash case for manual reference IDs as well, consistent with references in data files 2014-01-04 04:39:06 +01:00
scrawl
be2ebc5cac Closes #1081: Implement disease contraction 2014-01-03 23:33:14 +01:00
scrawl
b42240be6d Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences. 2014-01-03 03:48:43 +01:00
scrawl
623cdef69f Code cleanup 2014-01-02 21:49:12 +01:00
scrawl
299690631f Implement SoulTrap magic effect 2014-01-02 21:21:28 +01:00
scrawl
12de351feb Check if levitation is enabled before levitating 2014-01-02 16:38:23 +01:00
Marc Zinnschlag
a6e6411686 Merge remote-tracking branch 'scrawl/master' 2014-01-02 12:12:52 +01:00
scrawl
993edf0384 Bug #1063: Safety check in moveObject. Required when items in containers execute script commands like setAtStart etc. 2014-01-02 02:27:48 +01:00
scrawl
0f2b2fabdb Implement water walking 2014-01-02 02:03:44 +01:00
scrawl
c6421276bd Closes #841: Correct activation distance in third person mode 2014-01-01 23:59:17 +01:00
scrawl
24aa743573 Add function for converting feet to game units 2014-01-01 23:34:18 +01:00
scrawl
f6387d5979 Implement Telekinesis magic effect. Remove some duplicate code. 2014-01-01 23:30:58 +01:00
scrawl
531bef6193 Shorter Vector3 initialisation 2014-01-01 22:46:10 +01:00
scrawl
5729672262 Show marked position on map. Implement Detect X magic effects. 2014-01-01 22:37:52 +01:00
Marc Zinnschlag
1f4c192bf6 Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting' 2014-01-01 19:47:11 +01:00
scrawl
eab7ffd6b4 Remove redundant finding of default exterior position height 2014-01-01 18:05:28 +01:00
scrawl
8e5cae1081 Implement mark/recall magic effects 2014-01-01 17:06:21 +01:00
Lukasz Gromanowski
722469d57b Correction to the e9844e1 commit. 
Restored interrior check in WeatherManager::update().

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-01-01 16:45:39 +01:00
Marc Zinnschlag
c3482b6f24 Merge remote-tracking branch 'scrawl/master' 
Conflicts:
	apps/openmw/mwmechanics/spellcasting.cpp
 2014-01-01 15:05:42 +01:00
Marc Zinnschlag
5fa9aa5d1e Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting' 
Conflicts:
	apps/openmw/mwworld/weather.cpp
	apps/openmw/mwworld/worldimp.cpp
 2014-01-01 14:57:14 +01:00
scrawl
ea3b88951a Implement divine/almsivi intervention magic effects 2014-01-01 02:22:11 +01:00
scrawl
c86760e3cd Remember the last known exterior position of the player in case we fail to map the interior to a world position. 2014-01-01 01:10:55 +01:00
Lukasz Gromanowski
101813fd0d Fixes #417: Apply weather instantly when teleporting 
Correction to previous commit - WeatherManager->update()
will always be called.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-31 21:18:10 +01:00
Lukasz Gromanowski
e9844e1b37 Fixes #417: Apply weather instantly when teleporting 
Changed teleporting detection from "position tracking" to manually
setting "teleportation" flag ( player->setTeleported(true) ).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-31 20:40:23 +01:00
scrawl
3604b9d171 Closes #566: In interior cells, update global map position marker using the first exterior teleport door 2013-12-31 18:35:46 +01:00
scrawl
79a440e94a Many additions to 900bc06d2c: 
- Fix indentation
 - Consider any kind of light, not just torch_infinite_time
 - Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon)
 - Remove redundant code and don't add additional lights to the inventory
 - World::isDark returns false for interiors which are unaffected by weather
 2013-12-30 17:57:41 +01:00
Lukasz Gromanowski
c65f018760 Fixes #417: Apply weather instantly when teleporting 
Corrected constant name.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-29 15:09:49 +01:00
Marc Zinnschlag
6de39a7329 Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day' 
Conflicts:
	apps/openmw/mwmechanics/character.cpp
 2013-12-29 15:00:31 +01:00
Lukasz Gromanowski
faf8011c48 Fixes #417: Apply weather instantly when teleporting 
Removed changing speed of weather transition introduced in previous
commit. Instead try to detect player "teleporting" (ie. coc),
and then switch instantly to the next weather type.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-29 12:47:44 +01:00
Lukasz Gromanowski
100edda8c0 Fixes #417: Apply weather instantly when teleporting 
Change speed of weather transition from blight to other (twice fast as normal)
and from other to blight (four times faster than normal).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-28 16:15:34 +01:00
scrawl
7265b427fe Bug #1013: Rewrote fall height detection 2013-12-27 21:21:18 +01:00
scrawl
686d9efac3 Bug #1060: Fix incorrect spell type checks 2013-12-27 18:58:35 +01:00
scrawl
27092a4494 flagAsModified should be private 2013-12-27 18:58:35 +01:00
scrawl
561c661156 Reset starting angle / position when adding world item to a container 2013-12-27 01:57:08 +01:00
scrawl
608bd0f525 Don't copy the base node pointer when adding a world object to a container. Fixes bug #1028 2013-12-27 01:34:56 +01:00
scrawl
5a287a7e01 Remove no longer accurate flagAsModified calls. Container items are now modified via ContainerStore, not RefData. 2013-12-27 00:41:19 +01:00
scrawl
5054d8e6c1 Bug #1055: Check power use and mana before starting cast animation 2013-12-26 22:06:13 +01:00
scrawl
71d9755ef1 Bug #991: Don't autoequip items with harmful permanent enchantments 2013-12-26 21:26:59 +01:00
Lukasz Gromanowski
900bc06d2c Fixes #845: NPCs hold torches during the day 
Moved 'equipping torches at night and unequipping at day' code from Character
to Actors class.

Removed unneeded showLights method (introduced in previous commits)
from animation/npcanimation classes.

Since this commit autoEquip() method doesn't automatically equip lights.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-20 22:38:23 +01:00
scrawl
9afdf71af3 Fix crash with player->position command 2013-12-19 00:37:57 +01:00
scrawl
876fb9a899 Addition to bb4bd999ba : adjust position for objects placed from inventory 2013-12-19 00:11:14 +01:00
Marc Zinnschlag
c22e38f825 removing 255 content file limitation 2013-12-17 21:19:05 +01:00
Marc Zinnschlag
09fadd446b Merge remote-tracking branch 'mrcheko/savedgame' into savedgame 2013-12-17 19:33:32 +01:00
mrcheko
f50ff0b1c4 reworked http://bugs.openmw.org/issues/428 2013-12-16 15:40:47 +02:00
scrawl
19e5978a01 Merge branch 'master' of https://github.com/zinnschlag/openmw 
Conflicts:
	apps/openmw/main.cpp
 2013-12-16 13:35:31 +01:00
scrawl
56893a097d Don't stack used torches 2013-12-16 13:31:03 +01:00
Marc Zinnschlag
1cf1d49bc4 fix to content file reading error reporting in case of missing dependency 2013-12-16 11:39:24 +01:00
mrcheko
fd9f8c34f6 bug fix http://bugs.openmw.org/issues/428 2013-12-15 18:50:25 +02:00
Marc Zinnschlag
74793c1c2f globals script cleanup; fixed potential case folding bug 2013-12-12 13:15:38 +01:00
Marc Zinnschlag
fc37c77a91 store global variables in saved game files 2013-12-12 12:19:25 +01:00
Lukasz Gromanowski
91a4d9a2eb Fixes #845: NPCs hold torches during the day 
Added method in WeatherManger and World which returns true if it is night.
This method is used later in character controller to show torches
(or other sources of light) at night and hide them at day.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-10 23:48:49 +01:00
Marc Zinnschlag
b38bfe1f21 removed a redundant function for listing global variables 2013-12-10 15:22:38 +01:00
Marc Zinnschlag
51bfa5cde3 rewrote global variable storage (using ESM variant type now) 2013-12-10 15:09:58 +01:00
Marc Zinnschlag
1fdd43bbb7 removed a redundant new 2013-12-10 12:31:18 +01:00
Marc Zinnschlag
77a2179d1e Merge remote-tracking branch 'scrawl/master' 2013-12-09 18:39:34 +01:00
scrawl
0bc3a13c0f Break invisibility on Use or Activate 2013-12-08 23:36:37 +01:00
scrawl
5fd2df5546 Ignore invisible targets for combat AI 2013-12-08 23:21:23 +01:00
Marc Zinnschlag
1c13a9037a save and load dynamic records 2013-12-07 13:17:28 +01:00
Marc Zinnschlag
030c733e2d Merge branch 'master' into savedgame 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
 2013-12-07 12:27:06 +01:00
Marc Zinnschlag
14eff87339 removed some junk from ESM store 2013-12-06 11:34:24 +01:00
Lukasz Gromanowski
bfd79bfbe6 Various fixes for CppCheck warnings. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-06 07:36:16 +01:00
Marc Zinnschlag
a7b42b867b more cleanup 2013-12-05 14:18:43 +01:00
Marc Zinnschlag
ce624e024b make sure player record stays in place across cleanups 2013-12-05 14:03:25 +01:00
Marc Zinnschlag
e818d43bc3 removed an outdated typedef and some dead code 2013-12-05 13:21:26 +01:00
Marc Zinnschlag
537b2efe8e first round of cleaning up world cleanup 2013-12-05 12:49:25 +01:00
scrawl
8391891a5b Ignore case for content file extensions 2013-11-30 14:25:29 +01:00
scrawl
4b4025ed0f Keep the player's CharacterController when changing cells. Fixes several glitches. 2013-11-30 11:01:45 +01:00
scrawl
bb4bd999ba PlaceAt: Copy the rotation when placing a non-actor. Don't modify placement position by bounding box for non-actors. Fixes placement in Graphic Herbalism mod. 2013-11-30 08:29:22 +01:00
scrawl
ce2d521b8f Always apply queued movement, even when there's no duration. Fixes crash with --start="bal isra". 
When a script disables a reference that still has movement queued, trying to apply that movement will then fail due to the reference not being in the scene. Therefore, we should make sure that movement is always applied in the frame that it's queued in.
 2013-11-29 20:03:50 +01:00
scrawl
ffc885853a Fix bolt for magic effects that don't have one specified 2013-11-29 10:39:37 +01:00
scrawl
b82ee4b44f Fix some problems with the previous commit 2013-11-28 21:49:15 +01:00
scrawl
076cc9230b First try at handling target magic 2013-11-28 17:31:17 +01:00
Marc Zinnschlag
5aea6ef80f some clean up for the cleanup code 2013-11-28 11:22:34 +01:00
Marc Zinnschlag
7e2819c62e store year in saved game profile 2013-11-28 09:27:10 +01:00
Marc Zinnschlag
b0eb5938bf removed some redundant code 2013-11-28 09:13:54 +01:00
Marc Zinnschlag
71436b1160 changed interface for global variable access 2013-11-28 09:10:38 +01:00
scrawl
a8c838b53a Don't list deleted refs in CellStore::foreach 2013-11-27 18:49:04 +01:00
Marc Zinnschlag
99ea63dc4a factored out code for generating month names 2013-11-26 12:47:30 +01:00
Marc Zinnschlag
bc6fe682c9 replaced getCurrentCellName function with a more general getCellName function 2013-11-26 11:39:58 +01:00
Marc Zinnschlag
616e3aa32f store content file list in saved games and reject saved games not matching the current game 2013-11-25 13:00:05 +01:00
scrawl
0e254aa7c7 Fix startNewGame assigning an already freed CellStore to the player Ptr supplied to WindowManager. Fixes a crash when equipping lights after starting a new game (bug 967). Side note: The inventory preview's Ptr being assigned a cell at all doesn't make sense, as that is used to determine the light setting which should be the same no matter which cell you're in. 2013-11-23 03:25:55 +01:00
scrawl
39de0510a0 Fix another case of container scripts not getting re-added 2013-11-22 02:12:37 +01:00
scrawl
829512ded4 Fix container scripts not getting re-added when the player changes cells 2013-11-22 01:02:12 +01:00
scrawl
b490e56ba1 Remove redundant setLocals (already done by ContainerStore::add) 2013-11-21 17:19:41 +01:00
scrawl
bab657fe2b Add a utility function to add items to a ContainerStore by RefID 2013-11-21 17:14:30 +01:00
scrawl
800a2845b0 Add Bound & Summon effects (will need some adjustments later) 2013-11-21 17:14:23 +01:00
scrawl
8b095982e9 Don't auto equip for dead actors 2013-11-19 18:42:43 +01:00
Marc Zinnschlag
8190fdb16c Merge remote-tracking branch 'scrawl/master' 2013-11-19 16:56:18 +01:00
scrawl
e8dcd74741 Recharge enchanted items in player's inventory over time 2013-11-19 16:42:24 +01:00
Marc Zinnschlag
11e254aac8 Merge remote-tracking branch 'gus/AICombat' 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
 2013-11-19 09:10:48 +01:00
scrawl
0dc2e829dd Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX. 2013-11-17 23:31:08 +01:00
scrawl
2a11618ee7 Make sure the equipped weapon HUD icon is updated properly 2013-11-17 23:31:07 +01:00
scrawl
b8c358df63 Fix a bug with equipping using the quick keys: when item is already equipped, equipping it again would cause the slot to get unequipped first, possibly restacking and destroying the Ptr that was supposed to be equipped in the first place 2013-11-17 23:31:07 +01:00
scrawl
07251f0fa4 Don't apply spells to dead actors 2013-11-17 04:32:56 +01:00
scrawl
b1a29eb27e Implement Resist & Weakness effects 2013-11-16 02:34:43 +01:00
scrawl
c73217627e Move code for listing effect sources to the spell management classes 2013-11-15 20:29:47 +01:00
scrawl
f7befa3e54 Remove a no longer required method 2013-11-15 02:20:04 +01:00
scrawl
00af6b5617 Use an inventory store listener for animation parts and VFX update instead of updating them directly. Slightly more flexible, reduces InventoryStore dependencies and solves a crash during character creation due to the preview doll's animation not being registered in World. 2013-11-15 02:08:36 +01:00
scrawl
427de69b79 Allow stacking enchanted items when charge is full 2013-11-14 21:02:37 +01:00
scrawl
49125fa26e Fix restacking unequipped items 2013-11-14 19:54:00 +01:00
scrawl
da85f3e575 Use the formula from the wiki for spell success. 2013-11-14 19:19:32 +01:00
scrawl
5458207325 Reduce fatigue when casting. Has no effect in the vanilla game due to the GMSTs being 0. 2013-11-14 18:41:34 +01:00
scrawl
e26cc31e3b Disable projectiles for now 2013-11-14 14:45:08 +01:00
scrawl
992a8e9c36 Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore. 2013-11-14 14:41:10 +01:00
scrawl
956d8adb99 Merge branch 'master' of https://github.com/zinnschlag/openmw into magic 
Conflicts:
	apps/openmw/mwgui/inventoryitemmodel.cpp
 2013-11-14 14:25:22 +01:00
scrawl
0b5f5351b5 Fix continuous FX getting removed instantly 2013-11-14 13:30:48 +01:00
Marc Zinnschlag
d49b8e7443 Merge branch 'dialogue' 2013-11-14 11:40:50 +01:00
scrawl
ff7e4174f9 Fix some leftover code that still calculated random magnitude per spell rather than per effect. Major cleanup of InventoryStore: Magic effects are now updated when needed, rather than cached. Also allows to get rid of 'mutable' hacks and non-const method that should be const. Play sounds and particles when equipping a permanent enchantment item. 2013-11-13 18:51:28 +01:00
scrawl
9b0e82a37f Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends) 2013-11-13 14:02:15 +01:00
Marc Zinnschlag
a8274e5c86 Merge remote-tracking branch 'potatoesmaster/inventory-fix' 2013-11-13 13:55:24 +01:00
Emanuel Guevel
baf13483c0 Update actor model only when in the current cell 2013-11-13 00:04:04 +01:00
scrawl
60bec03987 Rename variables called 'slots' to work around wrong code parsing in QT Creator. 2013-11-12 23:23:19 +01:00
scrawl
027f4152e4 Missing flagAsModified() 2013-11-12 23:17:03 +01:00
scrawl
3c6a391507 Rename arguments again 2013-11-12 23:12:56 +01:00
scrawl
700d06764c Order of arguments for ContainerStore::stacks shouldn't matter. Supplying them in the correct order is error prone, and also caused a bug where equipped items would incorrectly stack. 2013-11-12 22:58:56 +01:00
scrawl
eccb8f38ba Apply "cast when strikes" enchantments when hitting with a weapon 2013-11-12 02:07:51 +01:00
scrawl
5f209b120b Use the new ContainerStore::remove method. 2013-11-12 01:26:16 +01:00
scrawl
ffdb91bb21 Add particles for Cast + Hit. Not looking quite right yet. 2013-11-11 23:43:28 +01:00
scrawl
6f3d737498 Missing const, thanks to jeaye 2013-11-10 23:27:11 +01:00
scrawl
1773c70455 Merge branch 'master' of https://github.com/zinnschlag/openmw into magic 2013-11-10 22:03:17 +01:00
scrawl
6cd373c5c6 Only allow using powers once every 24 h. Apply on touch effects. 2013-11-10 15:40:31 +01:00
Marc Zinnschlag
8c4303399f Merge branch 'master' into dialogue 
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loadinfo.hpp
 2013-11-10 13:21:39 +01:00
Emanuel Guevel
bbfd7f4c9d Disable equipped item re-stacking when the item is removed from inventory 
The item was not removed if it was re-stacked.
 2013-11-10 02:45:17 +01:00
Emanuel Guevel
d2dcf0b203 Add a warning comment to RefData::setCount() 2013-11-10 02:45:17 +01:00
Emanuel Guevel
467bd91651 Update actor model on inventory change 2013-11-10 02:45:17 +01:00
Emanuel Guevel
37e91a278e Add InventoryStore::unequipItem() 2013-11-10 02:45:17 +01:00
Emanuel Guevel
12dbbde1e3 InvStore::unequipSlot: return an iterator to the unequipped item 2013-11-10 02:45:17 +01:00
Emanuel Guevel
59c963b6cc Auto-equip items when a clothe or an armor is removed from inventory 
This fix auto-equip on corpses.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
750f1fd760 Edit ContainerStore::stacks for clarifications and correctness 
Rename arguments and fix some potential errors (add checks).
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
26e4ccb8c2 Cosmetic changes 
Rename ContainerStore::addImpl to addNewStack (it was confusing, since
ContainerStore had methods named 'addImp' and 'addImpl').
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
aefa54d72d Pass item count to ManualRef constructor 
This remove the need to call setCount in multiple places.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
0691978603 Add item count to ManualRef constructor as optional argument 2013-11-10 02:45:16 +01:00
Emanuel Guevel
8ff747fbef Move some deleteObject logic from OpDelete to MWWorld::deleteObject 2013-11-10 02:45:16 +01:00
Emanuel Guevel
2786530430 Edit InventoryStore::equip() to call the new unequipSlot function… 
…to unequip previously equipped item.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
52cef19982 Update weapon/magic icons when items are removed from player inventory 2013-11-10 02:45:16 +01:00
Emanuel Guevel
d05baa8c22 Add method InventoryStore::unequipSlot() 
This will permit to do run a treatment when an item is unequipped.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
10abb9d297 Call ContainerStore::remove() to remove items from inventory 
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).

Enchanting an item now unequips it.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
23b8206bdc Add remove methods to MWWorld::ContainerStore 2013-11-10 02:45:16 +01:00
Marc Zinnschlag
a198751f21 Merge remote-tracking branch 'scrawl/magic' 2013-11-09 17:00:27 +01:00
Marc Zinnschlag
8be3ffc2a0 Merge remote-tracking branch 'scrawl/magic' 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-11-09 10:54:51 +01:00
scrawl
3ea7d58ca8 Advance skill on successfull spell cast 2013-11-09 10:34:46 +01:00
scrawl
976344f0a3 Handle CastOnce enchantments 2013-11-09 08:07:40 +01:00
scrawl
1051611ffa Added spell failure sound 2013-11-09 07:59:17 +01:00
scrawl
cbe96a2170 Refactor ActiveSpells to track range type. Added basic self range magic. 2013-11-09 07:51:46 +01:00
Marc Zinnschlag
2d4a6c0edf cleaned up ID handling in INFO record (including a ESMTool bug fix) 2013-11-05 12:56:20 +01:00
Alexander "Ace" Olofsson
468e8e3635 Missing iostream include 2013-11-04 10:36:22 +01:00
Marc Zinnschlag
dec1483fa4 Merge branch 'saving' into openmw-27 2013-11-04 08:57:32 +01:00
Lukasz Gromanowski
afce10cf37 Fixes #597: Assertion `dialogue->mId == id' failed in esmstore.cpp 
It seems that assertion was unnecessary, after removing it, dialogs
related to moon-and-star in "Path of the Incarnate" quest were
correctly loaded (dumped DialInfo records were correct).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-11-02 16:39:05 +01:00
gus
d587f3c946 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/docs/vmformat.txt
 2013-10-31 09:51:17 +01:00
gus
d7584f9df7 getLineOfSight, no script instruction yet 2013-10-28 18:01:40 +01:00
Marc Zinnschlag
c995533e07 Merge branch 'dialogue' into saving 
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
 2013-10-21 16:45:43 +02:00
Marc Zinnschlag
19bd0f90b9 Merge remote-tracking branch 'rainChu/torches' 2013-10-16 21:24:45 +02:00
Alex "rainChu" Haddad
65818155d8 Fixed punctuation consistency 2013-10-16 15:14:35 -04:00
Alex "rainChu" Haddad
30ee3c5cf6 Equipped torches and lights run out of fuel 2013-10-15 21:50:14 -04:00
Marc Zinnschlag
708cde2688 Merge remote-tracking branch 'jordan-ayers/topic/COC-Exterior-Cell-Selection' 2013-10-12 23:18:19 +02:00
Jordan Ayers
141382b8c0 COC Command: Exterior cell selection fix. 
Return the northernmost cell of the easternmost matching column for Ext. cells.
 2013-10-12 14:48:37 -05:00
Marc Zinnschlag
608d154ad7 Merge remote-tracking branch 'rainChu/master' 2013-10-12 20:31:33 +02:00
Marc Zinnschlag
87cd5d4267 Merge remote-tracking branch 'potatoesmaster/DisableLevitation' 2013-10-12 13:31:06 +02:00
Emanuel Guevel
4265dddc40 Add MWWorld::isSlowFalling(Ptr) 2013-10-02 23:34:25 +02:00
Emanuel Guevel
496f786c2a Implement Disable/EnableLevitation script functions 
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
 2013-10-02 15:33:20 +02:00
Emanuel Guevel
b8c60dabb3 Reintroduce Acrobatics changes made by Glorf 
Advance Acrobatics skill on jump and on landing,
apply fall damage on landing.
 2013-10-01 23:35:34 +02:00
Alex "rainChu" Haddad
00a776a1a8 Fixed compilation failure on my machine 
Fixed shared records not being populated before the player record is
moved.
 2013-09-30 02:54:20 -04:00
Lukasz Gromanowski
9c2145eda1 Issue #913: Merge --master and --plugin switches 
Merged master/plugin switches into content in openmw
and mwiniimporter.

Extension in content files is now required.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-09-29 09:11:57 +02:00
graffy76
70ac14b8ba Merge branch 'master' into esxSelector 2013-09-21 23:07:53 -05:00
graffy76
cfdc19c427 Renamed esxSelector to contentSelector 
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
 2013-09-21 23:06:29 -05:00
mckibbenta
644f081c60 minor changes 2013-09-15 15:48:32 -04:00
Marc Zinnschlag
bf8a25c2c6 Merge remote-tracking branch 'mckibbenta/tgm' 2013-09-12 19:07:35 +02:00
mckibbenta
89b7d6121d Initial toggleGodMod/tgm instruction. Currently only affects player health. 2013-09-12 08:30:00 -04:00
mckibbenta
85b8af6262 Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm 2013-09-12 08:08:07 -04:00
gus
f9bfbc8764 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat 2013-09-10 16:18:39 +02:00
gus
46a734852b adding script instruction getLOS + some test about AI 2013-09-10 16:16:13 +02:00
scrawl
10c21579bc Item stacking case sensitivity fix 2013-09-07 01:00:38 +02:00
mckibbenta
f65172bdca Merge branch 'master' of https://github.com/zinnschlag/openmw into tgm 2013-08-29 20:26:36 -04:00
mckibbenta
eef9df504a fiddlings 2013-08-29 20:25:36 -04:00
scrawl
c8e31725dc Fix weather sounds persisting on a new game 2013-08-29 15:16:08 +02:00
scrawl
d3d6dfbde8 Refactored loading screen 
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
 2013-08-27 15:48:13 +02:00
Marc Zinnschlag
dcc55b60c3 Merge remote-tracking branch 'kcat/misc-cleanup' 2013-08-26 08:51:19 +02:00
Chris Robinson
f2889e4bb5 Remove unused functions and parameters 2013-08-25 16:08:45 -07:00
Chris Robinson
3843357cd2 Fix actor stepping 2013-08-25 16:08:43 -07:00
scrawl
3f8a69b4ad Don't crash when trying to delete a reference that doesn't exist anymore 2013-08-26 00:14:02 +02:00
mckibbenta
06701467ab Merge branch 'master' into tgm 2013-08-24 21:28:26 -04:00
mckibbenta
8998b90e8b initial do-nothing implementation; registered opcode 2013-08-24 21:19:12 -04:00
Chris Robinson
ca24a809fc Use the position of the actor to determine if they're swimming 2013-08-23 13:44:16 -07:00
Chris Robinson
3fa65f21dd Use a proper cone shape with a contact test to check for melee hits 2013-08-23 12:27:40 -07:00
Chris Robinson
f5d03a16c1 Rename getFacedObject and getFacedHandle for melee hits 2013-08-23 12:27:39 -07:00
Marc Zinnschlag
e03e2f0817 Merge remote-tracking branch 'scrawl/master' 2013-08-21 19:50:08 +02:00
scrawl
758d989a03 If multiple plugins have land data for the same cell, the last plugin should win 2013-08-21 17:26:11 +02:00
Chris Robinson
c855ab65cf Non-colliding objects are considered flying 2013-08-21 07:24:54 -07:00
Chris Robinson
602be9bbe7 Avoid swimming into the air from underwater 2013-08-21 07:24:54 -07:00
Chris Robinson
9f09bb6f6f Use separate inputs for swimming and flying 2013-08-21 07:24:54 -07:00
Chris Robinson
a546ace94d Remove an unused method 2013-08-21 07:24:54 -07:00
Chris Robinson
1a9672e31b Don't update player physics more than 60 times a second 
Bullet and/or our collision handling code doesn't like timesteps much
smaller than that. Ideally we should do physics in 60fps (or even 30fps)
steps and use prediction and interpolation to get more, but that's not
straight forward and needs a fixed timestep loop to lock physics and
logic together.
 2013-08-20 11:31:49 -07:00
Chris Robinson
0e56b2facb Merge remote-tracking branch 'zini/master' into physics 2013-08-20 04:42:28 -07:00
Chris Robinson
d9040df9d6 Increase the max number of physics iterations 
Should help with highly tessellated collision meshes with high
framerates.
 2013-08-20 04:41:52 -07:00
scrawl
fa76d1631b Some terrain fixes 2013-08-20 12:08:46 +02:00
scrawl
0545622f5a Fix werewolf state not getting completely reset when starting a new game 2013-08-20 11:24:19 +02:00
Chris Robinson
a993af53e7 Merge remote-tracking branch 'zini/master' into physics 2013-08-20 02:21:44 -07:00
Chris Robinson
a17997a973 Continually add bits of input velocity to inertia when falling 2013-08-20 02:10:18 -07:00
scrawl
8c8653160d Crash fix, material fix 2013-08-20 09:52:27 +02:00
scrawl
ebf9debb80 Enabled terrain self shadows, implemented getHeightAt, some optimizations 2013-08-19 20:39:37 +02:00
Chris Robinson
d727b15580 Fix tracing down 2013-08-19 20:39:37 +02:00
Chris Robinson
394fc75697 Clean up the trace struct 2013-08-19 20:39:37 +02:00
Chris Robinson
b351109649 Get rid of the old newtrace method 2013-08-19 20:39:37 +02:00
Chris Robinson
14acacf401 Use a better method to do actor physics traces 2013-08-19 20:39:37 +02:00
Chris Robinson
76b812f75f Improve actor movement collision handling 2013-08-19 20:39:37 +02:00
Chris Robinson
584eec3743 Store the object class in the LiveCellRef 2013-08-19 20:39:37 +02:00
scrawl
e27437f8ed New terrain renderer - improvements: 
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
 - Fixes several blending issues and cell border seams
 - Fix map render to use the terrain bounding box instead of an arbitrary height
 - Different LODs are now properly connected instead of using skirts
 - Support self shadowing
 - Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
 - Support a fixed function fallback (though the splatting shader usually performs better)
 - Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
 2013-08-19 20:34:20 +02:00
Chris Robinson
48e594b7c4 Improve stepping down when starting on the ground 2013-08-19 08:09:23 -07:00
Chris Robinson
1aa92067c2 Fix tracing down 2013-08-19 04:56:02 -07:00
Chris Robinson
7770203dff Some physics cleanup 
Gets rid of some unneeded/unused variables, and halves the 'on ground'
offset.
 2013-08-18 08:24:39 -07:00
Chris Robinson
8c3564326e Improve movement inertia 
Handles all 3 axis. Incoming velocity is only added to inertia when
leaving the ground, and does not continually add to it.
 2013-08-18 05:38:50 -07:00
Chris Robinson
9d56e2d86d Apply movement by queueing it to do later 2013-08-17 22:34:38 -07:00
Chris Robinson
96bab88da6 Add physics methods to queue and apply movements 2013-08-17 07:48:45 -07:00
Chris Robinson
0481e64b02 Fix tracing down 2013-08-17 05:09:34 -07:00
Chris Robinson
8bcce0fb55 Clean up the trace struct 2013-08-17 05:09:33 -07:00
Chris Robinson
62c7b3698d Get rid of the old newtrace method 2013-08-17 05:09:33 -07:00
Chris Robinson
65ce3c6ba5 Use a better method to do actor physics traces 2013-08-17 05:09:32 -07:00
Chris Robinson
d82f54c771 Improve actor movement collision handling 2013-08-17 05:09:30 -07:00
Chris Robinson
21121d5ba5 Store the object class in the LiveCellRef 2013-08-16 04:18:48 -07:00
Chris Robinson
08d1d486a4 Merge remote-tracking branch 'zini/master' into ptr-improvements 2013-08-15 17:42:16 -07:00
Marc Zinnschlag
d122699b2f and another fix for the same issue :( 2013-08-15 18:29:09 +02:00
Chris Robinson
58481ec7c3 Merge remote-tracking branch 'zini/master' into ptr-improvements 2013-08-15 07:11:38 -07:00
Marc Zinnschlag
7b4d8afde7 fix to previous commit 2013-08-15 15:53:50 +02:00
Chris Robinson
fdbf09ed40 Merge remote-tracking branch 'zini/master' into ptr-improvements 
Conflicts:
	apps/openmw/mwworld/containerstore.cpp
 2013-08-15 05:56:24 -07:00
Marc Zinnschlag
e94fcce622 accessing references via their ID now also works for references in containers in active cells 2013-08-15 14:45:13 +02:00
Chris Robinson
2853b56ed5 Throw an exception when trying to get an empty Ptr's type 2013-08-15 04:52:01 -07:00
Chris Robinson
0f2b2ff1ce Small header cleanup 2013-08-15 01:21:43 -07:00
Chris Robinson
86f2cd5848 Use dynamic_cast to get the LiveCellRef 2013-08-14 20:26:50 -07:00
Chris Robinson
48c07fbd98 Remove some unnecessary fields from Ptr 2013-08-14 17:05:42 -07:00
Chris Robinson
74f855e948 Move common LiveCellRef fields to the base class 2013-08-14 01:55:51 -07:00
Chris Robinson
11166a1a17 Don't store the type name string in the Ptr 
This should get rid of all heap allocations caused by constructing or copying
Ptr objects.
 2013-08-14 00:45:28 -07:00
Chris Robinson
b6d2888c48 Avoid using boost::any in MWWorld::Ptr 
Reduces dependency on Boost, and should improve performance a bit when
copying or constructing Ptr objects.
 2013-08-14 00:45:27 -07:00
Chris Robinson
2353ac1739 Properly implement SetWerewolfAcrobatics 2013-08-13 04:54:41 -07:00
Chris Robinson
6fd4cdb5fb Play randomized werewolf sounds 2013-08-11 00:53:17 -07:00
Chris Robinson
89c7f5bc70 Handle object activation as a werewolf 2013-08-08 22:34:53 -07:00
Chris Robinson
6110a0ee3b Don't allow resting as a werewolf 2013-08-08 18:30:47 -07:00