mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 17:19:56 +00:00
Code Issues Releases Wiki Activity
6203 commits 38 branches 54 tags 122 MiB
Commit graph

1107 commits

Author SHA1 Message Date
scrawl
93c641efa7 terrain albedo 2012-07-14 18:25:43 +02:00
scrawl
16c2ea3a75 terrain colourmap 2012-07-14 11:13:38 +02:00
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
scrawl
5fba52c238 Merge branch 'terrain18' into occlusionquery 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 2012-03-24 15:14:33 +01:00
scrawl
99b2b6b648 ogre 1.8 fixes 2012-03-24 14:46:48 +01:00
scrawl
f2a7acb102 Merge branch 'next' into terrain 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
 2012-03-24 13:19:17 +01:00
scrawl
f4898539e9 added some code that doesn't do anything yet, waiting for ogre 1.8 2012-03-24 13:06:01 +01:00
Marc Zinnschlag
9ec1e55aaf Merge remote branch 'scrawl/minimap' into next 2012-03-24 10:31:42 +01:00
scrawl
a6259a1b0d bugfixes 2012-03-23 17:37:56 +01:00
scrawl
06fa310e29 player arrow rotated correctly 2012-03-23 15:00:48 +01:00
scrawl
b8f962a68d Merge branch 'next' into shaders 2012-03-23 10:26:20 +01:00
scrawl
9c3e1f48f0 player arrow 2012-03-23 09:00:00 +01:00
scrawl
2dd329938a automatically zoom in on the player while moving 2012-03-23 08:16:04 +01:00
scrawl
9076401892 Merge branch 'next' into terrain 
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
 2012-03-22 22:31:49 +01:00
scrawl
ab9aa1ba74 Merge branch 'next' into minimap 
Conflicts:
	files/mygui/openmw_map_window_layout.xml
 2012-03-22 19:36:37 +01:00
Jason Hooks
fe9e6a732c Some cleanup 2012-03-18 22:32:46 -04:00
Jason Hooks
51fb9e67cd Merge 2012-03-18 21:31:31 -04:00
scrawl
1907e21207 removed preprocessor constants 2012-03-18 20:44:56 +01:00
scrawl
c2329b7027 removed preprocessor constants 2012-03-18 20:32:50 +01:00
scrawl
5e939e4818 map window now works for interiors 2012-03-17 13:59:51 +01:00
scrawl
3e4cf64a77 Merge branch 'master' into shaders 2012-03-16 20:46:18 +01:00
scrawl
5ea2122f79 sun gradually disappears 2012-03-16 20:39:58 +01:00
scrawl
a67cc8e73b more fixes 2012-03-16 19:02:33 +01:00
scrawl
c885ec1bd1 Merge branch 'master' into minimap 2012-03-16 17:10:27 +01:00
scrawl
91d2031eb7 first attempt at map window 2012-03-16 17:09:31 +01:00
scrawl
877cb2aca7 much better looking moons 2012-03-15 20:35:23 +01:00
scrawl
e354203c21 stars rotation 2012-03-15 19:49:15 +01:00
Alexander "Ace" Olofsson
e8eea03b4c Fixed a few more non-virtual destructor warnings 2012-03-15 17:40:42 +01:00
Nikolay Kasyanov
65fc141b62 Merge branch 'master' into pgrd-rendering 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-03-15 20:38:21 +04:00
Marc Zinnschlag
5b378e820d warning level adjustments and some related fixes 2012-03-15 16:01:41 +01:00
scrawl
2edd7e59f4 some fixes and facilities for saving the fog of war to disk 2012-03-14 20:44:06 +01:00
scrawl
5a46d58da5 fully working fog of war 2012-03-14 17:44:19 +01:00
scrawl
583a25f634 fog of war rendering (incomplete) 2012-03-14 14:51:58 +01:00
Nikolay Kasyanov
a8e25bc32c Feature #37 (In Progress) Render Path Grid 
improved path grid point mesh (closer to vanilla MW)
 2012-03-14 15:03:04 +04:00
Marc Zinnschlag
81abd97753 Merge remote branch 'scrawl/weather' 2012-03-14 09:40:22 +01:00
Nikolay Kasyanov
3a705baa29 Feature #37 (In Progress) Render Path Grid 
added simple pathgrid edges
 2012-03-14 03:06:56 +04:00
scrawl
e8267c7363 adjusted fog distance, prevents objects suddenly popping up on cell load 2012-03-13 22:14:35 +01:00
scrawl
8421fd2670 fixed a visual issue with the stars 2012-03-13 19:57:33 +01:00
scrawl
118250171d Merge branch 'master' of https://github.com/zinnschlag/openmw into shaders 
Conflicts:
	apps/openmw/mwrender/objects.cpp
 2012-03-13 17:31:10 +01:00
Nikolay Kasyanov
f292a5a7ca Feature #37 (In Progress) Render Path Grid 
now using mwRoot instead of ogre's root, so no more messing with coordinates.
 2012-03-12 02:37:07 +04:00
Nikolay Kasyanov
4659076129 Feature #37 (In Progress) Render Path Grid 
workaround for strange ESMStore bug
 2012-03-10 20:45:55 +04:00
Nikolay Kasyanov
11f957a64d Feature #37 (In Progress) Render Path Grid 
cubes for path grid points
strange crash when trying to get path grids from Debugging
 2012-03-10 20:03:00 +04:00
scrawl
5b38b17baf local map rendering (nothing to see yet, as it is not displayed in GUI) 2012-03-10 15:28:18 +01:00
scrawl
8be661c802 Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next 
Conflicts:
	CMakeLists.txt
 2012-03-07 13:29:59 +01:00
Marc Zinnschlag
3d1cbcd4e7 Merge remote branch 'jhooks/animperform' 2012-03-07 09:20:29 +01:00
Jason Hooks
39ff8d6a01 Compile error retry 2012-03-06 18:28:41 -05:00
Jason Hooks
9848b67174 Fixing errors 2012-03-05 17:46:29 -05:00
Marc Zinnschlag
25f5bdf7aa Merge remote branch 'scrawl/weather' 2012-03-05 22:45:52 +01:00
scrawl
42a7375a0b adjusted the batch region size, this was the cause for lights going on/off bug 2012-03-04 23:26:35 +01:00
scrawl
ff8f95fcca fix batch lighting, removed the "bumping number of lights" hack 2012-03-04 23:18:40 +01:00
scrawl
8910b0d471 use shaders for all NIF materials. this has numerous advantages: 
- vertex colours are now working as they should (and they have a huge impact on the look)
 - the lighting is per pixel and looks a lot better
 - by using shaders, we can use more lights at a time (fixed function has max of 8)
 2012-03-04 20:59:23 +01:00
Jacob Essex
eca91d17bb Indentation tweaks and code cleanup 2012-03-04 11:46:33 +00:00
Jacob Essex
941a22034f Merge branch 'terrain_next' of git://github.com/scrawl/openmw into terrain_next 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
 2012-03-04 11:30:37 +00:00
Jacob Essex
bcd2371baa Code cleanup: Removed unneeded Ogre namespace 2012-03-04 11:21:47 +00:00
Jason Hooks
a81ecb5f65 Bug 210 fix 2012-03-03 18:26:11 -05:00
scrawl
a8939bc318 disabled the composite map, improves loading time a lot 2012-03-04 00:08:56 +01:00
scrawl
d74b78a302 very minor performance improvement 2012-03-03 12:26:08 +01:00
scrawl
b882c03adc fixed terrain regions without vertexcolours, tweaked maxPixelError 2012-03-02 23:36:48 +01:00
Jacob Essex
3c934e3e44 Fixed a bug with fog not being applied to initially created terrain when starting in exteriors. 2012-03-02 22:31:17 +00:00
Jacob Essex
07a2e5a5be Removed dead code, fixed a error, added comments and tweaked some constants (after trying to find their min/max values) 2012-03-02 21:20:12 +00:00
Jacob Essex
0f705eaca5 Removed the option of not splitting terrain as it was slower and adding to code complexity. The only real reason for keeping it, which was that it made debugging some texture issues easier is now gone. 2012-03-02 21:03:53 +00:00
Jacob Essex
3ecc427b96 Implemented slightly better texture splatting 2012-03-02 20:27:20 +00:00
scrawl
461ec9f3d6 fix regarding last commit 2012-03-02 18:50:55 +01:00
scrawl
0d4e3b8e75 remove alpha channel from colour map 2012-03-02 18:33:05 +01:00
scrawl
2bea4c4724 fixed the global colour map, apparently Ogre::Terrain was corrupting it 
somehow, now we are just bypassing Ogre::Terrain for the colour map and
passing it directly to the material, which makes more sense
performance-wise anyway
 2012-03-02 15:29:12 +01:00
scrawl
04c141ddd5 Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
 2012-03-02 13:49:57 +01:00
Jacob Essex
8dd6e75ae1 Vertex colours now uses the Ogre::Terrain colour map 2012-03-02 11:56:51 +00:00
Marc Zinnschlag
be70d197e5 Merge branch 'next' 
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
 2012-03-02 12:11:44 +01:00
scrawl
562cc7aa30 fixed 2 assertions that caused crashes 2012-03-01 15:03:43 +01:00
scrawl
fddf7b4dd0 terrain material now supports point lights 2012-03-01 14:35:39 +01:00
Jacob Essex
611f336d07 Now doesn't attempt to use fake vertex colours with cells that don't have vertex colours 2012-02-29 23:38:21 +00:00
Jacob Essex
6924348696 Fixed some texture splatting issues with loading empty terrain cells 2012-02-29 23:33:54 +00:00
Jacob Essex
1d0ae9c8d1 Start of a basic implementation of fake vertex colours 2012-02-29 23:05:22 +00:00
scrawl
bac7f23604 Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
 2012-02-29 19:38:34 +01:00
scrawl
e04ef38a5c Merge branch 'next' of https://github.com/zinnschlag/openmw into terrain_next 2012-02-29 11:01:03 +01:00
Marc Zinnschlag
3c5f8a4a23 void pointer workaround 2012-02-29 10:13:25 +01:00
scrawl
be5555956c improved composite map, now adapts to the ambient/diffuse light 2012-02-28 22:04:44 +01:00
scrawl
f2c3616638 Merge branch 'next' into terrain_next 
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	cmake/FindOGRE.cmake
 2012-02-28 21:49:45 +01:00
scrawl
c8aab3a562 fix sun angle 2012-02-28 20:28:46 +01:00
Jacob Essex
13e3955916 Merge branch 'terrain' of github.com:Yacoby/openmw into terrain 2012-02-28 16:22:19 +00:00
scrawl
f55905609f fixed the terrain normals - they had to be adjusted because we use Morrowind's coordinate system 2012-02-28 17:18:07 +01:00
scrawl
abcf25ead2 terrain shader performance improvement (tested on opengl only, please test on directx) 2012-02-28 16:41:05 +01:00
scrawl
5b5e8ba4fd fix a typo that caused SPLIT_TERRAIN=true blendmap to be too detailed (causing insane loading times) 2012-02-28 16:20:57 +01:00
scrawl
b3db4f1c27 slightly improved moon fading 2012-02-28 15:20:46 +01:00
scrawl
dbd2d390fd terrain material fixes: 
- disable normal and parallax mapping
 - disable specular mapping and specular
 2012-02-27 21:12:16 +01:00
scrawl
f34b2c73c5 committing the terrain material generator from ogre 1.7.4, it seems to 
be almost impossible to make a derived class of TerrainMaterialGeneratorA
because of the many classes it contains and the inter-relationships
between them; just adding the whole source makes it a lot easier to modify

if we decide to update this source from OGRE upstream at any point
(which seems unlikely), we can take the diff from this commit on
to see the changes we did to the material generator
 2012-02-27 19:44:52 +01:00
Jason Hooks
36e9322830 a few changes2 2012-02-26 21:43:04 -05:00
Jason Hooks
8d7a5f469b a few changes 2012-02-26 21:27:54 -05:00
Marc Zinnschlag
053a2996d2 fix for non-standard erase function 2012-02-26 23:31:16 +01:00
Alexander "Ace" Olofsson
be8690e333 Fix for debug crash on windows 2012-02-26 22:45:17 +01:00
scrawl
8b0ef8f98c improvements to sun glare 2012-02-26 20:46:09 +01:00
scrawl
932983c2fa fix toggleSky 2012-02-26 18:21:11 +01:00
scrawl
c1d39bb35f tweaked cloud color 2012-02-26 15:54:52 +01:00
scrawl
f79bf1f300 fog 2012-02-26 13:13:29 +01:00
scrawl
8d5783d75d - set moon phase using (day%32)/4 (not really correct, but good for now) 
- added all weather patterns from morrowind.ini
 2012-02-25 21:06:03 +01:00
scrawl
e31ad90802 moon positions and fading 2012-02-25 16:36:45 +01:00
scrawl
4650672bb1 thunderstorm 2012-02-25 13:46:17 +01:00
scrawl
0ebdce543a - added night sky rendering with stars, nebulas, and fading in/out to sunset / sunrise 
- changed WeatherGlobals members to static
 2012-02-24 23:26:38 +01:00
scrawl
9560904d8a visibility fixes 2012-02-24 18:47:09 +01:00
scrawl
67c7b965f0 calculate a sun position depending on time of day 2012-02-24 18:30:16 +01:00
scrawl
811c4a41b7 fade in/out for sunrise and sunset 2012-02-24 17:42:31 +01:00
scrawl
aad8f6605e send a raycast through the physics engine to check if sun is visible 2012-02-24 16:12:43 +01:00
Jason Hooks
08f3ecf935 Slightly better performance on animation2 2012-02-24 01:30:17 -05:00
Jason Hooks
fb51b281b2 Slightly better performance on animation 2012-02-24 01:16:30 -05:00
scrawl
af83742e6f - disable the sky renderer completely in interior cells 
- SkyManager update (initial sun glare effect, no raycast)
 2012-02-23 21:44:56 +01:00
scrawl
d9c02ca526 - added isCellExterior / isCellQuasiExterior methods to World 
- interior now have the sun disabled properly (and ambient managed by cell, not sky)
 2012-02-23 21:12:06 +01:00
scrawl
90af78e3b8 attempt to fix openmw's lighting (restored the sun, set proper ambient value outside) 
- the fix should remain in this branch since the main branch still has the lighting by caelum
 2012-02-23 20:33:34 +01:00
scrawl
a5720e9a4f set sky colors according to time of day 2012-02-23 19:49:56 +01:00
scrawl
41a8b22ebd implemented weather transitions (currently only blends the clouds) 2012-02-22 19:17:37 +01:00
scrawl
b2de9e8f45 allow setting the clouds opacity 2012-02-21 22:11:41 +01:00
scrawl
83753dc384 tweaked the cloud animation speed 2012-02-21 17:42:43 +01:00
scrawl
91ffacbb6d added moon phases 2012-02-21 17:38:15 +01:00
scrawl
10ca67c0a5 fixed the sky elements positioning delay (nodes are now children of the camera node) 2012-02-21 16:49:28 +01:00
scrawl
2d8b0a4ac0 merged the sky manager implementation with its interface 2012-02-21 16:15:38 +01:00
scrawl
694a537b57 - removed caelum sources, resources, build scripts 2012-02-21 00:14:20 +01:00
scrawl
04d7db2860 moved the SkyManager implementation to a new source file (sky_impl.cpp) for convenience 2012-02-20 23:53:17 +01:00
scrawl
6aac3d4b77 - removed caelum (we can get it from the git history, if needed) 
- added code for moon rendering (they are not visible by default)
 2012-02-20 23:41:22 +01:00
scrawl
090c0586a0 leak fix 2012-02-20 22:20:34 +01:00
scrawl
6d37f53fa2 - abstracted the sun creation code into a CelestialBody class to be reused for the moons 
- fixed render queue problem
 2012-02-20 22:15:13 +01:00
scrawl
ad0f9f4bcf fixed the sun rendering (rendered without depth check) 2012-02-20 21:32:12 +01:00
scrawl
3b3218d907 fixed 3 gcc warnings in sky.cpp 2012-02-20 18:45:04 +01:00
scrawl
8b5da06fce Merge branch 'next' into weather 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-02-20 18:33:13 +01:00
Marc Zinnschlag
db205cf8aa Merge remote branch 'scrawl/next' into test 
Conflicts:
	libs/openengine
 2012-02-20 14:54:08 +01:00
Marc Zinnschlag
e02cba58b1 Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwclass/light.cpp
 2012-02-20 14:34:27 +01:00
Marc Zinnschlag
7eae24bb45 some fixes 2012-02-20 14:02:24 +01:00
scrawl
c884f70a61 added sun rendering (unfinished) 2012-02-20 00:52:44 +01:00
Jason Hooks
7e1e746201 More changes 2012-02-19 17:59:50 -05:00
scrawl
705d85e7d1 Merge branch 'next' into weather 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-02-19 23:27:26 +01:00
scrawl
60856b46e6 moved the renderer update call from OMW::Engine to RenderingManager 2012-02-19 23:22:29 +01:00
scrawl
1d9f0f4813 added MWSkyManager; already has atmosphere and moving clouds (although their colour is static) 2012-02-19 23:09:14 +01:00
Jason Hooks
38a0d1d1c5 Merging in master 2012-02-19 15:39:12 -05:00
Jason Hooks
e58f2f5363 Eliminating unnecessary data from skeletons and shape saving 2012-02-19 02:01:15 -05:00
scrawl
f81b615976 implemented script functions FadeIn, FadeOut, FadeTo 2012-02-18 18:25:28 +01:00
scrawl
40e23fe26f added twf console command 2012-02-18 16:06:03 +01:00
Lukasz Gromanowski
8829d46bda Clean up compilation warnings. 
Clan up compilation warnings like "variable ... set but not used" introduced
in some older and recent commits.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-02-12 15:45:08 +01:00
Jacob Essex
286701e3a5 Removed the flawed shading, updated textures, removed the need for a unused base texture 2012-02-11 20:54:29 +00:00
Marc Zinnschlag
bb7730a708 Merge branch 'lightfix' 2012-02-10 14:55:52 +01:00
gugus
597e670eef corrected the light problem 2012-02-10 14:51:49 +01:00
Jacob Essex
9cc3af34e5 Removed composite maps, fixes to texture sizes and unloading 2012-02-07 12:41:08 +00:00
Marc Zinnschlag
784c6fe0ff some cleanup 2012-02-06 10:41:13 +01:00
Marc Zinnschlag
e1600d9a2a fixed movable object cleanup for ordinary objects 2012-02-06 10:29:18 +01:00
Cris Mihalache
daa8fb15ce Removed all physics-related code from Engine 2012-01-29 20:51:20 +02:00
Jason Hooks
1da519a914 Some cleanup 2012-01-29 00:42:55 -05:00
Jason Hooks
6de0847b86 Slightly better performance on animation 2012-01-25 01:21:30 -05:00
Yacoby
46b8d3a83e Merge pull request #1 from corristo/terrain 2012-01-24 05:41:24 -08:00
Jacob Essex
5e3e6f9165 Fixed some minor bugs, a cells terrain can now be rendered as 4 Ogre::Terrain objects, possibly giving a speed increase 2012-01-24 13:29:31 +00:00
Marc Zinnschlag
4b6cd582a7 removed some redundant (and misplaced) functions 2012-01-24 10:45:40 +01:00
Jacob Essex
cd0df082df Textures are now blended between cells and the texture blending functions are now more abstract 2012-01-23 17:19:54 +00:00
Marc Zinnschlag
16bc374921 animation updates were hooked up to the wrong update function 2012-01-23 14:33:06 +01:00
Jason Hooks
3a1d7b7864 Huge Water 2012-01-22 19:24:35 -05:00
Jason Hooks
e1aba44da6 Switching cells in exterior works 2012-01-22 16:38:10 -05:00
Jason Hooks
ec94ecacaf Zinis branch merge 2012-01-22 15:02:38 -05:00
Nikolay Kasyanov
1b1ce48502 Now terrain manager donesn't try to load terrain for interiors 2012-01-22 20:20:12 +04:00
Jason Hooks
a0838369b2 Very basic exterior water 2012-01-21 20:05:08 -05:00
Jacob Essex
637302fc87 Added blended textures to the terrain 2012-01-21 17:59:12 +00:00
Jacob Essex
18108c02a7 Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered 2012-01-21 16:59:08 +00:00
Jason Hooks
84f45b1972 underwater view 2012-01-20 17:59:56 -05:00
Jason Hooks
2aad3a0bd8 Correct water levels 2012-01-19 23:29:07 -05:00
Jason Hooks
ff2bbc9fc5 Transparent water 2012-01-18 22:42:07 -05:00
Jason Hooks
bcf3e45ff6 Proper buffer designation 2012-01-18 22:00:03 -05:00
Marc Zinnschlag
9b910dda94 clean up 2012-01-17 15:10:53 +01:00
Jason Hooks
8798f7dd40 Bringing in some of Azathoth's work 2012-01-14 18:34:14 -05:00
Jason Hooks
e35aee0f89 Disjointed free part fix 2012-01-13 02:19:28 -05:00
Jason Hooks
41769f202c Huge Performance Increase 2012-01-13 00:48:52 -05:00
Jason Hooks
d1793bc4bd Animation files in the correct directory 2012-01-12 20:09:55 -05:00
Jason Hooks
0712bba49b Changing a few things around with handleshapes 2012-01-12 16:03:07 -05:00
Jason Hooks
5e1cc07ee8 Fixed ancestor ghost crash 2012-01-10 02:00:04 -05:00
Jason Hooks
7fde576dd9 actor physics again 2012-01-07 23:21:19 -05:00
Jason Hooks
a615369189 Warning and different physics 2012-01-06 22:52:15 -05:00
Jason Hooks
295eb27c2d Better Text Indices; Better file output 2012-01-06 18:23:41 -05:00
Jason Hooks
859ac1153e Basic Text Indices Working 2012-01-06 02:27:10 -05:00
Jason Hooks
0715f9b6ab Preparing to use text indices 2012-01-06 00:55:02 -05:00
Jason Hooks
595d0b1192 Cleanup; warnings 2012-01-05 21:45:17 -05:00
Jason Hooks
c2fa82326d Animation with physics attempt 2012-01-04 23:48:25 -05:00
Jason Hooks
45c57721ff Turning off hardware skinning2 2012-01-04 20:30:06 -05:00
Jason Hooks
1d2e77d947 Turning off hardware skinning 2012-01-04 19:47:06 -05:00
Jason Hooks
762727308e Hardware skinning working (YESgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --all) 2012-01-02 23:06:10 -05:00
Jason Hooks
a4c6d948d4 Disabling normal updates 2012-01-01 20:51:26 -05:00
Jason Hooks
289b8f667e Various npc heights 2012-01-01 17:28:46 -05:00
Jason Hooks
f7d26b2695 Scaling for wood elves 2012-01-01 00:05:21 -05:00
Jason Hooks
497d994525 female argonian fix 2011-12-31 02:41:26 -05:00
Jason Hooks
42e7ff9b13 Introducing loops; SkipAnim; Skeleton reset bug fixed 2011-12-28 21:52:05 -05:00
Jason Hooks
c8cca06b40 unlocking change and stop change 2011-12-28 17:34:47 -05:00
Jason Hooks
8c3127367a Npc Optimization 2011-12-27 22:35:22 -05:00
Jason Hooks
cef2f5e927 Trying to get code to conform with older c++ 2011-12-27 19:19:45 -05:00
Jason Hooks
c399f4f210 Fixing a few things 2011-12-27 17:12:47 -05:00
Jason Hooks
1a90f4241b Npc Animation Working 2011-12-27 00:25:52 -05:00
Jason Hooks
a6b88b48ec A different way 2011-12-27 00:20:14 -05:00
Jason Hooks
653d999ac4 Animation creatures 2011-12-26 19:23:46 -05:00
Jason Hooks
88c427543b Deleting animations; Empty Functions/Planning 2011-12-25 22:37:26 -05:00
Jason Hooks
7eee54bcd7 More physics and managing of Animation objects 2011-12-25 01:52:57 -05:00
Jason Hooks
1b835d6702 Cell changing fixes 2011-12-24 21:53:12 -05:00
Jason Hooks
7cf3fc8991 handleAnimationTransforms 2011-12-18 03:18:26 -05:00
Jason Hooks
6d10c76b06 Unique Identifiers for Creatures and NPC Free Parts 2011-12-17 01:29:08 -05:00
Jason Hooks
93a4060346 Switching handleShapes to use sets instead of maps 2011-12-15 00:41:44 -05:00
Jason Hooks
d51dfebde1 NPCs fully rendered 2011-12-15 00:33:10 -05:00
Jason Hooks
47112ad7f9 Changing a lot of things 2011-12-13 23:49:03 -05:00
Jason Hooks
509009e5c1 Putting the actors in a list 2011-12-11 23:42:39 -05:00
Jason Hooks
0902a3db89 Filled out NpcAnimation and CreatureAnimation classes 2011-12-11 22:40:00 -05:00
Jason Hooks
39338f4be1 NPC bounded parts 2011-12-09 15:20:35 -05:00
Jason Hooks
5c48d8fc1e more stuff 2011-12-09 03:02:09 -05:00
Jason Hooks
ee98a2af1a Empty npcs 2011-12-09 00:08:30 -05:00
Jason Hooks
7bd911b401 Problems with handles 2011-11-24 23:13:34 -05:00
Jason Hooks
16ff2a7a1b Changing to Actors;NPCAnimation;CreatureAnimation 2011-11-24 01:48:54 -05:00
Jason Hooks
0d3338f867 Some naming changes 2011-11-22 02:39:28 -05:00
Marc Zinnschlag
0f4adc39b3 added animation-related script instructions 2011-11-21 14:08:44 +01:00
Marc Zinnschlag
51d5c7cd59 Merge remote branch 'jhooks/mwrender' into mwrender 
Conflicts:
	apps/openmw/engine.cpp

- fixed code that did not compile
- removed tons of tabs
- more clean up
 2011-11-21 12:52:28 +01:00
Jason Hooks
7385948056 Yet another crash fix 2011-11-19 20:22:56 -05:00
Jason Hooks
7319f7a8c6 Many bugs fixed related to changing cells 2011-11-19 01:01:19 -05:00
Jason Hooks
4dc59dfbdd Scenenode flip 2011-11-17 17:10:27 -05:00
Jason Hooks
a0947cd432 Player handle changed;Interior removed;Exterior removed;Cellimp removed; Probe fixed 2011-11-16 21:15:49 -05:00
Jason Hooks
9b94074472 addObject 2011-11-16 16:22:13 -05:00
Jason Hooks
db57f0a1a5 more corrections 2011-11-13 18:19:29 -05:00
Jason Hooks
bc58ef28cd Made corrections 2011-11-12 15:58:22 -05:00
Jason Hooks
0b3bb2719f Fixing some errors 2011-11-12 00:19:22 -05:00
Jason Hooks
62d8d1add2 more recommended changes 2011-11-11 14:37:42 -05:00
Jason Hooks
f4e7bd6dfd Made some recommended changes 2011-11-11 00:20:53 -05:00
Jason Hooks
a7652bcb0c Yacoby's changes on Objects 2011-11-09 13:53:29 -05:00
Jason Hooks
c25b49d2b6 refdata change 2011-11-08 22:59:39 -05:00
Jason Hooks
469086747e Compile error fix;RenderingInterface separated; buildStaticGeometry argument changed 2011-11-07 23:35:39 -05:00
Jacob Essex
9aac625000 Changes to move the mutable ESM::Position data to RefData 2011-11-08 00:08:00 +00:00
Jason Hooks
c11b3a57c1 Made buildStaticGeometry function 2011-11-05 14:57:33 -04:00
Jason Hooks
8edcd4d15b removing tabs 2011-11-04 21:57:39 -04:00
Jason Hooks
6c80e75deb More Objects functionality 2011-11-04 21:48:52 -04:00
Jason Hooks
e041006063 Adding light and fog functions 2011-11-03 23:47:15 -04:00
Jason Hooks
edf85b26f9 Insert Mesh, Insert Light, insertBegin improved 2011-11-03 19:40:37 -04:00
Jason Hooks
9ac627c931 Commenting out assert 2011-11-02 22:45:58 -04:00
Jason Hooks
d49a02abe5 new insertBegin() 2011-11-02 22:41:48 -04:00
Jason Hooks
c2181d2091 Dealing with scenenodes 2011-11-02 00:13:33 -04:00
Jason Hooks
3d43a4cd33 Made recommended changes 2011-11-01 13:46:57 -04:00
Jason Hooks
f1bc5b0ab6 Objects started, RenderingInterface 2011-10-31 23:59:16 -04:00
Jason Hooks
3761271c59 Empty creature, objects, npc 2011-10-31 00:04:06 -04:00
Jason Hooks
1083db5582 Hiding debugging 2011-10-30 00:25:29 -04:00
Jason Hooks
c3a492bf74 Debugging file renamed 2011-10-25 14:06:44 -04:00
Jason Hooks
d4f63443e6 Hiding the rendering manager; crash eliminated 2011-10-24 22:11:36 -04:00
Jason Hooks
6efc61b9df Removal of MWScene; Object listing fixed 2011-10-24 13:42:36 -04:00
Jason Hooks
30ba9b74da Simple Debugging class 2011-10-22 00:15:15 -04:00
Jason Hooks
47593f3641 Removing old files 2011-10-20 19:35:49 -04:00
Jason Hooks
fcf404d27b GetFacedHandle in Physics. RenderingManager constructor code added 2011-10-20 18:15:30 -04:00
Jason Hooks
3315de8b4a Naming convention change 2011-10-20 15:02:19 -04:00
Jason Hooks
d0f922ec5d Moved SkyManager creation 2011-10-20 13:55:56 -04:00
Jason Hooks
0992f1e903 Applying Gus's Windows fix 2011-10-18 21:02:42 -04:00
Jason Hooks
9126bb27b6 empty functions 2011-10-18 19:50:19 -04:00
Marc Zinnschlag
40853e292f various bits of clean up 2011-09-04 09:48:50 +02:00
Marc Zinnschlag
0a2979caf2 more cleanup 2011-08-27 10:45:09 +02:00
Marc Zinnschlag
f8029aaa9e more cleanup; fixes for player handling during physics (unrelated to the actual refactoring bugs); fixed minor bug in character initialisation 2011-08-27 10:30:38 +02:00
Sebastian Wick
29b8a5374b get rid of the warnings 2011-08-19 17:03:47 +02:00
Sebastian Wick
b7dbfb849a moved skyManager into RenderingManager 2011-08-08 21:11:30 +02:00
Sebastian Wick
54724d7e7f start RenderingManager 2011-08-07 16:40:01 +02:00
Sebastian Wick
4b846a54f1 PhysicsSystem 2011-08-01 15:55:36 +02:00
Sebastian Wick
6baf904f0f mStore fixed; glibc detected in shutdown process 2011-08-01 04:53:06 +02:00
Sebastian Wick
e7057bed29 moving stuff from MWWorld::World to MWWorld::Scene but receiving segfault signals 2011-07-31 17:07:11 +02:00
Marc Zinnschlag
8446619ac4 Merge branch 'components_namespaces' into next 
Conflicts:
	apps/openmw/mwrender/interior.cpp
	components/bsa/bsa_archive.cpp
 2011-06-19 20:22:29 +02:00
Lukasz Gromanowski
e9ff9a446b Mantis: #18 - Move components from global namespace into their own namespace. 
Moving classes from components/nifogre into NifOgre namespace.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2011-06-19 19:14:14 +02:00
Marc Zinnschlag
bc92b7b1fa Merge branch 'directories' into next 
Conflicts:
	components/files/multidircollection.hpp
	components/nifogre/ogre_nif_loader.hpp
 2011-06-15 22:40:24 +02:00
Marc Zinnschlag
0f2df4e2b8 more cleanup 2011-06-15 22:33:31 +02:00
Marc Zinnschlag
7d2956329a some cleanup 2011-05-30 14:27:04 +02:00
Marc Zinnschlag
bed45a936e fixed cell change crash 2011-05-30 14:21:55 +02:00
Jason Hooks
51b74c2f05 starting 2011-05-23 19:01:36 -04:00
Jason Hooks
b945ce61a5 Merge remote branch 'upstream/master' 2011-05-23 15:01:47 -04:00
gugus
c7fb27e801 Clean up wasn't done properly when deleting a Cell. 2011-05-23 20:22:12 +02:00
gugus
faaa08d6d0 removed this stupide methode to generate unique ID. 2011-05-23 19:47:27 +02:00
gugus
4546ca3863 static Objects goes inside the static geometry 2011-05-23 19:39:10 +02:00
gugus
cd79df1d8b Merge branch 'static' of git@github.com:zinnschlag/openmw.git into optimisation 
Conflicts:
	apps/openmw/mwrender/exterior.cpp
 2011-05-23 19:27:40 +02:00
Marc Zinnschlag
7192bc4f89 added static flag 2011-05-23 19:12:28 +02:00
gugus
41d283a3aa very experimental: static geometry. 2011-05-23 15:00:01 +02:00
Marc Zinnschlag
f52e6bd5ef made toggle-type script instructions more verbose 2011-04-26 21:38:21 +02:00
Jason Hooks
92509d3b70 Trying to animate creatures 2011-04-13 20:35:44 -04:00
Jan-Peter Nilsson
a94de76801 Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline) 2011-04-03 13:20:42 +02:00
Jan-Peter Nilsson
2e2d490c78 Remove unused variable (compiler warning) 2011-04-03 13:20:18 +02:00
Marc Zinnschlag
c571148bef Merge branch 'collision' 2011-03-23 22:57:56 +01:00
gugus
3ad2b9986e fix actors not beeing deleted. Need the latest OEngine. 2011-03-23 19:16:51 +01:00
Marc Zinnschlag
7144657cfc Merge branch 'script' 2011-03-23 17:07:05 +01:00
gugus
773b7635a4 decrease the range of the raycast, and modifie the gravity/speed of the player. 2011-03-22 21:30:46 +01:00
Marc Zinnschlag
0866e4d4fe fix: NPCs were not added to physics system 2011-03-22 20:31:33 +01:00
gugus
7a28c9f3aa fix the door bug 2011-03-22 20:15:19 +01:00
gugus
0cc94c81d4 Merge remote branch 'upstream/collision' into collision 2011-03-22 14:14:56 +01:00
Marc Zinnschlag
7b5d24c853 fixed a bug in phyiscs update code 2011-03-22 13:48:31 +01:00
gugus
3dddcbd958 fix a camera problem and increase player speed 2011-03-22 13:01:23 +01:00
Marc Zinnschlag
91ea36509d gus' fly mode fix; manually applied 2011-03-21 14:08:56 +01:00
Marc Zinnschlag
8788dcebcf Merge remote branch 'gus/collisions' into collision 2011-03-20 22:38:42 +01:00
gugus
8aeefd2af8 fix the fall bug when using ToggleCollision. Require lastest change with OEngine. 2011-03-20 21:52:31 +01:00
Marc Zinnschlag
647e88003e build and activation fix 2011-03-19 19:54:37 +01:00
gugus
21c224af25 add gravity change to the ToggleCollisionMode function. 2011-03-18 13:32:42 +01:00
gugus
102f1ee5dc filled the toggleCollisionMode function. It needs the lastest change in OEngine 2011-03-18 13:23:26 +01:00
gugus
98b27813b7 change raycasting 2011-03-17 10:54:38 +01:00
Marc Zinnschlag
72a84356e2 added tcg/tcb instructions (toggle collision rendering); not fully working yet (problem in OpenEngine or MWScene) 2011-03-16 09:09:45 +01:00
Marc Zinnschlag
eb93ef68f1 fixed collision mode interface and redirected collision mode script instruction from Player class to MWScene class 2011-03-13 22:33:55 +01:00
gugus
00de2e6d98 correct some stuff with the physic implementation 2011-03-09 19:09:11 +01:00
gugus
40193253b0 fix some time bug 2011-03-09 18:29:57 +01:00
Marc Zinnschlag
1e9dc4b435 de-Windownizing and some build-fixes 2011-02-26 16:37:47 +01:00
gugus
33f22fd68b fix camera bug 2011-02-23 12:28:13 +01:00
gugus
903f39cb50 change the rayCasting system. It use bullet now. NOT TESTED! 2011-02-22 20:52:05 +01:00
gugus
d3c1640723 add physic support 2011-02-22 14:11:53 +01:00
gugus
84dce2eb36 add physic and solve a problem with window.h macro min/max 2011-02-19 19:18:03 +01:00
gugus
746cf3a45a add physic. 2011-02-19 11:36:57 +01:00
Marc Zinnschlag
9807e7dadc simplified actor-related physics interface to mwscene 2011-02-11 09:24:59 +01:00
Marc Zinnschlag
5c1aae3e26 added object movement code in mwscene (will be replaced by physics code later); does not work well, because OpenEngine manipulates camera instead of player node 2011-02-10 13:32:34 +01:00
Marc Zinnschlag
9c6bc4975c attached camera to a scene node 2011-02-10 12:56:19 +01:00
Marc Zinnschlag
ca44b3640a pasing movement data from mwmechanics to mwscene and fixed a very stupid interface bug 2011-02-01 10:11:41 +01:00
Marc Zinnschlag
88b0908104 adding physics when insertering objects into the OGRE scene 2011-01-29 17:33:48 +01:00