Commit Graph

1160 Commits (master)

Author SHA1 Message Date
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.
12 years ago
Marc Zinnschlag 5cd2fe00ab initialise blank global records 12 years ago
Marc Zinnschlag 8a09e03d5c global variable editing (no undo support yet) 12 years ago
Marc Zinnschlag ef9575498f basic (non-editable) subview for global variables 12 years ago
Mark Siewert b103426cf0 - Partially reimplement deleting objects defined in a parent esX file.
- Try to reimplement multiple esX files dropping references in the same file.
NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.
12 years ago
Mark Siewert 896ab44d1e - Add some updated files missing from last commit.
- Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.
12 years ago
Mark Siewert 8ea9f00e6f Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/cellstore.hpp
	apps/openmw/mwworld/containerstore.cpp
	apps/openmw/mwworld/localscripts.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm_store/reclists.hpp
	components/esm_store/store.cpp
	extern/shiny

- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
12 years ago
Mark Siewert 31fb715bd7 - Add support for moving existing references by plugin files. No cell changing yet.
- Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber.
- Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers.
- Many small tweaks so that the new CellRefList does not conflict with existing code.
12 years ago
Mark Siewert 2175f13b67 - Add tracking for dependencies between plugins.
- Add reference number mangling required for moving references around.
12 years ago
scrawl 5f7d349126 several missing includes 12 years ago
Mark Siewert 42eefaf36f - Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned).
- Reference loader now (partially) supports MVRF tag.
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
greye c3f0dc0dfb m prefix for NpcAnimation members 12 years ago
Marc Zinnschlag 662054acf4 Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter 12 years ago
Mark Siewert 7f77bf76c7 - Add support for multiple esm contexts in cell store. This will allow to generate references from multiple esX files. Currently, only the first context is used.
- Add many TODOs to mark points where more work is required to fully implement this feature.
12 years ago
Mark Siewert 64c08eada4 Merge remote-tracking branch 'upstream/next' into multiple_esm_esp 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 f0a3ee0ef9 gmst id should be lowercase, wipe RecIdListT 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
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
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
12 years ago
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.
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
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 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 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
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
Marc Zinnschlag 677158c477 added typesafe access functions for GMST values 12 years ago
Marc Zinnschlag f2ab4c929d Issue #356: added hardcoded magic effect flags *grumble* 12 years ago
greye a90547bbbe code formatting 13 years ago
greye 75fa0288a3 fix creatures has spells, creatures ai data 13 years ago
greye 02d7aa4135 npc ai packages 13 years ago
Marc Zinnschlag 34c30b132c Issue #378: workaround for bad ingredient records in Morrowind.esm 13 years ago
Edmondo Tommasina c08e098d7f esm_reader.cpp: fix std::runtime_error compile error 13 years ago
Edmondo Tommasina a63fd77ccc Revert "esm_reader.hpp: fix std::runtime_error compile error"
This reverts commit 0f3cb5667f.
13 years ago
Edmondo Tommasina 0f3cb5667f esm_reader.hpp: fix std::runtime_error compile error 13 years ago
Marc Zinnschlag 2c70a93553 Merge branch 'master' into potions
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
13 years ago
Marc Zinnschlag 4bfed952bc Merge remote branch 'guidoj/master' 13 years ago
guidoj 0549e949ba Mostly removal of unnecessary #include's and a little clean up 13 years ago
Chris Robinson ada88596dc Fix an abort at shutdown
Ogre uses a special method to delete the stream object, so it needs to be
allocated properly.
13 years ago
Chris Robinson 7734771245 Use Ogre to load ESM data instead of Mangle 13 years ago
Marc Zinnschlag 182017b8e9 Issue #314: Moved ingredients and potions to a different type of record list 13 years ago
Alexander "Ace" Olofsson 76c4aa41bb More land and cell work 13 years ago
Alexander "Ace" Olofsson f675d8d039 Merge branch 'master' 13 years ago
scrawl c85c794c86 fixed some cppcheck issues 13 years ago
scrawl 10cfe0f5bc Issue #295: Class creation dialogs tooltips; plus tons of other improvements 13 years ago
scrawl 8ce4727424 skill tooltips 13 years ago
scrawl 630241c8e2 load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum. 13 years ago
Alexander "Ace" Olofsson b1af18e98d Merged next 13 years ago
Alexander "Ace" Olofsson 0c9dfcc017 Some changes 13 years ago
scrawl 4ce83badc9 flickering lights 13 years ago
Alexander "Ace" Olofsson a74aeace73 Can now save strings with proper encoding, byte-perfect clones up until land records 13 years ago
Alexander "Ace" Olofsson f16a9ce5ed Working on making output identical to input. 13 years ago
Jason Hooks 7fce57f335 Getting started with a new branch 13 years ago
Alexander "Ace" Olofsson 290d09de64 Switching creature and npc to using the same id storage as the rest of the records 13 years ago
Alexander "Ace" Olofsson f0c32ba7d3 Fixed saving cell ref data with wrong name 13 years ago
Alexander "Ace" Olofsson fc8c75ab89 Esmtool can now clone an esm file in such a way that it can read it back again afterwards. 13 years ago
Alexander "Ace" Olofsson 0fd48c4229 Extended the esmtool a bit and prepared all records for saving. 13 years ago
Alexander "Ace" Olofsson 47013799ea Fleshing out the esm writer a bit 13 years ago
Alexander "Ace" Olofsson b81ac363fc Write names with a small sanity check 13 years ago
Alexander "Ace" Olofsson 7c1e417f9a Niceify-ing it (Yes, that's a word) 13 years ago
Alexander "Ace" Olofsson ba602929ef Adding basic save functions to all record types. 13 years ago
Lukasz Gromanowski ea8e5cb6f8 Issue #225: Land struct is not copyable.
Disabled copy constructor and assignment operator in Land structure.
13 years ago
Lukasz Gromanowski cd2789b15a Revert "Issue #225: Correction to commit ae98904."
This reverts commit 0e5c90d3e7.
13 years ago
Lukasz Gromanowski 0e5c90d3e7 Issue #225: Correction to commit ae98904.
Changed pointer to LandData struct to simple member variable.
13 years ago
Lukasz Gromanowski ae989040e5 Issue #225: Fix for memleak when loading terrain. 13 years ago
Marc Zinnschlag 2d2af4b28a Merge remote branch 'scrawl/terrain18' into terrain
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
	components/esm_store/cell_store.hpp
13 years ago
scrawl d5c49fa036 getWaterLevel use CellStore ; attempted fix for morrowind without tribunal 13 years ago
scrawl 42c5d515e6 fixed interior water level 13 years ago
Jacob Essex b76b62e5e4 Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore 13 years ago
scrawl 9076401892 Merge branch 'next' into terrain
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
13 years ago
Marc Zinnschlag ff866269ec Merge remote branch 'corristo/pgrd'
Removed a warning

Conflicts:
	CMakeLists.txt
13 years ago
Nikolay Kasyanov 988c1111e9 Feature #161 (Fix) Load REC_PGRD records
fixed edge decoding, thanks Project Aedra!
13 years ago
Nikolay Kasyanov de5b692f9f Feature #161 (Resolved) Load REC_PGRD records 13 years ago
Nikolay Kasyanov fda5b59eb6 Feature #161 (In Progress) Load REC_PGRD records
now using vector instead of C arrays
fixed path grid edge loading
added path grid to cell store
implemented dedicated storage class for path grids
13 years ago
Nikolay Kasyanov 08db70e137 disabled debug output 13 years ago
scrawl 8be661c802 Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
Conflicts:
	CMakeLists.txt
13 years ago
Nikolay Kasyanov 540e4f77a7 Feature #161 (In Progress) Load REC_PGRD records
improved debug output
13 years ago
Nikolay Kasyanov e58e00ef2a Feature #161 (In Progress) Load REC_PGRD records
Point coords definitely not floats
13 years ago
Nikolay Kasyanov 40e07bbd2a Feature #161 (In Progress) Load REC_PGRD records
Struct sizes seems correct, but floats is broken
13 years ago
Michael Papageorgiou a1cbc7fb42 Altered getFver to fix a warning 13 years ago
Jacob Essex 6924348696 Fixed some texture splatting issues with loading empty terrain cells 13 years ago
Jacob Essex 1d0ae9c8d1 Start of a basic implementation of fake vertex colours 13 years ago
Jacob Essex 637302fc87 Added blended textures to the terrain 13 years ago
Jacob Essex 18108c02a7 Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered 13 years ago
Marc Zinnschlag ce7202a147 Issue #28: shifting around functionality among CellStore, Cells and CellList 13 years ago
Lukasz Gromanowski ac9b1715d5 Added new command line option: "encoding"
Added new command line option: "encoding" which allow to
change font encoding used in game messages.

Currently there are three evailable encodings:

    win1250 - Central and Eastern European (languages
              that use Latin script, such as Polish,
              Czech, Slovak, Hungarian, Slovene, Bosnian,
              Croatian, Serbian (Latin script),
              Romanian and Albanian)

    win1251 - languages that use the Cyrillic alphabet
              such as Russian, Bulgarian, Serbian Cyrillic
              and others

    win1252 - Western European (Latin) - default

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Lukasz Gromanowski 90985e849e Mantis: #18 - Move components from global namespace into their own namespace.
Moving classes from components/misc into Misc namespace.

Note: Misc namespace introduced conflict with ESM::Misc and MWClass::Misc
classes, so both of them are renamed to ESM::Miscellaneous
and MWClass::Miscellaneous.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
Nikolay Kasyanov 79911b16d0 Fixed enum formatting in components/esm headers 14 years ago
Nikolay Kasyanov 1e5768170f Refactored remaining headers in components/esm except defs.hpp.
Removed obsolete *.cpp files.
14 years ago
Nikolay Kasyanov a2c42ab5a2 components/esm header refactoring in progress. Refactored:
esm_reader.hpp
loadacti.hpp
loadalch.hpp
loadappa.hpp
loadarmo.hpp
loadbody.hpp
loadbook.hpp
loadbsgn.hpp
loadcell.hpp
loadclas.hpp
loadclot.hpp
loadland.hpp
Updated code style in defs.hpp
14 years ago
Jan-Peter Nilsson 4dd76ff36e Remove no longer needed local .gitignore 14 years ago
Jan-Peter Nilsson f65f210149 An unsigned integer can not be smaller than 0 so there's no point in checking 14 years ago
athile 27f69d0f5b Fix some double-to-float Visual Studio warnings in npc.cpp. Add 'm' prefix to member variables in esm_reader.hpp. 14 years ago
Yuri Krupenin b791a8f6be Merge remote branch 'zini/master' 14 years ago
Pieter van der Kloet dd4d022301 Converted all tabs to four spaces 14 years ago
Yuri Krupenin 6b6ee5440e Minimal set of fixes to build with MinGW. 14 years ago
Marc Zinnschlag 38ab9f7a3d Merge branch 'newchar'
Conflicts:
	components/esm_store/store.hpp
14 years ago
Marc Zinnschlag cc86fe54d5 Merge remote branch 'amos/gui-windows' into newchar 14 years ago
Nicolay Korslund 30f2d4fdd4 Added LAND and LTEX to esm_store 14 years ago
Marc Zinnschlag 770276281b changed numeric char type defs from char to signed char 14 years ago
Marc Zinnschlag c16f79afc6 fixed a bug in esm loader, that made all doors and chests locked by default 14 years ago
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. 14 years ago
Jan Borsodi cd3e976b7c Added birthsign dialog and spell effect widget. 14 years ago
Jan Borsodi eec34e9f0e Added dialog for picking class from a list. 14 years ago
Jan Borsodi 573917f3e1 Removed the need to configure the misc skills, they are now automatically set to any skills not part of the major/minor group. 14 years ago
Jan Borsodi 30e0d713ed Changed list of skill names to contain the ID of the names instead, the actual names are then fetched from GMST. 14 years ago
Jan Borsodi edb2df7d27 Merge remote branch 'zini/newchar' into gui-windows 14 years ago
Jan Borsodi 415426c30b Convert tabs to spaces. 14 years ago
Jan Borsodi 1c79a62957 Added a static list of skill names to ESM::Skill. 14 years ago
Marc Zinnschlag 0414d7f862 load skill and magic effect records 15 years ago
Nicolay Korslund 6a12ce313e Fixed uninit var in loadland.hpp 15 years ago
Nicolay Korslund f55362cbdc Some Windows-help to cmake/FindAudiere.cmake + non-important changes. 15 years ago
Nicolay Korslund 5552c44753 Cleaned up strnlen in esm_reader. Added -Werror switch to g++. 15 years ago
Nicolay Korslund e30306f7c3 Removed redundant custom exception class 15 years ago
Nicolay Korslund c5d3a40fde Fixed ESM bug (quest records). 15 years ago
Nicolay Korslund 358e1ca5a5 Added custom UTF8 converter. Removed iconv dependency. 15 years ago
Marc Zinnschlag 2cfe5f0697 Merge branch 'master' into dialogue
Conflicts:
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
	apps/openmw/mwworld/class.cpp
	apps/openmw/mwworld/class.hpp
15 years ago
Armin Preiml 6a936100a7 Merge remote branch 'upstream/master' 15 years ago
Nicolay Korslund 5d4dba981f Fixed mistake in NPC record struct 15 years ago
Marc Zinnschlag 8086933282 Merge branch 'master' into dialogue
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
15 years ago
Marc Zinnschlag 8d85211fa1 modified Npc and Creature class to let them store a copy of their own ID 15 years ago
Armin Preiml 305563e595 disabled char encoding method for windows, although you'll need to add the iconv libs 15 years ago
Marc Zinnschlag 6b1b3b20fd store info records in dialogue records 15 years ago
Marc Zinnschlag d47de55ce9 read info records 15 years ago
Marc Zinnschlag 69ea00455f Merge branch 'poly'
Conflicts:
	apps/openmw/mwworld/world.cpp
15 years ago
Marc Zinnschlag f50ced4616 added missing record classes 15 years ago
Armin Preiml 986325b3b2 Changed decoding code page from ISO-8859-1 to WINDOWS-1252 15 years ago
Armin Preiml f3ee9ced5c Added cmake file for the iconv library and extended relevant
cmake files to use it.
Added convertToUTF8 to esm_reader. getString(int size) uses this
method now.
15 years ago
Nicolay Korslund f87810ce7a Moved esmtool to apps/ 15 years ago
athile 5fe4313b95 Various Windows fixes to CMake, compile errors, and a few warnings. Also made the command server optional and disabled by default since it is not currently working correctly on Linux. 15 years ago
Marc Zinnschlag d57e67e722 added global variable handling to compiler context (not working yet because of case problems) 15 years ago
athile 59a2e8dcf7 Merge upstream 15 years ago
athile 819c146ad1 Project clean-up: move 'misc' into the platform lib, update CMake to build 'platform' as a lib, and various fixes for Visual Studio compiler warnings 15 years ago
athile b2485e8a52 Windows build fixes 15 years ago
athile d67f0c74b0 Merge remote branch 'upstream/master' 15 years ago
Marc Zinnschlag e4f85cb3e6 directory structure reorganisation (still missing the mangle stuff) 15 years ago