c2901fe6cc
added addsoulgem scripting function
12 years ago
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
12 years ago
c2b75e28e9
Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback
12 years ago
282601d6e9
support the allowSkipping extra parameter for playBink command.
12 years ago
35f4d09288
swscale handled better (cmake)
12 years ago
2557ef4d7d
post merge fixes and some misc clean up
12 years ago
41767f8dfa
Merge remote-tracking branch 'blunted2night/better_flicker'
12 years ago
0f3712f284
change flickering light's brightness pattern
12 years ago
25815ab8f7
Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite'
12 years ago
63f09462fd
to_utf8, Utf8Encoder: pass encoding as constructor parameter
...
Edit other files accordingly.
12 years ago
fbb59302d9
Merge remote-tracking branch 'blunted2night/loading_screen_fix'
12 years ago
67273fc177
mwiniimporter: use Utf8Encoder
12 years ago
9afe4467d8
cache results of query for spash screen names
...
ResourceGroupManager::listResourceNames returns a list of all resource
accessable which is expensive, this change caches the result of the
processed query so additional splash screen changes are quicker.
12 years ago
0af7a2888a
Merge remote-tracking branch 'scrawl/ai_script'
12 years ago
25d9918765
post merge fix: bringing code more in line with our naming standards and fixing an invalid name (names starting with double underscore are reserved in C++)
12 years ago
c0260697c2
Merge remote-tracking branch 'scrawl/master'
12 years ago
ce5d27b07b
Merge remote-tracking branch 'scrawl/button_fixes'
12 years ago
42e0501c67
fix typo
12 years ago
a5ef669eb6
Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD
...
Conflicts:
apps/openmw/mwscript/aiextensions.cpp
apps/openmw/mwscript/docs/vmformat.txt
12 years ago
ba7086cadf
Use race/class names (instead of ID) in replaced escape sequences
12 years ago
1718d735b5
Fix menu/journal/book/scroll buttons when using localised MW-installations
...
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
12 years ago
ddbe13e569
Workaround for http://bugs.openmw.org/issues/475
12 years ago
ff74f687fb
Merge remote-tracking branch 'lazydev/master'
12 years ago
04cca2a1ce
fix for http://bugs.openmw.org/issues/517
12 years ago
83fe128e87
Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'
12 years ago
86f30992d7
fix message boxes not appearing properly when e.g. trading
12 years ago
2a7336c310
mwiniimporter: handle ini file encodings
...
Use components/to_utf8 to handle encodings.
Add an --encoding option for choosing between win1250, win1251 and
win1252 encodings for the imported ini file.
12 years ago
4a8bf40a83
Merge remote-tracking branch 'lazydev/master'
12 years ago
7cd1e87fe8
Merge branch 'master' of git://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
12 years ago
e9a464c9f7
mwiniimporter: remove fallback values for Cursors
12 years ago
e2b348de96
mwiniimporter: fix line ending problem
12 years ago
65c7c7f60e
Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'
12 years ago
7e0713f6c4
fix string case update
12 years ago
cd5d95ed22
1. Dialogs in Russian version now works.
...
2. Destination names it travel window are now translated
12 years ago
8b2785400b
Merge remote-tracking branch 'trombonecot/comparestring'
12 years ago
69d9d22579
comparestring
12 years ago
e577731a06
Merge remote-tracking branch 'scrawl/master'
12 years ago
f56182cac2
fix journal window not rendering any text
12 years ago
cb71efc427
mwiniimporter: clean up
12 years ago
38e7dbb970
mwininimporter: add more fallback values
12 years ago
714b1924a5
partial dialogue subview implementation
12 years ago
98103e15eb
conflict resolution
12 years ago
fb25f407fb
dialoguemanager conflict
12 years ago
c85400b809
Merge https://github.com/zinnschlag/openmw into comparestring
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwworld/worldimp.cpp
components/esm_store/reclists.hpp
components/misc/stringops.hpp
12 years ago
9d043d0193
mwiniimporter: fix string cutting
12 years ago
b2203d22fc
mwiniimporter: added fallback values
...
Ugly comments included. I will merge it on another branch to clean this
up later.
12 years ago
1dcc0f10ee
Merge pull request #6 from ChrisKCat/videoplayback
...
Videoplayback
12 years ago
8d4afe3bf5
post merge fix
12 years ago
e2a8e2107b
Merge branch 'globals'
12 years ago
334588bf1c
Merge branch 'editor2'
12 years ago
bed8fb69e6
added bounty related scripting functions
12 years ago
1dd9276ceb
Add missing decoder method declarations
12 years ago
ade4ec0453
fix texture edge bleeding due to wrong addressing mode
12 years ago
c75a5ae212
string compare and tolower
12 years ago
8545667bbd
string compare and tolower
12 years ago
ad9b86058b
replaced explicit text with GMST entries, thanks to zinnschlag
12 years ago
ba2301a156
removed redundant code thanks to scrawl
12 years ago
299a1f32ed
cleanup
12 years ago
51fce62b69
Merge branch 'messageboxes'
12 years ago
716fbbbd74
messageboxes during dialogue show up in dialogue window, and messageboxes are generated when an item is removed from inventory
12 years ago
a14b7e4a0f
small fixes on text defines
12 years ago
afc2e840ae
renamed namespace TranslationData to Translation
12 years ago
206c613b52
moved translation storage from GUI manager to engine
12 years ago
2d468fec02
made previous commits naming standard compliant
12 years ago
4c28f3211b
Merge remote-tracking branch 'lazydev/master'
12 years ago
1f71395660
renaming of translation component; removing of C++11 features
12 years ago
74ae479780
Cell names localization fix
12 years ago
8ac8fdff47
implemented all text defines except a few for keybindings that don't exist yet
12 years ago
f2c6907244
Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work
12 years ago
85850c7440
Fix DEFAULT_OUTPUT declaration
12 years ago
64210e6efa
Revert "New Game button"
...
This reverts commit c5dd0e1968
12 years ago
1c73a3f2fb
Revert "remove commandline switch for new game"
...
This reverts commit 86671096ec
12 years ago
7b2c3e6cd3
Pass a proper PlayMode enum to playSound and playSound3D
12 years ago
3b7edae7c3
Don't hold a list of all sound sources
12 years ago
fe36cc1de7
Don't try to resume sound types that aren't paused
12 years ago
2f8daec379
Allow pausing only certain types of sounds
12 years ago
1cf019a007
post merge fix
12 years ago
b4e36d4f31
Add a method to get the volume from the sound type
12 years ago
a5356e194e
Allow specifying a type for the playTrack method
12 years ago
72ffceb206
Add type flags to the sound play mode
12 years ago
dd3e568a00
Set the sound properties at initialization
12 years ago
20321c4552
Keep track of the actual active sounds
12 years ago
d348435a1d
Improve audio open error message
12 years ago
67485d3454
Store the AVStream in the decoder for easy referencing
12 years ago
4373218746
Fix audio stream check
12 years ago
58ab3407b7
Constify a couple fields
12 years ago
9e842a0bbb
Fix for trying to play videos when not supported
12 years ago
26660110e5
Allow building the video player without ffmpeg (playVideo will always throw an exception)
12 years ago
06fd66e99d
Move some fields to the class they're used in
12 years ago
f0f521a4e0
enableRestMenu -> enableRest
12 years ago
9c805483b0
Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback
12 years ago
86671096ec
remove commandline switch for new game
12 years ago
c5dd0e1968
New Game button
12 years ago
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
6bc526b74d
Avoid another loop for decoding audio
12 years ago
77852439ce
moved ColumnBase and Column struct into a separate translation unit
12 years ago
254a623319
Remove a redundant check
12 years ago
dd20db5dc2
Remove the stream indices from the VideoState
12 years ago
3f6d36c712
Avoid double-setting the material texture
12 years ago
e9d833be03
Use the packet pts to calculate the decoder sample offset
12 years ago
Tom Mason
scrawl
Marc Zinnschlag
Nathan Jeffords
Emanuel Guevel
lazydev
greye
eduard
Chris Robinson