Marc Zinnschlag
|
ea8eab4f34
|
more cleanup
|
2012-09-18 11:06:19 +02:00 |
|
Marc Zinnschlag
|
408c5b8bd4
|
some cleanup
|
2012-09-18 10:49:51 +02:00 |
|
Marc Zinnschlag
|
4469976be9
|
Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2012-09-18 10:44:25 +02:00 |
|
gugus
|
3c1a9061de
|
Fixed a bug of Ptr having a wrong orientation. But that's strange, seems CellRef isn't initialized properly
|
2012-09-17 14:12:27 +02:00 |
|
gugus
|
032ff7c879
|
Clean-up. There is still a little bug.
|
2012-09-17 13:36:48 +02:00 |
|
Marc Zinnschlag
|
2bb400eaa8
|
Merge remote-tracking branch 'pvdk/datalocalfix'
|
2012-09-16 10:36:03 +02:00 |
|
Marc Zinnschlag
|
b041a511b6
|
Merge remote-tracking branch 'mmd/windowswarnings'
|
2012-09-16 10:33:06 +02:00 |
|
Pieter van der Kloet
|
4bcc34f4f9
|
Re-enabled and fixed multiple data directory handling in the launcher
|
2012-09-16 04:28:51 +02:00 |
|
Pieter van der Kloet
|
97326ffdbf
|
Fixed data-local directory handling in the launcher
|
2012-09-16 03:01:48 +02:00 |
|
scrawl
|
896428c129
|
enableRestMenu & enableLevelupMenu
|
2012-09-15 20:18:41 +02:00 |
|
scrawl
|
9cf1cbc89b
|
remove book skill gain
|
2012-09-15 20:03:53 +02:00 |
|
scrawl
|
3e5ab069a6
|
remove the const cast
|
2012-09-15 19:52:18 +02:00 |
|
scrawl
|
cf358fa79d
|
>= instead of ==
|
2012-09-15 19:20:13 +02:00 |
|
scrawl
|
0dc242c603
|
don't increase skill beyond 100
|
2012-09-15 19:10:48 +02:00 |
|
scrawl
|
f5237ff1a6
|
skill gain from books
|
2012-09-15 19:06:56 +02:00 |
|
scrawl
|
234f8fa5d5
|
added the missing sound & notification for skill increase
|
2012-09-15 18:35:59 +02:00 |
|
scrawl
|
b34b894d6a
|
removed some debug stuff
|
2012-09-15 17:20:47 +02:00 |
|
scrawl
|
76b494100e
|
finished?
|
2012-09-15 17:12:42 +02:00 |
|
scrawl
|
95f3a20e2c
|
Merge branch 'master' into levelup
|
2012-09-15 14:25:37 +02: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
|
b76a28f69c
|
beginnings of the gui
|
2012-09-14 19:44:00 +02:00 |
|
scrawl
|
35f7216f2f
|
fixed some things
|
2012-09-14 17:25:32 +02:00 |
|
scrawl
|
7c59b83419
|
performance optimization
|
2012-09-14 17:10:10 +02:00 |
|
scrawl
|
a308d2e38a
|
fixed exception, fixed armor label obscuring the items
|
2012-09-14 15:33:24 +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 |
|
Marc Zinnschlag
|
835c530e06
|
Merge branch 'ingredients'
|
2012-09-13 13:31:46 +02:00 |
|
Marc Zinnschlag
|
5706caa141
|
Issue #356: added ingredient eating sound effect
|
2012-09-13 13:30:57 +02:00 |
|
Marc Zinnschlag
|
fe68a252d5
|
Issue #356: Implemented ingredient eating
|
2012-09-13 13:02:26 +02:00 |
|
Marc Zinnschlag
|
2ccd7a480d
|
Issue #356: added a missing return
|
2012-09-13 13:01:59 +02:00 |
|
scrawl
|
7ad80e306b
|
fixed the disappearing
|
2012-09-13 12:33:09 +02:00 |
|
Marc Zinnschlag
|
9de7b3bf90
|
Issue #356: Properly support ingredients effect in ActiveSpells (hopefully)
|
2012-09-13 11:30:59 +02:00 |
|
Marc Zinnschlag
|
0af0dc0d5d
|
Issue #356: More CreatureStats cleanup
|
2012-09-13 11:13:05 +02:00 |
|
Marc Zinnschlag
|
2934987f78
|
Issue #356: Some CreatureStats cleanup
|
2012-09-13 10:52:34 +02:00 |
|
Marc Zinnschlag
|
9dcf8939e9
|
Issue #356: added function for fatigue term calculation
|
2012-09-13 10:45:32 +02:00 |
|
Marc Zinnschlag
|
fca3b67507
|
Issue #356: basic support for ingredients in ActiveSpells (still using the wrong formula)
|
2012-09-13 09:30:47 +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
|
a96ed6ac61
|
splash screens on startup
|
2012-09-12 19:15:29 +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 |
|
Marc Zinnschlag
|
e9e30c0fce
|
fixed a memory leak
|
2012-09-11 20:34:54 +02:00 |
|
scrawl
|
a8d9aa98b1
|
some fixes
|
2012-09-11 19:18:26 +02:00 |
|
scrawl
|
d5a08e31e7
|
scene does not disappear anymore during load
|
2012-09-11 17:36:20 +02:00 |
|
scrawl
|
369db182de
|
actual progress bar, performance optimization
|
2012-09-11 16:53:49 +02:00 |
|
scrawl
|
2b339f6c0f
|
loading screen
|
2012-09-11 16:37:54 +02:00 |
|