Marc Zinnschlag
9ee3f1bfe7
Merge remote-tracking branch 'slothlife/moon-settings' into mergetool
2015-08-02 13:42:39 +02:00
slothlife
0244a9b329
Correct moon texture with respect to trajectory
2015-08-01 07:57:05 -05:00
Marc Zinnschlag
9392e426c0
Merge remote-tracking branch 'origin/master' into mergetool
2015-08-01 10:16:20 +02:00
Marc Zinnschlag
15e8275443
Merge remote-tracking branch 'slothlife/moon-settings' into mergetool
2015-08-01 10:14:28 +02:00
cc9cii
8acc2f31ff
Merge pull request #8 from cc9cii/minor-enhancements
...
Minor enhancements
2015-08-01 16:38:40 +10:00
cc9cii
da85b3a4ee
Update to keeping config comments (Feature #2535 )
...
-An attempt to fix Coverity-Scan warning (see: https://github.com/OpenMW/openmw/pull/618#discussion_r33641670 )
- Unable to test until a PR can be submitted.
2015-08-01 13:25:35 +10:00
Arthur Moore
08d5aaf0fc
Remove more comments
2015-07-31 18:23:07 -04:00
Arthur Moore
6fce49bfb5
Don't warn twice when unable to play an idle animation
2015-07-31 18:01:02 -04:00
Arthur Moore
61c3835637
Don't try to play animations we know are bad
...
Prevents log spam
2015-07-31 18:01:02 -04:00
cc9cii
5538f822f4
Initial support for Land and LandTexture tables. Updates Features #936 and #933 .
2015-08-01 07:50:56 +10:00
scrawl
7644a46ded
Creatures with no movement should not attempt to start combat ( Fixes #2786 )
2015-07-31 01:26:26 +02:00
cc9cii
870bb491af
Fix for issue #6 ( https://github.com/cc9cii/openmw/issues/6 ) where dialogue subview for editing an NPC fails with an "invalid ID" exception.
...
* NPC autocalc code was looking for non-existent values of race and class, this is now validated first.
* Also took the opportunity to grey out the spells table when auto-calculated. The template specialisation is a bit ugly, though.
2015-07-31 09:05:26 +10:00
scrawl
f326b8e5d2
Fix weapon animations playing on the lowerbody when swimming
2015-07-31 00:52:34 +02:00
scrawl
e8cbdcfb1e
Play swimming animation fallback on the upper body when possible
2015-07-31 00:35:41 +02:00
scrawl
1f755a2bc0
Don't use a shared Material in AlphaFader
2015-07-31 00:03:01 +02:00
scrawl
16b8ef3164
Don't use a shared Material in MaterialColorController
2015-07-31 00:01:55 +02:00
scrawl
de479e35c8
Fix AlphaController affecting all instances of the StateSet
2015-07-30 23:51:37 +02:00
slothlife
67a63cc662
Add some const correctness to MoonModel
2015-07-30 14:00:08 -05:00
Stanislav Bas
d13766cb3c
Remove redundant template specializations
2015-07-30 16:08:22 +03:00
Stanislav Bas
f15adb4e4f
Store::load() overwrites loaded records with the same IDs
2015-07-30 15:38:07 +03:00
Arthur Moore
5ea596f38d
Refactor onChooseActionStatePerFrameActions
...
This prevents playIdle errors from tyring to play idleAnimation 0
2015-07-30 08:15:45 -04:00
Arthur Moore
f69de1f263
Alert the user if trying to play a non-idle animation
...
Continue to propagate success/failure up the call stack.
2015-07-30 08:08:58 -04:00
Arthur Moore
5e6fcc2aef
Alert the user if attempting to play an animation fails
...
This is mostly propogating the error up the stack so the game can do something about it.
Working on avoiding log spam from calling an animation that doesn't exist every frame.
2015-07-30 08:00:26 -04:00
scrawl
a391579382
Merge pull request #700 from ace13/osg-3.3.3-fixes
...
Fix OSG 3.3.3+ build issue
2015-07-30 13:33:12 +02:00
Alexander "Ace" Olofsson
1f78ebd3c9
Oops?
2015-07-30 12:22:51 +02:00
Alexander "Ace" Olofsson
77a3a52b4e
What's wrong with this statement?
2015-07-30 12:16:15 +02:00
Marc Zinnschlag
6a9218ee07
replaced State_Compiling (not requried anymore) with State_Merging
2015-07-30 11:49:24 +02:00
Alexander "Ace" Olofsson
e9ffbcc1b0
OSG 3.3.3 moves GL extensions out of osg::Texture
2015-07-30 11:45:10 +02:00
Marc Zinnschlag
d310753e0f
Merge remote-tracking branch 'origin/master'
2015-07-30 10:28:14 +02:00
Marc Zinnschlag
26ea3aa1ad
Merge remote-tracking branch 'dteviot/refactoringAiWander'
2015-07-30 10:26:40 +02:00
cc9cii
5bef43ac14
Remove duplicated config scanning (see: https://forum.openmw.org/viewtopic.php?f=7&t=2922&p=32940#p32940 )
...
* Requires boost::filesystem::canonical() from v1.48
* reduces startup time
* Fixes asset files being listed multiple times in tables
2015-07-30 16:30:59 +10:00
cc9cii
7247da5a77
Fix loading openmw-template.omwgame with debug builds (see: https://forum.openmw.org/viewtopic.php?f=7&p=34026#p34026 ). Script::load() was failing with debug assertion fail (vector subscript out of range)
2015-07-30 15:48:45 +10:00
slothlife
a4e1630ec2
Remove unreferenced member in MoonModel
2015-07-30 00:41:30 -05:00
slothlife
8dc7e158c6
Fix forward declaration of MoonState
2015-07-30 00:18:56 -05:00
slothlife
24ba54f4fe
Implement accurate moon settings ( fixes #672 )
2015-07-29 23:57:45 -05:00
cc9cii
2e6a8e1b18
Merge pull request #7 from cc9cii/master-cherry-pick
...
Merge master (cherry pick)
2015-07-30 14:21:08 +10:00
cc9cii
7e7c028530
Fix formatting issues after cherry-picking commit ab0b5932f7
2015-07-30 10:41:18 +10:00
Marc Zinnschlag
26d617d88b
allow keywords in quotes ( Fixes #2794 )
2015-07-30 09:34:46 +10:00
Arthur Moore
f4776112c6
(Re) Wrote a tool to test NIF files in BSAs and on the filesystem.
...
Just give it a set of files, one file per argument, and it will make sure openmw can read them.
2015-07-30 09:34:12 +10:00
Stanislav Bas
9a936046f6
Add edit locking to ExtendedCommandConfigurator
2015-07-30 09:33:28 +10:00
Stanislav Bas
6033e67b4a
Close the extended configurator when all respective records were removed outside
2015-07-30 09:33:12 +10:00
Stanislav Bas
34d8e5dba5
Rewording of the user setting for extended configuration
2015-07-30 09:32:58 +10:00
Stanislav Bas
be1cf2fc80
ExtendedCommandConfigurator: layout changes
2015-07-30 09:31:48 +10:00
Stanislav Bas
194888e035
TableBottomBox: Creator/Configurator can be closed via Escape
2015-07-30 09:31:28 +10:00
Stanislav Bas
214a448ecf
Fix build error
2015-07-30 09:30:50 +10:00
Stanislav Bas
977f317eb9
ExtendedCommandConfigurator: the perform button is now the default for the widget
2015-07-30 09:27:26 +10:00
Stanislav Bas
09d867c9bf
ExtendedCommandConfigurator: the perform button takes the name of the command that is executed
2015-07-30 09:27:13 +10:00
Stanislav Bas
8eb677befb
The configuration panel gets a focus when opening
2015-07-30 09:26:56 +10:00
Stanislav Bas
bf3891e16f
ExtendedCommandConfigurator: disable the perform button when all tables are unchecked
2015-07-30 09:26:17 +10:00
Stanislav Bas
24eb9bddfb
TableBottomBox adjusts its size according to the current widget size
2015-07-30 09:26:03 +10:00
