scrawl
|
fc17e47ecb
|
Replace boost::array with c++11
|
10 years ago |
Marc Zinnschlag
|
c5ae95aedd
|
Merge branch 'master' into c++11
Conflicts:
apps/openmw/mwworld/store.hpp
|
10 years ago |
Alexander "Ace" Olofsson
|
2bebfea38d
|
Instantiate struct as a struct
|
10 years ago |
Marc Zinnschlag
|
91d1bab4ac
|
replaced NULL with nullptr
|
10 years ago |
Marc Zinnschlag
|
3c76764ef4
|
replaced auto_ptr with unique_ptr
|
10 years ago |
Alexander "Ace" Olofsson
|
3655ef16af
|
Explicitly instantiate ESM::StatState
|
10 years ago |
scrawl
|
a1432b0255
|
Move attackingOrSpell flag to the CharacterController
|
10 years ago |
scrawl
|
a081d402c5
|
Use the format field instead of version field
|
10 years ago |
scrawl
|
4637750601
|
Savegame loading optimization
|
10 years ago |
scrawl
|
1956e2c988
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
|
10 years ago |
scrawl
|
502cc852da
|
Handle encoding conversions when saving TES3 header (Fixes #2727)
|
10 years ago |
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.
|
10 years ago |
scrawl
|
5bc6513e2d
|
Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime
|
10 years ago |
scrawl
|
5ac502d104
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
|
10 years ago |
scrawl
|
d3ef075952
|
Fix an uninitialized variable
|
10 years ago |
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
|
10 years ago |
scrawl
|
2ce269c0fc
|
Werewolf stats compatibility with old save files
|
10 years ago |
scrawl
|
d6a7255391
|
Loading/saving for player's original skills/attributes (prior to becoming a werewolf)
|
10 years ago |
scrawl
|
44582fe3b3
|
Don't use separate werewolf skills/attributes for non-player werewolves
Still need to deal with save files.
|
10 years ago |
scrawl
|
cad18969e3
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
|
10 years ago |
Marc Zinnschlag
|
e17f7ac81a
|
Merge remote-tracking branch 'cc9cii/master'
|
10 years ago |
scrawl
|
28caeadef4
|
Improve error message for not found records
|
10 years ago |
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.
|
10 years ago |
scrawl
|
4bb3cbf0fb
|
Remove last remains of Ogre
|
10 years ago |
scrawl
|
b70383d127
|
Remove last remains of Ogre math
|
10 years ago |
scrawl
|
974fda5bde
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
|
10 years ago |
scrawl
|
cdd0623009
|
Terrain rendering
|
10 years ago |
scrawl
|
de8e5f0db1
|
Restore projectiles
|
10 years ago |
scrawl
|
a066b24303
|
Restore WeaponAnimation
|
10 years ago |
cc9cii
|
5fd107a95c
|
Fix crash with array out of bounds when refNum index is incorrect.
|
10 years ago |
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
|
10 years ago |
cc9cii
|
7f12fc4770
|
Fix for Bug #2544. Add a default mNpdtType to ESM::Npc::blank().
|
10 years ago |
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
|
10 years ago |
Marc Zinnschlag
|
ba57a648db
|
Merge remote-tracking branch 'rohit-n/reorder'
|
10 years ago |
Marc Zinnschlag
|
607a16eb01
|
removed leftover ignoreRefNum argument
|
10 years ago |
Rohit Nirmal
|
997347b01e
|
Silence -Wreorder warnings.
|
10 years ago |
cc9cii
|
7673be6d0f
|
Loading of moved refs complete.
|
10 years ago |
cc9cii
|
e668b35b02
|
Fix typo.
|
10 years ago |
cc9cii
|
dcce59f76c
|
Pass MovedCellRef info to RefCollection. Still has debugging code.
|
10 years ago |
cc9cii
|
acb800b8f9
|
Resolve merge issues and fix typos.
|
10 years ago |
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
|
10 years ago |
scrawl
|
68f93294da
|
Port EffectManager
|
10 years ago |
scrawl
|
25f1c1ae76
|
Remove persistent flag which will be unused
|
10 years ago |
scrawl
|
4e69e7cc0f
|
OpenMW compiles and runs w/o render window
|
10 years ago |
scrawl
|
232e34bddd
|
OpenCS: port lighting toolbar, fix multiple context GL objects issue
|
10 years ago |
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
|
10 years ago |
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 ).
|
10 years ago |
cc9cii
|
488bc76da5
|
Fix saving land data.
|
10 years ago |
Marc Zinnschlag
|
056bc66c6c
|
Merge remote-tracking branch 'scrawl/master'
|
10 years ago |
scrawl
|
5f051b5bf2
|
Remove comment about GMST cleaning which was removed.
|
10 years ago |