scrawl
|
50d79a8815
|
Merge branch 'next' into tooltips
|
2012-04-29 17:30:34 +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 |
|
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 |
|