mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-03 17:56:40 +00:00
Code Issues Releases Wiki Activity
14992 commits 115 branches 76 tags 128 MiB
Commit graph

14992 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
scrawl
7644a46ded Creatures with no movement should not attempt to start combat (Fixes #2786) 2015-07-31 01:26:26 +02: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
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
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
scrawl
5d3ad13868 Merge pull request #696 from EmperorArthur/verbose_errors 
Be more descriptive when the NIF loader does not handle something.
 2015-07-29 15:32:01 +02:00
Marc Zinnschlag
be1692f218 Merge remote-tracking branch 'origin/master' 2015-07-29 14:46:23 +02:00
Marc Zinnschlag
20106bb90f allow keywords in quotes (Fixes #2794) 2015-07-29 14:45:56 +02:00
Arthur Moore
2d93a6f6cb Be more verbose when dealing with unhandled nif texture properties 2015-07-28 18:46:11 -04:00
scrawl
d7ad0ee148 Print a sensible error message when S3TC support is missing (Fixes #2800) 2015-07-28 23:35:10 +02:00
scrawl
3a7d0d8dc8 Remove a file that isn't in use yet from build 2015-07-28 23:34:55 +02:00
Arthur Moore
2a653e45fd (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-28 06:51:47 -04:00
Marc Zinnschlag
2c1cee38b4 Merge remote-tracking branch 'smbas/feature-extended-configurator' 2015-07-28 07:56:12 +02:00
scrawl
7ba399fc92 Change a message to upper case spelling 
More consistent with other loading messages
 2015-07-28 03:21:44 +02:00
scrawl
26656707dd Use marker_error.nif as replacement when a mesh fails to load 2015-07-28 03:21:44 +02:00
scrawl
ac1f64b559 Fix StencilProperty front face mixup (Fixes #2802) 2015-07-28 03:20:18 +02:00
Stanislav Bas
03c2e11961 Update to upstream/master. Resolve merge conflicts 2015-07-27 13:54:13 +03:00
Marc Zinnschlag
420503d5fc Merge remote-tracking branch 'smbas/fix-bug-2728' 2015-07-27 11:23:49 +02:00
Marc Zinnschlag
bafa86d3e9 Merge remote-tracking branch 'scrawl/master' 2015-07-27 11:10:16 +02:00
Stanislav Bas
812fffbadc Don't inform about a nested row addition in proxy models for top-level tables 2015-07-26 20:25:46 +03:00
Stanislav Bas
2471e4d67a Rework Table to use rowAdded() signal of a proxy model 2015-07-26 20:09:31 +03:00
Stanislav Bas
86b7d2a43d Inform about a row addition after re-sorting in InfoTableProxyModel 2015-07-26 20:07:36 +03:00
Stanislav Bas
37fd733deb Create a custom signal to inform about a row addition in IdTableProxyModel 2015-07-26 20:06:30 +03:00
Marc Zinnschlag
6a1e1a07cb updated credits file 2015-07-26 11:02:22 +02:00
Marc Zinnschlag
b2fdfbcfe4 Merge remote-tracking branch 'pkubik/distance-setting' 2015-07-26 11:01:12 +02:00
dteviot
04aee1fe20 extracted function reactionTimeActions(). 2015-07-26 17:32:29 +12:00
dteviot
c7aacaee70 extracted function returnToStartLocation(). 2015-07-26 17:29:32 +12:00
dteviot
5e519ef550 extract function isPackageFinished(). 2015-07-26 17:29:01 +12:00
dteviot
ad0d807103 extracted function reactionTimeActions(). 2015-07-26 17:28:32 +12:00
dteviot
9c0e3d6c28 extracted functions doPerFrameActionsForState() and onChooseActionStatePerFrameActions(). 2015-07-26 17:25:44 +12:00
dteviot
76f95eafe7 extract function onWalkingStatePerFrameActions(). 2015-07-26 17:25:00 +12:00
dteviot
5ec310dfba extract function onIdleStatePerFrameActions(). 2015-07-26 17:24:33 +12:00
dteviot
b3d5b47fea extracted function UpdateActorsMovement(). 2015-07-26 17:23:45 +12:00