krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
10589 commits 35 branches 0 tags 65 MiB
Commit graph

1546 commits

Author SHA1 Message Date
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
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