eduard
98103e15eb
conflict resolution
2012-12-30 13:46:07 +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
Marc Zinnschlag
334588bf1c
Merge branch 'editor2'
2012-12-28 23:31:43 +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
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
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
Marc Zinnschlag
5cd2fe00ab
initialise blank global records
2012-12-03 22:16:02 +01:00
Marc Zinnschlag
8a09e03d5c
global variable editing (no undo support yet)
2012-11-29 14:45:34 +01:00
Marc Zinnschlag
ef9575498f
basic (non-editable) subview for global variables
2012-11-26 12:29:22 +01:00
Marc Zinnschlag
d684b3ae11
fixed getString function in NIF loader
2012-11-22 10:35:03 +01:00
scrawl
5f7d349126
several missing includes
2012-11-14 05:32:23 +01:00
Marc Zinnschlag
75f64aa38b
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.hpp
apps/openmw/mwmechanics/npcstats.cpp
apps/openmw/mwmechanics/npcstats.hpp
2012-11-10 15:44:44 +01:00
greye
b1ef0026a9
race selection/inventory preview character model update
2012-11-10 11:41:12 +04:00
Marc Zinnschlag
4994a253da
Merge branch 'bountydisease' into dialogue
2012-11-09 18:17:14 +01:00
greye
c3f0dc0dfb
m prefix for NpcAnimation members
2012-11-08 23:11:43 +04:00
scrawl
00a2de432a
fix BulletShapeLoader namespace
2012-11-08 18:48:07 +01:00
Marc Zinnschlag
662054acf4
Issue #219 : moved checks for various dialogue info fields from DialogueManager to Filter
2012-11-08 14:55:31 +01:00
greye
8691eac557
resolve Script::mData.mName -> mId, resolve moving ESMStore
2012-11-05 17:41:36 +04:00
greye
5ac54d1fff
alter ESM::Script for storing id as std::string
2012-11-05 17:18:01 +04:00
greye
d5628c678f
add mId field to every record indexed by id
2012-11-05 17:18:01 +04:00
greye
2057f5619e
move ESMStore to MWWorld
2012-11-05 17:18:01 +04:00
greye
f0a3ee0ef9
gmst id should be lowercase, wipe RecIdListT
2012-11-05 17:14:02 +04:00
scrawl
4ca0eb93ee
fix markers used for raycasting and blocking activation
2012-10-24 17:47:03 +02:00
Marc Zinnschlag
3f6afb13f1
Merge remote-tracking branch 'scrawl/alchemy'
2012-10-19 20:09:45 +02:00
Marc Zinnschlag
18686614db
Merge remote-tracking branch 'scrawl/splashscreen_dirlisting'
...
Conflicts:
apps/openmw/mwgui/loadingscreen.cpp
2012-10-18 15:46:43 +02:00
Marc Zinnschlag
510674aa5e
Merge branch 'master' into alchemy
...
Conflicts:
components/esm/loadmgef.hpp
2012-10-18 14:37:05 +02:00
Marc Zinnschlag
5fbca239dd
Issue #61 : potion creation (1st part; still missing some implementations)
2012-10-18 14:02:06 +02:00
scrawl
1a2034b4dd
training window
2012-10-17 18:03:02 +02:00
scrawl
84a4fd56c3
consider all files in Splash directory
2012-10-17 12:39:45 +02:00
Marc Zinnschlag
e05e683da3
Merge remote-tracking branch 'scrawl/spellcreation'
2012-10-12 17:19:30 +02:00
scrawl
8ccb0907e6
assertion -> exception; added the old effect flags again
2012-10-12 14:26:10 +02:00
Marc Zinnschlag
3fd887c030
silenced some warnings
2012-10-09 17:11:41 +02:00
Marc Zinnschlag
35d099a638
disabling gcc extensions
2012-10-09 17:10:25 +02:00
scrawl
21493c2dbd
added magic effect flags from Research wiki page
2012-10-01 23:33:07 +02:00
greye
31f7325e1f
fix land loading
2012-10-01 15:46:32 +04:00
greye
93078bb0dc
move record ids to defs.hpp
2012-10-01 00:55:27 +04:00
greye
3494e17b7c
wipe record superclass
2012-10-01 00:51:54 +04:00
greye
2fa4ac177a
initial resolving
2012-10-01 00:23:49 +04:00
greye
721324c1db
rm record inheritance, rework esmtool accordingly
2012-09-30 23:34:53 +04:00
