greye
|
18cc435aa1
|
resolving conflicts
|
2012-09-21 13:13:11 +04:00 |
|
greye
|
2d5ddd104b
|
Land::loadData rework
|
2012-09-21 12:12:16 +04:00 |
|
scrawl
|
a161b34c67
|
remove useless member, fix map rendering crash
|
2012-09-20 18:23:27 +02:00 |
|
scrawl
|
8214966d44
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
|
2012-09-20 17:41:14 +02:00 |
|
scrawl
|
5f014f7411
|
oops, left in a testing assertion
|
2012-09-20 14:04:29 +02:00 |
|
scrawl
|
86cfc91ef3
|
global map rendering
|
2012-09-20 13:56:37 +02:00 |
|
Marc Zinnschlag
|
87a9373a56
|
Merge remote-tracking branch 'scrawl/gamma' into next
|
2012-09-20 09:01:58 +02:00 |
|
scrawl
|
b9a3f8e8d7
|
gamma slider
|
2012-09-19 23:47:42 +02:00 |
|
scrawl
|
d9f6072f02
|
gamma correct rendering & adjustment setting
|
2012-09-19 23:25:07 +02:00 |
|
scrawl
|
4d4ba6698a
|
fix character preview destruction; don't allow empty names in name dialog
|
2012-09-18 19:00:20 +02:00 |
|
Marc Zinnschlag
|
4abb9a00da
|
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
|
2012-09-18 11:25:09 +02:00 |
|
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
2012-09-17 11:37:50 +04:00 |
|
scrawl
|
3e794a6087
|
remove useless member and removed a warning
|
2012-09-15 01:02:07 +02:00 |
|
scrawl
|
2793096b50
|
Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/world.hpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
|
2012-09-15 00:57:29 +02:00 |
|
Marc Zinnschlag
|
b7c9285b24
|
added support for out of world rendering
|
2012-09-14 21:12:16 +02:00 |
|
scrawl
|
35f7216f2f
|
fixed some things
|
2012-09-14 17:25:32 +02:00 |
|
scrawl
|
1f7e044fad
|
removed some debug stuff
|
2012-09-14 14:41:19 +02:00 |
|
scrawl
|
6ac2a12296
|
item selection working on the preview
|
2012-09-14 14:34:18 +02:00 |
|
scrawl
|
eef750e6b0
|
race selection preview
|
2012-09-13 19:03:31 +02:00 |
|
scrawl
|
5155339cb6
|
character preview working
|
2012-09-13 14:56:50 +02:00 |
|
scrawl
|
d90af9c524
|
Merge branch 'master' into characterpreview
|
2012-09-13 14:22:17 +02:00 |
|
scrawl
|
4f3eb3c34a
|
character preview WIP
|
2012-09-13 00:54:32 +02:00 |
|
scrawl
|
2f0b47fc38
|
test
|
2012-09-13 00:21:58 +02:00 |
|
scrawl
|
c3966a7c5a
|
oops, I used a float texture for water reflection. this change should give a little performance boost.
|
2012-09-11 22:45:41 +02:00 |
|
scrawl
|
a8d9aa98b1
|
some fixes
|
2012-09-11 19:18:26 +02:00 |
|
Jason Hooks
|
c5b25ef70b
|
Very basic actor physics (no set scale/rotate functions)
|
2012-09-10 20:29:24 -04:00 |
|
Jason Hooks
|
23777033fd
|
Starting to implement new PhysicActor
|
2012-09-05 17:44:11 -04:00 |
|
scrawl
|
c27ff546e4
|
shader cache
|
2012-09-02 19:40:26 +02:00 |
|
scrawl
|
950bf66334
|
throw an exception if default value for a setting is not found
|
2012-09-02 11:39:54 +02:00 |
|
Jason Hooks
|
0697c7f7f4
|
Finally merged in master
|
2012-09-01 17:28:12 -04:00 |
|
Artem Kotsynyak
|
e9b2f4ee74
|
fix equipment visibility update
|
2012-08-28 22:59:44 +04:00 |
|
scrawl
|
5834b4baa5
|
door markers on the local map
|
2012-08-28 17:30:34 +02:00 |
|
scrawl
|
9af0b48ad6
|
show/hide crosshair correctly
|
2012-08-27 19:18:55 +02:00 |
|
greye
|
e6c3e0744e
|
tvm update and fix
|
2012-08-19 10:37:51 +04:00 |
|
greye
|
5b2b378f25
|
tvm script instruction
|
2012-08-18 18:05:10 +04:00 |
|
Marc Zinnschlag
|
d1656b2f5d
|
Merge remote-tracking branch 'greye/player_control'
Conflicts:
apps/openmw/mwrender/player.cpp
|
2012-08-18 13:38:54 +02:00 |
|
greye
|
b6954a4e8d
|
use the same height on non-1st person modes
|
2012-08-17 22:08:16 +04:00 |
|
scrawl
|
8817a9634c
|
don't switch to vanity mode as a result of idle time when the gui is opened (e.g. when talking to someone)
|
2012-08-17 16:55:21 +02:00 |
|
Marc Zinnschlag
|
1da56e2832
|
removed some unused variables
|
2012-08-17 15:37:14 +02:00 |
|
greye
|
0e6e141fd4
|
camera control related script instructions
|
2012-08-17 15:20:57 +04:00 |
|
greye
|
60fb1e8df6
|
fix sky in preview mode movement
|
2012-08-17 15:19:44 +04:00 |
|
greye
|
6961830efb
|
using real player eye direction when moving
|
2012-08-17 15:19:44 +04:00 |
|
greye
|
e8fc942bef
|
reverse Z-axis rotation to make doors happy
|
2012-08-17 15:19:44 +04:00 |
|
greye
|
a453a7f035
|
camera adjustment, fix view mode on start
|
2012-08-17 15:19:44 +04:00 |
|
scrawl
|
34f796c38e
|
removed the far clip distance hack which is not needed anymore
|
2012-08-17 15:19:44 +04:00 |
|
scrawl
|
b97b3d7b71
|
fix sky position when reflection is enabled, fix delay in sky reflection
|
2012-08-17 15:19:44 +04:00 |
|
greye
|
575244bd35
|
fix SkaManager issue
|
2012-08-17 15:19:44 +04:00 |
|
greye
|
783e81afc3
|
fix 1st/preview/1st change; 1st invisible model
|
2012-08-17 15:19:43 +04:00 |
|
greye
|
392e6efcb5
|
initial player rendering
|
2012-08-17 15:19:43 +04:00 |
|
greye
|
6f87c0c36d
|
preview mode, advanced vanity support
|
2012-08-17 15:19:43 +04:00 |
|