Marc Zinnschlag
1489570b09
change variant in info record to new type
2013-03-05 10:34:03 +01:00
Marc Zinnschlag
1b19ab6028
fixed gmst integers
2013-03-05 08:15:03 +01:00
Marc Zinnschlag
ba4907fbaf
use new Variant type for GMSTs
2013-03-05 08:02:27 +01:00
Marc Zinnschlag
ce49ad54a1
some cleanup and fixing
2013-03-05 08:02:05 +01:00
Marc Zinnschlag
a1ac20c6f3
changed global variable records to new variant type
2013-03-04 14:32:59 +01:00
Marc Zinnschlag
65081f5520
added variant class
2013-03-04 14:32:23 +01:00
Marc Zinnschlag
230136438b
minor cleanup
2013-02-28 22:17:07 +01:00
lazydev
60f2219450
fixed zini's norices
2013-03-01 00:46:05 +04:00
lazydev
169a1ff1ce
Merge branch 'master' of git://github.com/zinnschlag/openmw
2013-02-28 23:02:19 +04:00
scrawl
6683e43efc
Removed commented code
2013-02-28 12:35:18 +01:00
scrawl
f75681d89b
Ignore ESX header version
2013-02-28 12:12:51 +01:00
Marc Zinnschlag
3bd228f71b
fix for global variables of type short
2013-02-28 11:50:29 +01:00
lazydev
b93eb84401
fix for https://bugs.openmw.org/issues/573
2013-02-28 02:43:03 +04:00
lazydev
759b2e96bf
fix for https://bugs.openmw.org/issues/577
2013-02-27 01:37:40 +04:00
Marc Zinnschlag
a7102c143f
ESX variable type cleanup
2013-02-26 14:37:11 +01:00
Chris Robinson
db9a3aeddf
Merge remote-tracking branch 'zini/master' into animation2
2013-02-24 03:32:35 -08:00
Nathan Jeffords
44b1c66c4b
fixed various warnings about converting size_t to int
2013-02-23 10:23:38 -08:00
Chris Robinson
e2d7cc49e3
Merge remote-tracking branch 'zini/next' into animation2
2013-02-17 03:42:37 -08:00
Douglas Mencken
df5919f2c5
Use `signed char' explicitly where needed. It is important because:
...
- It is implementation-dependent if plain `char' signed or not.
- C standard defines three *distinct* types: char, signed char,
and unsigned char.
- Assuming that char is always unsigned or signed can lead to
compile-time and run-time errors.
You can also use int8_t, but then it would be less obvious for developers
to never assume that char is always unsigned (or always signed).
Conflicts:
components/esm/loadcell.hpp
2013-02-15 20:28:14 +01:00
Chris Robinson
f197c67e95
Fix a circular include
2013-02-09 12:46:20 -08:00
Marc Zinnschlag
f19fbaa293
Merge remote-tracking branch 'mark76/multiple_esm_esp' into next
2013-02-09 15:30:29 +01:00
Mark Siewert
eefbdde6de
- For pull request: remove all instances of maps used to track refnumbers.
...
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
2013-02-09 13:00:57 +01:00
Marc Zinnschlag
d5dd0640c7
basic gmst support
2013-02-08 09:58:19 +01:00
Mark Siewert
dca8dc4fdb
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/esmreader.hpp
- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.
2013-01-25 18:22:01 +01:00
Mark Siewert
713d324eeb
- Minor code cleanup
2013-01-20 19:07:33 +01:00
Mark Siewert
a8e02779b2
- Add support for multiple plugins trying to modify the same reference
...
- Fix a small signed/unsigned warning
2013-01-19 23:33:18 +01:00
Marc Zinnschlag
25815ab8f7
Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite'
2013-01-06 13:31:01 +01:00
Emanuel Guevel
63f09462fd
to_utf8, Utf8Encoder: pass encoding as constructor parameter
...
Edit other files accordingly.
2013-01-06 01:37:58 +01:00
Nathan Jeffords
fec9a59237
changed EMSLoader to use ConstrainedDataStream
...
Changed the EMSLoader class to use the ConstrainedDataStream so that
future changes may benifit from its increased performance.
2013-01-04 13:41:03 -08:00
Emanuel Guevel
02bf02f288
ESMReader, ESMWriter: use Utf8Encoder
2013-01-04 01:52:03 +01:00
Mark Siewert
d6377fb2e3
- Support deleting references from a plugin
...
- Add preliminary support for loading some unique fields appearing only in savegames
- Add a few lines required for supporting respawning references. Incomplete.
2013-01-03 18:51:04 +01:00
Marc Zinnschlag
334588bf1c
Merge branch 'editor2'
2012-12-28 23:31:43 +01:00
Mark Siewert
049b0e66e0
- Restore ability to generate references in the same cell from multiple plugins
...
- Disable some code related to deleting entries in the store so that it builds again
2012-12-25 20:27:30 +01:00
lazydev
74ae479780
Cell names localization fix
2012-12-23 23:23:24 +04: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
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.
2012-11-25 19:07:16 +01:00
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.
2012-11-25 17:19:29 +01:00
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.
2012-11-25 14:12:44 +01:00
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.
2012-11-17 21:50:25 +01:00
Mark Siewert
2175f13b67
- Add tracking for dependencies between plugins.
...
- Add reference number mangling required for moving references around.
2012-11-17 00:21:51 +01:00
scrawl
5f7d349126
several missing includes
2012-11-14 05:32:23 +01:00
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.
2012-11-10 21:43:41 +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
greye
c3f0dc0dfb
m prefix for NpcAnimation members
2012-11-08 23:11:43 +04: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
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.
2012-11-06 22:13:19 +01:00
Mark Siewert
64c08eada4
Merge remote-tracking branch 'upstream/next' into multiple_esm_esp
2012-11-06 20:37:29 +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
f0a3ee0ef9
gmst id should be lowercase, wipe RecIdListT
2012-11-05 17:14:02 +04: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
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
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
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
scrawl
d163f8203c
change books to RecListWithIDT
2012-09-25 21:38:34 +02:00
greye
1339787863
remove underscores from filenames in esm
2012-09-23 23:12:10 +04:00
greye
7368e7b655
rename getASCII() to getLegacyEnc()
2012-09-23 22:20:18 +04:00
greye
c54750977f
remove underscores in guards
2012-09-23 22:11:08 +04:00
scrawl
872fcf3e3d
sleeping restoration of health, magicka, and fatigue
2012-09-21 17:53:16 +02:00
greye
18cc435aa1
resolving conflicts
2012-09-21 13:13:11 +04:00
greye
09195894cf
restore INGR and MGEF
2012-09-21 12:30:08 +04:00
greye
2d5ddd104b
Land::loadData rework
2012-09-21 12:12:16 +04:00
greye
bd94f257bf
a bit formatting
2012-09-21 09:36:18 +04:00
greye
e69880f77e
almost perfect byte copies, has redundant data
2012-09-20 20:33:30 +04:00
scrawl
e8bba2b833
disabled loading of land normals again, didn't need them after all
2012-09-20 14:06:30 +02:00
scrawl
86cfc91ef3
global map rendering
2012-09-20 13:56:37 +02:00
greye
597b88e95a
update saving AI packages
2012-09-18 19:30:19 +04:00
greye
7606ebafd6
resolving conflicts, minor update
2012-09-17 11:37:50 +04:00
Marc Zinnschlag
677158c477
added typesafe access functions for GMST values
2012-09-13 10:41:55 +02:00
Marc Zinnschlag
f2ab4c929d
Issue #356 : added hardcoded magic effect flags *grumble*
2012-09-13 09:26:17 +02:00
greye
a90547bbbe
code formatting
2012-08-29 21:35:06 +04:00
greye
75fa0288a3
fix creatures has spells, creatures ai data
2012-08-29 14:35:43 +04:00
greye
02d7aa4135
npc ai packages
2012-08-29 14:35:43 +04:00
Marc Zinnschlag
34c30b132c
Issue #378 : workaround for bad ingredient records in Morrowind.esm
2012-08-28 10:12:22 +02:00
Edmondo Tommasina
c08e098d7f
esm_reader.cpp: fix std::runtime_error compile error
2012-08-04 23:02:34 +02:00
Edmondo Tommasina
a63fd77ccc
Revert "esm_reader.hpp: fix std::runtime_error compile error"
...
This reverts commit 0f3cb5667f
2012-08-04 22:58:26 +02:00
Edmondo Tommasina
0f3cb5667f
esm_reader.hpp: fix std::runtime_error compile error
2012-08-03 22:41:51 +02:00
Marc Zinnschlag
2c70a93553
Merge branch 'master' into potions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
2012-07-17 10:32:18 +02:00
Marc Zinnschlag
4bfed952bc
Merge remote branch 'guidoj/master'
2012-07-17 10:17:06 +02:00
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
2012-07-17 09:27:12 +02:00
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.
2012-07-16 15:30:09 -07:00
Chris Robinson
7734771245
Use Ogre to load ESM data instead of Mangle
2012-07-15 08:31:03 -07:00
Marc Zinnschlag
182017b8e9
Issue #314 : Moved ingredients and potions to a different type of record list
2012-07-13 13:08:48 +02:00
