04cca2a1ce
fix for http://bugs.openmw.org/issues/517
12 years ago
c613f07b84
updated credits file
12 years ago
83fe128e87
Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'
12 years ago
0e80b445a9
Merge remote-tracking branch 'scrawl/master'
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
80a0be3264
Merge remote-tracking branch 'blunted2night/msvcbuild'
12 years ago
08fa9dcd3e
replaced std::string concatenation with std::ostringstream
...
Changed a block of code that was performing a series of string
concatenations to use an ostringstream instead. This allowed the removal
of calls to std::to_string (not C++03 compliant) and fixes an compile
error in MSVC 2010 (ambigous overload when calling std::to_string).
12 years ago
4a8bf40a83
Merge remote-tracking branch 'lazydev/master'
12 years ago
a842fc2c11
added hack to fix an alignment issue in MSVC 2010
...
The default allocator in Visual Studio 2010 does not respect the
alignment requirements of classes it is allocating memory for. This
results in a potential crash when using OEngine::Physics::PhysicActor
that has been allocated on the heap if it is built against a version of
Bullet that has SSE intrinsics enabled.
12 years ago
7228f5d696
added missing reference to <cctype>
...
added missing reference to <cctype> that was causing Visual Studio 2010
to fail to compile stringops.hpp
12 years ago
008d6d6589
added additional library search paths to find bullet
...
This allowed CMake to correctly build Visual Studio 2010 project files against a windows compiled version of bullet (2.81 rev 2613)
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
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
lazydev
Marc Zinnschlag
scrawl
Emanuel Guevel
Nathan Jeffords
greye
eduard
Tom Mason
Chris Robinson