guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
2012-07-17 09:27:12 +02:00
Chris Robinson
a539e98274
Handle all meshes when inserting objects into the scene
2012-07-16 10:48:48 -07:00
scrawl
778e59ee37
terrain as it was before, with about 4x less code
2012-07-15 08:21:43 +02:00
scrawl
29f91753f7
correction
2012-07-14 18:44:03 +02:00
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