Mark Siewert
|
1f961d575e
|
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
Conflicts:
apps/openmw/mwrender/terrain.cpp
components/esm/loadland.hpp
components/esm_store/reclists.hpp
|
2012-10-07 20:35:54 +02:00 |
|
Mark Siewert
|
28d4d7ea3f
|
Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging.
- Remove check for 255 master/plugin files.
|
2012-10-07 20:00:55 +02:00 |
|
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
2012-09-17 11:37:50 +04:00 |
|
scrawl
|
8231cab599
|
correct case for dialogue topics
|
2012-04-17 23:47:50 +02:00 |
|
Marc Zinnschlag
|
2b5dc0042b
|
fix for issue 138 (record loading failed for some NPCs)
|
2011-07-04 23:36:22 +02:00 |
|
Jan Borsodi
|
ee101440a2
|
Continued work on Class Create dialog. Added sub-dialogs for picking specialization, attribute and skill. Also added some definitions in ESM for attributes and specializations.
|
2010-09-24 15:28:14 +02:00 |
|
Marc Zinnschlag
|
0414d7f862
|
load skill and magic effect records
|
2010-09-12 09:34:45 +02:00 |
|
Marc Zinnschlag
|
6b1b3b20fd
|
store info records in dialogue records
|
2010-08-06 15:23:13 +02:00 |
|
Marc Zinnschlag
|
d47de55ce9
|
read info records
|
2010-08-06 15:19:39 +02:00 |
|
Nicolay Korslund
|
c84672a560
|
Added MyGUI to OpenMW, fully working (with events and script hooks)
|
2010-07-17 19:38:32 +02:00 |
|
Marc Zinnschlag
|
e4f85cb3e6
|
directory structure reorganisation (still missing the mangle stuff)
|
2010-06-25 22:28:59 +02:00 |
|