mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 19:19:55 +00:00
Code Issues Releases Wiki Activity
16095 commits 38 branches 54 tags 122 MiB
Commit graph

689 commits

Author SHA1 Message Date
Stanislav Bas
b2f3ccb080 Add NAME handling to GameSetting record 2015-07-10 00:29:34 +03:00
Stanislav Bas
09a3358017 Add NAME and DELE handling to Global record 2015-07-10 00:29:32 +03:00
Stanislav Bas
30b42bf4c0 Remove redundant code 2015-07-10 00:29:30 +03:00
Stanislav Bas
8c3654af11 Add NAME handling to Race record 2015-07-10 00:29:28 +03:00
Stanislav Bas
b667338a8f Add NAME and DELE handling to Cell record 2015-07-10 00:29:26 +03:00
Stanislav Bas
847614c26f Add DELE handling to Info record 2015-07-10 00:29:24 +03:00
Stanislav Bas
0b537186e5 Add NAME and DELE handling to Dialogue record 2015-07-10 00:29:22 +03:00
Stanislav Bas
19ac4e942a Change DELE sub-record value to 0 (4 bytes) 2015-07-10 00:29:20 +03:00
Stanislav Bas
d2c15647a3 Add NAME and DELE handling to Script record 2015-07-10 00:29:18 +03:00
Stanislav Bas
9ac20a3355 Add NAME and DELE handling to ESM records. 
Changed records are those where DELE is inserted at the beginning of a
record (before NAME).
The record has all required sub-records in this case.
 2015-07-10 00:25:54 +03:00
Stanislav Bas
926c825d0c Add NAME and DELE handling to ESM records. 
Changed records are those where DELE is located after NAME sub-record.
And DELE is the last sub-record.
 2015-07-10 00:18:00 +03:00
Alexander "Ace" Olofsson
2bebfea38d Instantiate struct as a struct 2015-07-09 22:45:25 +02:00
Alexander "Ace" Olofsson
3655ef16af Explicitly instantiate ESM::StatState 2015-07-07 19:19:37 +02:00
scrawl
a1432b0255 Move attackingOrSpell flag to the CharacterController 2015-07-02 19:14:28 +02:00
scrawl
a081d402c5 Use the format field instead of version field 2015-06-30 17:26:33 +02:00
scrawl
4637750601 Savegame loading optimization 2015-06-30 16:47:41 +02:00
scrawl
1956e2c988 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
 2015-06-28 00:38:39 +02:00
scrawl
502cc852da Handle encoding conversions when saving TES3 header (Fixes #2727) 2015-06-26 20:16:32 +02:00
scrawl
882e359008 Move attackStrength to the CharacterController, where it should have been to begin with 
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
 2015-06-26 05:15:07 +02:00
scrawl
5bc6513e2d Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime 2015-06-26 02:32:41 +02:00
scrawl
5ac502d104 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-23 05:12:12 +02:00
scrawl
d3ef075952 Fix an uninitialized variable 2015-06-23 05:06:49 +02:00
scrawl
a5670b5133 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp
 2015-06-22 20:09:02 +02:00
scrawl
2ce269c0fc Werewolf stats compatibility with old save files 2015-06-21 18:45:49 +02:00
scrawl
d6a7255391 Loading/saving for player's original skills/attributes (prior to becoming a werewolf) 2015-06-21 17:36:49 +02:00
scrawl
44582fe3b3 Don't use separate werewolf skills/attributes for non-player werewolves 
Still need to deal with save files.
 2015-06-21 17:28:18 +02:00
scrawl
cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aitravel.cpp
 2015-06-14 16:32:13 +02:00
Marc Zinnschlag
e17f7ac81a Merge remote-tracking branch 'cc9cii/master' 2015-06-14 12:50:10 +02:00
scrawl
28caeadef4 Improve error message for not found records 2015-06-14 02:31:00 +02:00
cc9cii
b81454d226 Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668. 2015-06-13 14:37:47 +10:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
b70383d127 Remove last remains of Ogre math 2015-06-03 21:37:21 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00
scrawl
de8e5f0db1 Restore projectiles 2015-06-01 21:41:13 +02:00
scrawl
a066b24303 Restore WeaponAnimation 2015-05-31 01:07:43 +02:00
cc9cii
5fd107a95c Fix crash with array out of bounds when refNum index is incorrect. 2015-05-27 10:19:26 +10:00
scrawl
22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
 2015-05-23 20:33:44 +02:00
cc9cii
7f12fc4770 Fix for Bug #2544. Add a default mNpdtType to ESM::Npc::blank(). 2015-05-13 13:39:04 +10:00
scrawl
e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
 2015-05-04 02:41:50 +02:00
Marc Zinnschlag
ba57a648db Merge remote-tracking branch 'rohit-n/reorder' 2015-04-29 12:09:55 +02:00
Marc Zinnschlag
607a16eb01 removed leftover ignoreRefNum argument 2015-04-29 12:09:30 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
cc9cii
7673be6d0f Loading of moved refs complete. 2015-04-26 12:18:23 +10:00
cc9cii
e668b35b02 Fix typo. 2015-04-25 17:51:31 +10:00
cc9cii
dcce59f76c Pass MovedCellRef info to RefCollection. Still has debugging code. 2015-04-25 17:20:02 +10:00
cc9cii
acb800b8f9 Resolve merge issues and fix typos. 2015-04-25 09:39:37 +10:00
cc9cii
f1a58994c6 Merge branch 'master' into moveref 
Conflicts:
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/commands.cpp
	apps/opencs/model/world/commands.hpp
	apps/opencs/model/world/ref.cpp
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/dialoguesubview.hpp
	apps/opencs/view/world/util.cpp
	components/esm/cellref.hpp
 2015-04-25 06:52:53 +10:00
scrawl
68f93294da Port EffectManager 2015-04-19 17:55:56 +02:00
scrawl
25f1c1ae76 Remove persistent flag which will be unused 2015-04-02 17:33:24 +02:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +02:00
scrawl
232e34bddd OpenCS: port lighting toolbar, fix multiple context GL objects issue 2015-03-28 20:15:17 +01:00
scrawl
236d628884 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/documentmanager.cpp
	components/CMakeLists.txt
	components/bsa/resources.cpp
	components/nif/data.hpp
	components/nif/node.cpp
	components/nifogre/mesh.hpp
	components/nifogre/ogrenifloader.cpp
	components/nifogre/particles.cpp
 2015-03-27 17:30:48 +01:00
Nikolay Kasyanov
3e45e9a48a Remove no longer required strnlen wrapper 
It was used for MinGW & OS X < 10.7. Minimal OS X version was bumped to
10.7 and MinGW support was recently dropped (see
1eaa64c49c).
 2015-03-18 23:37:54 +02:00
cc9cii
488bc76da5 Fix saving land data. 2015-03-13 22:06:55 +11:00
Marc Zinnschlag
056bc66c6c Merge remote-tracking branch 'scrawl/master' 2015-03-12 10:29:39 +01:00
scrawl
5f051b5bf2 Remove comment about GMST cleaning which was removed. 2015-03-12 00:32:57 +01:00
Scott Howard
e2ef8c4022 fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
scrawl
e30f240ba2 Add travel service support for creatures (Fixes #2432) 2015-03-09 03:15:11 +01:00
dteviot
36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	extern/sdl4ogre/sdlcursormanager.cpp
 2015-03-08 18:29:12 +13:00
dteviot
e197f5318b fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 2015-03-07 18:34:29 +01:00
dteviot
f2ac939e61 reverted mShouldRepeat back to unsigned char. 
As recommended by Scrawl.
 2015-03-07 11:04:54 +13:00
dteviot
45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 2015-03-06 23:19:57 +13:00
cc9cii
d28f257ada Fix for bug #2428. Set default flag value (mandatory) for containers. 2015-03-06 11:53:46 +11:00
Marc Zinnschlag
4e1c086d6a load start up script records 2015-03-03 14:31:59 +01:00
Marc Zinnschlag
bf92d5cde9 removed redundant mScript field in ESM::StartScript 2015-03-03 13:04:57 +01:00
scrawl
da690c91b3 Delete the old Ogre DataStream class 2015-02-22 14:19:00 +01:00
scrawl
8f0ab7d09f ESM component no longer relies on Ogre DataStreams 2015-02-22 14:12:05 +01:00
Marc Zinnschlag
8686ffcedb Merge remote-tracking branch 'scrawl/master' 2015-02-17 11:55:12 +01:00
scrawl
96a295c44f Fix for deleting all items in a levelled list 2015-02-13 17:37:56 +01:00
scrawl
8b417c06db Fix missing clear in ESM::Spell::load (Fixes #2368) 2015-02-13 17:26:33 +01:00
Kamil Bar
3b7a23aa72 Fixed charge checks for light and other objects, corrected CellRef charge union comments 2015-02-13 13:11:10 +01:00
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
 2015-02-12 05:43:22 +01:00
scrawl
9009889d24 Don't rely on subrecord order when reading (Fixes #2361) 2015-02-10 23:19:33 +01:00
scrawl
cff0127ce7 Update comment on merging levelled lists 2015-02-06 01:27:17 +01:00
scrawl
d18d2a1882 Skip rest of LEVI record if it has no items (Bug #2348) 2015-02-06 01:27:17 +01:00
scrawl
bea88c3643 Stolen item tracking overhaul part 2 (Fixes #2338) 2015-02-06 01:27:16 +01:00
scrawl
6d097fbfbd Normalise spelling of "levelled" throughout the code 2015-02-05 04:18:42 +01:00
scrawl
fec8cf91f5 Add exception handling to various uses of DataStream::read 2015-01-31 22:40:42 +01:00
scrawl
2346c3528d Remove NpcStats::mProfit and store it in the script instead 
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
 2015-01-31 22:40:40 +01:00
scrawl
b9acf437fd Remove friendly hits from the save file 
The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature rather than a bug.
 2015-01-31 22:40:39 +01:00
scrawl
081c8c8615 ESSImport: convert to utf8, based on encoding setting in openmw.cfg 2015-01-31 22:40:38 +01:00
scrawl
e712b0353b Terrain refactoring, reduce game startup time and memory usage 2015-01-29 03:39:01 +01:00
scrawl
62a32220ff Use low-LOD heightmap for world map rendering 
Add vanilla-accurate colour palette (thanks Hrnchamd)
 2015-01-29 03:39:01 +01:00
scrawl
431f540791 ESSImport: fix NPC factions 2015-01-27 23:12:21 +01:00
scrawl
875df46ae9 ESSImport: convert journal indices 2015-01-27 23:12:21 +01:00
scrawl
6367b4dc0b Improve INFO struct naming 2015-01-27 23:12:21 +01:00
scrawl
9d3f0b2ed5 Remove some unused code, include cleanup 2015-01-27 23:12:13 +01:00
scrawl
d34086ac8f ESSImport: convert running global scripts 2015-01-27 23:05:20 +01:00
dteviot
946dd16696 Fixed Windows warning. 
warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
 2015-01-26 13:57:22 +13:00
dteviot
f95743ccc3 Fixed MSVC warning. 
warning C4305: 'return' : truncation from 'double' to 'float'
 2015-01-26 13:18:21 +13:00
dteviot
e02bab67ba Fixed MSVC warnings. 
warning C4099: 'ESM::ESMReader' : type name first seen using 'class' now seen using 'struct'
warning C4099: 'ESM::CellId' : type name first seen using 'struct' now seen using 'class'
 2015-01-26 13:17:16 +13:00
Nathan Aclander
33ce03dfc5 Should be compared against uint only 2015-01-24 17:17:05 -08:00
scrawl
b1bd236345 ESSImport: convert script local variables 
Had to add special reading code to openmw, because the variable names are not stored.
 2015-01-24 16:45:36 +01:00
Marc Zinnschlag
7f905470fa fixed moved reference loading 2015-01-24 15:01:38 +01:00
scrawl
7d76213374 Fix loading faction reactions for older savegames (Fixes #2301) 2015-01-24 14:32:02 +01:00
Marc Zinnschlag
89998a6a03 save MVRF subrecords 2015-01-24 14:22:29 +01:00
scrawl
79d2eebe54 Store selected enchant item in savegame (Fixes #1702) 2015-01-23 16:45:47 +01:00
scrawl
c883a73d30 Several warning fixes 2015-01-23 15:34:47 +01:00