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

7172 commits

Author SHA1 Message Date
scrawl
e48dc45ede Fix creatures not being able to move with 0/0 encumbrance 2014-10-27 21:53:00 +01:00
scrawl
c194226d08 Increase maximum height for finding spawn points to 500 (Fixes #2056) 2014-10-27 21:52:59 +01:00
scrawl
aa02974d3b Fix Journal instruction for non-existing journal indices (Fixes #2063) 2014-10-27 21:52:59 +01:00
scrawl
dab05471be Reset crime when bounty is reset to 0 by a script (Fixes #2057) 2014-10-25 21:09:37 +02:00
scrawl
ac067564ea Don't include al.h in decoder classes, format support check will need to be redone later. For now, resample all formats that might not be supported on any hardware. 2014-10-25 20:50:41 +02:00
scrawl
4680bc6c93 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-10-25 19:59:23 +02:00
scrawl
55c9c0a266 Audio resampling fixes 
- Don't try to use float audio or extended channel layouts if the hardware does not support them
- Add channel layout resampling support to ffmpeg_decoder
 2014-10-25 17:17:57 +02:00
Marc Zinnschlag
a87092d11b Merge remote-tracking branch 'miroslavr/master' 2014-10-25 12:09:36 +02:00
Marc Zinnschlag
a4be214fb1 Merge remote-tracking branch 'scrawl/master' 2014-10-25 12:08:16 +02:00
cc9cii
e01795556f Suppress some warnings for MSVC. 2014-10-25 10:37:57 +11:00
scrawl
dbe30e31b9 Make creature's model take priority over base_anim.nif (Fixes #2055) 2014-10-25 00:56:43 +02:00
scrawl
b39d69e98c Videoplayer fixes, play/pause & seeking 
- Fix rindex overflow
 - Fix audio sample size bugs (was using sample_fmt and channel count of the decoder, instead of the resampled settings). We didn't notice this bug before, because the OpenAL MovieAudioFactory tries to resample to a format of the same byte size.
 - Add support for play/pause and seeking controls (not used by cutscenes in OpenMW)
 - Closing the video when arriving at the stream end is now handled by the user (we may also want to keep the video open and seek back)

The video player now has a standalone demo, at https://github.com/scrawl/ogre-ffmpeg-videoplayer
 2014-10-24 21:31:11 +02:00
MiroslavR
ed3a3f717f Handle getdistance on objects inside a container (Fixes #2046) 2014-10-24 19:05:43 +02:00
MiroslavR
fa746b8e54 Do not display weight or value in tooltip for zero-weight items (Fixes #2047) 2014-10-24 19:05:43 +02:00
MiroslavR
925fa8d193 Reset ownership of items dropped via 'drop' instruction (Fixes #2053) 2014-10-24 19:04:47 +02:00
scrawl
e2bad395e5 Leak fix 2014-10-24 18:07:17 +02:00
Marc Zinnschlag
19b380d0b4 Merge remote-tracking branch 'scrawl/master' 2014-10-23 20:07:40 +02:00
scrawl
eb1c24ffe6 Refactor video player engine to get rid of MWSound dependencies 
- Split video player to separate source files.
 - Move video player engine sources to extern/ (repository will be set up on github soon).
 - Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
 - Handle conversion of unsupported channel layouts via ffmpeg's swresample.
 2014-10-22 22:33:32 +02:00
Marc Zinnschlag
c1d867a213 Merge remote-tracking branch 'origin/master' 2014-10-22 09:48:30 +02:00
Marc Zinnschlag
8f0add75f5 Merge remote-tracking branch 'scrawl/master' 2014-10-22 09:42:28 +02:00
Marc Zinnschlag
94d5151273 Merge remote-tracking branch 'miroslavr/master' 2014-10-22 09:39:54 +02:00
scrawl
bcb2d714c0 Add TODO comments for future videoplayer enhancements 2014-10-21 23:46:04 +02:00
scrawl
41df4289c6 Merge remote-tracking branch 'upstream/openmw-33' into HEAD 
Conflicts:
	apps/openmw/mwworld/store.hpp
 2014-10-21 19:40:58 +02:00
Alexander "Ace" Olofsson
b5a57920b6 Fix compile error on Windows 2014-10-21 19:35:17 +02:00
scrawl
5711103322 Remove leftover comment 2014-10-21 17:51:59 +02:00
scrawl
202cfa879f Implement frame drop support in the videoplayer (Fixes #1343) 2014-10-21 17:01:53 +02:00
scrawl
290aacd2a6 Fix videoplayer crash on quit 
The sound stream thread was trying to update the stream during/after destruction of the video state.
 2014-10-21 17:01:53 +02:00
scrawl
8472695f89 Revert "Fix for compiler warnings and deprecated functions usage in videoplayer." 
This reverts commit d77546b7dc.

Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
 2014-10-21 17:01:53 +02:00
scrawl
de0e0fedff Revert "Fix for compiler warnings and deprecated functions usage in videoplayer." 
This reverts commit f5589b42ea.

Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
 2014-10-21 17:01:53 +02:00
scrawl
681f3fa530 Revert "Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder." 
This reverts commit b40c1ff26c.
 2014-10-21 17:01:52 +02:00
scrawl
8b3755a770 Compile fix 2014-10-20 17:45:24 +02:00
scrawl
f2877c69d7 Fix old alchemy apparatus still showing in alchemy window after removal 2014-10-20 17:45:18 +02:00
scrawl
192069a181 Add automatic potion naming 2014-10-20 17:45:11 +02:00
scrawl
fd7c181e06 Fix alchemy producing potion IDs from content files 2014-10-20 17:45:06 +02:00
scrawl
9bb51fd9c2 Compile fix 2014-10-20 17:42:51 +02:00
scrawl
ace8e0175b Fix old alchemy apparatus still showing in alchemy window after removal 2014-10-20 17:28:51 +02:00
scrawl
29ac97be7a Add automatic potion naming 2014-10-20 17:28:51 +02:00
scrawl
7f06e3e7e3 Fix alchemy producing potion IDs from content files 2014-10-20 17:07:54 +02:00
MiroslavR
5a7dbb19f7 Code clarity 2014-10-20 01:10:08 +02:00
scrawl
4047e3c928 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 2014-10-19 17:46:28 +02:00
scrawl
b0f98687e6 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 2014-10-19 17:45:18 +02:00
MiroslavR
ed6bdc0bde Use all topics to search for keywords in dialogues (Fixes #2013) 
Move KeywordSearch to MWDialogue
Move hypertext parsing functions to a new file
 2014-10-18 20:07:40 +02:00
scrawl
deabc52c16 Treat "Root Bone" as the animation root if existing (Fixes #2019) 2014-10-17 23:29:59 +02:00
scrawl
415f67f859 Treat "Root Bone" as the animation root if existing (Fixes #2019) 2014-10-17 23:29:13 +02:00
scrawl
5892fd9e65 Fix NpcAnimation non-existing skeleton crash (Fixes #2028) 2014-10-17 23:07:01 +02:00
scrawl
8233f5894a Fix NpcAnimation non-existing skeleton crash (Fixes #2028) 2014-10-17 23:04:36 +02:00
scrawl
f117a75747 Force walk animation when flying (Fixes #2015) 2014-10-17 19:11:06 +02:00
scrawl
5f11ccc298 Show tooltip for non-affordable list items (Fixes #2025) 2014-10-17 19:02:31 +02:00
scrawl
2be65a89a7 Show tooltip for non-affordable list items (Fixes #2025) 2014-10-17 19:01:28 +02:00
Marc Zinnschlag
c97845d35d better script compiler diagnostics 2014-10-17 10:59:25 +02:00
scrawl
c3ef39eb6f Fix ItemWidget text cleanup (Fixes #2022) 2014-10-17 02:41:43 +02:00
scrawl
c4e81adb83 Fix settings window being too small for all tabs on some localizations 2014-10-16 15:49:01 +02:00
scrawl
244db5cbfe Merge branch 'openmw-33' of https://github.com/OpenMW/openmw into openmw-33 2014-10-15 17:22:53 +02:00
Marc Zinnschlag
984b586bb1 fix for implicit references 2014-10-15 16:27:03 +02:00
Marc Zinnschlag
8afdf0f46b dagoth fix 2014-10-15 16:12:57 +02:00
scrawl
69bbbefc09 setDynamic workaround for broken endgame scripts (Fixes #2016) 2014-10-15 15:00:45 +02:00
Alexander "Ace" Olofsson
dc788512e2 Fix LNK2019 link error on Visual Studio 2010 builds 
For some reason VS2010 (Haven't tested 2013) is REALLY pedantic about class/struct being two different things when it comes to function signatures
 2014-10-14 16:10:19 +02:00
Marc Zinnschlag
6beee95151 Merge remote-tracking branch 'terrorfisch/aistate' 2014-10-13 19:14:15 +02:00
Marc Zinnschlag
528dcf761d Merge remote-tracking branch 'internecine/master' 2014-10-13 19:11:14 +02:00
Marc Zinnschlag
eb45793eab Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage' 2014-10-13 11:03:03 +02:00
Marc Zinnschlag
61731d3277 Merge remote-tracking branch 'miroslavr/master' 2014-10-13 10:57:04 +02:00
Thoronador
4d62541b62 fix usage of numeric_limits static functions min() and max() 
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
 2014-10-12 23:28:16 +02:00
MiroslavR
8456741eaa Fix blindness and create a separate fader for it 2014-10-12 19:06:40 +02:00
scrawl
9edcc332ec Don't remove player's sounds when unloading a cell 2014-10-12 18:35:15 +02:00
scrawl
d51daf5875 Fix AI not using F_Always spells, for example "vampire touch" 2014-10-12 17:18:27 +02:00
scrawl
8cb09e89ed Make spells cast by scripts always succeed (Fixes #1993) 2014-10-12 17:18:27 +02:00
Marc Zinnschlag
aefe8cd4ae Merge remote-tracking branch 'lgro/issue1887_equipped_items_doesnt_emit_sound' 
Conflicts:
	apps/openmw/mwworld/class.cpp
 2014-10-12 14:06:08 +02:00
Lukasz Gromanowski
a6a3eca930 Fixes #1887: Equipped items do not emit sounds 
Corrected wrong return type of Class::getSound() method.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-12 13:38:41 +02:00
Lukasz Gromanowski
e1663de7cf Fixes #1887: Equipped items do not emit sounds 
Added getSound() method to MWClass class and implementation
into Light class.

Also added additional bool parameter responsible for enabling/disabling
of playing items sounds into NpcAnimation class constructor.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-12 11:40:14 +02:00
MiroslavR
ad253059b1 Hit indicator for absorb/damage health effect 2014-10-12 01:15:40 +02:00
MiroslavR
8dd95fd77e Construct hit fader with correct texture right away to prevent mygui warning 2014-10-12 00:40:31 +02:00
MiroslavR
a5e972aeb5 Make collision events available on every frame (thanks, scrawl), make hurtStandingActor and hurtCollidingActor no-op in guimode 2014-10-12 00:13:24 +02:00
Lukasz Gromanowski
b44ba84a80 Issue #1887: Equipped items do not emit sounds 
Use separate arrays for sound ids and object parts.
Restored getting inventoryStore via getInventoryStore()
call (removed mInv introduced in previous commit).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-11 23:20:40 +02:00
MiroslavR
2162a9e1b9 Fall back to player_hit_01.dds if bm_player_hit_01.dds is not available 2014-10-11 23:09:20 +02:00
Lukasz Gromanowski
1a0c3dc6cf Issue #1887: Equipped items do not emit sounds 
Removed unused mUnequipping and mFirstEquip member variables.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-11 22:33:11 +02:00
Lukasz Gromanowski
3b9cfba03c Issue #1887: Equipped items do not emit sounds 
Sounds are played only when actors draw state
is equal to MWMechanics::DrawState_Nothing

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-11 22:21:59 +02:00
MiroslavR
0ae604990e Implement continuous damage indication (Fixes #1970) 2014-10-11 22:21:48 +02:00
MiroslavR
4dc613a04b Merge branch 'master' of github.com:OpenMW/openmw 2014-10-11 22:03:47 +02:00
Lukasz Gromanowski
fa65c8981a Issue #1887: Equipped items do not emit sounds 
Played sound items are based on parts not inserted items.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-11 21:05:12 +02:00
Marc Zinnschlag
3fd10d2a82 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2014-10-11 14:51:55 +02:00
Marc Zinnschlag
82b4148a62 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2014-10-11 13:09:33 +02:00
Thoronador
f29a71b498 remove unused var. mSoftwareCursor in WindowManager 2014-10-11 12:54:15 +02:00
Nikolay Kasyanov
138e3032ce Fix: initialize boolean field with boolean value, not NULL 2014-10-11 10:07:01 +04:00
Thoronador
8361019456 fix uninitialized (pointer) vars in more classes 2014-10-11 02:31:26 +02:00
Thoronador
13a0c5624c fix uninitialized member variables in OcclusionQuery class 2014-10-11 01:35:12 +02:00
Thoronador
db38108801 fix uninitialized pointer variables in some classes 2014-10-11 01:20:33 +02:00
Thoronador
a5245d5a13 remove unused dummy variable 2014-10-11 00:56:57 +02:00
terrorfisch
c4badcea6e removed warning 2014-10-10 23:51:29 +02:00
terrorfisch
c28dfc2fa4 Travis CI fix? 2014-10-10 23:34:58 +02:00
terrorfisch
4eb1668467 references now initialized when they are needed 2014-10-10 23:32:15 +02:00
terrorfisch
bbca942601 -improved trigonometric precision 
-cleanup
 2014-10-10 23:31:01 +02:00
terrorfisch
5248917a6c - changed namespace 2014-10-10 23:28:49 +02:00
Internecine
470d375177 Removed duplicate functions and moved pause check in weather.cpp 2014-10-10 23:29:51 +13:00
terrorfisch
db1b93498d Added comment. 2014-10-10 00:17:50 +02:00
terrorfisch
730abf6841 Moved all variables in temporary storage for AiCombat and some more for AiWander. 
+Buxfix for previous AiWander changes
 2014-10-10 00:16:17 +02:00
MiroslavR
29f5cb46ac Merge branch 'master' of github.com:OpenMW/openmw 2014-10-09 19:17:39 +02:00
Internecine
782e851eb1 Better fix, now allows for teleporting to change weather while still paused. 2014-10-09 19:41:51 +13:00
terrorfisch
cae948df96 removed unecessary PathFinders 2014-10-08 23:09:50 +02:00
terrorfisch
4c36c67fb8 Updated AiCombat: 
-moved everything except target to temporary storage
-removed the Pathfinder since present in baseclass
-cleaned some trigonometric mess
 2014-10-08 23:00:36 +02:00
terrorfisch
4391c1fd00 Addded the parts of AiWander that I fully understand to the temporary storage. 
The rest should be done by someone who has a clearer overview over the class.
 2014-10-08 22:11:45 +02:00