scrawl
|
a07eaa0c0d
|
Feature #50: Allow body pitch in third person for ranged weapon aiming
|
2014-02-05 05:18:10 +01:00 |
|
scrawl
|
7cf22391a5
|
Feature #50: Handle weapon controllers (i.e. bowstring animations, etc)
|
2014-02-05 05:18:10 +01:00 |
|
scrawl
|
8aed4fcfa4
|
Correction for marksman weapon inventory preview
|
2014-02-05 05:18:10 +01:00 |
|
scrawl
|
5b076aa570
|
Revert "Bug #1074: Inventory paperdoll obscures armour rating"
This reverts commit b017a3be3e.
|
2014-02-05 05:18:10 +01:00 |
|
mrcheko
|
761f13d3ce
|
activate whole-body attack animations
|
2014-02-02 16:29:51 +02:00 |
|
scrawl
|
dea9d21db6
|
Some additional safety checks for global map loading
|
2014-02-01 18:42:01 +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 |
|
scrawl
|
4ec86d1c68
|
Bug #1147: Fix the inventory preview pose used for ranged weapons
|
2014-01-31 05:06:35 +01:00 |
|
scrawl
|
60bbab52fe
|
Support keyframe controllers for bones that aren't in the skeleton base
|
2014-01-31 05:06:34 +01:00 |
|
mrcheko
|
e50e94af0b
|
remove CreatureStats::mAttackType, set/getAttackType()
|
2014-01-27 23:05:17 +02:00 |
|
scrawl
|
eba6c9a8fd
|
Fix massive console spam regarding the scrib's idle3 animation
|
2014-01-26 02:49:32 +01:00 |
|
scrawl
|
e0de76a6f7
|
Save/load global map
|
2014-01-25 19:06:14 +01:00 |
|
scrawl
|
f09328ca84
|
Clear global map overlay when starting/loading a game
|
2014-01-25 13:34:56 +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
|
786ed6ca5b
|
Include some required Ogre headers explicitely
|
2014-01-24 15:02:34 +01:00 |
|
scrawl
|
cf378ec31e
|
Support optional volume and pitch arguments for soundgen events (e.g. moan 0.5 1.0) as required for some actors
|
2014-01-22 15:25:03 +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
|
205e8aa4e9
|
Feature #957: Implement area magic
|
2014-01-20 13:11:29 +01:00 |
|
scrawl
|
13646a651b
|
Issue #777: Handle creatures with weapons in CharacterController. Move attack strength to CreatureStats.
|
2014-01-19 13:32:58 +01:00 |
|
scrawl
|
198bb0de60
|
Issue #777: Add CreatureAnimation variant for creatures with weapons/shields
|
2014-01-19 13:05:26 +01:00 |
|
scrawl
|
589fbbd871
|
Issue #777: Create InventoryStore for creatures with weapons/shields
|
2014-01-19 11:43:23 +01:00 |
|
scrawl
|
9b32b1403b
|
Feature #960: Implement Creature::hit
|
2014-01-17 17:19:08 +01:00 |
|
scrawl
|
805843d7ff
|
Closes #1086: Implement blood effects
|
2014-01-17 11:27:13 +01:00 |
|
scrawl
|
240d96a0f1
|
Renamed AnimationValue to AnimationTime
|
2014-01-17 10:55:46 +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 |
|
Marc Zinnschlag
|
1b03eec63e
|
Merge remote-tracking branch 'scrawl/master'
|
2014-01-11 11:43:12 +01:00 |
|
scrawl
|
15e48107f7
|
Use i1stPersonSneakDelta + some cleanup
|
2014-01-10 22:39:01 +01:00 |
|
Marc Zinnschlag
|
f62497dfdc
|
Merge remote-tracking branch 'mrcheko/master'
|
2014-01-10 19:08:35 +01:00 |
|
mrcheko
|
ffcb7fb280
|
fix for bug scrawl mentioned
|
2014-01-10 19:04:07 +02:00 |
|
mrcheko
|
d41f27451b
|
appropriate camera vanity<>preview mode switch + hit recoils fix
|
2014-01-09 23:36:40 +02:00 |
|
scrawl
|
aa855e9524
|
Include some required Ogre headers explicitely
|
2014-01-09 20:56:24 +01:00 |
|
Marc Zinnschlag
|
85707b5e3e
|
Merge remote-tracking branch 'scrawl/master'
|
2014-01-09 09:35:54 +01:00 |
|
scrawl
|
6f9113fe88
|
Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions
|
2014-01-09 01:49:58 +01:00 |
|
Marc Zinnschlag
|
a7be755db0
|
Merge remote-tracking branch 'mrcheko/master'
|
2014-01-08 20:13:31 +01:00 |
|
scrawl
|
098f9712f1
|
Add getPlayerPtr() utility method. Reduces dependencies a lot.
|
2014-01-08 18:39:44 +01:00 |
|
mrcheko
|
46519062d3
|
hit recoils/knockdowns feature
|
2014-01-08 16:05:14 +02: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 |
|
mrcheko
|
2591ff2d5a
|
bug repairing
|
2014-01-06 22:00:01 +02: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
|
c004fb778f
|
Get rid of underscore defines. They are reserved by the standard.
|
2014-01-05 18:22:29 +01:00 |
|
scrawl
|
634a53211c
|
Make sure materials are built before trying to determine their transparency
|
2014-01-04 22:56:06 +01:00 |
|
scrawl
|
c4e4a8fb57
|
Closes #1083: Fix werewolf change handling
|
2014-01-04 20:50:18 +01:00 |
|
mrcheko
|
7002412760
|
resolve conflict in character.cpp
|
2014-01-04 17:55:09 +02:00 |
|
Marc Zinnschlag
|
ee621245bb
|
Merge remote-tracking branch 'scrawl/master'
|
2014-01-03 15:59:06 +01:00 |
|
scrawl
|
623cdef69f
|
Code cleanup
|
2014-01-02 21:49:12 +01:00 |
|
Lukasz Gromanowski
|
b017a3be3e
|
Bug #1074: Inventory paperdoll obscures armour rating
Changed size of inventory paperdoll.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2014-01-02 20:20:57 +01:00 |
|
scrawl
|
0990ca4b75
|
Closes #1072: Fix extra light being added multiple times when showCarriedLeft(true) is called repeatedly
|
2014-01-02 15:58:00 +01:00 |
|
Marc Zinnschlag
|
a6e6411686
|
Merge remote-tracking branch 'scrawl/master'
|
2014-01-02 12:12:52 +01:00 |
|
scrawl
|
c6421276bd
|
Closes #841: Correct activation distance in third person mode
|
2014-01-01 23:59:17 +01:00 |
|
scrawl
|
5729672262
|
Show marked position on map. Implement Detect X magic effects.
|
2014-01-01 22:37:52 +01:00 |
|
mrcheko
|
09a0a69b04
|
more improvements
|
2014-01-01 21:40:31 +02:00 |
|
Marc Zinnschlag
|
e1355be47c
|
Merge remote-tracking branch 'lgro/valgrind_warnings'
|
2014-01-01 19:41:52 +01:00 |
|
Lukasz Gromanowski
|
2d4e06cd50
|
Updated comments about freeing format_ctx->pb->buffer.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2014-01-01 17:05:49 +01:00 |
|
scrawl
|
be1938ee90
|
Closes #805: Don't add entities that are supposed to be invisible to static geometry
|
2013-12-31 18:32:46 +01:00 |
|
scrawl
|
94cdc1efd2
|
Enable mipmap generator for 1.9+
|
2013-12-31 00:54:40 +01:00 |
|
Lukasz Gromanowski
|
cb04f43384
|
Fixes for "Conditional jump or move depends on uninitialised value(s)"
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2013-12-30 23:08:53 +01:00 |
|
Lukasz Gromanowski
|
5c5f87445b
|
Fixes for "Conditional jump or move depends on uninitialised value(s)"
and memleaks reported by valgrind.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2013-12-30 21:47:06 +01:00 |
|
scrawl
|
596c9b80a9
|
Check if threads are joinable before joining (issue with boost 1.52)
|
2013-12-27 22:38:30 +01:00 |
|
scrawl
|
85ec80100c
|
Bug #1005: Hide torches/shields during spellcasting and hand-to-hand combat
|
2013-12-27 22:00:16 +01:00 |
|
scrawl
|
6400f23ab0
|
Use the material controller manager for effects with overridden texture
|
2013-12-27 14:54:36 +01:00 |
|
scrawl
|
d262d9e6b0
|
Bug #1054: Set render queue group for effects
|
2013-12-27 14:51:59 +01:00 |
|
scrawl
|
d09a86e208
|
Issue #1018: Don't allow view mode switching while performing an action
|
2013-12-27 00:36:06 +01:00 |
|
scrawl
|
5931fdcbde
|
Implement NiBillboardNode. Flags not handled yet.
|
2013-12-26 20:53:52 +01:00 |
|
scrawl
|
6d27ebabb6
|
Integrate AddGlow with material controllers
|
2013-12-26 20:53:45 +01:00 |
|
scrawl
|
eb5e4ecec2
|
Remove more unused code
|
2013-12-16 15:35:38 +01:00 |
|
mrcheko
|
fd9f8c34f6
|
bug fix http://bugs.openmw.org/issues/428
|
2013-12-15 18:50:25 +02:00 |
|
scrawl
|
37a7ee8fcd
|
Set alpha value of character animations according to Invisibility / Chameleon effects.
|
2013-12-08 23:05:21 +01:00 |
|
scrawl
|
1624e0fd8a
|
Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.
|
2013-12-07 20:15:39 +01:00 |
|
scrawl
|
bb70deabb1
|
Add an incomplete implementation of SayAnimationValue (lip animation)
|
2013-12-07 14:15:45 +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
|
e818d43bc3
|
removed an outdated typedef and some dead code
|
2013-12-05 13:21:26 +01:00 |
|
scrawl
|
8f4ffe4ddc
|
Fix new window size not being written to settings when manually resizing window
|
2013-12-03 15:55:31 +01:00 |
|
scrawl
|
ffc885853a
|
Fix bolt for magic effects that don't have one specified
|
2013-11-29 10:39:37 +01:00 |
|
scrawl
|
97fadb24ca
|
Update the Ptr in mObjects in Objects::updateObjectCell
|
2013-11-27 18:49:04 +01:00 |
|
scrawl
|
d2ed77f3f2
|
Fix shields being visible during spellcasting
|
2013-11-23 20:24:52 +01:00 |
|
Marc Zinnschlag
|
d8c40562ae
|
Merge remote-tracking branch 'scrawl/light'
|
2013-11-23 12:44:42 +01:00 |
|
scrawl
|
a1fe07181c
|
Fix rotation offset of some lights (bug 955)
|
2013-11-23 05:55:03 +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
|
4ed4c1e319
|
Add Vampirism and Sun Damage effects. Some fixes.
|
2013-11-21 00:41:31 +01:00 |
|
scrawl
|
3452bd2e0b
|
Add glow effect for enchanted items
|
2013-11-20 00:13:12 +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
|
e7993ced69
|
Fix invalid casts
|
2013-11-17 04:33:04 +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
|
4083c55848
|
Make sure NpcAnimation base exists before runAnimation. Not sure yet why this is needed.
|
2013-11-14 19:18:27 +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
|
0b5f5351b5
|
Fix continuous FX getting removed instantly
|
2013-11-14 13:30:48 +01:00 |
|
scrawl
|
da5c59c8af
|
addEffect should check effectId, not model.
|
2013-11-13 19:07:44 +01:00 |
|
scrawl
|
a6e2f43b75
|
Stop continuous VFX when the effect is no longer active.
|
2013-11-13 15:44:43 +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 |
|
scrawl
|
0dab7031c0
|
Make sure effects are destroyed with the animation
|
2013-11-12 02:22:44 +01:00 |
|
scrawl
|
ffdb91bb21
|
Add particles for Cast + Hit. Not looking quite right yet.
|
2013-11-11 23:43:28 +01:00 |
|
Emanuel Guevel
|
467bd91651
|
Update actor model on inventory change
|
2013-11-10 02:45: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
|
ce8694c84e
|
Merge remote-tracking branch 'scrawl/master'
|
2013-10-13 18:55:49 +02:00 |
|
scrawl
|
fa264935ff
|
We can apply vsync at runtime now that the Ogre bug is fixed.
|
2013-10-13 17:56:26 +02:00 |
|