Marc Zinnschlag
|
07ce7b95cf
|
Merge remote-tracking branch 'cc9cii/npc-additional-data'
|
10 years ago |
cc9cii
|
22420c3a83
|
Close DialogueSubView if the corresponding record is deleted. Should resolve Bug #2575.
- ToDo: Doesn't seem to shrink the widget width properly (when horizontal scrollbar is active)
|
10 years ago |
|
cc9cii
|
c721e340d8
|
Merge branch 'master' into npc-additional-data
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
|
10 years ago |
|
cc9cii
|
21af1913e1
|
Ensure ColumnId names are unique.
|
10 years ago |
scrawl
|
76dd3e4034
|
Fix lip animation regression
|
10 years ago |
|
scrawl
|
1fd9fba7a3
|
Fix debug drawer crash
|
10 years ago |
|
scrawl
|
95465a1489
|
Player raycast fix
|
10 years ago |
|
scrawl
|
d84990be85
|
Restore getCollisions
|
10 years ago |
|
scrawl
|
8b322fcd06
|
Implement getFacedObject using osgUtil::IntersectionVisitor
|
10 years ago |
|
scrawl
|
c2131e7c31
|
Make near clip distance configurable
|
10 years ago |
|
scrawl
|
c748ea7363
|
Fix view distance slider
|
10 years ago |
|
scrawl
|
9a0db5d55a
|
Restore cell changes
|
10 years ago |
|
scrawl
|
152d690a7a
|
Minor cleanup
|
10 years ago |
|
scrawl
|
da24e298ee
|
Fix -Wreorder warnings
|
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 |
|
Marc Zinnschlag
|
53b4c15d85
|
Merge remote-tracking branch 'smbas/master'
|
10 years ago |
|
Marc Zinnschlag
|
913caf96bd
|
Merge branch 'openmw-36'
|
10 years ago |
|
Marc Zinnschlag
|
63c3d8df2e
|
updated credits file
|
10 years ago |
|
Marc Zinnschlag
|
c64e96e551
|
Merge remote-tracking branch 'cramal/master'
|
10 years ago |
|
Marc Zinnschlag
|
b58b7a89ed
|
Merge remote-tracking branch 'rohit-n/reorder2'
|
10 years ago |
Cramal
|
45f6e3b39e
|
debug latex code
|
10 years ago |
|
Cramal
|
10ca6cf379
|
debug latex code
|
10 years ago |
|
scrawl
|
f2809ab63b
|
Delete nifosgtest again
|
10 years ago |
|
scrawl
|
0de6839890
|
Minor cleanup
|
10 years ago |
|
scrawl
|
0b042b75cc
|
Restore actor visibility mask
|
10 years ago |
|
scrawl
|
04e827ecf6
|
Don't try to play an empty video
|
10 years ago |
|
scrawl
|
cd81ec92db
|
Minor cleanup
|
10 years ago |
|
scrawl
|
8092f37ce5
|
New game crash fix
|
10 years ago |
Stanislav Bas
|
a5183aefbe
|
Add record state tracking to the ModifyCommand (Fix #2555)
|
10 years ago |
|
scrawl
|
0fb59178b6
|
Settings file cleanup
|
10 years ago |
|
scrawl
|
d1b6289cad
|
Don't teleport followers when using teleportation spells
|
10 years ago |
Rohit Nirmal
|
396fba7fa9
|
Silence -Wreorder warnings, and remove -Wno-reorder.
|
10 years ago |
|
scrawl
|
85345e663a
|
Restore getHitContact
|
10 years ago |
|
scrawl
|
627fee07bc
|
Minor cleanup
|
10 years ago |
|
scrawl
|
cac7c1e535
|
Restore various physics features
|
10 years ago |
|
scrawl
|
d6da5c8007
|
Fix for crosshair not showing
|
10 years ago |
|
scrawl
|
5ea61af6ac
|
Fix for applying view distance
|
10 years ago |
|
scrawl
|
2235d2978b
|
Restore animation text key handling
|
10 years ago |
|
scrawl
|
9b8e2e9db3
|
Port MWRender::Camera
|
10 years ago |
|
Stanislav Bas
|
d27b92e9f1
|
Avoid gaps between local indexes in RefIdData after removal of records (Fix #2545)
|
10 years ago |
|
scrawl
|
0fb97bd2e7
|
Readded baseonly parameter to Animation::setObjectRoot
Fixes the first person view.
|
10 years ago |
|
cc9cii
|
aecd9a275e
|
Remove debugging comments.
|
10 years ago |
|
scrawl
|
6031db7882
|
Character sliding fix
|
10 years ago |
|
Marc Zinnschlag
|
9767910f06
|
updated credits file
|
10 years ago |
|
Marc Zinnschlag
|
49529b7cd0
|
Merge remote-tracking branch 'bodillium/ManualEdit'
|
10 years ago |
Nicola Bodill
|
8f8fdedcde
|
Some more edits
Responding to sirherrbatka's feedback.
|
10 years ago |
|
cc9cii
|
2fc964ca73
|
Grey out disabled entries rather than hiding them.
|
10 years ago |
|
cc9cii
|
1d0b8587a1
|
Use HasWater bit flag rather than mWaterInt bool.
|
10 years ago |
|
Marc Zinnschlag
|
ca7829032e
|
updated credits file
|
10 years ago |
|
scrawl
|
cfe57199d7
|
Minor cleanup
|
10 years ago |