Commit Graph

35 Commits (520e65f82205480a6286d6c51129c0715ec13149)

Author SHA1 Message Date
scrawl b8e11cf197 Merge commit 'pull/upstream/678' into HEAD
Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp
9 years ago
scrawl a47617c21f Fix tab indentations in apps/ and components/ 9 years ago
Stanislav Bas 4a16eba716 Make deleted flag a parameter of load/save methods (instead of a record member) in ESM records 10 years ago
scrawl 28caeadef4 Improve error message for not found records 10 years ago
scrawl 49d912e5b6 Don't rely on subrecord order part 2
Nice side effects:
 - Subrecord name comparison now uses magic number instead of string (faster)
 - Improves the error message for unknown subrecords: will print the record in question instead of failing to read the next record with a strange error
10 years ago
Marc Zinnschlag 850dbb55a5 improved magic effect IDs 10 years ago
Marc Zinnschlag 58a9176c18 preparing magic effects record for use in OpenCS 10 years ago
scrawl 44642ae21b Fix incorrect Speed value in ESM::MagicEffect (thanks Hrnchamd) 10 years ago
MiroslavR 46e9ee408f Do not allow mods to change fixed effect properties in the legacy format, but allow it entirely in the new format. 11 years ago
MiroslavR d16e0c063c Enchanting, spellmaking dialog: check for flags when listing known effects 11 years ago
scrawl 1d19d36bd6 Remove unused magic effect flags and update esmtool output 11 years ago
scrawl 3452bd2e0b Add glow effect for enchanted items 11 years ago
scrawl c5f1bbcc5f Add functions to get the effect affecting resistance and weakness for another effect 11 years ago
scrawl a6e2f43b75 Stop continuous VFX when the effect is no longer active. 11 years ago
scrawl ffdb91bb21 Add particles for Cast + Hit. Not looking quite right yet. 11 years ago
Marc Zinnschlag c995533e07 Merge branch 'dialogue' into saving
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
11 years ago
Jordan Ayers 296b2ab870 Magic Effect: Recognize other display types.
Fill out the list of effects which use percentage formatting.
Add in types which use Feet and level labels.
11 years ago
Jordan Ayers 6ab7002908 MagicEffect: Put magnitude type into ESM::MagicEffect helper. 11 years ago
Marc Zinnschlag c42e74dadf make 4 byte record type accessable from record struct 11 years ago
Marc Zinnschlag 874ce26bef added missing consts to record save functions 11 years ago
Chris Robinson 73437dfdca GetEffect can accept an effect ID string as well 12 years ago
scrawl dd57eabc3e Better use an enum for magic effect IDs 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 8ccb0907e6 assertion -> exception; added the old effect flags again 12 years ago
scrawl 21493c2dbd added magic effect flags from Research wiki page 12 years ago
greye 3494e17b7c wipe record superclass 12 years ago
greye 721324c1db rm record inheritance, rework esmtool accordingly 12 years ago
greye c54750977f remove underscores in guards 12 years ago
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
Marc Zinnschlag f2ab4c929d Issue #356: added hardcoded magic effect flags *grumble* 12 years ago
Alexander "Ace" Olofsson 0fd48c4229 Extended the esmtool a bit and prepared all records for saving. 13 years ago
Alexander "Ace" Olofsson ba602929ef Adding basic save functions to all record types. 13 years ago
Nikolay Kasyanov fcfe267fc9 Refactored remaining headers in components/esm except defs.hpp.
Removed obsolete *.cpp files.
14 years ago
Marc Zinnschlag e4f85cb3e6 directory structure reorganisation (still missing the mangle stuff) 15 years ago