Marc Zinnschlag
|
d684b3ae11
|
fixed getString function in NIF loader
|
12 years ago |
scrawl
|
5f7d349126
|
several missing includes
|
12 years ago |
|
Marc Zinnschlag
|
75f64aa38b
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.hpp
apps/openmw/mwmechanics/npcstats.cpp
apps/openmw/mwmechanics/npcstats.hpp
|
12 years ago |
greye
|
b1ef0026a9
|
race selection/inventory preview character model update
|
12 years ago |
|
Marc Zinnschlag
|
4994a253da
|
Merge branch 'bountydisease' into dialogue
|
12 years ago |
|
greye
|
c3f0dc0dfb
|
m prefix for NpcAnimation members
|
12 years ago |
|
scrawl
|
00a2de432a
|
fix BulletShapeLoader namespace
|
12 years ago |
|
Marc Zinnschlag
|
662054acf4
|
Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter
|
12 years ago |
|
greye
|
8691eac557
|
resolve Script::mData.mName -> mId, resolve moving ESMStore
|
12 years ago |
|
greye
|
5ac54d1fff
|
alter ESM::Script for storing id as std::string
|
12 years ago |
|
greye
|
d5628c678f
|
add mId field to every record indexed by id
|
12 years ago |
|
greye
|
2057f5619e
|
move ESMStore to MWWorld
|
12 years ago |
|
greye
|
f0a3ee0ef9
|
gmst id should be lowercase, wipe RecIdListT
|
12 years ago |
|
scrawl
|
4ca0eb93ee
|
fix markers used for raycasting and blocking activation
|
12 years ago |
|
Marc Zinnschlag
|
3f6afb13f1
|
Merge remote-tracking branch 'scrawl/alchemy'
|
12 years ago |
|
Marc Zinnschlag
|
18686614db
|
Merge remote-tracking branch 'scrawl/splashscreen_dirlisting'
Conflicts:
apps/openmw/mwgui/loadingscreen.cpp
|
12 years ago |
|
Marc Zinnschlag
|
510674aa5e
|
Merge branch 'master' into alchemy
Conflicts:
components/esm/loadmgef.hpp
|
12 years ago |
|
Marc Zinnschlag
|
5fbca239dd
|
Issue #61: potion creation (1st part; still missing some implementations)
|
12 years ago |
|
scrawl
|
1a2034b4dd
|
training window
|
12 years ago |
|
scrawl
|
84a4fd56c3
|
consider all files in Splash directory
|
12 years ago |
|
Marc Zinnschlag
|
e05e683da3
|
Merge remote-tracking branch 'scrawl/spellcreation'
|
12 years ago |
|
scrawl
|
8ccb0907e6
|
assertion -> exception; added the old effect flags again
|
12 years ago |
|
Marc Zinnschlag
|
3fd887c030
|
silenced some warnings
|
12 years ago |
|
Marc Zinnschlag
|
35d099a638
|
disabling gcc extensions
|
12 years ago |
|
scrawl
|
21493c2dbd
|
added magic effect flags from Research wiki page
|
12 years ago |
|
greye
|
31f7325e1f
|
fix land loading
|
12 years ago |
|
greye
|
93078bb0dc
|
move record ids to defs.hpp
|
12 years ago |
|
greye
|
3494e17b7c
|
wipe record superclass
|
12 years ago |
|
greye
|
2fa4ac177a
|
initial resolving
|
12 years ago |
|
greye
|
721324c1db
|
rm record inheritance, rework esmtool accordingly
|
12 years ago |
Chris Robinson
|
cd8515396a
|
Use a multimap to store the text keys
|
12 years ago |
|
Chris Robinson
|
9b491edbf8
|
Small cleanup for loading animation keyframes
|
12 years ago |
|
scrawl
|
d163f8203c
|
change books to RecListWithIDT
|
12 years ago |
|
greye
|
1339787863
|
remove underscores from filenames in esm
|
12 years ago |
|
greye
|
7368e7b655
|
rename getASCII() to getLegacyEnc()
|
12 years ago |
|
greye
|
c54750977f
|
remove underscores in guards
|
12 years ago |
|
scrawl
|
bf3aad8be0
|
handle NCC flag
|
12 years ago |
|
scrawl
|
872fcf3e3d
|
sleeping restoration of health, magicka, and fatigue
|
12 years ago |
|
greye
|
18cc435aa1
|
resolving conflicts
|
12 years ago |
|
greye
|
09195894cf
|
restore INGR and MGEF
|
12 years ago |
|
greye
|
2d5ddd104b
|
Land::loadData rework
|
12 years ago |
|
greye
|
bd94f257bf
|
a bit formatting
|
12 years ago |
|
greye
|
e69880f77e
|
almost perfect byte copies, has redundant data
|
12 years ago |
|
scrawl
|
8214966d44
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
|
12 years ago |
|
scrawl
|
e8bba2b833
|
disabled loading of land normals again, didn't need them after all
|
12 years ago |
|
scrawl
|
86cfc91ef3
|
global map rendering
|
12 years ago |
|
greye
|
597b88e95a
|
update saving AI packages
|
12 years ago |
|
Marc Zinnschlag
|
4abb9a00da
|
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
|
12 years ago |
|
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
12 years ago |
|
Marc Zinnschlag
|
835c530e06
|
Merge branch 'ingredients'
|
12 years ago |