Commit Graph

3556 Commits (bbac63bff7cd2f16f00c2c9cde102f1dbdbb7c02)

Author SHA1 Message Date
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
Marc Zinnschlag 0e7ba008ad another skill gain fix 12 years ago
Marc Zinnschlag caaffd1ec2 handle persuasion records properly 12 years ago
Marc Zinnschlag a70a5282f4 fixed an overzealous skill gain error check 12 years ago
Marc Zinnschlag fdc7e93835 preliminary multi-threaded verify implementation (does not actually perfom any document verification yet) 12 years ago
Marc Zinnschlag 386eec51c1 some skill usage fixes 12 years ago
eduard e50b9aca86 tradding skill use, spechcraft use 12 years ago
eduard 2d62649dc9 tradding skill use, spechcraft use 12 years ago
eduard b2a0e4b1fd tradding skill use, spechcraft use 12 years ago
Marc Zinnschlag 1c80390bce Merge branch 'master' into editor2 12 years ago
Marc Zinnschlag 2b53cf6547 do not list actions in the pop up menu that do not apply to any of the selected records 12 years ago
Marc Zinnschlag c12ee129f7 added delete command 12 years ago
Marc Zinnschlag b41cc5e9e9 added revert command 12 years ago
eduard ea8ee11ff7 tradding skill use 12 years ago
eduard 5332546541 tradding skill use 12 years ago
Marc Zinnschlag 8bcd7d8fb1 fixed a type in a script instruction 12 years ago
Marc Zinnschlag f07b7d17cd improved exception handling 12 years ago
Marc Zinnschlag 8e1a2e3a13 Issue #474: adjust global variable pcrace 12 years ago
Marc Zinnschlag 5cd2fe00ab initialise blank global records 12 years ago
Marc Zinnschlag 8e93bfa607 turned the global class into a general purpose table subview class 12 years ago
Marc Zinnschlag 0a8b7602d3 fixed edit lock 12 years ago
Marc Zinnschlag 49d6239004 added pop-up menu with create record action 12 years ago
scrawl 7cc28c3eb9 Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback 12 years ago
scrawl 3106db0379 commented out debug output 12 years ago
scrawl bc90c75176 more clean up, video played with correct speed, videos without sound working too (mw_credits.bik) 12 years ago
scrawl a77d910aaf audio codec is opened, some cleanup 12 years ago
Marc Zinnschlag db29e411c4 added merge functions; temporarily merge on document creation 12 years ago
scrawl 3db850a7d1 Don't crash if no loading screens are found 12 years ago
scrawl ea2bbec76e better fix for bed activation 12 years ago
Tom Mason a6fd369e4e Fixed wait window reappearing after sleeping 12 years ago
greye 682fd23aea fix wrong increment 12 years ago
Marc Zinnschlag b25f2e88ce Issue #492: fixed double alchemy ingredients removal 12 years ago
Marc Zinnschlag 556d737f65 Merge remote-tracking branch 'trombonecot/windowformatting' 12 years ago
eduard 30d0e93cf4 Fix window formatting on tool tip with too log titles 12 years ago
eduard 7e7e6e2bcb Fix window formatting on tool tip with too log titles 12 years ago
scrawl d432420a32 fix FindFFmpeg.cmake 12 years ago
Marc Zinnschlag bd5e364ac1 display record state in table 12 years ago
scrawl c4facc233e Merge branch 'master' into videoplayback
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
12 years ago
Marc Zinnschlag ec1f957e54 edit lock for sub views 12 years ago
rpopovici 7079b9062f add AI script functions 12 years ago
Marc Zinnschlag 8dd76b49af factored out table widget from globals sub view 12 years ago
Marc Zinnschlag fd55c0cae2 record IDs are no longer handled as a special case 12 years ago
Marc Zinnschlag 4086b556d2 use commands for modifying globals 12 years ago
Marc Zinnschlag 8a09e03d5c global variable editing (no undo support yet) 12 years ago
scrawl 398eecc35e GetWeaponType fix 12 years ago
scrawl 00e46addc2 GetArmorType fix 12 years ago
scrawl 8e857587d7 fix a text coloring bug 12 years ago
scrawl 1def60dbe1 PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank 12 years ago
scrawl 9f720ccbc9 Merge branch 'master' of https://github.com/zinnschlag/openmw into scripting 12 years ago
scrawl 644dacf603 suggestion by Zini for SetDelete 12 years ago
Marc Zinnschlag 5eb0f489e2 Issue 476: fixed auto-move bypassing disabled player controls 12 years ago
Greendogo 8b18d195bd Update apps/openmw/main.cpp
Edited the description for the --script-run switch.
12 years ago
Marc Zinnschlag 92f70635a2 improved selection behaviour 12 years ago
scrawl d6dd212ce8 GetWerewolfKills, ModScale, SetDelete, GetSquareRoot 12 years ago
Marc Zinnschlag ef9575498f basic (non-editable) subview for global variables 12 years ago
Marc Zinnschlag 1dd63e9fb6 Merge branch 'master' into editor2 12 years ago
scrawl 1ccad32877 GetWeaponType 12 years ago
scrawl e68dc19256 GetCurrentTime, HasSoulGem 12 years ago
scrawl 0db48b29c7 GetSpellEffects, GetRace 12 years ago
scrawl 4b830e5c7a Merge branch 'scripting' of github.com:scrawl/openmw into scripting 12 years ago
Marc Zinnschlag eece4226c0 basic sub view system (very incomplete) 12 years ago
Marc Zinnschlag 4c0dcd46a1 added UniversalId class 12 years ago
Marc Zinnschlag 019146756f minor documentation changes regarding future improvements and additions 12 years ago
scrawl 70aa7459f5 GetWeaponDrawn 12 years ago
scrawl be82d1452f HasItemEquipped 12 years ago
scrawl 600ed5f38a GetAttacked 12 years ago
scrawl 50baf6dac7 moved to controlextensions 12 years ago
scrawl a596d23203 GetArmorType 12 years ago
scrawl d7811624d5 GetEffect 12 years ago
scrawl e8ef4dba1e getPcRunning, getPcSneaking, getForceRun, getForceSneak 12 years ago
scrawl 10329c780d GetLocked 12 years ago
Marc Zinnschlag a6c7f16a7b Merge remote-tracking branch 'scrawl/reputation' 12 years ago
scrawl d418e21371 <Mod|Get><Flee|Fight|Hello|Alarm> 12 years ago
scrawl 9c170af30c SameFaction 12 years ago
scrawl d54ed557bf Equip 12 years ago
scrawl 064cb80c0a fix wait dialog fading 12 years ago
scrawl 0af869c816 GetReputation 12 years ago
scrawl eb29b1593b ModReputation, SetReputation 12 years ago
scrawl f218ef2675 fix separator 12 years ago
scrawl 1d7e92b6b3 dialogue fixes 12 years ago
Marc Zinnschlag 303506d24b added new document function 12 years ago
Marc Zinnschlag 997386d873 implemented world verify function (doesn't do anything yet; mostly meant as a test for multi-operation interface) 12 years ago
Marc Zinnschlag 2fc183d595 added operations progress bar 12 years ago
Marc Zinnschlag eaa58e0530 preparations for multiple parallel progress-type operations 12 years ago
Marc Zinnschlag 04158d03b0 clean up properly after closing a top level window 12 years ago
Marc Zinnschlag 03aacd3263 added progress tracking 12 years ago
Marc Zinnschlag 931eb08114 implemented edit locking (used during saves) 12 years ago
Marc Zinnschlag 5838929371 implemented a dummy save function (does not actually save anything) 12 years ago
Marc Zinnschlag d7c63d4c74 track document modification state and display it in the top level window title bar 12 years ago
Marc Zinnschlag d7af9fbec6 various fixes 12 years ago
Marc Zinnschlag 6643674b13 ESM tool fix 12 years ago
Marc Zinnschlag 8e546ebd30 added test command 12 years ago
Marc Zinnschlag ed3d8b8ca2 added undo stack and undo/redo actions 12 years ago
Marc Zinnschlag 1ddcea1f07 display view indices in title bar 12 years ago
Marc Zinnschlag 789cecb9df added main menu and implemented new view function 12 years ago
Marc Zinnschlag 758371d7e4 implemented view/document closing 12 years ago
Marc Zinnschlag 9834bb3ad5 basic document handling 12 years ago
Marc Zinnschlag 9201baebf9 template fix 12 years ago
Marc Zinnschlag c3cd6e8a8a new attempt at the editor 12 years ago
scrawl c8562d8442 toggleCollisionBoxes actually does something useful now 12 years ago
Marc Zinnschlag 5d45bcd03a Merge remote-tracking branch 'trombonecot/master'
Conflicts:
	apps/openmw/mwclass/light.cpp
12 years ago
eduard 4e4d15f8ac Failed action 12 years ago
scrawl 693eeabeca shiny: fix GLSL texture units when shaders were disabled 12 years ago
eduard 82ea547ce4 Failed action 12 years ago
scrawl 8ef3edd416 Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap 12 years ago
scrawl f5355e3e92 512x512 map, slightly faster 12 years ago
Marc Zinnschlag a092deaee8 various fixes 12 years ago
Marc Zinnschlag 3dc013ceae Merge remote-tracking branch 'gohan/Gohan' 12 years ago
scrawl dc67a547b0 global map explored overlay 12 years ago
marcin 51027c541e Feature #391 Dummy AI package classes 12 years ago
Marc Zinnschlag 9193f3b0ae implemented getCommon/BlightDisease script instructions 12 years ago
Marc Zinnschlag 89c7936534 fixed dialogue script error reporting 12 years ago
Marc Zinnschlag fd5671e6db fixed argument lists for setpcfacrep and modpcfacrep 12 years ago
marcin bed0280ba1 Feature #391 Dummy AI package classes 12 years ago
marcin 99ddc63e2c Feature #391 Dummy AI package classes 12 years ago
marcin 515419ae0b Feature #391 Dummy AI package classes 12 years ago
marcin 4b939c7521 Feature #391 Dummy AI package classes 12 years ago
Marc Zinnschlag 82d62eb95a Merge branch 'script' 12 years ago
Marc Zinnschlag 9669eed083 Issue #219: added last missing function filters 12 years ago
scrawl aefde3f5bc Merge branch 'master' into globalmap 12 years ago
marcin e6c8e1f0d7 Feature #391 Dummy AI package classes 12 years ago
marcin 698afbec3e Feature #391 Dummy AI package classes 12 years ago
scrawl 5f7d349126 several missing includes 12 years ago
Marc Zinnschlag b046687f46 added PCFacRep script instructions 12 years ago
Marc Zinnschlag 2a1727d4c5 improved error reporting for dialogue scripts (enabled via --script-verbose) 12 years ago
Marc Zinnschlag c621a9f7e4 added missing disposition script instructions 12 years ago
Marc Zinnschlag 8aa1fd921b fixed some stats related script instructions 12 years ago
Marc Zinnschlag cbb0fd5792 Merge branch 'dialogue' 12 years ago
Marc Zinnschlag 409d15576b Merge remote-tracking branch 'greye/player-model' 12 years ago
Marc Zinnschlag e2ccec99f0 Issue #219: added another missing PC stats filter 12 years ago
Marc Zinnschlag 586ac3f5c6 Issue #219: added some more stats filters; fixed two filters 12 years ago
Marc Zinnschlag 77ba8c5117 Issue #219: implemented rank requirement filter 12 years ago
scrawl 8e847fdc6e fix speechcraft skill increasing when persuade didn't succeed 12 years ago
scrawl 11a8d5d70a Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap 12 years ago
scrawl 7c22690116 Merge branch 'next' into globalmap 12 years ago
greye 623e00531d fix reentering race selection 12 years ago
greye 0d33d005a5 head/hair selection 12 years ago
greye 50867e8d87 fix gender selection update, main model visibility and couple of crashes 12 years ago
Marc Zinnschlag 75f64aa38b Merge branch 'master' into dialogue
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
12 years ago
Marc Zinnschlag 7b1788b03b minor fix 12 years ago
Marc Zinnschlag 0ab4068fbd Merge remote-tracking branch 'scrawl/persuasion' into next 12 years ago
Marc Zinnschlag 6dc2214502 Issue #219: more DialogueManager refactoring 12 years ago
Marc Zinnschlag 79706bf60f Issue #219: dialogue manager cleanup 12 years ago
Marc Zinnschlag d24e3eec9f Issue #219: added filters for various player stats 12 years ago
Marc Zinnschlag f8fcca64b6 Issue #219: Proper implementation of talked to PC filter 12 years ago
Marc Zinnschlag 7e8d4bb3c9 Issue #219: added various creature and NPC stats; implemented respective filters 12 years ago
Marc Zinnschlag d15eb6cd17 Merge remote-tracking branch 'greye/player-model' into next 12 years ago
Marc Zinnschlag e97f3003ab Issue #219: added expelled status tracking; implemented expelled filter 12 years ago
Marc Zinnschlag bd2c772dae Issue #219: implemented player skill and attribute filter 12 years ago
Marc Zinnschlag d6961c0246 Issue #219: made all unimplemented filters return false 12 years ago
Marc Zinnschlag ceaf1677ce Issue #219: rewrote AI settings and implemented AI settings filters 12 years ago
Marc Zinnschlag eb4e72aaa7 Issue #219: implemented disease filters 12 years ago
Marc Zinnschlag c425b3f4a3 Issue #219: fixed function decoding and moved choice function from DialogueManager to Filter 12 years ago
Marc Zinnschlag a752536cea Issue #219: added function decoding and moved same faction function from DialogueManager to Filter 12 years ago
greye 235b565bb7 update main character model 12 years ago
greye b1ef0026a9 race selection/inventory preview character model update 12 years ago
scrawl 92bba18218 removed useless member 12 years ago
scrawl 553ea08eae consider temporary disposition change when trading 12 years ago
scrawl 94aeb15220 bartering disposition change 12 years ago
scrawl 33b4b29fbc persuasion mechanics, added reputation 12 years ago
scrawl ace9ee9c83 persuasion dialog 12 years ago
scrawl f6a9029c4b bounty & disease disposition effect 12 years ago
Marc Zinnschlag 4994a253da Merge branch 'bountydisease' into dialogue 12 years ago
Marc Zinnschlag be1334b202 disease tests 12 years ago
Marc Zinnschlag 0727d943b1 Merge branch 'next' into bountydisease
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
12 years ago
scrawl d53a7ade1e method names, disposition uint->int 12 years ago
Marc Zinnschlag 39ff2f06ce added bounty to NpcStats 12 years ago
scrawl ae78eaeb28 fixed training, fixed todo comments 12 years ago
scrawl b2afb1fd5c Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/spellbuyingwindow.cpp
	apps/openmw/mwgui/trainingwindow.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
12 years ago
scrawl 322faf13e4 cleanup 12 years ago
scrawl bf4e855260 fixed creatures 12 years ago
Marc Zinnschlag e6021a3fe3 Issue #219: moved checks for local and global variables from DialogueManager to Filter 12 years ago
gugus 4634227f1c notify the user when the merchant doesn't accept the offer 12 years ago
Marc Zinnschlag e68bb3481e Issue #219: moved over the second batch of functions (boolean and one integer I forgot last time) 12 years ago
Marc Zinnschlag 91afef140b Issue #219: moved first batch of integer type functions from DialogueManager to Filter 12 years ago
greye c3f0dc0dfb m prefix for NpcAnimation members 12 years ago
scrawl 3d7146cd50 don't allow opening a window multiple times, primarily the console 12 years ago
Marc Zinnschlag 2be60041f3 Merge remote-tracking branch 'greye/player-dynamics' into next 12 years ago
Marc Zinnschlag e912b5bed2 Merge remote-tracking branch 'greye/next' into dialogue 12 years ago
greye af5fb7916f fix searching in store 12 years ago
Marc Zinnschlag 235397dde8 Issue #219: added missing implemented for isInverted function 12 years ago
Marc Zinnschlag f5972a3080 Issue #219: Support for boolean select structs 12 years ago
Marc Zinnschlag b412ebd0af Issue #219: Supoort for inverted select structs 12 years ago
Marc Zinnschlag 4614d2bc8e Issue #219: added basic select struct analysis and type checking 12 years ago
greye b5a59c3a07 minor doxygen comments update 12 years ago
greye 2a86432887 store birthsign in MWWorld::Player 12 years ago
Marc Zinnschlag 662054acf4 Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter 12 years ago
Marc Zinnschlag 1502b3f6f8 Issue #219: Begin of refactoring; added filter class (doesn't do anything yet) 12 years ago
Marc Zinnschlag 6c6c0dd1e3 Merge branch 'next' into dialogue 12 years ago
gugus 0a883f4492 The player can now barter with merchants 12 years ago
greye 83e758ee50 clean up interfaces 12 years ago
greye 2a06d72e32 remove unused custom character classes 12 years ago
greye 9dc9098fa7 update MWBase::World interface since records contains own id 12 years ago
greye f818fa1ebf minor update since records contains own id 12 years ago
greye 5b9621bca5 store player record data in ESMStore 12 years ago
greye 9ab2c16055 store created character classes as dynamic records 12 years ago
greye 78740306db non-const access to Store<T> from ESMStore 12 years ago
Marc Zinnschlag c5a6171aab cleanup 12 years ago
Marc Zinnschlag 918316168f Merge remote-tracking branch 'greye/store' into next
Conflicts:
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwworld/worldimp.cpp
12 years ago
greye 11c0e6382f make ESMStore setting up itself after loading 12 years ago
greye bc218759e9 forgotten module 12 years ago