mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity
23,196 Commits 18 Branches 66 Tags
Commit Graph

843 Commits

Author SHA1 Message Date
Stanislav Bas
adec0cb61d Add removing of deleted Infos to Dialogue::clearDeletedInfos() 2015-07-12 00:19:04 +03:00
Stanislav Bas
e0983c815c Some fixes for ESM Dialogues and Infos 2015-07-11 22:17:53 +03:00
Stanislav Bas
7ecb54a776 Set Deleted flag to false when initializing ESM records 2015-07-10 00:29:46 +03:00
Stanislav Bas
89e44c8f1f Remove explicit record ID in load/read methods of MWWorld::Store 2015-07-10 00:29:36 +03:00
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