greye
|
3aa53fea32
|
wrong
|
2012-07-23 23:06:53 +04:00 |
|
scrawl
|
3ebc6fd590
|
fixed a settings window bug
|
2012-07-23 20:50:56 +02:00 |
|
scrawl
|
a70f93b024
|
fix "Crash when running openmw with --start="XYZ", remove HLSL for windows
|
2012-07-23 20:12:42 +02:00 |
|
greye
|
a62c684222
|
Merge branch 'master' of https://github.com/zinnschlag/openmw
|
2012-07-23 20:44:03 +04:00 |
|
scrawl
|
9f9183ff73
|
depth bias
|
2012-07-23 18:25:20 +02:00 |
|
scrawl
|
ab35bfa32c
|
fixed a sky issue
|
2012-07-23 18:19:34 +02:00 |
|
scrawl
|
ce0d351b38
|
Merge branch 'master' into nif-cleanup
|
2012-07-23 15:59:30 +02:00 |
|
Marc Zinnschlag
|
d29b3c4709
|
Merge remote branch 'scrawl/shadersystem'
|
2012-07-23 15:56:57 +02:00 |
|
scrawl
|
d5384403f3
|
forgot something else
|
2012-07-23 15:46:18 +02:00 |
|
scrawl
|
5572421576
|
submodule update for "fix a typo"
|
2012-07-23 15:40:10 +02:00 |
|
scrawl
|
cfa0519721
|
Merge branch 'master' into nif-cleanup
|
2012-07-23 15:37:08 +02:00 |
|
scrawl
|
1fef086088
|
Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup"
This reverts commit 546b640022 , reversing
changes made to fcaa8aae06 .
|
2012-07-23 15:36:12 +02:00 |
|
scrawl
|
f8d6a36196
|
Merge branch 'master' into nif-cleanup
Conflicts:
apps/openmw/mwrender/sky.cpp
apps/openmw/mwrender/sky.hpp
components/nifogre/ogre_nif_loader.cpp
components/nifogre/ogre_nif_loader.hpp
|
2012-07-23 15:35:31 +02:00 |
|
Marc Zinnschlag
|
a24e7c9de2
|
Merge remote branch 'scrawl/shadersystem'
|
2012-07-23 15:25:11 +02:00 |
|
scrawl
|
ac5bd38df9
|
some cmake fixes
|
2012-07-23 14:59:57 +02:00 |
|
scrawl
|
2eca27bba9
|
fix horizon color of the sky reflection
|
2012-07-23 14:21:40 +02:00 |
|
Marc Zinnschlag
|
2c5d3d8df9
|
Merge remote branch 'scrawl/shadersystem' into shadersystem
Attention: We have submodules again. Don't forget to update!
Conflicts:
components/files/configurationmanager.cpp
|
2012-07-23 14:12:21 +02:00 |
|
scrawl
|
1dbfd60305
|
Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup
|
2012-07-23 13:48:12 +02:00 |
|
scrawl
|
afe7c41729
|
removed some unused code
|
2012-07-23 13:47:51 +02:00 |
|
scrawl
|
bc7876e980
|
use alpha map for moons
|
2012-07-23 13:04:48 +02:00 |
|
scrawl
|
268987835d
|
fix the crash
|
2012-07-23 12:19:53 +02:00 |
|
scrawl
|
f0b3142966
|
switch to glsl 1.2
|
2012-07-23 02:54:50 +02:00 |
|
Marc Zinnschlag
|
df70b2dc9f
|
updated credits.txt
|
2012-07-22 21:25:37 +02:00 |
|
Marc Zinnschlag
|
e1bb98e71f
|
Merge remote branch 'greye/master'
|
2012-07-22 17:07:04 +02:00 |
|
greye
|
436152dd0e
|
Merge remote branch 'upstream/master'
|
2012-07-22 18:53:18 +04:00 |
|
greye
|
32b1350b63
|
CreatureStats class
|
2012-07-22 18:29:54 +04:00 |
|
scrawl
|
b2dcf5adcd
|
support system install for boost wave
|
2012-07-22 14:41:23 +02:00 |
|
Lukasz Gromanowski
|
1dde806add
|
Fixes #313: openmw without a ~/.config/openmw folder segfault.
Added creation of $HOME/.config/openmw directory.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2012-07-22 14:52:55 +03:00 |
|
Chris Robinson
|
4035d7370e
|
Fix name/filter comparison
|
2012-07-21 22:04:05 -07:00 |
|
Chris Robinson
|
d8cb685543
|
Interpolate keyframes when creating them
Probably not fully correct, but better than nothing.
|
2012-07-21 18:03:01 -07:00 |
|
scrawl
|
6bfcf2bc1b
|
- exchanged the preprocessor again, no warnings now
- disable line directives for now, causing some trouble
|
2012-07-22 02:45:39 +02:00 |
|
Chris Robinson
|
77446a0d58
|
Fix skipAnim, only skip one animation update
|
2012-07-21 17:39:57 -07:00 |
|
Chris Robinson
|
e81fc42daa
|
Remove the beast-race special cases from updateParts
The special handling should happen at a much lower level, and prevent the
objects from being equipped in the first place.
|
2012-07-21 17:12:41 -07:00 |
|
Chris Robinson
|
c5b9098517
|
Remove an unused field from EntityList
|
2012-07-21 17:09:16 -07:00 |
|
scrawl
|
546b640022
|
Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup
|
2012-07-21 23:50:56 +02:00 |
|
Chris Robinson
|
81ce8dbe12
|
Combine animation handling into the base class
|
2012-07-21 14:41:26 -07:00 |
|
Chris Robinson
|
fcaa8aae06
|
Don't skip animation state updates for NPCs
|
2012-07-21 11:26:09 -07:00 |
|
scrawl
|
e7ab3544ac
|
removed some redundant code
|
2012-07-21 13:52:12 +02:00 |
|
scrawl
|
17a5c22c8f
|
don't use globbing
|
2012-07-20 23:31:49 +02:00 |
|
Chris Robinson
|
4bc93ecd1a
|
Use the skeleton name for the main animation
|
2012-07-20 11:09:05 -07:00 |
|
scrawl
|
acc5c3bbbf
|
some fixes
|
2012-07-20 17:08:15 +02:00 |
|
scrawl
|
41791ccaa2
|
add file
|
2012-07-20 16:44:40 +02:00 |
|
scrawl
|
014396e80c
|
remove the plugins.cfg files, do not enforce CG plugin
|
2012-07-20 16:44:03 +02:00 |
|
scrawl
|
21728020f6
|
fixed the water on local map
|
2012-07-20 14:45:42 +02:00 |
|
Chris Robinson
|
2db80a1504
|
Rename a couple methods to match their scripting counterparts
|
2012-07-20 00:53:12 -07:00 |
|
Chris Robinson
|
66860825cf
|
Remove some unused and unneeded bits from the Animation class
|
2012-07-20 00:36:52 -07:00 |
|
Chris Robinson
|
8b5b74f9ee
|
Add a quick hack to let "playgroup all" work on creatures and NPCs
|
2012-07-19 22:34:26 -07:00 |
|
Chris Robinson
|
4210880c06
|
Load the animation tracks into Ogre
|
2012-07-19 21:46:16 -07:00 |
|
Chris Robinson
|
0986cd5962
|
Get the animation controller target names
|
2012-07-19 20:48:12 -07:00 |
|
Chris Robinson
|
c2acf47d88
|
Store the list of keyframe controllers when building the bones
|
2012-07-19 20:30:10 -07:00 |
|