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
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
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
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
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
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
mckibbenta
644f081c60
minor changes
2013-09-15 15:48:32 -04:00
mckibbenta
89b7d6121d
Initial toggleGodMod/tgm instruction. Currently only affects player health.
2013-09-12 08:30:00 -04: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
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
Chris Robinson
f2889e4bb5
Remove unused functions and parameters
2013-08-25 16:08:45 -07: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
f5d03a16c1
Rename getFacedObject and getFacedHandle for melee hits
2013-08-23 12:27:39 -07:00
Chris Robinson
c855ab65cf
Non-colliding objects are considered flying
2013-08-21 07:24:54 -07:00
Chris Robinson
0e56b2facb
Merge remote-tracking branch 'zini/master' into physics
2013-08-20 04:42:28 -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
scrawl
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
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
9d56e2d86d
Apply movement by queueing it to do later
2013-08-17 22:34:38 -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
48c07fbd98
Remove some unnecessary fields from Ptr
2013-08-14 17:05:42 -07:00
Chris Robinson
2353ac1739
Properly implement SetWerewolfAcrobatics
2013-08-13 04:54:41 -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
47b8a31317
Fixes suggested by KittyCat
2013-08-07 12:05:53 +02:00
Emanuel Guevel
20d40c4368
Implement MWWorld::World::setWerewolf()
2013-08-06 12:34:35 +02:00
scrawl
fe51a00112
Fix the initial player inventory being added twice when starting a new game
2013-07-31 21:00:58 +02:00
scrawl
7dc30a01cd
Some changes suggested by cppcheck
2013-07-31 18:46:32 +02:00
scrawl
04b90b7d14
Other actors no longer collide with an actor that has collision disabled
2013-07-30 22:00:48 +02:00
Chris Robinson
c94653dc49
Implement the ModRegion script function
2013-07-27 07:10:18 -07:00
