scrawl
|
3dcb167066
|
Map rendering
|
2015-05-26 16:40:44 +02:00 |
|
scrawl
|
76dd3e4034
|
Fix lip animation regression
|
2015-05-24 04:40:09 +02:00 |
|
scrawl
|
1fd9fba7a3
|
Fix debug drawer crash
|
2015-05-24 04:28:34 +02:00 |
|
scrawl
|
95465a1489
|
Player raycast fix
|
2015-05-24 04:01:36 +02:00 |
|
scrawl
|
d84990be85
|
Restore getCollisions
|
2015-05-24 03:59:22 +02:00 |
|
scrawl
|
8b322fcd06
|
Implement getFacedObject using osgUtil::IntersectionVisitor
|
2015-05-24 03:36:34 +02:00 |
|
scrawl
|
c2131e7c31
|
Make near clip distance configurable
|
2015-05-24 02:34:20 +02:00 |
|
scrawl
|
c748ea7363
|
Fix view distance slider
|
2015-05-24 01:40:49 +02:00 |
|
scrawl
|
9a0db5d55a
|
Restore cell changes
|
2015-05-24 01:32:00 +02:00 |
|
scrawl
|
152d690a7a
|
Minor cleanup
|
2015-05-23 23:10:53 +02:00 |
|
scrawl
|
da24e298ee
|
Fix -Wreorder warnings
|
2015-05-23 22:44:00 +02: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 |
|
Marc Zinnschlag
|
53b4c15d85
|
Merge remote-tracking branch 'smbas/master'
|
2015-05-23 16:02:09 +02:00 |
|
Marc Zinnschlag
|
913caf96bd
|
Merge branch 'openmw-36'
|
2015-05-23 09:46:54 +02:00 |
|
Marc Zinnschlag
|
63c3d8df2e
|
updated credits file
|
2015-05-23 09:46:48 +02:00 |
|
Marc Zinnschlag
|
c64e96e551
|
Merge remote-tracking branch 'cramal/master'
|
2015-05-23 09:45:08 +02:00 |
|
Marc Zinnschlag
|
b58b7a89ed
|
Merge remote-tracking branch 'rohit-n/reorder2'
|
2015-05-23 09:19:03 +02:00 |
|
Cramal
|
45f6e3b39e
|
debug latex code
|
2015-05-23 14:40:04 +09:00 |
|
Cramal
|
10ca6cf379
|
debug latex code
|
2015-05-23 14:39:16 +09:00 |
|
scrawl
|
f2809ab63b
|
Delete nifosgtest again
|
2015-05-23 06:53:26 +02:00 |
|
scrawl
|
0de6839890
|
Minor cleanup
|
2015-05-23 06:07:11 +02:00 |
|
scrawl
|
0b042b75cc
|
Restore actor visibility mask
|
2015-05-23 05:42:37 +02:00 |
|
scrawl
|
04e827ecf6
|
Don't try to play an empty video
|
2015-05-23 05:42:21 +02:00 |
|
scrawl
|
cd81ec92db
|
Minor cleanup
|
2015-05-23 05:41:53 +02:00 |
|
scrawl
|
8092f37ce5
|
New game crash fix
|
2015-05-23 05:40:24 +02:00 |
|
Stanislav Bas
|
a5183aefbe
|
Add record state tracking to the ModifyCommand (Fix #2555)
|
2015-05-22 23:53:25 +03:00 |
|
scrawl
|
0fb59178b6
|
Settings file cleanup
|
2015-05-22 20:15:50 +02:00 |
|
Rohit Nirmal
|
396fba7fa9
|
Silence -Wreorder warnings, and remove -Wno-reorder.
|
2015-05-21 22:46:44 -05:00 |
|
scrawl
|
85345e663a
|
Restore getHitContact
|
2015-05-22 04:36:33 +02:00 |
|
scrawl
|
627fee07bc
|
Minor cleanup
|
2015-05-22 04:36:33 +02:00 |
|
scrawl
|
cac7c1e535
|
Restore various physics features
|
2015-05-22 04:36:33 +02:00 |
|
scrawl
|
d6da5c8007
|
Fix for crosshair not showing
|
2015-05-22 04:36:33 +02:00 |
|
scrawl
|
5ea61af6ac
|
Fix for applying view distance
|
2015-05-22 04:36:33 +02:00 |
|
scrawl
|
2235d2978b
|
Restore animation text key handling
|
2015-05-22 04:36:33 +02:00 |
|
scrawl
|
9b8e2e9db3
|
Port MWRender::Camera
|
2015-05-22 00:29:27 +02:00 |
|
Stanislav Bas
|
d27b92e9f1
|
Avoid gaps between local indexes in RefIdData after removal of records (Fix #2545)
|
2015-05-22 00:57:47 +03:00 |
|
scrawl
|
0fb97bd2e7
|
Readded baseonly parameter to Animation::setObjectRoot
Fixes the first person view.
|
2015-05-21 23:24:22 +02:00 |
|
scrawl
|
6031db7882
|
Character sliding fix
|
2015-05-21 21:04:48 +02:00 |
|
Marc Zinnschlag
|
9767910f06
|
updated credits file
|
2015-05-21 17:51:20 +02:00 |
|
Marc Zinnschlag
|
49529b7cd0
|
Merge remote-tracking branch 'bodillium/ManualEdit'
|
2015-05-21 17:49:02 +02:00 |
|
Nicola Bodill
|
8f8fdedcde
|
Some more edits
Responding to sirherrbatka's feedback.
|
2015-05-21 14:20:35 +10:00 |
|
Marc Zinnschlag
|
ca7829032e
|
updated credits file
|
2015-05-20 11:45:16 +02:00 |
|
scrawl
|
cfe57199d7
|
Minor cleanup
|
2015-05-20 04:09:21 +02:00 |
|
scrawl
|
7882c3d7f0
|
Fix incorrect rotation for meshes with BoneOffset
|
2015-05-20 04:09:21 +02:00 |
|
scrawl
|
c4452afd89
|
Inventory item picking
|
2015-05-20 04:09:21 +02:00 |
|
scrawl
|
8d033f0558
|
Fix UpdateRigBounds not being copied properly
|
2015-05-20 03:12:42 +02:00 |
|
scrawl
|
72c1f37527
|
Port CharacterPreview
|
2015-05-20 02:18:20 +02:00 |
|
scrawl
|
820f4a2688
|
Fix light direction
|
2015-05-20 02:07:18 +02:00 |
|
Stanislav Bas
|
163c12d3eb
|
Merge remote-tracking branch 'upstream/master'
|
2015-05-19 21:39:48 +03:00 |
|
Stanislav Bas
|
196be7283d
|
Reset an activated reference after activation's exectution (Fix #1738)
|
2015-05-19 21:39:17 +03:00 |
|