darkf
fc0f04324c
Remove some superfluous mSkyManager NULL checks
2013-06-11 20:56:40 -07:00
scrawl
1e7cf4ae1c
GLES2 experiment
2013-05-25 04:15:24 +02:00
scrawl
4983d08fe4
Fix a problem with statics disappearing sometimes on the map
...
Ogre::StaticGeometry doesn't seem to like materials being changed at runtime. It stores raw pointers to Ogre::Technique objects also, which conflicts with shiny's way of managing "unloaded" materials as having zero techniques. If a static geometry object is baked from an unloaded material, it won't find any techniques to use and can't render. By moving the unload call afterwards, it will be detected as in use by a renderable and won't be unloaded. Ideally this needs fixing of Ogre::StaticGeometry to not hold on to Technique objects (they also currently need to be rebuilt whenever user settings are changed, which also causes "unloading" of materials)
2013-05-18 22:55:30 +02:00
scrawl
60563afc10
Fix a new game crash, reset camera
2013-05-17 22:53:43 +02:00
scrawl
75dcf52552
Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)
2013-05-03 13:55:57 +02:00
scrawl
91c89e5db4
Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace
2013-04-30 20:26:59 +02:00
Chris Robinson
a15758ac85
Fix preview and vanity cameras
2013-04-29 08:48:45 -07:00
Chris Robinson
d17e1e83d5
Rename MWRender's Player to Camera
2013-04-29 05:50:40 -07:00
Chris Robinson
bb8277920b
Manage the player's NpcAnimation object in the RenderingManager
...
It may be more appropriate to manage it in MWRender::Actors with the other
Animation-based objects, but that will need some (minor) interface changes.
2013-04-29 03:31:46 -07:00
Chris Robinson
ba3a67f84b
Don't store the player base node in MWRender::Player
2013-04-28 23:44:44 -07:00
Chris Robinson
ce7bc20fa1
Avoid special-casing player rotation
2013-04-28 01:14:58 -07:00
scrawl
933f894148
Added Blind and Night Eye effects
2013-04-25 02:31:51 +02:00
Tom Mason
6ca2b1af74
fix for turning animations playing when in vanity mode
2013-04-09 19:24:41 +01:00
scrawl
2e7d5377f4
Fix crash when moving npcs to an inactive cell
2013-04-04 16:51:22 +02:00
scrawl
ebaf80d539
Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change.
2013-04-03 23:55:57 +02:00
Chris Robinson
63af72c315
Avoid converting to and from quaternions
2013-03-30 17:31:16 -07:00
scrawl
485b6c855a
Fix NPC race height not being applied
2013-03-15 16:44:35 +01:00
Glorf
521bebd2f4
Fallback system rewritten, added light fallbacks
2013-03-15 10:17:30 +01:00
Marc Zinnschlag
7e100c36b5
Merge remote-tracking branch 'gus/AI'
2013-03-06 19:05:55 +01:00
gus
5938e19362
Clean up
2013-03-06 17:31:57 +00:00
gus
d3bf3812a4
changing rotation order (fix some misoriented objects)
2013-03-05 20:16:57 +00:00
gus
8b6f0e0770
Correct orientation sign
2013-03-05 18:28:57 +00:00
scrawl
fe7b2732d8
Avoid manually updating render targets from within frameRenderingQueued
2013-03-05 14:24:29 +01:00
scrawl
2486ec6cb9
Material fixes (vertex colors, alpha)
2013-03-05 13:51:48 +01:00
scrawl
cab5315a8e
Disable mipmaps generation
2013-03-04 16:28:20 +01:00
scrawl
f1d35b73b8
Cleanup
2013-03-03 19:52:20 +01:00
scrawl
c9fefc7f5d
Simpler, more lightweight underwater effect, changed colors to match vanilla better
2013-03-03 19:28:11 +01:00
gus
e1882dce32
correcting a bug: player orientation wasn't stored correctly, and objects orientation wasn't properly retrived.
2013-03-03 13:02:41 +00:00
scrawl
9b0ac4e299
NPCs / creatures can now emit ripples
2013-02-27 09:20:42 +01:00
scrawl
d4264353a3
Merge branch 'z-up' into graphics
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/water.cpp
files/materials/water.shader
2013-02-26 14:54:53 +01:00
scrawl
cc9b72b9b1
Removing some leftovers of mwRoot node
2013-02-26 14:01:10 +01:00
scrawl
2e7bc1a368
Z-up conversion: local map, fix tcg
2013-02-26 13:39:10 +01:00
scrawl
3ef952172d
Z-up conversion: water, sky
2013-02-26 10:38:48 +01:00
scrawl
a5451eb9d9
Z-up conversion: terrain, objects
2013-02-26 08:30:06 +01:00
scrawl
b1fc68d44d
Merge branch 'master' into graphics
2013-02-25 17:36:33 +01:00
scrawl
355390429e
Fix World::isUnderwater to use dynamic waterlevel
2013-02-25 17:27:50 +01:00
scrawl
cacdb33b42
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/sky.cpp
2013-02-25 15:12:03 +01:00
greye
6a8c532244
fix and unify object cell change update in mwrender
2013-02-24 15:04:56 +04:00
scrawl
01102f9c73
Don't emit if there wasn't enough movement
2013-02-23 05:53:20 +01:00
scrawl
5b099393fa
Fix time factor
2013-02-23 04:43:51 +01:00
Chris Robinson
7ec73c29f2
Do not return the player's Animation object for non-players
2013-02-22 01:27:26 -08:00
scrawl
6cceb04adf
When a custom near clip plane is used, we need to fix up a second viewproj matrix manually to get proper depth values in the vertex shader. This fixes fog on reflections.
2013-02-19 03:08:00 +01:00
scrawl
42883ec64b
cleanup
2013-02-18 02:33:53 +01:00
scrawl
7ffcfa3622
Water and clouds no longer depend on timescale.
2013-02-17 16:23:55 +01:00
scrawl
6a49ea9b4f
Cleaning out some old bits
2013-02-13 18:39:36 +01:00
Chris Robinson
923d0d6eb4
Fix up some header includes
2013-02-06 21:47:09 -08:00
scrawl
31f760ccce
Fixing issues from last commit: restored input and occlusion queries
2013-02-05 20:26:13 +01:00
scrawl
c4d518132f
With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.
2013-02-05 19:22:08 +01:00
scrawl
3772cd9257
Refraction can be disabled separately now
2013-02-05 14:29:46 +01:00
scrawl
a44dfcd2ac
Now that refraction is separated out, we don't have to worry about rendering order. Should fix transparency blending issues around water (eg waterfalls) for good.
2013-02-03 19:28:31 +01:00
scrawl
5334934612
Listen to render window updates and properly activate/deactivate occlusion queries pre/post update.
2013-02-03 18:03:09 +01:00
scrawl
15e51b76de
Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth
2013-02-03 15:46:23 +01:00
scrawl
a461b282c1
water ripples (experimental)
2013-02-01 23:43:23 +01:00
Chris Robinson
00879ab20e
Fix player rendering
2013-01-17 15:48:09 -08:00
Chris Robinson
d2f5a886c7
Handle playgroup and skipanim through mwmechanics
2013-01-16 17:53:18 -08:00
Chris Robinson
63e685ea39
Add a method to get the Animation from a Ptr
2013-01-16 09:59:19 -08:00
Jordan Milne
10a3caa504
more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine
2013-01-13 23:38:46 -04:00
scrawl
30136eb449
Update settings UI
2013-01-12 06:36:48 +01:00
Chris Robinson
9675a6d04a
Merge remote-tracking branch 'zini/master' into animation2
2013-01-08 02:25:37 -08:00
Chris Robinson
05dfafa777
Avoid an unnecessary lookup when moving the scene node
2013-01-07 05:09:15 -08:00
scrawl
282601d6e9
support the allowSkipping extra parameter for playBink command.
2013-01-07 13:19:52 +01:00
Chris Robinson
efca5ded47
Clean up some header includes to reduce nesting
2013-01-05 21:12:08 -08:00
scrawl
5ed04ae53e
added black bars
2012-12-15 19:23:03 +01:00
scrawl
faad64b254
Esc cancels the video
2012-12-12 01:13:53 +01:00
scrawl
c49966dd29
started over
2012-12-11 22:49:31 +01:00
scrawl
5f676f9c6b
Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwscript/miscextensions.cpp
2012-12-11 22:28:23 +01:00
scrawl
c4facc233e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-12-01 11:30:51 +01:00
scrawl
064cb80c0a
fix wait dialog fading
2012-11-23 20:48:53 +01:00
scrawl
c8562d8442
toggleCollisionBoxes actually does something useful now
2012-11-20 02:20:54 +01:00
Marc Zinnschlag
918316168f
Merge remote-tracking branch 'greye/store' into next
...
Conflicts:
apps/openmw/mwclass/light.cpp
apps/openmw/mwworld/worldimp.cpp
2012-11-07 19:34:28 +01:00
Marc Zinnschlag
6d5333be05
some code cleanup
2012-11-06 13:08:25 +01:00
greye
932a9dc6f9
applying new interface vol.8, inconsistent
2012-11-06 11:53:00 +04:00
emoose
5c1b3fc043
Fixed: scene: adjust rotation/scale when creating objects
2012-11-05 20:45:04 +00:00
emoose
e8e3c211a4
Changed: MWRender::player: make camera rotation functions public; world: fix/clean scaleObject and rotateObject; rendering: add scaleObject code, fix rotateObject so it stores correct rotation
2012-11-05 19:56:20 +00:00
greye
d205723a17
resolving m prefix/ESMStore movement
2012-11-05 18:02:47 +04:00
greye
2057f5619e
move ESMStore to MWWorld
2012-11-05 17:18:01 +04:00
greye
3c2ce25f5f
m prefix for mwworld/cellstore.hpp
2012-11-05 16:07:59 +04:00
scrawl
b7aa7e4cef
pause all animations
2012-11-04 11:57:51 +01:00
emoose
cadc753216
Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell
...
Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery
Bug #430 fix is only tested in interiors (ToddTest)
2012-11-03 19:29:55 +00:00
greye
9f923e7963
fix crashing if /home/greye/.cache not exist
2012-10-25 15:14:34 +04:00
scrawl
21493c2dbd
added magic effect flags from Research wiki page
2012-10-01 23:33:07 +02:00
scrawl
dc33dee22e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwscript/miscextensions.cpp
2012-10-01 20:25:23 +02:00
greye
2fa4ac177a
initial resolving
2012-10-01 00:23:49 +04:00
scrawl
73c69e8eda
video playback
2012-09-25 02:35:50 +02:00
scrawl
78b2d51cfc
fix a map crash
2012-09-22 16:52:31 +02:00
scrawl
9106e5307c
moved global map from RenderingManager to gui and removed world method
2012-09-21 14:11:01 +02:00
greye
18cc435aa1
resolving conflicts
2012-09-21 13:13:11 +04:00
scrawl
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
2012-09-20 17:41:14 +02:00
scrawl
86cfc91ef3
global map rendering
2012-09-20 13:56:37 +02:00
Marc Zinnschlag
87a9373a56
Merge remote-tracking branch 'scrawl/gamma' into next
2012-09-20 09:01:58 +02:00
scrawl
b9a3f8e8d7
gamma slider
2012-09-19 23:47:42 +02:00
scrawl
d9f6072f02
gamma correct rendering & adjustment setting
2012-09-19 23:25:07 +02:00
Marc Zinnschlag
4abb9a00da
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
2012-09-18 11:25:09 +02:00
greye
7606ebafd6
resolving conflicts, minor update
2012-09-17 11:37:50 +04:00
scrawl
3e794a6087
remove useless member and removed a warning
2012-09-15 01:02:07 +02:00
scrawl
2793096b50
Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/world.hpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
2012-09-15 00:57:29 +02:00
Marc Zinnschlag
b7c9285b24
added support for out of world rendering
2012-09-14 21:12:16 +02:00
scrawl
1f7e044fad
removed some debug stuff
2012-09-14 14:41:19 +02:00
scrawl
6ac2a12296
item selection working on the preview
2012-09-14 14:34:18 +02:00
scrawl
eef750e6b0
race selection preview
2012-09-13 19:03:31 +02:00
