Tom Mason
bed8fb69e6
added bounty related scripting functions
12 years ago
Chris Robinson
1dd9276ceb
Add missing decoder method declarations
12 years ago
scrawl
ade4ec0453
fix texture edge bleeding due to wrong addressing mode
12 years ago
eduard
c75a5ae212
string compare and tolower
12 years ago
eduard
8545667bbd
string compare and tolower
12 years ago
Tom Mason
ad9b86058b
replaced explicit text with GMST entries, thanks to zinnschlag
12 years ago
Tom Mason
ba2301a156
removed redundant code thanks to scrawl
12 years ago
Tom Mason
299a1f32ed
cleanup
12 years ago
Tom Mason
51fce62b69
Merge branch 'messageboxes'
12 years ago
Tom Mason
716fbbbd74
messageboxes during dialogue show up in dialogue window, and messageboxes are generated when an item is removed from inventory
12 years ago
Tom Mason
a14b7e4a0f
small fixes on text defines
12 years ago
Marc Zinnschlag
afc2e840ae
renamed namespace TranslationData to Translation
12 years ago
Marc Zinnschlag
206c613b52
moved translation storage from GUI manager to engine
12 years ago
Marc Zinnschlag
2d468fec02
made previous commits naming standard compliant
12 years ago
Marc Zinnschlag
4c28f3211b
Merge remote-tracking branch 'lazydev/master'
12 years ago
lazydev
1f71395660
renaming of translation component; removing of C++11 features
12 years ago
lazydev
74ae479780
Cell names localization fix
12 years ago
Tom Mason
8ac8fdff47
implemented all text defines except a few for keybindings that don't exist yet
12 years ago
Tom Mason
f2c6907244
Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work
12 years ago
Chris Robinson
85850c7440
Fix DEFAULT_OUTPUT declaration
12 years ago
scrawl
64210e6efa
Revert "New Game button"
...
This reverts commit c5dd0e1968
.
12 years ago
scrawl
1c73a3f2fb
Revert "remove commandline switch for new game"
...
This reverts commit 86671096ec
.
12 years ago
Chris Robinson
7b2c3e6cd3
Pass a proper PlayMode enum to playSound and playSound3D
12 years ago
Chris Robinson
3b7edae7c3
Don't hold a list of all sound sources
12 years ago
Chris Robinson
fe36cc1de7
Don't try to resume sound types that aren't paused
12 years ago
Chris Robinson
2f8daec379
Allow pausing only certain types of sounds
12 years ago
Marc Zinnschlag
1cf019a007
post merge fix
12 years ago
Chris Robinson
b4e36d4f31
Add a method to get the volume from the sound type
12 years ago
Chris Robinson
a5356e194e
Allow specifying a type for the playTrack method
12 years ago
Chris Robinson
72ffceb206
Add type flags to the sound play mode
12 years ago
Chris Robinson
dd3e568a00
Set the sound properties at initialization
12 years ago
Chris Robinson
20321c4552
Keep track of the actual active sounds
12 years ago
Chris Robinson
d348435a1d
Improve audio open error message
12 years ago
Chris Robinson
67485d3454
Store the AVStream in the decoder for easy referencing
12 years ago
Chris Robinson
4373218746
Fix audio stream check
12 years ago
Chris Robinson
58ab3407b7
Constify a couple fields
12 years ago
Chris Robinson
9e842a0bbb
Fix for trying to play videos when not supported
12 years ago
Chris Robinson
26660110e5
Allow building the video player without ffmpeg (playVideo will always throw an exception)
12 years ago
Chris Robinson
06fd66e99d
Move some fields to the class they're used in
12 years ago
scrawl
f0f521a4e0
enableRestMenu -> enableRest
12 years ago
Chris Robinson
9c805483b0
Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback
12 years ago
scrawl
86671096ec
remove commandline switch for new game
12 years ago
scrawl
c5dd0e1968
New Game button
12 years ago
Chris Robinson
c92cde2be9
Properly flush packet queues when at EOF
...
Note: the previous flush method was renamed to clear. Flushing a queue allows
consumers to retrieve queued packets, but not expect any more to come in.
12 years ago
Chris Robinson
6bc526b74d
Avoid another loop for decoding audio
12 years ago
Marc Zinnschlag
77852439ce
moved ColumnBase and Column struct into a separate translation unit
12 years ago
Chris Robinson
254a623319
Remove a redundant check
12 years ago
Chris Robinson
dd20db5dc2
Remove the stream indices from the VideoState
12 years ago
Chris Robinson
3f6d36c712
Avoid double-setting the material texture
12 years ago
Chris Robinson
e9d833be03
Use the packet pts to calculate the decoder sample offset
12 years ago
Chris Robinson
0edc87825d
Move audio_clock to the decoder where it's used
12 years ago
Chris Robinson
4561c22e2b
More fixes for the audio clock
...
The audio_clock for the decoder represents the end of the current packet, so it
needs to be adjusted back to match the position that's actually going to be
read next.
12 years ago
Chris Robinson
1a771ae671
Merge the stream struct into the parent decoder
12 years ago
Chris Robinson
5fff1c4e47
Update the ffmpeg decoder to use avcodec_decode_audio4
12 years ago
Chris Robinson
5f4c33f896
Only store one packet at a time
12 years ago
Chris Robinson
9d86890d9d
Only use one stream for the ffmpeg decoder
12 years ago
scrawl
a3bd3a40ca
fix 2 unrelated leaks
12 years ago
scrawl
18623a5efe
Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback
12 years ago
scrawl
edf18a7d6e
change destruction order to fix crash on exit when a video is playing
12 years ago
Chris Robinson
c869444dcf
Don't leak the IO context if avformat_open_input fails
12 years ago
scrawl
63e86555b6
use sample_aspect_ratio if available
12 years ago
scrawl
5ed04ae53e
added black bars
12 years ago
Chris Robinson
e6d27cd6d0
Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback
12 years ago
Chris Robinson
9b3cf5c159
Use a looping thread to trigger refreshes
12 years ago
Chris Robinson
fa1ad381da
Make sure packets are cleaned up properly
12 years ago
scrawl
7477345481
fixed video material
12 years ago
Chris Robinson
db23c8152e
Only duplicate AVPackets as needed
...
Packets that don't have a destruct method are using static memory, which will
only be valid until the next av_read_frame call. Otherwise, it's already
dynamically allocated and will remain valid.
12 years ago
Chris Robinson
6008cf0d15
Remove unneeded video_current_pts field
12 years ago
Chris Robinson
da44141b95
Avoid creating extra texture unit states on the video material
12 years ago
Chris Robinson
d50698d7d1
Clean up the rectangle and scene node used for displaying the video
12 years ago
Chris Robinson
eb0e8d9e37
Simplify PacketQueue::get
12 years ago
Chris Robinson
b41a77648e
Avoid re-reading the source sample to duplicate, to avoid pointer aliasing
12 years ago
Chris Robinson
62a995d492
Calculate audio sync once per read
12 years ago
Chris Robinson
32b0a5d96e
Update the queued sample count immediately
12 years ago
Chris Robinson
cbdf6ad595
Move more stuff to where it should be, and improve cleanup
12 years ago
Chris Robinson
71ff90aaee
Don't use sub-frame timing for the video clock
12 years ago
Chris Robinson
582efcdb9b
Always try to resync if the clock difference is large
12 years ago
Chris Robinson
f97eaec7ab
Consolidate some code
12 years ago
Chris Robinson
d66d8a3118
Don't assume we can write beyond the end of the sample buffer
12 years ago
Chris Robinson
7332ffb0f8
Let the wanted sample size go down to 0
12 years ago
Chris Robinson
05c6483257
Fix external clock
12 years ago
Chris Robinson
2f37d31108
Move some definitions into the source file they're used in
12 years ago
Chris Robinson
a6e627001a
Avoid a for(;;) construct
12 years ago
Chris Robinson
4d6c05f6cc
Tighten audio skew allowance
12 years ago
Chris Robinson
8db5d10f10
Avoid showing a video picture if we're late
...
Ideally we should skip decoding, or at least YUV->RGB conversion, too.
12 years ago
Chris Robinson
157cb10f56
Fix a 16-bit audio assumption
12 years ago
Chris Robinson
c2b711d195
Move some more methods to the class they're part of
12 years ago
Chris Robinson
26a09ee7ba
Move some methods into their respective class
12 years ago
Chris Robinson
5221298a7f
Move a couple packet queue methods into the struct
12 years ago
Chris Robinson
90294c589b
Use a volatile bool for the refresh
12 years ago
Chris Robinson
f555dc60eb
Reduce some indentation
12 years ago
Chris Robinson
6cedd64509
Fix audio sync correction sizes
12 years ago
Chris Robinson
e291d0943d
Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback
12 years ago
Chris Robinson
606fb982a8
Update to use avcodec_decode_audio4
12 years ago
scrawl
82564e07c7
fix crash when video file doesn't exist
12 years ago
scrawl
27cd9ff732
Revert "Use the decoded frame pts when available"
...
This reverts commit cab68df257
.
12 years ago
scrawl
9d6f656822
fixed ogre resource functions
12 years ago
Chris Robinson
43481ad117
Use the external clock by default
12 years ago
Marc Zinnschlag
f95e72166c
hide type column in non-mixed type tables
12 years ago
Marc Zinnschlag
faa5ef0874
rewrote column class
12 years ago
Chris Robinson
0a5ab977b7
Use the decoder's sample offset for calculating the stream offset
12 years ago
Marc Zinnschlag
640c218df3
made record state uneditable again
12 years ago
Marc Zinnschlag
3d4c8c5444
added dialogue sub view (editing of a single record; not functional yet); fixed a bug in Universal to string conversion
12 years ago
Chris Robinson
cab68df257
Use the decoded frame pts when available
12 years ago
Chris Robinson
1ea1407707
Support quad, 5.1, and 7.1 with OpenAL and ffmpeg
...
The other decoders don't guarantee any channel ordering, which makes them
useless.
12 years ago
Chris Robinson
600494eed8
More cleanup of unused code
12 years ago
Chris Robinson
f7ff8b3374
A bit more cleanup
12 years ago
Chris Robinson
7e8b844b2e
Clean up some unused code
12 years ago
Chris Robinson
d2fbae9760
Init and deinit the VideoState synchronously, and re-enable audio playback
12 years ago
Chris Robinson
f067b22b3f
Use a recursive mutex for the OpenAL stream thread
12 years ago
Chris Robinson
ba9c5f5b4e
Don't initially fill buffers in OpenAL_SoundStream::play
12 years ago
Marc Zinnschlag
02184526e6
moved two helper classes from view/world/table into a separate translation unit
12 years ago
Chris Robinson
1ffaf6625a
Remove SDL for playing movie audio and prepare for using an audio track
...
This breaks audio playback on movies
12 years ago
Chris Robinson
779ced0889
Add a method to play an audio track with a custom decoder
12 years ago
Chris Robinson
1571243ef0
Implement getTimeOffset for OpenAL_SoundStream
12 years ago
Chris Robinson
86bf6388c6
Pass a decoder to the playStream sound output method
12 years ago
Chris Robinson
9c831d3039
Add a decoder method to get the "file" name
12 years ago
Chris Robinson
1fb9eef27b
Detach the thread used for frame timing
12 years ago
Chris Robinson
34e36fb852
Add a method to get the time offset from sounds
12 years ago
Marc Zinnschlag
cc18b30e17
open sub view on double click in report view
12 years ago
scrawl
7fd9e1d212
Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/videoplayer.cpp
12 years ago
scrawl
18d8c767bd
fix a bunch of warnings, improved error handling, initialize texture to black
12 years ago
Chris Robinson
2c1eceb9f0
Add methods to pause and stop all playing sounds (and music)
12 years ago
Chris Robinson
973b5faf25
Keep track of all allocated sources
12 years ago
Chris Robinson
e82c4afd50
close SDL when closing the video, not after the video loop is finished
12 years ago
Chris Robinson
a62d5bbfe4
Sleep using the absolute time, so the thread creation doesn't add to the wait
12 years ago
Chris Robinson
c2e1595445
Treat paused sounds as still playing
12 years ago
Chris Robinson
2efdafecd9
Indentation fixes
12 years ago
Chris Robinson
277248cdcb
Fix some "comparison between signed and unsigned" warnings
12 years ago
Chris Robinson
3519934f27
Add a missing return value
12 years ago
Chris Robinson
9e2d4f8b7c
Avoid potential NULL dereference
12 years ago
scrawl
fe384a1600
pause 3d rendering while the video plays
12 years ago
scrawl
faad64b254
Esc cancels the video
12 years ago
scrawl
0ce5ade6d8
DataStreamPtr fix, indentation fixes
12 years ago
scrawl
c49966dd29
started over
12 years ago
scrawl
5f676f9c6b
Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwscript/miscextensions.cpp
12 years ago
Marc Zinnschlag
c75563c184
report model and view
12 years ago
Marc Zinnschlag
2db930a5cf
rewrote subview factory system
12 years ago
Marc Zinnschlag
0ed378dfb2
changed sub view factory method signature
12 years ago
Marc Zinnschlag
de4a03081c
fixed skill level type in skill level up message
12 years ago
scrawl
e3dd3d565c
fix 2 leaks
12 years ago
Marc Zinnschlag
832fc56d34
changed UniversalId to string conversion
12 years ago
Marc Zinnschlag
5f5addf052
fixed an enum
12 years ago
Marc Zinnschlag
9fe7ff9690
added mandatory ID check stage
12 years ago
Marc Zinnschlag
72623652e4
addded messages interface for operations/stages
12 years ago
Marc Zinnschlag
89b4497331
added missing edit locks for create/revert/delete
12 years ago
Marc Zinnschlag
6c18be39f0
added stage class
12 years ago
Marc Zinnschlag
8b7f342641
removed last remains of old verify implementation
12 years ago
Marc Zinnschlag
af9b48f4d3
added operations base class
12 years ago
Marc Zinnschlag
a2b4f43176
moved document state enum to a separate file
12 years ago