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

3288 commits

Author SHA1 Message Date
Chris Robinson
9c831d3039 Add a decoder method to get the "file" name 2012-12-12 22:19:44 -08:00
Chris Robinson
1fb9eef27b Detach the thread used for frame timing 2012-12-12 22:02:33 -08:00
Chris Robinson
34e36fb852 Add a method to get the time offset from sounds 2012-12-12 16:50:35 -08:00
scrawl
7fd9e1d212 Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback
Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
2012-12-12 22:24:38 +01:00
scrawl
18d8c767bd fix a bunch of warnings, improved error handling, initialize texture to black 2012-12-12 15:15:55 +01:00
Chris Robinson
2c1eceb9f0 Add methods to pause and stop all playing sounds (and music) 2012-12-12 02:33:12 -08:00
Chris Robinson
973b5faf25 Keep track of all allocated sources 2012-12-12 01:32:16 -08:00
Chris Robinson
e82c4afd50 close SDL when closing the video, not after the video loop is finished 2012-12-12 00:36:52 -08:00
Chris Robinson
a62d5bbfe4 Sleep using the absolute time, so the thread creation doesn't add to the wait 2012-12-11 23:54:41 -08:00
Chris Robinson
c2e1595445 Treat paused sounds as still playing 2012-12-11 21:01:32 -08:00
Chris Robinson
2efdafecd9 Indentation fixes 2012-12-11 20:11:48 -08:00
Chris Robinson
277248cdcb Fix some "comparison between signed and unsigned" warnings 2012-12-11 19:43:07 -08:00
Chris Robinson
3519934f27 Add a missing return value 2012-12-11 19:36:04 -08:00
Chris Robinson
9e2d4f8b7c Avoid potential NULL dereference 2012-12-11 19:32:10 -08:00
scrawl
fe384a1600 pause 3d rendering while the video plays 2012-12-12 01:30:34 +01:00
scrawl
faad64b254 Esc cancels the video 2012-12-12 01:13:53 +01:00
scrawl
0ce5ade6d8 DataStreamPtr fix, indentation fixes 2012-12-11 23:06:06 +01:00
scrawl
c49966dd29 started over 2012-12-11 22:49:31 +01:00
scrawl
5f676f9c6b Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwscript/miscextensions.cpp
2012-12-11 22:28:23 +01:00
Marc Zinnschlag
de4a03081c fixed skill level type in skill level up message 2012-12-10 11:04:21 +01:00
scrawl
e3dd3d565c fix 2 leaks 2012-12-10 00:59:39 +01:00
Marc Zinnschlag
5f5addf052 fixed an enum 2012-12-09 00:12:24 +01:00
Marc Zinnschlag
0e7ba008ad another skill gain fix 2012-12-08 14:28:56 +01:00
Marc Zinnschlag
caaffd1ec2 handle persuasion records properly 2012-12-08 14:24:15 +01:00
Marc Zinnschlag
a70a5282f4 fixed an overzealous skill gain error check 2012-12-08 13:37:43 +01:00
Marc Zinnschlag
386eec51c1 some skill usage fixes 2012-12-07 11:36:38 +01:00
eduard
e50b9aca86 tradding skill use, spechcraft use 2012-12-06 20:58:33 +01:00
eduard
2d62649dc9 tradding skill use, spechcraft use 2012-12-06 18:30:19 +01:00
eduard
b2a0e4b1fd tradding skill use, spechcraft use 2012-12-06 18:19:35 +01:00
eduard
ea8ee11ff7 tradding skill use 2012-12-06 14:25:53 +01:00
eduard
5332546541 tradding skill use 2012-12-06 13:58:52 +01:00
Marc Zinnschlag
8bcd7d8fb1 fixed a type in a script instruction 2012-12-04 20:56:45 +01:00
Marc Zinnschlag
8e1a2e3a13 Issue #474: adjust global variable pcrace 2012-12-04 10:58:43 +01:00
scrawl
7cc28c3eb9 Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback 2012-12-03 17:43:00 +01:00
scrawl
3106db0379 commented out debug output 2012-12-03 17:41:38 +01:00
scrawl
bc90c75176 more clean up, video played with correct speed, videos without sound working too (mw_credits.bik) 2012-12-03 17:33:02 +01:00
scrawl
a77d910aaf audio codec is opened, some cleanup 2012-12-03 16:44:41 +01:00
scrawl
3db850a7d1 Don't crash if no loading screens are found 2012-12-03 05:45:04 +01:00
scrawl
ea2bbec76e better fix for bed activation 2012-12-03 05:32:12 +01:00
Tom Mason
a6fd369e4e Fixed wait window reappearing after sleeping 2012-12-02 22:10:47 +00:00
greye
682fd23aea fix wrong increment 2012-12-02 21:18:59 +04:00
Marc Zinnschlag
b25f2e88ce Issue #492: fixed double alchemy ingredients removal 2012-12-02 15:07:22 +01:00
Marc Zinnschlag
556d737f65 Merge remote-tracking branch 'trombonecot/windowformatting' 2012-12-02 14:36:36 +01:00
eduard
30d0e93cf4 Fix window formatting on tool tip with too log titles 2012-12-02 14:12:18 +01:00
eduard
7e7e6e2bcb Fix window formatting on tool tip with too log titles 2012-12-02 14:08:22 +01:00
scrawl
d432420a32 fix FindFFmpeg.cmake 2012-12-01 20:53:28 +01:00
scrawl
c4facc233e Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
2012-12-01 11:30:51 +01:00
scrawl
398eecc35e GetWeaponType fix 2012-11-28 02:51:46 +01:00
scrawl
00e46addc2 GetArmorType fix 2012-11-28 02:48:21 +01:00
scrawl
8e857587d7 fix a text coloring bug 2012-11-28 02:36:33 +01:00