Chris Robinson
939d0d2fc5
Return a list of meshes and the skeleton from NIFLoader::load
2012-07-13 20:01:15 -07:00
Carl Maxwell
e4d046f69c
Prepending m to the name of every member variable.
...
I made a bunch of changes in apps/openmw/mwrender/animation.cpp
because the scope brackets didn't line up in a bunch of places
npcanimations.cpp & creatureanimations.cpp were the same kind of
thing
2012-07-13 03:51:58 -07:00
scrawl
d2fbb11475
temp commit
2012-07-13 11:26:36 +02:00
scrawl
7731e9a6fa
finished cleaning up sky
2012-07-13 09:13:12 +02:00
scrawl
b8384162b6
merge
2012-07-13 06:16:55 +02:00
Chris Robinson
ecdd4ee23f
Load NiMorphData and NiKeyframeData using proper key lists
2012-07-12 20:56:47 -07:00
Chris Robinson
386ac56bda
Remove the NIF loader and code to manually transform the vertices
...
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
2012-07-12 20:12:18 -07:00
scrawl
ad7383be43
sky
2012-07-11 09:08:55 +02:00
scrawl
e0a99f104b
settings tab "shadows"
2012-07-11 04:28:45 +02:00
scrawl
485adc8bdc
shader mode button in settingswindow
2012-07-11 03:19:51 +02:00
scrawl
865bfc6f47
sync mrt_output setting
2012-07-11 02:31:03 +02:00
scrawl
3537af051d
removed the old shader helper
2012-07-10 00:17:52 +02:00
scrawl
5d1e6b6bf6
remove cg profile check
2012-07-10 00:09:47 +02:00
scrawl
1a9f59d5d4
shadows
2012-07-10 00:07:33 +02:00
scrawl
07fd9986ef
accidently removed the map.
2012-07-09 20:14:07 +02:00
scrawl
b803d0e949
converted shadow caster shader
2012-07-09 19:46:36 +02:00
scrawl
81d30ff63a
temp commit
2012-07-09 19:20:41 +02:00
scrawl
a095572205
fixed some textures, started with sky
2012-07-06 10:31:48 +02:00
scrawl
33c48b9481
update
2012-07-06 04:28:08 +02:00
scrawl
4ea6530772
hello world.
2012-07-04 00:26:57 +02:00
scrawl
a1e48b0feb
builds now
2012-07-03 22:48:16 +02:00
Marc Zinnschlag
c85aaafac2
more include cleanup (most removing Ogre.h)
2012-07-03 15:32:38 +02:00
Marc Zinnschlag
87667ab57e
Issue #107 : Ptr related include cleanup
2012-07-03 13:55:53 +02:00
Marc Zinnschlag
5a7b95bf7a
Issue #107 : cleaned up includes in apps/openmw/mwworld/class.hpp
2012-07-03 13:15:20 +02:00
Marc Zinnschlag
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
2012-07-03 12:30:50 +02:00
Marc Zinnschlag
7fcd41c69d
Issue #107 : Detemplateised CellStore; some include cleanup
2012-06-29 18:54:23 +02:00
Marc Zinnschlag
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
2012-06-29 16:48:50 +02:00
scrawl
63ce143a04
fix triangle / batch counts with compositors
2012-06-22 12:56:04 +02:00
Mark Siewert
bef4bef5d2
- Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied.
...
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
2012-06-10 11:14:46 +02:00
scrawl
447158e9d6
shutdown crash fix
2012-06-09 19:15:11 +02:00
scrawl
42e44ac1b5
fixed some leaks
2012-06-06 21:08:20 +02:00
scrawl
c85c794c86
fixed some cppcheck issues
2012-06-06 20:29:30 +02:00
scrawl
36d26e0681
set the camera orientation after using teleport doors
2012-05-30 15:52:39 +02:00
scrawl
1b561ce91f
Merge branch 'master' into next
2012-05-29 06:56:23 +02:00
scrawl
69e6bc6588
add water settings to settings window
2012-05-29 06:45:44 +02:00
scrawl
5d03e86613
added field of view and texture filtering to settings window
2012-05-29 04:54:54 +02:00
scrawl
14f4f09f83
proper resolution switching (reposition GUI & adjust mouse clipping region)
2012-05-28 09:19:25 +02:00
scrawl
3daf1ebc3f
small map tweak
2012-05-28 05:03:50 +02:00
scrawl
19c428e86c
delete fix
2012-05-28 02:04:00 +02:00
scrawl
8f667580bb
ogre 1.8 final release compability fixes
2012-05-27 23:12:45 +02:00
scrawl
f6a6684685
when the resolution changes, adjust camera aspect ratio and recreate compositors
2012-05-27 21:39:18 +02:00
scrawl
a7e6a142f9
blend fog of war into adjacent cells
2012-05-27 00:39:33 +02:00
scrawl
656a8f1be9
working menu transparency slider
2012-05-23 01:32:36 +02:00
Marc Zinnschlag
7938566004
Merge remote branch 'scrawl/graphics'
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-05-21 11:24:36 +02:00
scrawl
8f2c8bbea4
Merge branch 'master' into graphics
2012-05-21 09:50:46 +02:00
scrawl
789dfe1c88
fix a bug with water reflection plane height
2012-05-21 09:50:02 +02:00
scrawl
8a0c859c16
Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI
2012-05-18 22:27:48 +02:00
scrawl
c9aa0ca1f4
don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region
2012-05-17 19:54:09 +02:00
scrawl
933a40de14
better floating object label positioning.
2012-05-14 21:37:43 +02:00
gugus
9dd65dce30
Finished merging.
2012-05-11 11:52:07 +02:00
scrawl
ee883446b5
Merge branch 'master' into graphics
2012-05-04 07:38:11 +02:00
scrawl
02dad448fe
make the wireframe mode not affect sky
2012-05-03 05:38:43 +02:00
scrawl
9e6531a6c6
fix for dark corners bug on some cards
2012-04-30 21:22:26 +02:00
scrawl
4655ec94f0
Merge branch 'master' into physicsaedra2 & fix warnings
...
Conflicts:
apps/openmw/mwworld/scene.cpp
2012-04-30 18:46:51 +02:00
scrawl
aaa81397ed
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-04-30 18:24:05 +02:00
scrawl
50d79a8815
Merge branch 'next' into tooltips
2012-04-29 17:30:34 +02:00
scrawl
9cf6f27f96
small fix
2012-04-29 03:38:00 +02:00
scrawl
11ebae3be2
toggleCompositors command useful for debugging
2012-04-29 03:33:10 +02:00
Marc Zinnschlag
d1d21c8a0e
compile fix
2012-04-28 21:21:40 +02:00
scrawl
4ce83badc9
flickering lights
2012-04-28 20:42:53 +02:00
scrawl
1b5bfc52a1
Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwgui/window_manager.cpp
2012-04-24 02:02:03 +02:00
scrawl
e443455612
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
2012-04-24 00:54:35 +02:00
Marc Zinnschlag
7ac9523e0c
Merge branch 'master' into next
2012-04-23 15:32:02 +02:00
Marc Zinnschlag
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
2012-04-23 15:27:03 +02:00
Marc Zinnschlag
cc86998281
removing some cout spam
2012-04-21 10:12:59 +02:00
scrawl
7400b7f313
fix underwater effect staying active when teleporting from underwater to a cell that doesn't have water
2012-04-19 23:25:58 +02:00
scrawl
c6da3872b4
light improvements
2012-04-19 20:59:57 +02:00
scrawl
fb0e649191
minor fix
2012-04-19 01:10:55 +02:00
scrawl
aa4a1b675f
fixed the sky reflection issue
2012-04-19 01:08:26 +02:00
scrawl
046ef39c4a
use camera-relative rendering to prevent precision artifacts when moving far from (0,0,0)
2012-04-18 01:10:00 +02:00
scrawl
51a76eda92
Merge branch 'master' into graphics
2012-04-18 01:09:55 +02:00
Jason Hooks
1ce759af06
Merging in master
2012-04-17 18:12:05 -04:00
scrawl
1de1b3e40e
Merge branch 'master' into tooltips
2012-04-17 15:57:08 +02:00
scrawl
a11c4da16c
vertex colour tweak
2012-04-17 14:22:03 +02:00
Marc Zinnschlag
14ddcc1204
Merge remote branch 'jhooks/clothingarmor'
2012-04-17 00:26:39 +02:00
Jason Hooks
950378ff65
Khajiit male foot fix
2012-04-16 17:25:55 -04:00
scrawl
13b67faf2f
adding more safety checks
2012-04-16 20:39:41 +02:00
Marc Zinnschlag
7483c78b4a
Merge remote branch 'jhooks/clothingarmor'
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
2012-04-16 14:06:27 +02:00
scrawl
d1e298c2e1
Merge branch 'master' into tooltips
2012-04-16 13:15:50 +02:00
Jason Hooks
0c9c253778
Fix for some types of boots
2012-04-15 22:49:17 -04:00
scrawl
0a223196e8
Merge branch 'master' into tooltips
2012-04-15 22:23:16 +02:00
scrawl
268b7cd6fc
replaced typename checks
2012-04-15 22:05:33 +02:00
Marc Zinnschlag
afa859a6a6
Merge remote branch 'jhooks/clothingarmor'
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
2012-04-15 22:06:05 +02:00
Jason Hooks
65c9cf565c
Skirt and robe part blanking
2012-04-15 15:16:48 -04:00
scrawl
688e79e6d1
Merge branch 'master' into tooltips
2012-04-15 21:14:39 +02:00
Jason Hooks
bc8bb9c57e
Reserve; skirts
2012-04-15 14:22:55 -04:00
scrawl
ab4e03f05f
Merge branch 'master' into tooltips
2012-04-15 17:11:14 +02:00
scrawl
d37bc9cba8
basic mouse-over info for in-game objects
2012-04-15 17:10:08 +02:00
Jason Hooks
85ac658cac
Adding tons of skin body parts
2012-04-14 22:52:05 -04:00
Jason Hooks
5e1ac0cca1
Gloves, Gauntlets, Boots, Shoes
2012-04-14 20:32:46 -04:00
Jason Hooks
940a90e3ba
Pauldrons
2012-04-14 19:21:14 -04:00
Jason Hooks
e5becb1f50
Group add function;Greaves
2012-04-14 18:58:52 -04:00
Jason Hooks
5d4ad4cd81
Shirts and Cuirasses
2012-04-14 16:44:46 -04:00
scrawl
4b0099fb5b
npc visibility flags fix
2012-04-14 16:10:47 +02:00
scrawl
fa5a1432c9
map lighting tweak, default settings tweak
2012-04-14 15:58:58 +02:00
scrawl
e05faa184f
Merge branch 'terrainshader' into graphics
2012-04-14 15:10:35 +02:00
scrawl
e04d127f30
terrain shader fixes
2012-04-14 15:10:26 +02:00
Jason Hooks
7551926afd
Adding helmets
2012-04-13 23:25:15 -04:00
Alexander "Ace" Olofsson
0c6862e3e6
Undefining some windows defines
2012-04-13 15:09:38 +02:00
scrawl
a33ae35e94
some fixes
2012-04-13 13:28:31 +02:00
Jason Hooks
e869433b07
Add or replace individual parts
2012-04-12 22:16:02 -04:00
Jason Hooks
1f566fc93a
Another remove function
2012-04-12 20:59:30 -04:00
Jason Hooks
a885f3e942
Remove part function
2012-04-12 20:40:11 -04:00
scrawl
fb78e853d4
removed 2 unneeded lines
2012-04-12 19:18:38 +02:00
scrawl
e2ec889d10
fixed a warning "implicit cast to float3"
2012-04-12 17:40:26 +02:00
scrawl
a96ad7fb82
restored toggleWater
2012-04-12 16:46:56 +02:00
Jason Hooks
7fce57f335
Getting started with a new branch
2012-04-11 20:16:22 -04:00
scrawl
2a4fcf42a3
basic shadows
2012-04-11 18:53:13 +02:00
Jason Hooks
c0f52fef48
one more change
2012-04-09 00:51:10 -04:00
Jason Hooks
80afcb2eac
small change
2012-04-08 20:44:44 -04:00
Jason Hooks
74deb5588d
Post merge
2012-04-08 20:41:49 -04:00
scrawl
1df7be7fee
- fixes to texture filtering setting
...
- add a sensible warning to settings-default.cfg, since there have been some confusions with it
2012-04-09 00:10:42 +02:00
Jason Hooks
6bdfdf379b
Trying iterators
2012-04-08 17:27:56 -04:00
scrawl
a5c6207fe7
add setting to disable the underwater effect
2012-04-08 17:44:00 +02:00
scrawl
113bbfa253
removed the now unneccesary SG for transparent objects
2012-04-08 14:37:36 +02:00
Jason Hooks
ebab98a8a0
Restructuring things
2012-04-07 22:02:20 -04:00
scrawl
c748252d33
weather fix again
2012-04-07 22:55:25 +02:00
scrawl
96911ada95
restored render queue of transparent objects, they are now part of the mrt textures
...
this fixes some issues with transparent objects not visible in the refraction
2012-04-07 22:37:15 +02:00
scrawl
c49d5dd40b
another sky tweak
2012-04-06 19:23:19 +02:00
scrawl
c0f991ac0a
underwater depth effect
2012-04-06 18:51:30 +02:00
scrawl
456eb95209
reversed sun and moon paths (sunrise at east)
2012-04-06 18:22:37 +02:00
scrawl
8316a4c2ec
add mrt dummy output to sky shaders
2012-04-06 17:21:56 +02:00
scrawl
c169f9e171
underwater tweaks
2012-04-06 16:11:08 +02:00
scrawl
2976625b00
better underwater
2012-04-06 15:51:57 +02:00
scrawl
ec3fe1ef00
no sun glare in the reflection
2012-04-06 15:17:54 +02:00
scrawl
393530e671
more or less fixed the sky for normal viewing angles, still disappears at a certain height though
2012-04-06 15:05:17 +02:00
scrawl
a41eee9a72
specular lighting
2012-04-06 14:07:52 +02:00
scrawl
8bfc81f398
Merge branch 'master' into water
2012-04-05 20:09:38 +02:00
scrawl
622fb568cf
removed MRT setting and figure it out automatically
2012-04-05 19:27:54 +02:00
scrawl
b8a470efcd
put transparent objects in a seperate render queue, in order to not mess up the mrt textures
2012-04-05 19:07:21 +02:00
Marc Zinnschlag
000cfad82d
Merge remote branch 'scrawl/gamesettings'
2012-04-05 18:07:47 +02:00
scrawl
88c50c5171
Merge branch 'master' into water
2012-04-05 15:38:46 +02:00
scrawl
1b89a9e203
various fixes
2012-04-05 15:30:55 +02:00
Dmitry Marakasov
84b475130a
Add missing include
2012-04-05 15:03:28 +02:00
scrawl
e1bde415f5
typo
2012-04-05 14:22:44 +02:00
scrawl
43fd0352f4
removed unneeded lines
2012-04-05 14:21:57 +02:00
scrawl
f49131e1b8
renamed setting, automatically disable MRT when unsupported
2012-04-05 13:09:59 +02:00
scrawl
f6342cfd60
fixed viewport background color, fixed indentation of some old functions
2012-04-05 11:52:06 +02:00
scrawl
5664d879a5
fixed some sky objects
2012-04-05 11:40:56 +02:00
scrawl
ab8b74dcac
forgot adding a file
2012-04-05 08:58:21 +02:00
Jason Hooks
ca4de0606e
Some planning
2012-04-04 23:23:24 -04:00
scrawl
3f05aba76d
got MRT working, some minor quirks to solve (black viewport background)
2012-04-05 01:21:36 +02:00
Marc Zinnschlag
6fd3d5c776
Merge remote branch 'lgro/master'
2012-04-04 23:19:30 +02:00
Lukasz Gromanowski
cd2789b15a
Revert "Issue #225 : Correction to commit ae98904."
...
This reverts commit 0e5c90d3e7
.
2012-04-04 21:05:19 +02:00
scrawl
eb67afe552
added MRT output to terrain material
2012-04-04 20:18:08 +02:00
scrawl
6442d49e16
render queue groups, sky fix
2012-04-04 18:53:40 +02:00
scrawl
cc4076d42a
basic noise
2012-04-03 21:16:43 +02:00
scrawl
fe63f2b2aa
first reflection test; removed the refraction render (we'll have it for free using MRT and deferred water rendering)
2012-04-03 19:10:02 +02:00
Marc Zinnschlag
cc9696cc2c
Merge remote branch 'scrawl/minimap'
2012-04-03 18:26:20 +02:00
scrawl
6481cf87fc
cleanup resources
2012-04-03 17:07:16 +02:00
scrawl
052cc47ee9
fixed waterAdded
2012-04-03 16:53:33 +02:00
scrawl
b3a186e729
simple water without shaders that uses original MW textures
2012-04-03 16:37:54 +02:00
scrawl
c1693a0c63
Merge branch 'minimap' into water
2012-04-03 15:37:11 +02:00
scrawl
51e33cc090
fixed map of some interiors
2012-04-03 15:34:13 +02:00
scrawl
8aea311797
added visibility flags for everything
2012-04-03 15:13:47 +02:00
scrawl
fd45208196
re-added code for reflection & refraction rendering
2012-04-03 14:23:23 +02:00
scrawl
d393f2dd4b
Merge branch 'master' into water
2012-04-03 14:06:14 +02:00
Jason Hooks
57299571d5
Preparing for clothes/armor
2012-04-02 22:08:46 -04:00
Marc Zinnschlag
26371a82a5
Merge remote branch 'scrawl/crashfix'
2012-04-02 23:53:07 +02:00
Lukasz Gromanowski
0e5c90d3e7
Issue #225 : Correction to commit ae98904
.
...
Changed pointer to LandData struct to simple member variable.
2012-04-02 23:50:53 +02:00
scrawl
d4a2bdfa3d
fix crash when hardware occlusion queries unsupporetd
2012-04-02 20:46:42 +02:00
scrawl
bd9e165e3f
Merge branch 'master' into water
2012-04-02 19:44:25 +02:00
scrawl
16481b0594
Merge branch 'master' into minimap
2012-04-02 19:38:36 +02:00
scrawl
342464530d
rotated map working
2012-04-02 19:37:24 +02:00
scrawl
ff15f28787
options for texture filtering and mipmaps
2012-04-02 18:01:49 +02:00
scrawl
39ee9e9ab8
setting for field of view
2012-04-02 17:51:51 +02:00
scrawl
5f2a674d93
fixed a typo
2012-04-02 16:14:39 +02:00
scrawl
fd662f937a
add settings for viewing distance and fog
2012-04-02 15:51:48 +02:00
scrawl
e5cc9adbb0
added settings for rendering distance of small objects
2012-04-02 15:30:29 +02:00
scrawl
2b4b941192
Merge branch 'master' into gamesettings
2012-04-02 15:21:10 +02:00
scrawl
e0631dd9be
Merge branch 'master' into minimap
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-04-02 14:38:02 +02:00
scrawl
b380e71832
fixed underwater wireframe mode
2012-04-02 14:32:21 +02:00
scrawl
1445ae992d
adding a setting to disable static geometry
2012-04-02 14:24:16 +02:00
Marc Zinnschlag
6022d3ab13
Merge remote branch 'corristo/pgrd-rendering'
...
reduced cout spam.
Conflicts:
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/renderingmanager.cpp
components/bsa/bsa_archive.cpp
libs/openengine/bullet/physic.hpp
2012-04-02 12:04:47 +02:00
Marc Zinnschlag
cdd0182912
Merge remote branch 'scrawl/occlusionquery'
...
Reduced cout spam
Conflicts:
apps/openmw/mwrender/occlusionquery.cpp
2012-04-02 11:33:16 +02:00
Lukasz Gromanowski
ae989040e5
Issue #225 : Fix for memleak when loading terrain.
2012-04-01 21:29:49 +02:00
scrawl
0a5757791c
Merge branch 'master' into minimap
2012-04-01 20:17:07 +02:00
scrawl
c2a82c3d89
Merge branch 'master' into gamesettings
2012-04-01 20:06:18 +02:00
scrawl
7b3adb27a3
backend changes, terrain num lights setting
2012-04-01 18:48:37 +02:00
Nikolay Kasyanov
30d6c880ff
Feature #37 (In Progress) Render Path Grid
...
tuned sized a bit
2012-04-01 17:51:37 +04:00
Nikolay Kasyanov
cab412c225
Feature #37 (In Progress) Render Path Grid
...
optimisation, now it takes only two batches per cell.
2012-04-01 17:27:18 +04:00
scrawl
9a261a02aa
changed the cloud movement direction like suggested on the forum
2012-04-01 15:14:43 +02:00
scrawl
ee754eda6c
don't create sky until entering an exterior cell
2012-04-01 15:07:41 +02:00
scrawl
80456778be
fix for pickup up transparent objects, workaround for doors
2012-04-01 14:22:04 +02:00
Marc Zinnschlag
40310f3663
Merge remote branch 'scrawl/occlusionquery'
2012-03-31 22:09:47 +02:00
Marc Zinnschlag
b5b40e2623
Merge remote branch 'lgro/master'
2012-03-31 21:45:15 +02:00
Lukasz Gromanowski
bdc4c79b4e
Fix for segfault when doing 'coc "seyda neen"'.
...
This is a fix for segfault:
==8683== Process terminating with default action of signal 11 (SIGSEGV)
==8683== Access not within mapped region at address 0x0
==8683== at 0x59DFE4: MWRender::Animation::handleShapes(std::vector<Nif::NiTriShapeCopy, std::allocator<Nif::NiTriShapeCopy> >*, Ogre::Entity*, Ogre::SkeletonInstance*) (animation.cpp:503)
==8683== by 0x5A4ECE: MWRender::Actors::update(float) (actors.cpp:134)
==8683== by 0x5937A9: MWRender::RenderingManager::update(float) (renderingmanager.cpp:168)
==8683== by 0x629AD6: MWWorld::World::update(float) (world.cpp:705)
==8683== by 0x68B022: OMW::Engine::frameRenderingQueued(Ogre::FrameEvent const&) (engine.cpp:157)
==8683== by 0x51F9574: Ogre::Root::_fireFrameRenderingQueued(Ogre::FrameEvent&) (in /usr/lib/libOgreMain.so.1.8.0)
==8683== by 0x51F964F: Ogre::Root::_fireFrameRenderingQueued() (in /usr/lib/libOgreMain.so.1.8.0)
==8683== by 0x51F9681: Ogre::Root::_updateAllRenderTargets() (in /usr/lib/libOgreMain.so.1.8.0)
==8683== by 0x51F98CF: Ogre::Root::renderOneFrame() (in /usr/lib/libOgreMain.so.1.8.0)
==8683== by 0x51F990C: Ogre::Root::startRendering() (in /usr/lib/libOgreMain.so.1.8.0)
==8683== by 0x68A669: OMW::Engine::go() (engine.cpp:408)
==8683== by 0x51CECB: main (main.cpp:254)
==8683== If you believe this happened as a result of a stack
==8683== overflow in your program's main thread (unlikely but
==8683== possible), you can try to increase the size of the
==8683== main thread stack using the --main-stacksize= flag.
==8683== The main thread stack size used in this run was 8388608.
when doing 'coc "seyda neen"' when animations are enabled
(Animation::animate member variable is set to 1).
2012-03-31 21:34:40 +02:00
Alexander "Ace" Olofsson
4ef921c43f
Prevent internal classes from being marked dllimport
2012-03-31 20:50:22 +02:00
scrawl
13efe68fc3
disabled some debug output
2012-03-31 20:28:07 +02:00
scrawl
cfb194f1d1
fix 6
2012-03-31 20:18:20 +02:00
scrawl
5f78f6c723
change queue
2012-03-31 20:10:34 +02:00
scrawl
b018d00fd3
fix 5
2012-03-31 20:05:23 +02:00
scrawl
c9067249dd
fix 4
2012-03-31 19:16:14 +02:00
scrawl
c08a2b2942
fix 3
2012-03-31 19:12:02 +02:00
scrawl
909abb480d
fix 2
2012-03-31 19:09:36 +02:00
scrawl
f8d45eae52
fix #1
2012-03-31 19:08:05 +02:00
Nikolay Kasyanov
5e829362cb
Feature #37 (In Progress) Render Path Grid
...
more similar to vanilla path grid rendering
2012-03-31 16:22:55 +04:00
Nikolay Kasyanov
006e1cde85
some updates after terrain merge
2012-03-31 14:56:54 +04:00
Nikolay Kasyanov
523648dbb1
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/debugging.cpp
2012-03-31 14:56:18 +04:00
Nikolay Kasyanov
057c2f2e2a
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-03-31 13:42:13 +04:00
scrawl
fc5cd703bb
maps are now rendered with correct rotation, however for interiors the arrow is wrong
2012-03-30 16:34:36 +02:00
scrawl
a4576f043d
fixed the physics debug rendering now activates/deactivates properly
2012-03-30 16:02:41 +02:00
Marc Zinnschlag
557e97bab4
fixed a terrain-related Redemption crash
2012-03-30 15:52:09 +02:00
Marc Zinnschlag
2d2af4b28a
Merge remote branch 'scrawl/terrain18' into terrain
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
components/esm_store/cell_store.hpp
2012-03-30 15:38:14 +02:00
scrawl
521b9eec6c
Merge branch 'master' into minimap
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/world.cpp
2012-03-30 15:31:07 +02:00
scrawl
30d27fa83f
Merge branch 'master' into occlusionquery
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
2012-03-30 15:00:04 +02:00
scrawl
4a6d034591
Merge branch 'master' into occlusionquery
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
components/esm_store/cell_store.hpp
2012-03-30 14:39:42 +02:00
Nikolay Kasyanov
b21a6291f7
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwscript/miscextensions.cpp
apps/openmw/mwworld/world.hpp
2012-03-30 02:50:30 +04:00
Marc Zinnschlag
647c0e4df3
Merge remote branch 'scrawl/renderingdistance'
2012-03-29 21:27:25 +02:00
Marc Zinnschlag
eec135c040
Merge remote branch 'scrawl/water'
2012-03-29 21:20:16 +02:00
scrawl
8d224f009f
toggleFogOfWar script command
2012-03-29 19:45:19 +02:00
scrawl
0c2317ce9d
player arrow works again
2012-03-29 19:20:09 +02:00
scrawl
79c2a2e465
implemented toggleWater (twa); formatting again
2012-03-29 18:33:08 +02:00
scrawl
01ecf3e0be
attempt at rotation (BROKEN)
2012-03-29 18:16:11 +02:00
scrawl
35f40b99ad
remove the bounding box hack, not needed because calculation is correct now
2012-03-29 18:10:01 +02:00
scrawl
0332a8df96
Merge branch 'renderingdistance' into minimap
2012-03-29 18:09:24 +02:00
Marc Zinnschlag
10b4c1d904
silenced a warning
2012-03-29 18:04:52 +02:00
scrawl
e22ae7c840
bounds fix (again)
2012-03-29 17:30:13 +02:00
scrawl
19c801f538
disabled rendering distance for now
2012-03-29 16:56:30 +02:00
scrawl
f45c650975
bounds fix
2012-03-29 16:47:59 +02:00
scrawl
f497813043
formatting, added Water::setHeight
2012-03-29 15:49:24 +02:00
Nikolay Kasyanov
c3357c4396
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
2012-03-29 13:27:13 +04:00
scrawl
39b3afb98f
use camera height instead of player height for underwater check
2012-03-29 05:03:34 +02:00
scrawl
e5a19209a4
remove the timeout stuff
2012-03-29 00:05:48 +02:00
scrawl
cb72e812f9
Merge branch 'master' into renderingdistance
2012-03-28 21:47:26 +02:00
scrawl
47c3e92db1
removed the unused ray scene query
2012-03-28 21:42:41 +02:00
scrawl
e6303fc3f4
Merge branch 'master' into water
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
2012-03-28 21:37:20 +02:00
scrawl
6bea08157e
Merge branch 'master' into terrain18
2012-03-28 21:30:15 +02:00
scrawl
cc7d3af701
Merge branch 'terrain18' into occlusionquery
2012-03-28 21:03:55 +02:00
scrawl
72ff7ec030
Merge branch 'next' into occlusionquery
...
Conflicts:
apps/openmw/mwrender/sky.cpp
2012-03-27 23:46:48 +02:00
scrawl
8f6d10f229
fix uninitalised stuff
2012-03-27 20:59:58 +02:00
Jacob Essex
ec21ff21cc
Removed memory leak, allocated more on the stack
2012-03-27 13:58:12 +01:00
scrawl
e398c51f8a
remove unneeded render queue workaround
2012-03-27 13:13:28 +02:00
Marc Zinnschlag
9863195f09
Merge remote branch 'lgro/valgrind' into next
2012-03-27 11:14:09 +02:00
Jacob Essex
b76b62e5e4
Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore
2012-03-27 09:20:22 +01:00
scrawl
bb09c2189a
lower rendering distance for small objects (reduce batch count)
2012-03-27 00:45:25 +02:00
Lukasz Gromanowski
be94da1527
Issue #225 : Initialize class members in constructor.
2012-03-27 00:34:06 +02:00
Lukasz Gromanowski
6d6ed909bf
Issue #225 : Deallocate memory used by actors animations.
2012-03-27 00:31:15 +02:00
scrawl
bf421d2873
use vector instead of array
2012-03-27 00:18:09 +02:00
scrawl
bb3f3ce1db
bugfix
2012-03-26 21:52:38 +02:00
scrawl
28dfba55e0
delete fix
2012-03-26 20:29:07 +02:00
Lukasz Gromanowski
5185a28b60
Issue #225 : Initialize all class members in constructor.
2012-03-26 19:09:55 +02:00
scrawl
4ee03cd61f
handle timeout
2012-03-26 00:31:03 +02:00
scrawl
98a33a7fc6
fix
2012-03-25 23:28:51 +02:00
scrawl
382fa6ac68
fixes
2012-03-25 22:53:00 +02:00
scrawl
53d4be5cf6
object pickup should work everywhere
2012-03-25 20:52:56 +02:00
Jason Hooks
18a139cd66
adding up and down move buttons
2012-03-24 22:03:08 -04:00
scrawl
9d30a139cc
added api
2012-03-24 20:41:23 +01:00
scrawl
e212a32350
bugfix
2012-03-24 18:38:58 +01:00
scrawl
743ea0c9be
use hardware occlusion query for sun glare effect
2012-03-24 17:59:26 +01:00