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
