mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity
4,831 Commits 18 Branches 66 Tags
Commit Graph

3356 Commits

Author SHA1 Message Date
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
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
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
Marc Zinnschlag
1cf019a007 post merge fix 2012-12-18 12:36:26 +01:00
scrawl
f0f521a4e0 enableRestMenu -> enableRest 2012-12-16 16:55:59 +01:00
Marc Zinnschlag
77852439ce moved ColumnBase and Column struct into a separate translation unit 2012-12-16 12:52:23 +01:00
Marc Zinnschlag
f95e72166c hide type column in non-mixed type tables 2012-12-13 15:03:35 +01:00
Marc Zinnschlag
faa5ef0874 rewrote column class 2012-12-13 14:53:16 +01:00
Marc Zinnschlag
640c218df3 made record state uneditable again 2012-12-13 13:52:26 +01:00
Marc Zinnschlag
3d4c8c5444 added dialogue sub view (editing of a single record; not functional yet); fixed a bug in Universal to string conversion 2012-12-13 13:35:08 +01:00
Marc Zinnschlag
02184526e6 moved two helper classes from view/world/table into a separate translation unit 2012-12-13 11:24:39 +01:00
Marc Zinnschlag
cc18b30e17 open sub view on double click in report view 2012-12-12 22:36:20 +01:00
Marc Zinnschlag
c75563c184 report model and view 2012-12-11 15:35:47 +01:00
Marc Zinnschlag
2db930a5cf rewrote subview factory system 2012-12-11 13:22:43 +01:00
Marc Zinnschlag
0ed378dfb2 changed sub view factory method signature 2012-12-11 11:24:30 +01:00
Marc Zinnschlag
de4a03081c fixed skill level type in skill level up message 2012-12-10 11:04:21 +01:00