Emanuel Guevel
0b7d11d38d
to_utf8 test: fix Utf8Encoder constructor
2013-01-06 11:39:18 +01:00
Emanuel Guevel
63f09462fd
to_utf8, Utf8Encoder: pass encoding as constructor parameter
...
Edit other files accordingly.
2013-01-06 01:37:58 +01:00
Emanuel Guevel
cc792da858
Fix to_utf8 test: add test data directory and remove unused include
2013-01-04 15:24:07 +01:00
Emanuel Guevel
c947d87ab9
Add a test for to_utf8 component
2013-01-04 15:10:30 +01:00
Emanuel Guevel
0bdf52a071
components/to_utf8: keep only Utf8Encoder
2013-01-04 01:58:30 +01:00
Emanuel Guevel
02bf02f288
ESMReader, ESMWriter: use Utf8Encoder
2013-01-04 01:52:03 +01:00
Emanuel Guevel
9906c3051d
components/translation: use Utf8Encoder
2013-01-04 01:52:02 +01:00
Emanuel Guevel
67273fc177
mwiniimporter: use Utf8Encoder
2013-01-04 01:52:02 +01:00
Emanuel Guevel
740e2b5769
components/to_utf8: add class Utf8Encoder
2013-01-04 01:52:02 +01:00
Marc Zinnschlag
5c007cd527
updated credits file
2013-01-03 10:05:37 +01:00
Marc Zinnschlag
0af7a2888a
Merge remote-tracking branch 'scrawl/ai_script'
2013-01-03 09:56:36 +01:00
Marc Zinnschlag
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++)
2013-01-03 09:55:48 +01:00
Marc Zinnschlag
c0260697c2
Merge remote-tracking branch 'scrawl/master'
2013-01-03 09:52:46 +01:00
Marc Zinnschlag
ce5d27b07b
Merge remote-tracking branch 'scrawl/button_fixes'
2013-01-03 09:50:24 +01:00
scrawl
42e0501c67
fix typo
2013-01-03 02:40:21 +01:00
scrawl
a5ef669eb6
Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD
...
Conflicts:
apps/openmw/mwscript/aiextensions.cpp
apps/openmw/mwscript/docs/vmformat.txt
2013-01-03 02:34:31 +01:00
scrawl
ba7086cadf
Use race/class names (instead of ID) in replaced escape sequences
2013-01-03 02:05:05 +01:00
scrawl
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.
2013-01-03 01:09:03 +01:00
scrawl
ddbe13e569
Workaround for http://bugs.openmw.org/issues/475
2013-01-03 01:07:17 +01:00
Marc Zinnschlag
ff74f687fb
Merge remote-tracking branch 'lazydev/master'
2013-01-02 16:04:44 +01:00
lazydev
04cca2a1ce
fix for http://bugs.openmw.org/issues/517
2013-01-02 18:58:52 +04:00
Marc Zinnschlag
c613f07b84
updated credits file
2013-01-02 10:10:10 +01:00
Marc Zinnschlag
83fe128e87
Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'
2013-01-02 10:05:27 +01:00
Marc Zinnschlag
0e80b445a9
Merge remote-tracking branch 'scrawl/master'
2013-01-02 10:03:59 +01:00
scrawl
86f30992d7
fix message boxes not appearing properly when e.g. trading
2013-01-01 22:00:14 +01:00
Emanuel Guevel
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.
2013-01-01 21:59:30 +01:00
Marc Zinnschlag
80a0be3264
Merge remote-tracking branch 'blunted2night/msvcbuild'
2013-01-01 21:19:27 +01:00
Nathan Jeffords
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).
2013-01-01 11:59:05 -08:00
Marc Zinnschlag
4a8bf40a83
Merge remote-tracking branch 'lazydev/master'
2013-01-01 20:45:09 +01:00
Nathan Jeffords
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.
2013-01-01 10:59:12 -08:00
Nathan Jeffords
7228f5d696
added missing reference to <cctype>
...
added missing reference to <cctype> that was causing Visual Studio 2010
to fail to compile stringops.hpp
2013-01-01 10:58:30 -08:00
Nathan Jeffords
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)
2013-01-01 10:57:58 -08:00
lazydev
7cd1e87fe8
Merge branch 'master' of git://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
2013-01-01 22:18:21 +04:00
Emanuel Guevel
e9a464c9f7
mwiniimporter: remove fallback values for Cursors
2012-12-31 16:45:24 +01:00
Emanuel Guevel
e2b348de96
mwiniimporter: fix line ending problem
2012-12-31 16:44:22 +01:00
Marc Zinnschlag
65c7c7f60e
Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'
2012-12-31 14:47:05 +01:00
greye
7e0713f6c4
fix string case update
2012-12-31 11:22:40 +04:00
lazydev
cd5d95ed22
1. Dialogs in Russian version now works.
...
2. Destination names it travel window are now translated
2012-12-31 04:15:47 +04:00
Marc Zinnschlag
8b2785400b
Merge remote-tracking branch 'trombonecot/comparestring'
2012-12-30 20:11:18 +01:00
eduard
69d9d22579
comparestring
2012-12-30 19:56:38 +01:00
Marc Zinnschlag
e577731a06
Merge remote-tracking branch 'scrawl/master'
2012-12-30 18:31:35 +01:00
scrawl
f56182cac2
fix journal window not rendering any text
2012-12-30 17:06:17 +01:00
Emanuel Guevel
cb71efc427
mwiniimporter: clean up
2012-12-30 16:44:52 +01:00
Emanuel Guevel
38e7dbb970
mwininimporter: add more fallback values
2012-12-30 16:43:05 +01:00
Marc Zinnschlag
714b1924a5
partial dialogue subview implementation
2012-12-30 14:01:52 +01:00
eduard
98103e15eb
conflict resolution
2012-12-30 13:46:07 +01:00
eduard
fb25f407fb
dialoguemanager conflict
2012-12-30 13:37:19 +01:00
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
