Marc Zinnschlag
|
642653d10e
|
World constructor fixes
|
2013-03-06 19:57:00 +01:00 |
|
Marc Zinnschlag
|
7e100c36b5
|
Merge remote-tracking branch 'gus/AI'
|
2013-03-06 19:05:55 +01:00 |
|
scrawl
|
268bb23590
|
Implemented sneaking animation
|
2013-03-06 16:58:56 +01:00 |
|
gus
|
8b6f0e0770
|
Correct orientation sign
|
2013-03-05 18:28:57 +00:00 |
|
Marc Zinnschlag
|
d839a4c6c2
|
Merge remote-tracking branch 'scrawl/graphics'
|
2013-03-05 16:31:22 +01:00 |
|
scrawl
|
fe7b2732d8
|
Avoid manually updating render targets from within frameRenderingQueued
|
2013-03-05 14:24:29 +01:00 |
|
Marc Zinnschlag
|
dc3edc6024
|
Merge branch 'vartype'
|
2013-03-05 10:59:08 +01:00 |
|
Marc Zinnschlag
|
ba4907fbaf
|
use new Variant type for GMSTs
|
2013-03-05 08:02:27 +01:00 |
|
Marc Zinnschlag
|
a93034b0a9
|
Merge remote-tracking branch 'k1ll/store_segfault_fix'
|
2013-03-04 19:27:14 +01:00 |
|
Marc Zinnschlag
|
a1ac20c6f3
|
changed global variable records to new variant type
|
2013-03-04 14:32:59 +01:00 |
|
gus
|
48b3f1e0cf
|
Clean up. But still a little hacky
|
2013-03-04 12:08:35 +00:00 |
|
scrawl
|
359ae06fcf
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
|
2013-03-03 19:35:26 +01:00 |
|
Marc Zinnschlag
|
123a111580
|
Merge remote-tracking branch 'scrawl/master'
|
2013-03-03 17:13:05 +01:00 |
|
scrawl
|
f0e3463e9b
|
Disable assertion for comparing iterators from different containers (Bug #605)
|
2013-03-03 16:50:10 +01:00 |
|
scrawl
|
05bd94effb
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
|
2013-03-03 15:14:20 +01:00 |
|
scrawl
|
11f21a1988
|
Weather update should be before renderer update
|
2013-03-03 15:10:40 +01:00 |
|
gus
|
7fb2ff18a3
|
Fix bug induced by previous commit (player orientation wasn't stored correctly), and fix NPC not beeing able to move with certain angles (like angle Z 70) because the trace function was hitting NPC own hitboxes. The solution prposed here is a little hacky, but i works. Need a little clean up(mBody shouldn't be public)
|
2013-03-03 13:06:45 +00:00 |
|
scrawl
|
0f6fd80294
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwrender/npcanimation.cpp
files/mygui/openmw_settings_window.layout
|
2013-03-03 11:02:38 +01:00 |
|
Nathan Jeffords
|
109dff2d29
|
renamed high level NIF files...
|
2013-03-02 13:23:09 -08:00 |
|
k1ll
|
dde43e8c87
|
Some cleanup
|
2013-03-02 21:46:31 +01:00 |
|
Nathan Jeffords
|
d3c1f5e7b2
|
renamed low-level NIF related files and include guards to conform to naming convention
|
2013-03-02 10:46:12 -08:00 |
|
k1ll
|
9acd4061cc
|
Fix dangling static references in mShared
|
2013-03-02 17:04:17 +01:00 |
|
vorenon
|
f66f67eaa1
|
Loading text uses now the corresponding GMSTs
|
2013-02-28 17:54:42 +01:00 |
|
vorenon
|
a6fb58bc59
|
Using "Loading Exterior" and "Loading Interior" instead of "Loading Cell"
This commit replaces the default "Loading Cell" text with "Loading
Interior" and "Loading Exterior"
|
2013-02-28 16:31:24 +01:00 |
|
vorenon
|
d4aa33b9a7
|
Removing the unloading cells part instead of just commenting them.
|
2013-02-28 15:58:03 +01:00 |
|
vorenon
|
ffd96c7715
|
Removed "Unloading Cell..." text from loading screen
OpenMW unloads the cell so fast, it's hardly noticable. This commit gets rid of
the "flicker" every time a cell loads.
|
2013-02-28 13:19:05 +01:00 |
|
scrawl
|
369f881170
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
|
2013-02-27 09:25:44 +01:00 |
|
scrawl
|
d4264353a3
|
Merge branch 'z-up' into graphics
Conflicts:
apps/openmw/mwrender/localmap.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/water.cpp
files/materials/water.shader
|
2013-02-26 14:54:53 +01:00 |
|
Marc Zinnschlag
|
dc445844d2
|
Merge remote-tracking branch 'scrawl/z-up'
|
2013-02-26 14:37:50 +01:00 |
|
Marc Zinnschlag
|
a7102c143f
|
ESX variable type cleanup
|
2013-02-26 14:37:11 +01:00 |
|
scrawl
|
cd68012498
|
Z-up conversion: raycasts
|
2013-02-26 14:28:35 +01:00 |
|
scrawl
|
2e7bc1a368
|
Z-up conversion: local map, fix tcg
|
2013-02-26 13:39:10 +01:00 |
|
Marc Zinnschlag
|
bd9884b244
|
Merge remote-tracking branch 'chris/misc-cleanup'
|
2013-02-25 19:45:09 +01:00 |
|
Marc Zinnschlag
|
08f13ef5ab
|
Merge remote-tracking branch 'greye/master'
|
2013-02-25 19:34:03 +01:00 |
|
greye
|
661fd73c6e
|
fix rotation for objects in inactive cells and forced vanity mode
|
2013-02-25 22:00:50 +04:00 |
|
Chris Robinson
|
48271e49ec
|
Properly update the Ptr object in the mechanics manager when moving across cells
|
2013-02-25 09:57:34 -08:00 |
|
scrawl
|
b1fc68d44d
|
Merge branch 'master' into graphics
|
2013-02-25 17:36:33 +01:00 |
|
scrawl
|
355390429e
|
Fix World::isUnderwater to use dynamic waterlevel
|
2013-02-25 17:27:50 +01:00 |
|
Chris Robinson
|
5d5d28c06c
|
Increase the ID cache to 40
Helps improve performance with Tribunal and Bloodmoon's scripts
|
2013-02-25 07:43:56 -08:00 |
|
scrawl
|
cacdb33b42
|
Merge branch 'master' into graphics
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/sky.cpp
|
2013-02-25 15:12:03 +01:00 |
|
scrawl
|
a3afb91485
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
|
2013-02-24 18:04:51 +01:00 |
|
Chris Robinson
|
94be45e07e
|
Merge remote-tracking branch 'zini/master' into animation2
|
2013-02-24 06:20:10 -08:00 |
|
ChrisKCat
|
aab7cf137b
|
Merge pull request #5 from greye/cross-cell
fix and unify object cell change update in mwrender
|
2013-02-24 05:32:52 -08:00 |
|
Marc Zinnschlag
|
fa880e3274
|
Merge remote-tracking branch 'lazydev/master'
|
2013-02-24 14:07:52 +01:00 |
|
Chris Robinson
|
db9a3aeddf
|
Merge remote-tracking branch 'zini/master' into animation2
|
2013-02-24 03:32:35 -08:00 |
|
Chris Robinson
|
89d4c245e9
|
Better calculate jump velocity
The fatigue term isn't currently used correctly
|
2013-02-24 03:30:33 -08:00 |
|
greye
|
6a8c532244
|
fix and unify object cell change update in mwrender
|
2013-02-24 15:04:56 +04:00 |
|
scrawl
|
3135482cee
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
|
2013-02-24 10:06:04 +01:00 |
|
Chris Robinson
|
90cb9ee0ac
|
Don't set a vertical velocity when on the ground
|
2013-02-23 16:30:11 -08:00 |
|
lazydev
|
a5ff8181b7
|
fix for https://bugs.openmw.org/issues/569
|
2013-02-24 03:35:43 +04:00 |
|