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

1584 commits

Author SHA1 Message Date
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
Chris Robinson
75131e6a48 Rebuild the actor after switching between werewolf forms 2013-08-08 17:16:24 -07:00
Chris Robinson
960ea3d96c Add/remove a WerewolfRobe when werewolf form is toggled 2013-08-08 04:40:31 -07:00
Emanuel Guevel
1cbfcc3910 Fix HUD weapon icon when turning from werewolf to normal 
The werewolf hand icon remained until the inventory menu was opened.
 2013-08-08 10:56:44 +02:00
Chris Robinson
2bac4566c0 Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/statsextensions.cpp
 2013-08-08 00:09:29 -07:00
PLkolek
8f4506f5b6 Implemented drowning. 
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
 2013-08-07 16:46:46 +02:00
Emanuel Guevel
48d2554ac3 Auto-equip when items are added to the inventory 
We limit that to armor pieces and clothing items.
No auto-equiping for the player nor werewolves.
 2013-08-07 15:17:55 +02:00
Emanuel Guevel
47b8a31317 Fixes suggested by KittyCat 2013-08-07 12:05:53 +02:00
Chris Robinson
a9cc3a2844 Ensure a valid CellStore for Ptr::isInCell 2013-08-06 19:49:01 -07:00
Chris Robinson
eab4e09566 Handle the pick/probe in the character controller 2013-08-06 19:48:59 -07:00
Emanuel Guevel
20d40c4368 Implement MWWorld::World::setWerewolf() 2013-08-06 12:34:35 +02:00
Emanuel Guevel
aa563e947e Implement MWWorld::InventoryStore::unequipAll() 2013-08-06 12:34:35 +02:00
Marc Zinnschlag
41b2fa985b silenced some warnings 2013-08-03 15:26:53 +02:00
Marc Zinnschlag
9123afa863 Merge remote-tracking branch 'gus/MeleeCombat2' 2013-08-03 15:23:36 +02:00
gus
a23e7fac93 clean up 2013-08-03 13:58:16 +02:00
gus
c8bb32c40d small maths correction 2013-08-03 12:29:18 +02:00
gus
a25ee360dc use angles and GMST. not sure this work as it should 2013-08-03 12:16:51 +02:00
gus
830762722d first attempt: hit detection with a sphere (not finished) 2013-08-03 11:26:36 +02:00
Emanuel Guevel
a9483dbdf1 Show sneak indicator when sneaking 
Temporary solution, as the indicator should be shown only when the
player is not detected by any other actor.
 2013-08-03 03:03:29 +02:00
Chris Robinson
b70975a74d Move getEvasion to CreatureStats 2013-08-02 00:21:01 -07:00
Chris Robinson
9e7d670745 Inline Class::get(const Ptr& ptr) 2013-08-02 00:20:59 -07:00
scrawl
fe51a00112 Fix the initial player inventory being added twice when starting a new game 2013-07-31 21:00:58 +02:00
Marc Zinnschlag
5cafe65cd7 Merge remote-tracking branch 'scrawl/cppcheck' 2013-07-31 20:00:35 +02:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
PLkolek
f297c21e4d Old door sound fades out on door open/close. Door sound is synchronised to angle on action. 2013-07-31 15:46:23 +02:00
scrawl
45006ea193 Fix inventory/container content loading so that it's done for dynamically spawned objects as well 2013-07-31 00:02:24 +02:00
scrawl
04b90b7d14 Other actors no longer collide with an actor that has collision disabled 2013-07-30 22:00:48 +02:00
Marc Zinnschlag
3fa4a194a7 Merge remote-tracking branch 'scrawl/master' 2013-07-29 09:59:23 +02:00
scrawl
6164e5bae6 Restored window resizing 2013-07-29 02:32:08 +02:00
Chris Robinson
54f91d4b3a Implement hand-to-hand attacks 2013-07-28 06:48:25 -07:00
Chris Robinson
c94653dc49 Implement the ModRegion script function 2013-07-27 07:10:18 -07:00
Chris Robinson
1174b85ac8 Implement Disable/EnableTeleporting script functions 2013-07-27 00:14:55 -07:00
Chris Robinson
dd6edd21f8 Add a separate on-hit method to handle objects being hit 2013-07-26 10:50:23 -07:00
Chris Robinson
6195062d72 Try to figure out what gets hit 
This isn't the greatest. The distance multiplier is a guess, and a sphere cast
may be better.
 2013-07-25 12:58:43 -07:00
Chris Robinson
b3a057d679 Handle hit chance and damage calculation 
Math is based on what the UESP describes, with some tweaks (using
fatigue term, and the fCombatCriticalStrikeMult GMST):
http://www.uesp.net/wiki/Morrowind:Combat
 2013-07-25 08:15:42 -07:00
Chris Robinson
92cc566fdc Rename the Class::attack method to Class::hit 2013-07-25 00:30:01 -07:00
Chris Robinson
0c8d4d9be2 Add beginnings of melee hits 2013-07-24 02:51:42 -07:00
Marc Zinnschlag
a8168c58c2 Merge remote-tracking branch 'kolek/thirdpersonzoom' 2013-07-20 18:29:59 +02:00
Kolzi
1b7966ca27 Can zoom in and out in third person view. 2013-07-19 16:12:01 +02:00
Chris Robinson
14e0c182f3 Allow specifying the sound type to playSound and playSound3D 2013-07-18 21:50:11 -07:00
Chris Robinson
9ea6b22a83 Handle soundgen animation keys 2013-07-17 23:58:21 -07:00
Chris Robinson
c7692acb79 Update the player's Ptr in mwrender when changing cells 2013-07-17 19:11:03 -07:00
Chris Robinson
f296d13c20 Add a speed multiplier to the animation state 2013-07-16 00:43:31 -07:00
scrawl
c81b852071 Fixes inaccurate ray casts; rely on getCameraToViewportRay 2013-07-15 00:39:37 +02:00
Marc Zinnschlag
602e40e19d Merge remote-tracking branch 'greye/coc' 2013-07-07 13:34:28 +02:00
greye
f3d54a7ba4 move finding default cell positions to World 2013-07-07 15:03:06 +04:00
greye
0c303aa285 fix fading on cell transition when cell is loaded 2013-07-07 14:30:11 +04:00
scrawl
744c5804ed Simplified doors, now they will stop after hitting an obstacle instead of trying to back off. 2013-07-07 03:52:17 +02:00
greye
76d95dffb6 special case for loading StartScript records 2013-07-05 23:52:46 +04:00
Marc Zinnschlag
56637a39a3 Merge remote-tracking branch 'vheuken/master' 2013-06-29 12:27:01 +02:00
Marc Zinnschlag
cd538538b5 fixed weather code 2013-06-28 09:00:21 +02:00
Vincent Heuken
f43b48015e remove actor's collisionbox on death 2013-06-27 19:42:27 -07:00
Vincent Heuken
b095c24854 resize actor collision boxes on death 2013-06-27 14:11:20 -07:00
Marc Zinnschlag
f5ba2b37e7 Merge remote-tracking branch 'vorenon/fixes' 2013-06-21 20:28:45 +02:00
vorenon
efdcd9649c Fading for Exterior->Interior cell transitions 2013-06-21 20:19:35 +02:00
Marc Zinnschlag
8b909ff838 killed a stray srand 2013-06-21 08:58:52 +02:00
Miroslav Puda
8da3494d74 Revert "Type of weather changed from string to enum." 
This reverts commit 04d90b4c47.

Conflicts:
	apps/openmw/mwworld/weather.cpp
	apps/openmw/mwworld/weather.hpp
 2013-06-20 21:51:07 +02:00
Miroslav Puda
26a6bdb27d Correction of sigsegv. 2013-06-19 20:06:02 +02:00
Miroslav Puda
f9940413fd Static for nextWeather() 2013-06-19 16:49:43 +02:00
Miroslav Puda
bf31e5385c Removal of duplicit exterior checking and unneded string copiing. 2013-06-19 16:18:43 +02:00
Miroslav Puda
8a45686e0a WeatherResult added as member variable. 2013-06-19 06:50:36 +02:00
Miroslav Puda
f01aa8f55e Simpler statistical calculation of next weather; minus before parens. 2013-06-19 04:57:36 +02:00
Miroslav Puda
04d90b4c47 Type of weather changed from string to enum. 2013-06-19 03:24:30 +02:00
scrawl
705488ddfb Fix mouse movement events being discarded when there's more than one event in a frame 2013-06-12 16:07:46 +02:00
scrawl
3a6e54c4f5 Sell owned items in the cell 2013-05-27 02:18:36 +02:00
scrawl
d9dd02c610 Security fixes 2013-05-20 12:42:11 +02:00
scrawl
2715520d6f Cleanup Security class 2013-05-19 23:19:48 +02:00
scrawl
5173779f4b Add sounds for security skill 2013-05-19 19:48:51 +02:00
scrawl
7a2d1cd8ce Security skill 2013-05-19 18:40:37 +02:00
scrawl
60563afc10 Fix a new game crash, reset camera 2013-05-17 22:53:43 +02:00
Marc Zinnschlag
2c8a511179 Merge remote-tracking branch 'scrawl/persistence' 2013-05-16 19:37:41 +02:00
scrawl
8a3d3f954b NPC/creature persistence flag 2013-05-16 18:50:26 +02:00
Glorf
af28be915f Use fallback video name 2013-05-16 13:47:27 +02:00
Marc Zinnschlag
9fee99d56c Merge remote-tracking branch 'scrawl/master' 2013-05-15 22:43:00 +02:00
scrawl
aaa9aba999 Some fixes 2013-05-15 22:38:53 +02:00
scrawl
c41f119ba6 Added new game button 2013-05-15 17:54:18 +02:00
Glorf
9fa2dd5277 Playing with moons part 2 2013-05-14 19:58:08 +02:00
Marc Zinnschlag
e14cb6853f Merge remote-tracking branch 'scrawl/containerui' 2013-05-11 19:23:02 +02:00
scrawl
0c4a963132 Container UI rewrite 2013-05-11 18:38:27 +02:00
Glorf
6aaa8d6dc0 Fixed fading problem 2013-05-10 19:33:43 +02:00
Glorf
9cc85cbe81 Playing with moons part 1 2013-05-10 18:55:56 +02:00
Glorf
6417fa504e Fixed constness 2013-05-09 13:56:13 +02:00
Glorf
c605f15a15 Another weather cleanup 2013-05-09 00:36:58 +02:00
Marc Zinnschlag
c80ffa0a16 Merge remote-tracking branch 'gus/AIFix' 2013-05-08 20:31:57 +02:00
gus
603af21715 little interface improvement 2013-05-07 19:42:21 +01:00
gus
a328a03bd3 more fix. Fargoth quest almost work as in vanilla now. 2013-05-07 19:35:10 +01:00
Glorf
68f249e8f4 Small weather cleanup 2013-05-07 10:27:37 +02:00
gus
006f25d1c0 First try to improve AI. Does not work yet due to strange bug in physicsystem 2013-05-06 00:46:50 +01:00
Marc Zinnschlag
d5741c7141 Merge remote-tracking branch 'scrawl/master' 2013-05-01 16:58:43 +02:00
Marc Zinnschlag
95eeea2a27 Revert "Merge remote-tracking branch 'glorf/acrobatics'" 
This reverts commit 089ef7a2a0, reversing
changes made to 67422c397c.
 2013-05-01 16:56:16 +02:00
scrawl
1acfd849a2 Fix a case folding bug 2013-05-01 16:38:16 +02:00
Marc Zinnschlag
6f0ccb6e38 Merge remote-tracking branch 'scrawl/insertrecords' 2013-05-01 13:55:26 +02:00
Marc Zinnschlag
089ef7a2a0 Merge remote-tracking branch 'glorf/acrobatics' 2013-05-01 13:44:23 +02:00
scrawl
40a0969055 Insert records that may not exist in vanilla MW 2013-05-01 12:47:50 +02:00
Glorf
236ec3409f Finished acrobatics 2013-05-01 12:21:59 +02:00
scrawl
67422c397c GetWindSpeed 2013-05-01 11:42:24 +02:00
scrawl
627c3fdb6b Added GetStandingPC, GetStandingActor; Fixed GetStartingPos 2013-05-01 11:15:43 +02:00
Glorf
5a8c1661be Jump acrobatics working, started falling acrobatics implementation 2013-04-30 20:44:17 +02:00
scrawl
1420a2cb33 Tweaked adjustPosition. Now uses a very thin box for tracing the feet only. 2013-04-30 20:43:38 +02:00
scrawl
91c89e5db4 Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace 2013-04-30 20:26:59 +02:00
Marc Zinnschlag
61e476118d Merge remote-tracking branch 'kcat/animations' 2013-04-30 10:25:26 +02:00
scrawl
c0dd383cd0 Fix door collision to work with all possible movement directions 2013-04-30 09:43:32 +02:00
Chris Robinson
15a2eeebb8 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-04-29 10:16:29 -07:00
Marc Zinnschlag
93868c8bca Merge remote-tracking branch 'scrawl/master' 2013-04-29 18:08:25 +02:00
Marc Zinnschlag
bab899513a Merge remote-tracking branch 'glorf/bugfix-4' 2013-04-29 18:04:22 +02:00
Glorf
74de8b83b6 Enabled collision when new game 2013-04-29 17:56:16 +02:00
Chris Robinson
d17e1e83d5 Rename MWRender's Player to Camera 2013-04-29 05:50:40 -07:00
scrawl
867c7db014 Fix wrong door sounds 2013-04-29 11:00:15 +02:00
scrawl
78596cad83 Fix enchantment points value 2013-04-29 10:19:09 +02:00
Chris Robinson
ba3a67f84b Don't store the player base node in MWRender::Player 2013-04-28 23:44:44 -07:00
Chris Robinson
24e503330b Merge remote-tracking branch 'zini/master' into animations 2013-04-28 09:41:31 -07:00
Marc Zinnschlag
11a45b3034 Merge remote-tracking branch 'scrawl/doors' 2013-04-28 18:22:09 +02:00
scrawl
67e5e939a1 Fix some doors 2013-04-28 17:57:36 +02:00
Marc Zinnschlag
f2a5377b2b Merge remote-tracking branch 'glorf/bugfix-4' 2013-04-28 16:52:48 +02:00
Glorf
98baf9fac1 Bugfix #718 2013-04-28 16:36:12 +02:00
scrawl
6ecd88af14 More fixes 2013-04-28 15:59:59 +02:00
scrawl
4ee1a6ee02 Put door physics in a separate method, some fixes 2013-04-28 15:36:37 +02:00
scrawl
9343b4459e Opening doors 2013-04-28 14:59:15 +02:00
Marc Zinnschlag
738a54337d removed redundant case smashing 2013-04-28 14:07:53 +02:00
scrawl
fdf80c1c4f Fix unused variable 2013-04-28 11:05:01 +02:00
scrawl
db78d15fc4 Fix changeWeather 2013-04-28 11:02:30 +02:00
Chris Robinson
ce7bc20fa1 Avoid special-casing player rotation 2013-04-28 01:14:58 -07:00
Glorf
3669d0a998 Bugfix #742 2013-04-27 20:57:44 +02:00
Chris Robinson
137017b325 Don't allow forcing vanity mode 2013-04-27 01:24:36 -07:00
Marc Zinnschlag
4e45222a63 Merge remote-tracking branch 'glorf/rotate-update1' 2013-04-25 20:57:24 +02:00
Glorf
240217ae42 Fixed rotations more than 360 degrees 2013-04-25 20:52:38 +02:00
Marc Zinnschlag
1e9656ee9c Merge remote-tracking branch 'glorf/rotate-update1' 2013-04-25 20:22:40 +02:00
Glorf
7cd4dd0c91 Improved local rotations 2013-04-25 19:14:10 +02:00
Marc Zinnschlag
71fc8f5830 Merge remote-tracking branch 'scrawl/item' into next 2013-04-25 10:21:14 +02:00
scrawl
9e3917881d Don't fail on nonexistent items in a levelled list 2013-04-25 04:44:30 +02:00
Nathan Jeffords
2dc01fe56b fixed the type of iterator uses in MWWorld::Store 
The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.
 2013-04-25 02:31:39 +02:00
Glorf
53fb17da10 Rotation system fixes 2013-04-24 21:42:04 +02:00
greye
cfccf0981d update IndexedStore::setUp() for multiple datafile support 2013-04-23 14:36:38 +04:00
scrawl
3c5e4ceefd Workaround for ambiguous "Chargen_plank" ID in chargen script (one at -22,16 and one at -2,-9) 2013-04-18 16:46:32 +02:00
scrawl
547f77031d Fix crash when disabling objects in a previously loaded cell, then coming back to that cell and leaving again 2013-04-17 17:06:30 +02:00
Glorf
1fd59d0ce0 Removed useless include 2013-04-16 21:21:54 +02:00
Glorf
1e92ffc314 Added rotation layer 2013-04-16 21:17:19 +02:00
Glorf
e0357c7b7c Merge rotate 2013-04-15 20:29:38 +02:00
Glorf
972481f63f Working rotate, rotateworld 2013-04-15 16:45:53 +02:00
scrawl
2693b78536 Add initial player inventory when new game is started 2013-04-15 02:56:23 +02:00
scrawl
48f46e505c Look in exterior cells first (chargen_crate_01_empty is in the prison ship but also outside of it, the one outside needs to be disabled) 2013-04-14 17:37:39 +02:00
scrawl
d50150ad71 Scale adjustment factor should not be written back to cellref scale 2013-04-13 00:13:56 +02:00
Marc Zinnschlag
beb1858a57 Merge remote-tracking branch 'glorf/bugfix' 2013-04-10 17:39:19 +02:00
Glorf
ad49d1ecab Sixth minor fix 2013-04-10 15:24:20 +02:00
Tom Mason
6ca2b1af74 fix for turning animations playing when in vanity mode 2013-04-09 19:24:41 +01:00
Glorf
bd93e63150 Fifth minor fix 2013-04-09 19:46:27 +02:00
Glorf
248fff6eb7 Fourth minor fix 2013-04-09 19:41:03 +02:00
Glorf
44ef02eb99 Third minor fix 2013-04-09 19:04:59 +02:00
Glorf
46925e93a6 Second minor fix 2013-04-09 16:14:08 +02:00
Glorf
623c2c8201 Minor fix 2013-04-09 07:45:07 +02:00
scrawl
01ae91f640 Fix several NPCs spawning in the ground 2013-04-09 01:24:17 +02:00
Glorf
7c22e123f4 Bugfix #691 changes 2013-04-08 22:10:55 +02:00
scrawl
9e08497f02 Initial container content should inherit the owner of its container 2013-04-07 22:07:04 +02:00
scrawl
f3c8cd2065 Don't buy/sell keys which are set to open a lock 2013-04-07 21:38:53 +02:00
scrawl
2d2196b0d6 Implemented levelled items 2013-04-07 21:01:02 +02:00
Glorf
48d9885554 Started bugfix #691 2013-04-05 15:42:05 +02:00
Marc Zinnschlag
034ebf8ffd Merge remote-tracking branch 'scrawl/master' 2013-04-04 19:57:55 +02:00
scrawl
2e7d5377f4 Fix crash when moving npcs to an inactive cell 2013-04-04 16:51:22 +02:00
Marc Zinnschlag
62d70f17c8 removed another redundant include 2013-04-04 12:42:38 +02:00
Marc Zinnschlag
5244362fba some cleanup 2013-04-04 12:23:06 +02:00
Marc Zinnschlag
8c7d578ddc moved the CellRef struct to its own header 2013-04-04 12:13:15 +02:00
Marc Zinnschlag
e8c32d0c3d MWWorld::Player cleanup 2013-04-04 12:05:03 +02:00
scrawl
ebaf80d539 Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change. 2013-04-03 23:55:57 +02:00
Glorf
900c2cfa81 Minor bugfix #646 change 2013-04-02 14:08:59 +02:00
Glorf
d25c838e1d Bugfix #646 2013-04-02 11:42:29 +02:00
Marc Zinnschlag
751c679255 Merge remote-tracking branch 'glorf/enchanting' 2013-04-01 17:35:04 +02:00
Glorf
d29a42dcbe Fixed enchanting mechanics 2013-03-31 23:18:23 +02:00
scrawl
1a2daa3bc1 Merge branch 'master' of git://github.com/zinnschlag/openmw into companion 2013-03-31 14:50:03 +02:00
Chris Robinson
13c098266c Pass player rotation through the movement settings 2013-03-31 02:57:22 -07:00
scrawl
69099c11a2 Merge branch 'enchanting' into companion 2013-03-31 11:52:55 +02:00
Chris Robinson
18e8ff7198 Actually rotate the object when updating physics 2013-03-31 02:24:44 -07:00
Chris Robinson
7b02ec411b Apply the rotation when updating the character controller 2013-03-31 01:29:24 -07:00
scrawl
13be61812a Made the "Unknown class key" exception slightly more helpful 2013-03-31 10:16:02 +02:00
Chris Robinson
466c0086b8 Use a full Movement to hand off to the world physics update 2013-03-31 00:13:56 -07:00
Chris Robinson
0ce188b7cc Store the position and rotation in MWMechanics::Movement 2013-03-30 19:00:46 -07:00
Chris Robinson
63af72c315 Avoid converting to and from quaternions 2013-03-30 17:31:16 -07:00
scrawl
0079f62180 Gold condition now always checks RefID instead of the name. This is necessary because in the french MW version, the sGold GMST is different from the name of the gold references. 2013-03-30 16:27:06 +01:00
scrawl
51204f098e Added soulgem dialog; made interactive message boxes not close the previous UI 2013-03-30 15:51:07 +01:00
scrawl
e7af718b55 Remove unnecessary WindowManager::messageBox arguments 2013-03-30 12:56:37 +01:00
Marc Zinnschlag
573368849b Merge remote-tracking branch 'glorf/enchanting' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2013-03-29 16:48:21 +01:00
Glorf
86275e5bd4 Some enchanting fixes 2013-03-29 12:00:09 +01:00
Glorf
eb88463b94 Some enchanting fixes 2013-03-28 23:39:20 +01:00
Glorf
6643fe789c Enchanting system 2013-03-28 17:41:00 +01:00
scrawl
6f1575d42a CELL record corrections 2013-03-27 17:27:43 +01:00
Marc Zinnschlag
6c76e97bbc fixed day count in rest dialogue 2013-03-25 11:53:02 +01:00
scrawl
a2ca679beb Added PC repair feature 2013-03-23 08:16:46 +01:00
scrawl
20774f8f81 Added merchant repair feature 2013-03-22 14:13:10 +01:00
scrawl
8e2f9f5186 Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips 2013-03-22 12:24:09 +01:00