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
83fe128e87
Merge remote-tracking branch 'potatoesmaster/ini_fallback_values-draft'
2013-01-02 10:05:27 +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
4a8bf40a83
Merge remote-tracking branch 'lazydev/master'
2013-01-01 20:45:09 +01: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
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
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
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
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
