1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 13:19:54 +00:00
Commit graph

1578 commits

Author SHA1 Message Date
scrawl
14a9f0ebf8 Handle Quadratic and Linear attenuation independently (Fixes #1456) 2014-06-11 02:24:17 +02:00
mrcheko
d6d9df6cec split getStartTime 2014-06-11 00:20:46 +04:00
mrcheko
08e8dab067 merge openmw master 2014-06-09 22:37:49 +04:00
mrcheko
67abc60264 aiming to moving target in ranged combat ai
1) Taking into account target move vector and speed. However aiming is not
ideal, since attack strength can't be controlled directly. I did achieve
almost 100% accuracy updating it everyframe but then thought it would be
unfair, cause AI should mimic human targetting.
2) Also added in this commit func to measure real attack durations for
weapon.
2014-06-08 20:59:26 +04:00
scrawl
823ccb1b3d Don't batch statics that have "references persist" set (temporary fix for Arkngthand door - Fixes #1386) 2014-06-08 11:22:37 +02:00
Marc Zinnschlag
0668019c86 Merge remote-tracking branch 'scrawl/master' 2014-06-06 19:09:24 +02:00
scrawl
b68a8e38cd Remove unused map 2014-06-06 15:24:06 +02:00
scrawl
54a5dba3f5 Don't reserve Pauldron parts for robes (Fixes #1396) 2014-06-06 15:20:56 +02:00
scrawl
d442853b3e Allow opposite gender's parts as fallback (Fixes #1404) 2014-06-06 01:30:23 +02:00
scrawl
d2e98c4de1 Fix forced switch to third person on death not always working
For instance, when dying from fall damage
2014-06-05 17:21:02 +02:00
Rohit Nirmal
4f4a37896e Check if player's CellStore is non-NULL before configuring fog.
This prevents an assertion fail in getCell() when changing the
view distance while in the main menu.
2014-05-30 22:37:13 -05:00
scrawl
a6788cfb0e Support lights that do not have a model (Fixes #1361) 2014-05-29 16:44:50 +02:00
scrawl
4caa8c5cca Fix offset to accumulation root not being cleared when adding an animation state with startpoint=1.f (observed with death animations) 2014-05-26 20:52:38 +02:00
scrawl
5660f283dd Fix actor models incorrectly being rotated on X/Y axes 2014-05-26 20:52:38 +02:00
scrawl
f3ba31de2d Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwscript/cellextensions.cpp
2014-05-25 14:58:47 +02:00
scrawl
039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
2014-05-25 14:30:07 +02:00
Marc Zinnschlag
130af28fa5 Merge remote-tracking branch 'cc9cii/master'
Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
2014-05-25 12:07:09 +02:00
Marc Zinnschlag
ff15601a4c Merge branch 'openmw-30' 2014-05-25 11:55:25 +02:00
cc9cii
d2794165ba Disable binkaudio sound for FFmpeg libavocdec versions below 54.55.xxx (Windows x64) and 54.10.xxx (Windows 32bit). Later versions are all allowed, but due to sample formats there will be no sound and this message will be shown on the console "Sound Error: Unsupported sample format: fltp" 2014-05-25 18:56:50 +10:00
scrawl
1d8da95756 Warning fix 2014-05-24 14:47:51 +02:00
cc9cii
367acd9676 Enable video but without sound. 2014-05-23 21:55:47 +10:00
cc9cii
3718847ffc Disable video for Windows until the crash issues are fixed. 2014-05-23 21:07:01 +10:00
Emanuel Guevel
1e4a854433 Remove static method MWWorld::Class::get(&Ptr)
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
2014-05-22 20:50:00 +02:00
Marc Zinnschlag
f7c89015f9 Merge remote-tracking branch 'scrawl/master' 2014-05-17 11:50:31 +02:00
scrawl
e266aff561 Savegame: store projectiles 2014-05-17 05:24:32 +02:00
scrawl
e5a21aca53 Refactor projectiles to no longer use MW-objects 2014-05-16 13:33:30 +02:00
scrawl
028e00c98f Add missing status report for some toggle commands 2014-05-16 09:21:28 +02:00
Marc Zinnschlag
d08869a25d Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
Conflicts:
	apps/openmw/mwrender/localmap.cpp
2014-05-15 08:13:15 +02:00
slothlife
f33559fead Fixes for MSVC warnings, less overall changes
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
2014-05-14 20:12:52 -05:00
slothlife
c160a04ede Revert "Fixes for warnings when building with MSVC"
This reverts commit 46eb20b98c.
2014-05-14 00:03:30 -05:00
scrawl
6cc691115b Savegame: store most of CreatureStats 2014-05-12 21:37:36 +02:00
scrawl
2bc2684a66 Fixes #275: force updating exterior cell maps even if already in cache 2014-05-11 18:01:47 +02:00
scrawl
54a893994a Also update local map when paused, to make it update properly when teleporting via GUI/console 2014-05-11 18:01:47 +02:00
scrawl
ac8abd3398 assert -> exception to gracefully handle corrupted savegames 2014-05-11 18:01:47 +02:00
scrawl
c39a0368cf Bug #618: Make local map textures static in an attempt to fix the disappearing maps with D3D.
Also removed problematic DISCARDABLE flag for fog of war textures.
2014-05-11 02:40:15 +02:00
scrawl
c98bea2a88 Moved local map update to LocalMap::updatePlayer to fix a brief desync on cell transitions due to sFogOfWarSkip 2014-05-11 02:27:43 +02:00
scrawl
a4a9794417 Savegame: store fog of war (Closes #1177) 2014-05-11 02:07:58 +02:00
slothlife
46eb20b98c Fixes for warnings when building with MSVC
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
2014-05-09 08:32:52 -05:00
scrawl
92467ba6bc Fix sunlight for interiors 2014-05-02 21:20:27 +02:00
scrawl
6f7fbc867f Fix several leaks 2014-05-01 16:55:15 +02:00
Marc Zinnschlag
0b2371a05d Merge remote-tracking branch 'thoronador/fix-minor-stuff' 2014-04-28 10:59:34 +02:00
scrawl
1da19585dc Remove some unneeded includes 2014-04-28 07:49:08 +02:00
Thoronador
1b8c975d5b minor performance improvements in apps/openmw
Checking for emptiness using size() might be inefficient, because
it can take linear time, while empty() is guaranteed to take only
constant time.

For non-primitive types, postfix ++ operators are inefficient
compared to prefix ++ operators, because post-increment usually
involves keeping a copy of the previous value around.
2014-04-27 19:10:23 +02:00
scrawl
30666f2cce Fixes #1297: Store global map markers in savegame 2014-04-26 13:42:32 +02:00
scrawl
45d2a00717 Fixes #1293: Allow interpolation type 0 in case of 0 keys 2014-04-26 11:36:27 +02:00
Emanuel Guevel
ce7aa96371 Fix visual glitch happening when closing inventory while sneaking
(bug #1255)
2014-04-06 22:21:28 +02:00
megaton
50af9bc0d3 General perfomance optimizations. 2014-03-30 19:45:27 +04:00
scrawl
5906d795c0 Refactored video player (now a MyGUI widget) 2014-03-27 19:10:15 +01:00
scrawl
23f4bbc5b0 Videoplayer: only pause previous sounds if there is an audio stream 2014-03-26 21:36:57 +01:00
scrawl
0a17245633 Refactored settings window 2014-03-22 19:02:14 +01:00
scrawl
3880247017 Fixes #1206: effect texture override was not accounted for 2014-03-15 20:28:48 +01:00
scrawl
0cd40294a2 Fixed ranged combat for creatures 2014-03-12 11:30:44 +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
scrawl
1d926816b5 Terrain: background load blendmaps & layer textures. Refactor QuadTree update. 2014-03-05 21:46:37 +01:00
scrawl
2a4e99c069 Set StaticGeometry origin
Fixes an exception for coordinates far away from (0,0,0).
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
065b6d3331 Terrain: moved ESM::Land load to earlier in the startup procedure
Required for background loading as we cannot load ESM::Land data from background threads.
2014-03-05 21:46:36 +01:00
scrawl
c9e349f60f Terrain: support alternate coordinate systems. Get rid of LoadingListener for now 2014-03-05 21:46:36 +01:00
Marc Zinnschlag
f9d2fde783 Merge branch 'openmw-29'
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
2014-03-04 09:34:38 +01:00
cc9cii
56ae85df0c Fix 32bit Windows crash while taking the save screenshot. 2014-02-28 00:28:02 +11:00
Marc Zinnschlag
367919200f moved CellRefList into a separate file 2014-02-23 20:11:05 +01:00
Marc Zinnschlag
7693f712bc started making CellStore into a proper class; encapsulated mCell member 2014-02-21 11:35:46 +01:00
scrawl
1fba5d1bb9 Terrain: change world bounds from AABB to 4 floats 2014-02-19 11:23:03 +01:00
scrawl
bc376e6649 Closes #888: Treat "Bip 01" as animation root if existing 2014-02-19 11:23:03 +01:00
scrawl
90f6cda4cc Moved includes to appropriate place 2014-02-19 11:23:03 +01:00
Marc Zinnschlag
9c52820754 Merge remote-tracking branch 'scrawl/master' 2014-02-13 10:54:51 +01:00
scrawl
c6fb0f2d9b Removed terrain component's dependency on ESM 2014-02-13 10:13:53 +01:00
mrcheko
a6be72673c improves animation-controlled velocity check 2014-02-08 16:59:15 +02:00
scrawl
8f949c6ae2 Fix lockpicks 2014-02-08 07:35:34 +01:00
scrawl
ff11d85a62 Fix wrong assertion 2014-02-06 03:15:01 +01:00
scrawl
ffe19e7a52 Feature #50: Handle attach & release of projectiles 2014-02-05 05:18:11 +01:00
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