1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 12:49:56 +00:00
Commit graph

577 commits

Author SHA1 Message Date
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