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 |
|
scrawl
|
0de6839890
|
Minor cleanup
|
2015-05-23 06:07:11 +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 |
|
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
|
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 |
|
scrawl
|
8bcfac1ea3
|
Fix adjustPosition not always working correctly (Fixes #2563)
moveObject was returning an incorrect Ptr for cell movements.
|
2015-05-17 18:16:42 +02:00 |
|
scrawl
|
24bb2e152c
|
Apply texture filter setting changes
|
2015-05-14 21:42:04 +02:00 |
|
scrawl
|
3e86dd7df0
|
Apply runtime changes to field of view & view distance
|
2015-05-14 18:46:28 +02:00 |
|
scrawl
|
b7258c8d23
|
Readded Objects::updatePtr
|
2015-05-14 17:34:55 +02:00 |
|
scrawl
|
bc237ee1fe
|
Actor placement fix
|
2015-05-14 17:14:49 +02:00 |
|
scrawl
|
375b736e74
|
Use SDL to create the window
No input nor event loop handling yet, so the window will "stop responding" after a few seconds.
Thanks to KittyCat for the GraphicsWindowSDL2 code.
|
2015-05-13 02:53:09 +02:00 |
|
scrawl
|
7a3bc69df7
|
Readded sound listener
|
2015-05-12 19:02:56 +02:00 |
|
scrawl
|
ccab8cc9a1
|
Register Player in the PhysicsSystem
|
2015-05-12 17:40:42 +02:00 |
|
scrawl
|
56ff280230
|
Mention the RefId in "error during rendering: " errors
|
2015-05-12 16:50:43 +02:00 |
|
scrawl
|
65f0195c71
|
Readded animated collision shape support
|
2015-05-12 16:26:11 +02:00 |
|
scrawl
|
19988d5e45
|
Remove RefData::getHandle
|
2015-05-12 04:04:54 +02:00 |
|
scrawl
|
47758c11cd
|
Readded collision objects and movement physics
|
2015-05-12 03:02:15 +02:00 |
|
scrawl
|
97c35da441
|
Change exterior water level to z=-1 (Fixes #1405)
|
2015-05-11 16:38:16 +02:00 |
|
scrawl
|
eef8f71797
|
Add a comment
|
2015-05-11 16:38:16 +02:00 |
|
scrawl
|
b312f50b1f
|
Fix regression with detect spells detecting deleted objects (Fixes #2518)
|
2015-05-11 16:38:15 +02:00 |
|
scrawl
|
54c1f19c18
|
Readded height fields
|
2015-05-10 02:08:25 +02:00 |
|
scrawl
|
c31b416ba1
|
Move physicssystem to a new mwphysics module
|
2015-05-10 01:09:00 +02:00 |
|
scrawl
|
c843cfc8e2
|
Physics stub in preparation for rewrite
|
2015-05-10 00:28:51 +02:00 |
|
scrawl
|
48ffeab191
|
Remove old BulletShapeManager
|
2015-05-09 01:06:55 +02:00 |
|
scrawl
|
e191f0e044
|
Rename MWRender::Debugging to MWRender::Pathgrid
|
2015-05-04 17:41:30 +02:00 |
|
scrawl
|
92cbc13964
|
Remove BtOgre
|
2015-05-03 00:50:56 +02:00 |
|
scrawl
|
1943110170
|
Add bullet debug drawer
|
2015-05-03 00:39:01 +02:00 |
|
scrawl
|
9cf9c2876e
|
Pathgrid rendering
|
2015-05-02 22:45:39 +02:00 |
|
scrawl
|
8817f44d63
|
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
|
2015-05-02 17:48:24 +02:00 |
|
scrawl
|
bddd31e385
|
Dead code removal
|
2015-05-02 17:11:51 +02:00 |
|
scrawl
|
d9d84bd7b2
|
Remove bullet raycasting shapes, to be replaced with OSG ray casts
|
2015-05-01 21:43:21 +02:00 |
|
scrawl
|
bd8f0248f0
|
Player rendering
|
2015-05-01 18:21:50 +02:00 |
|
scrawl
|
a59940a2c7
|
Move MyGUI platform to components
|
2015-05-01 01:44:21 +02:00 |
|
scrawl
|
c90125f936
|
Uninitialized basenode fix
|
2015-05-01 01:44:21 +02:00 |
|
scrawl
|
8971a200f7
|
Sky fix
|
2015-04-26 14:34:14 +02:00 |
|
scrawl
|
7809caf9dc
|
Dead code removal
|
2015-04-25 15:53:11 +02:00 |
|
scrawl
|
0ff7b2ff11
|
MechanicsManager, frame update
|
2015-04-25 15:19:17 +02:00 |
|
scrawl
|
9f12e53956
|
Scale NPCs by their Weight property (Fixes #814)
|
2015-04-24 14:49:20 +02:00 |
|
scrawl
|
1c0e3a6488
|
rotateObject, scaleObject
|
2015-04-23 23:50:46 +02:00 |
|
scrawl
|
1a19cd3607
|
Some cleanup
|
2015-04-22 19:08:56 +02:00 |
|
scrawl
|
8c810e3620
|
Move rng to components
|
2015-04-22 17:58:55 +02:00 |
|
scrawl
|
26766b8e0a
|
Dead code removal
|
2015-04-21 23:36:36 +02:00 |
|
scrawl
|
9e177df61b
|
Add fog, view distance, and far plane culling
|
2015-04-21 23:36:36 +02:00 |
|
scrawl
|
68f93294da
|
Port EffectManager
|
2015-04-19 17:55:56 +02:00 |
|
scrawl
|
27cfe8fb58
|
Crash fix
|
2015-04-19 02:39:10 +02:00 |
|