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
92623921ad
updated credits file
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
5f523afa05
Merge remote-tracking branch 'wheybags/master'
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
2736e84e49
updated credits file
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
e9ba7339f3
improved error handling
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
5a7a8629b6
remove unnecessary include directive
12 years ago
32f051d61d
Remove 'GMST fixing' for dirty GMST records
...
The 'fixing' for so-called dirty GMSTs does not work properly in its
current state anyway, so it should be removed. Fixing the 'GMST fixing'
might not be possible, because whether or not a GMST is 'dirty' depends
on the language version of MW. Therefore different 'fixing' algorithms
would be required for the different MW localisations, and I do not see
a good reason why GMST values should be hard-coded in the GMST load
procedure. In my opinion, it only clutters the code.
Last but not least, I believe that it is not the task of the engine to
clean ESM files from dirty entries. That is a job for the modders, who
should only release clean ESM/ESP files in the first place. The engine
should not need to worry about whether a file is 'dirty' or not.
That is why I believe a feature for cleaning ESM/ESP files shall not be
part of the engine.
12 years ago
Emanuel Guevel
Marc Zinnschlag
eduard
scrawl
Tom Mason
Chris Robinson
lazydev
Thoronador