1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 21:19:57 +00:00
Commit graph

542 commits

Author SHA1 Message Date
scrawl
4047e3c928 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 2014-10-19 17:46:28 +02:00
scrawl
86280df55a DialInfo: Clear SelectStructs from previous loadings when a record is overwritten (Fixes #2017) 2014-10-16 19:35:20 +02:00
Marc Zinnschlag
21b16f8425 Merge branch 'tables'
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/data.cpp
	apps/opencs/model/world/data.hpp
2014-10-10 16:11:54 +02:00
scrawl
8786fb639f Implement terrain rendering in OpenCS (Fixes #1597) 2014-10-08 17:17:31 +02:00
scrawl
861cc26aa6 Don't sell racial spells (Fixes #1961) 2014-10-02 16:50:05 +02:00
Marc Zinnschlag
f4c9897bbd Merge branch 'master' into tables 2014-10-02 15:49:36 +02:00
Marc Zinnschlag
d64127106b load and save pathgrid records 2014-10-02 12:30:15 +02:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
scrawl
790e0150b1 Fix global map markers being duplicated when cell is visited again 2014-09-26 16:51:48 +02:00
Marc Zinnschlag
850dbb55a5 improved magic effect IDs 2014-09-26 13:36:54 +02:00
Marc Zinnschlag
58a9176c18 preparing magic effects record for use in OpenCS 2014-09-25 14:16:00 +02:00
scrawl
45b4304237 Store levitation/teleport enabled state in savegames (Fixes #1923) 2014-09-24 12:21:19 +02:00
Marc Zinnschlag
02247fe712 load and save sound gen records 2014-09-23 12:20:02 +02:00
scrawl
dec9ffdb6c ESM: Make sure to clear old list when a list is overwritten by another content file (Fixes #1932) 2014-09-20 13:34:20 +02:00
Marc Zinnschlag
d1d861e1be Merge branch 'run'
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/CMakeLists.txt
2014-09-14 11:59:54 +02:00
Marc Zinnschlag
bf6150d009 allow project scope scripts 2014-09-14 11:41:28 +02:00
Marc Zinnschlag
d4c27d4ce0 Merge remote-tracking branch 'mellotanica/master' 2014-09-07 10:10:54 +02:00
Marco Melletti
9b6faa2ffa wrong rearrangement fixes
misleading comments fixed
2014-09-06 17:04:50 +02:00
Marco Melletti
e1393ad2df reputation sorted out 2014-09-06 15:16:04 +02:00
Marco Melletti
2e47290ed0 finished loadnpc.hpp, fixed npdt 52byte structure 2014-09-05 21:23:25 +02:00
scrawl
1c178768f5 Allow Script records with missing SCDT (precompiled code, not used anyway)
Not sure on the exact conditions, but this was missing in a plugin that I made in the TES-CS, while vanilla MW would load it just fine.
2014-09-05 16:43:20 +02:00
Marco Melletti
bc7e154643 done with header files, unsure about mSkills and mReputation in
loadnpc.hpp
2014-09-04 13:23:29 +02:00
Marco Melletti
8bce460f34 loadnpc is still unfinished, bodypartcheck.cpp mFlags check fix 2014-09-03 14:40:32 +02:00
cc9cii
df87859d7c Move the workaround to loadscpt.cpp as per feedback comments. 2014-08-29 07:41:49 +10:00
scrawl
4f92044d71 Allow user-created markers on local map (Fixes #1571) 2014-08-26 17:45:23 +02:00
scrawl
44642ae21b Fix incorrect Speed value in ESM::MagicEffect (thanks Hrnchamd) 2014-08-26 02:09:23 +02:00
MiroslavR
46e9ee408f Do not allow mods to change fixed effect properties in the legacy format, but allow it entirely in the new format. 2014-08-25 18:59:50 +02:00
MiroslavR
d16e0c063c Enchanting, spellmaking dialog: check for flags when listing known effects 2014-08-24 21:59:52 +02:00
Marc Zinnschlag
f468c53281 renamed the script field in DebugProfile to improve consistency 2014-08-22 13:38:03 +02:00
Marc Zinnschlag
232c6c9ad3 Merge branch 'scriptedit' into run 2014-08-22 13:20:02 +02:00
MiroslavR
85aa237baf Implement removal of corprus spells 2014-08-22 03:34:31 +02:00
MiroslavR
96e7ff666d Implement saving/loading of corprus stats, remove redundant code 2014-08-19 03:17:31 +02:00
scrawl
360c7f863c Store magic effect Base values in savegame (Fixes #1489) 2014-08-17 05:38:48 +02:00
Marc Zinnschlag
3486da0fb0 consolidated the debug profile flags into a single and added a global flag 2014-08-15 12:27:08 +02:00
scrawl
77a4e38c49 Remove -Wno-ignored-qualifiers and fix caused warnings 2014-08-14 19:18:30 +02:00
scrawl
28e61c9834 Add default values for fDifficultyMult and sDifficulty (Fixes #1742)
Also added values for some other GMSTs added in a Morrowind patch or Tribunal/BM
2014-08-13 17:32:52 +02:00
scrawl
e2ee3b2497 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwrender/terrainstorage.cpp
2014-08-12 19:53:37 +02:00
scrawl
28fe81df90 Make Lights with OffDefault flag not emit light nor particles when placed in a cell (Fixes #1796) 2014-08-11 20:39:56 +02:00
scrawl
4138c3e966 Reuse health of previous level rather than recalculating initial health (Fixes #1787) 2014-08-10 17:09:14 +02:00
Marc Zinnschlag
ee3acc31a8 minor correction to previous commit 2014-08-10 10:09:45 +02:00
cc9cii
c43bd3c345 Continue loading esm after detecting string table overflow condition. Should resolve bug #1774. 2014-08-10 12:54:54 +10:00
scrawl
22d7d8a466 Implement Command creature/humanoid magic effects (Fixes #1120) 2014-08-07 17:21:07 +02:00
scrawl
2e7b5fde7c Fix uninitialized QuestStatus in DialInfo (Fixes #1694) 2014-08-06 20:13:57 +02:00
Marc Zinnschlag
30f114873d added debug profile record 2014-08-03 10:12:03 +02:00
scrawl
45af34d189 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-07-29 19:35:44 +02:00
scrawl
ccde462308 Fix typo (RefId -> RefNum) 2014-07-29 19:01:14 +02:00
scrawl
4773d754c6 Remove redundant isHostile flag (Fixes #1652) 2014-07-28 16:41:12 +02:00
Marc Zinnschlag
7991dfb907 Merge remote-tracking branch 'scrawl/master' 2014-07-28 09:03:17 +02:00
Marc Zinnschlag
c9cd7fb6b7 Merge branch 'scripts' 2014-07-28 09:02:24 +02:00
scrawl
1a04501951 Handle faction save/load properly when player has faction reputation in a faction he is not a member of (Fixes #1573) 2014-07-27 20:33:45 +02:00
Marc Zinnschlag
acb728195f improved documentation of ESM::Script member variables 2014-07-25 10:37:34 +02:00
scrawl
75abe8db31 Ignore FLTV from old savegames 2014-07-24 20:52:14 +02:00
scrawl
d4ff17f1c5 Remove unused FLTV and NAM0 from CellRef 2014-07-24 02:20:16 +02:00
scrawl
4e0c133fb3 Add comment to Cell NAM0 (it's a RefId counter) 2014-07-24 02:19:36 +02:00
scrawl
75366b2e37 Implement CellRef's faction rank (rank requirement to use item) 2014-07-24 02:17:38 +02:00
scrawl
2b57c7fa67 Use CellRef's global variable to disable owner (Fixes #1677) 2014-07-22 17:06:40 +02:00
scrawl
876af8f529 Fix not saved Attacked flag (Fixes #1657) 2014-07-17 16:16:13 +02:00
Marc Zinnschlag
e9377ad5c4 include targeted script data in saved games 2014-07-15 13:05:38 +02:00
scrawl
1c41ce9b9d Implement Hrnchamd's player and NPC autocalc spells (Some unclarities remaining, XXX) 2014-07-12 18:53:15 +02:00
scrawl
ad90d20ad8 Don't silently skip unknown NPC subrecords 2014-07-08 10:30:46 +02:00
Marc Zinnschlag
d96ed38d49 added body part table 2014-07-01 12:37:22 +02:00
Marc Zinnschlag
e97fd35ae6 added enchantments table 2014-06-30 20:40:34 +02:00
scrawl
8a8ecce1e5 Fix some uninitialized data written to savegames 2014-06-25 00:11:25 +02:00
scrawl
218f916d6d Savegame: Don't write stat modifiers that are zero 2014-06-19 17:17:26 +02:00
scrawl
4e71db7081 Savegame: Don't load/save deleted container items. This is currently pointless, and also causes new garbage being added on each load/save cycle: Container stores are first filled from ESM records, then cleared and filled from the savegame. The items from ESM records remain as deleted refs. 2014-06-18 21:39:17 +02:00
scrawl
2477456f99 Implement Murder crimes and OnMurder instruction (Fixes #1315) 2014-06-17 04:05:27 +02:00
scrawl
d5b97005ab Make ESM::Faction skills optional (Fixes #1508)
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
2014-06-16 02:52:16 +02:00
scrawl
ee2b81763e Savegame: Store AiSettings and summoned creatures
CreatureStats state is now completely stored (Closes #1174)

Also play VFX_Summon_Start and VFX_Summon_End visual effects.
2014-06-15 21:19:37 +02:00
scrawl
4f742fd468 Allow INFO records with no subrecords following DATA (Fixes #1486) 2014-06-13 21:54:03 +02:00
scrawl
e458cf1df2 Savegame: Store death counter (Fixes #1477) 2014-06-13 02:26:53 +02:00
scrawl
a54ac579a5 Savegame: Store AiSequence 2014-06-13 02:26:52 +02:00
scrawl
73be457805 Merge ESM::Cell fields by subrecord
Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord.

Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (*oldcell = *cell;)
2014-06-11 16:13:33 +02:00
scrawl
98d7b6672a Make MODL subrecord optional for potions (Fixes #1419) 2014-06-08 11:22:37 +02:00
scrawl
823ccb1b3d Don't batch statics that have "references persist" set (temporary fix for Arkngthand door - Fixes #1386) 2014-06-08 11:22:37 +02:00
scrawl
7376cb9b61 Fix loading ESX files cleaned with testool (Fixes #1382) 2014-06-03 22:49:37 +02:00
scrawl
ce14a6413b Small optimization to ESM::Variant 2014-06-03 22:40:09 +02:00
scrawl
16ac6e7aac Merge DialInfo objects by subrecord instead of overwriting the object
Fixes #1360
2014-05-31 13:01:11 +02:00
Marc Zinnschlag
f5e587f566 Merge remote-tracking branch 'puppykevin/master' 2014-05-30 11:42:19 +02:00
Marc Zinnschlag
be7f344eca Merge branch 'refs'
Conflicts:
	apps/opencs/model/doc/savingstate.cpp
	components/esm/cellref.hpp
2014-05-30 10:38:38 +02:00
scrawl
50a72ed710 Fix ghosts in Cavern Of The Incarnate having -1 health 2014-05-29 18:09:13 +02:00
Kevin Poitra
18314b1707 We use spaces, not tabs. 2014-05-28 14:56:50 -05:00
Kevin Poitra
8e55eb8009 Fix some formatting. 2014-05-28 13:06:43 -05:00
Kevin Poitra
545c3c312c Remove a superfluous clear. 2014-05-28 13:03:40 -05:00
scrawl
e266c39c5d Implement modFactionReaction instruction (Closes #1347) 2014-05-27 14:54:29 +02:00
scrawl
0966755a0c Store death animation index in CreatureStats 2014-05-26 20:52:32 +02:00
scrawl
039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
2014-05-25 14:30:07 +02:00
Marc Zinnschlag
d8440e1fdc implemented reference record merging 2014-05-20 09:02:22 +02:00
scrawl
3dceb7ee4f Fix overwriting DialInfo 2014-05-18 18:58:32 +02:00
scrawl
0aa1042fd7 Optimized dialogue merging with a lookup map 2014-05-18 16:01:16 +02:00
scrawl
1677fcf324 Dialogue merging 2014-05-18 15:25:16 +02:00
scrawl
5b76c0893a Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	components/esm/inventorystate.hpp
2014-05-18 12:55:43 +02:00
scrawl
a872c9f83a Feature #1323: handle restocking levelled items 2014-05-18 12:53:21 +02:00
cc9cii
b36bb58e8c Bug #1324: Artem's solution 2014-05-18 07:34:13 +10:00
Marc Zinnschlag
f7c89015f9 Merge remote-tracking branch 'scrawl/master' 2014-05-17 11:50:31 +02:00
scrawl
ae66d28c87 Feature #32: Implement respawn for containers, creatures and NPCs 2014-05-17 09:09:00 +02:00
scrawl
e266aff561 Savegame: store projectiles 2014-05-17 05:24:32 +02:00
Marc Zinnschlag
3b2ba4f6cd Merge remote-tracking branch 'scrawl/master' 2014-05-15 14:25:36 +02:00
scrawl
a76e391ad0 Savegame: store door movement state (Closes #747) 2014-05-15 09:54:10 +02:00
scrawl
471bbd0021 Savegame: store levelled creature state and move to actorIds
(Closes #1332)
2014-05-15 09:54:04 +02:00
Marc Zinnschlag
d08869a25d Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
Conflicts:
	apps/openmw/mwrender/localmap.cpp
2014-05-15 08:13:15 +02:00