eduard
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
2012-12-30 13:09:37 +01:00
Emanuel Guevel
9d043d0193
mwiniimporter: fix string cutting
2012-12-29 18:16:03 +01:00
Emanuel Guevel
b2203d22fc
mwiniimporter: added fallback values
...
Ugly comments included. I will merge it on another branch to clean this
up later.
2012-12-29 18:15:32 +01:00
Marc Zinnschlag
92623921ad
updated credits file
2012-12-29 09:23:06 +01:00
scrawl
1dcc0f10ee
Merge pull request #6 from ChrisKCat/videoplayback
...
Videoplayback
2012-12-28 15:28:58 -08:00
Marc Zinnschlag
8d4afe3bf5
post merge fix
2012-12-28 23:45:13 +01:00
Marc Zinnschlag
e2a8e2107b
Merge branch 'globals'
2012-12-28 23:42:02 +01:00
Marc Zinnschlag
334588bf1c
Merge branch 'editor2'
2012-12-28 23:31:43 +01:00
Tom Mason
bed8fb69e6
added bounty related scripting functions
2012-12-28 22:26:21 +00:00
Chris Robinson
1dd9276ceb
Add missing decoder method declarations
2012-12-28 11:26:41 -08:00
Marc Zinnschlag
5f523afa05
Merge remote-tracking branch 'wheybags/master'
2012-12-28 19:31:26 +01:00
scrawl
ade4ec0453
fix texture edge bleeding due to wrong addressing mode
2012-12-28 19:01:47 +01:00
eduard
c75a5ae212
string compare and tolower
2012-12-28 18:05:52 +01:00
eduard
8545667bbd
string compare and tolower
2012-12-28 17:54:56 +01:00
Tom Mason
ad9b86058b
replaced explicit text with GMST entries, thanks to zinnschlag
2012-12-27 15:28:13 +00:00
Marc Zinnschlag
2736e84e49
updated credits file
2012-12-27 11:04:53 +01:00
Tom Mason
ba2301a156
removed redundant code thanks to scrawl
2012-12-27 00:49:39 +00:00
Tom Mason
299a1f32ed
cleanup
2012-12-26 23:52:16 +00:00
Tom Mason
51fce62b69
Merge branch 'messageboxes'
2012-12-26 23:06:27 +00:00
Tom Mason
716fbbbd74
messageboxes during dialogue show up in dialogue window, and messageboxes are generated when an item is removed from inventory
2012-12-26 22:57:53 +00:00
Tom Mason
a14b7e4a0f
small fixes on text defines
2012-12-26 18:07:56 +00:00
Marc Zinnschlag
e9ba7339f3
improved error handling
2012-12-26 17:15:53 +01:00
Marc Zinnschlag
afc2e840ae
renamed namespace TranslationData to Translation
2012-12-26 17:06:33 +01:00
Marc Zinnschlag
206c613b52
moved translation storage from GUI manager to engine
2012-12-26 17:03:37 +01:00
Marc Zinnschlag
2d468fec02
made previous commits naming standard compliant
2012-12-26 16:19:59 +01:00
Marc Zinnschlag
4c28f3211b
Merge remote-tracking branch 'lazydev/master'
2012-12-26 15:50:03 +01:00
lazydev
1f71395660
renaming of translation component; removing of C++11 features
2012-12-25 23:20:39 +04:00
lazydev
74ae479780
Cell names localization fix
2012-12-23 23:23:24 +04:00
Tom Mason
8ac8fdff47
implemented all text defines except a few for keybindings that don't exist yet
2012-12-21 18:09:31 +00:00
Tom Mason
f2c6907244
Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work
2012-12-20 23:16:34 +00:00
Chris Robinson
85850c7440
Fix DEFAULT_OUTPUT declaration
2012-12-18 10:43:04 -08:00
scrawl
64210e6efa
Revert "New Game button"
...
This reverts commit c5dd0e1968
2012-12-18 19:09:27 +01:00
scrawl
1c73a3f2fb
Revert "remove commandline switch for new game"
...
This reverts commit 86671096ec
2012-12-18 19:09:08 +01:00
Chris Robinson
7b2c3e6cd3
Pass a proper PlayMode enum to playSound and playSound3D
2012-12-18 06:01:21 -08:00
Chris Robinson
3b7edae7c3
Don't hold a list of all sound sources
2012-12-18 05:19:32 -08:00
Chris Robinson
fe36cc1de7
Don't try to resume sound types that aren't paused
2012-12-18 04:35:24 -08:00
Chris Robinson
2f8daec379
Allow pausing only certain types of sounds
2012-12-18 04:19:35 -08:00
Marc Zinnschlag
1cf019a007
post merge fix
2012-12-18 12:36:26 +01:00
Chris Robinson
b4e36d4f31
Add a method to get the volume from the sound type
2012-12-18 02:01:04 -08:00
Chris Robinson
a5356e194e
Allow specifying a type for the playTrack method
2012-12-18 01:35:20 -08:00
Chris Robinson
72ffceb206
Add type flags to the sound play mode
2012-12-18 00:57:57 -08:00
Chris Robinson
dd3e568a00
Set the sound properties at initialization
2012-12-17 23:35:20 -08:00
Chris Robinson
20321c4552
Keep track of the actual active sounds
2012-12-17 21:50:01 -08:00
Chris Robinson
d348435a1d
Improve audio open error message
2012-12-17 21:09:57 -08:00
Thoronador
5a7a8629b6
remove unnecessary include directive
2012-12-17 23:20:43 +01:00
Thoronador
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.
2012-12-17 23:13:33 +01:00
Chris Robinson
67485d3454
Store the AVStream in the decoder for easy referencing
2012-12-17 07:15:53 -08:00
Chris Robinson
4373218746
Fix audio stream check
2012-12-17 06:56:30 -08:00
Chris Robinson
58ab3407b7
Constify a couple fields
2012-12-17 04:17:06 -08:00
Chris Robinson
d67951a256
Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback
2012-12-17 00:42:13 -08:00
