Marc Zinnschlag
137d5e2586
Merge remote-tracking branch 'scrawl/master'
2015-07-19 11:46:06 +02:00
scrawl
1156668843
Render certain map markers on top of the player arrow ( Fixes #2559 )
2015-07-19 00:45:02 +02:00
scrawl
278a078e9d
Unify magic effect tick functions
...
- Removes duplicated code
- Handle some zero-duration instant effects that were not handled before (disintegrate, sun damage, elemental damage)
2015-07-18 20:39:45 +02:00
scrawl
77f1387da8
Include cleanup
2015-07-18 20:36:28 +02:00
Marc Zinnschlag
833ad5a2b4
Merge remote-tracking branch 'origin/master'
2015-07-18 17:48:05 +02:00
Marc Zinnschlag
cdfa3006a3
incorrect sBribe GMSTs for new omwgame files ( Fixes #2785 )
2015-07-18 17:47:50 +02:00
Marc Zinnschlag
b2ab0122ab
Merge branch 'scriptbuttons'
2015-07-18 17:37:43 +02:00
Marc Zinnschlag
f1ac440b78
do not allow editing of deleted scripts
2015-07-18 17:00:00 +02:00
Marc Zinnschlag
8763a3b3c3
make compilation delay configurable via a user setting
2015-07-18 15:32:38 +02:00
scrawl
111cf5462b
Merge pull request #666 from scrawl/animation
...
Animation refactoring & fixes
2015-07-18 13:33:41 +02:00
Marc Zinnschlag
73b6df8280
put script compilation in script subview behind a timer
2015-07-18 13:09:17 +02:00
Marc Zinnschlag
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2015-07-18 12:22:37 +02:00
Marc Zinnschlag
e921552053
Merge remote-tracking branch 'scrawl/opencs'
2015-07-18 11:58:20 +02:00
Marc Zinnschlag
edde1fb727
Merge remote-tracking branch 'scrawl/master'
2015-07-18 11:40:36 +02:00
Marc Zinnschlag
964cd44e96
Merge remote-tracking branch 'kunesj/master'
2015-07-18 11:34:04 +02:00
slothlife
f8f0380413
Fix for loading window icon on Windows
2015-07-17 21:41:53 -05:00
scrawl
58720e6a28
Fix the OpenCS rendering crash on exit ( Fixes #2735 )
2015-07-18 03:52:48 +02:00
scrawl
a33ca75742
Pass AnimPriority by const reference
2015-07-18 03:23:41 +02:00
scrawl
f09e4620b6
Move OpenMW version information to a textfile instead of compiling it in
...
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
2015-07-18 03:09:04 +02:00
scrawl
c783b50a83
Fix config file priority in the launcher to match OpenMW
2015-07-18 01:38:35 +02:00
scrawl
6e493500c9
Show custom map markers on the tooltip of the world map marker ( Fixes #2711 )
2015-07-18 00:14:11 +02:00
scrawl
41bed4c7d9
Use multimap to speed up custom map marker code
2015-07-17 20:49:10 +02:00
Jiří Kuneš
4a6d806127
fixed comment, save settings to member variable, removed usless include, changed variable to const
2015-07-17 20:30:00 +02:00
Jiří Kuneš
e68b388d16
removed setCrosshairOwned from windowmanager
2015-07-17 19:13:45 +02:00
Jiří Kuneš
c019f8e23d
use correct mechanics manager
2015-07-17 18:49:47 +02:00
Jiří Kuneš
15107ca5cf
crosshair owned - settings option
2015-07-17 17:48:38 +02:00
Jiří Kuneš
66edae9b93
change collor of crosshair
2015-07-17 17:29:00 +02:00
Jiří Kuneš
72728b9c01
disable cusor when item/container is owned
2015-07-17 16:32:35 +02:00
Marc Zinnschlag
5febb96012
do not try to jump to source location for errors that do not have a source location
2015-07-17 13:59:50 +02:00
Marc Zinnschlag
f665919046
consider column when jumping to error in source text
2015-07-17 13:53:22 +02:00
Marc Zinnschlag
0abd29a3b4
jump to line in source text when clicking on an error in error table
2015-07-17 13:42:25 +02:00
Marc Zinnschlag
100af80388
made error table read only
2015-07-17 13:06:51 +02:00
Marc Zinnschlag
56ed0926bd
improved error table layout
2015-07-17 12:45:08 +02:00
Marc Zinnschlag
eab1ec9160
consider script warning settings for script subview
2015-07-17 11:52:59 +02:00
scrawl
91d71d0fcd
Disable MyGUI's scrollbar autorepeat ( Fixes #2779 )
...
We are currently using a custom implementation so as to support MyGUI version 3.2.1. When compiled with 3.2.2 or later, we need to disable MyGUI's autorepeat so that it doesn't interfere with ours.
2015-07-17 03:39:09 +02:00
scrawl
660e7f5d89
Don't update animation states in skipAnim mode ( Fixes #2782 )
2015-07-17 03:28:17 +02:00
scrawl
cc59493cb2
Don't restart the jump animation when equipping a different weapon ( Fixes #2286 )
2015-07-16 20:03:16 +02:00
scrawl
b5c79738f1
Fix enchantments casting more than once per button press, broken by a1432b0255
2015-07-16 19:56:09 +02:00
scrawl
f6f82d433c
Fix bug with loop key assignment
...
Animations with time of "loop start" == time of "loop stop" were not getting their loop times assigned correctly.
This fixes incorrect playing of the jump animation, one aspect of Bug #2286 .
2015-07-16 19:55:05 +02:00
Marc Zinnschlag
9b12b4f1e2
refactored mapping from message severity enum to string
2015-07-16 14:46:02 +02:00
Marc Zinnschlag
2d8a78726d
improved error reporting
2015-07-16 14:09:14 +02:00
Marc Zinnschlag
2016ff773f
display script errors in script subview
2015-07-16 12:36:20 +02:00
scrawl
f8d360190d
Remove an unneeded virtual
2015-07-15 19:10:09 +02:00
scrawl
992b770315
Don't set OnPcEquip for items that failed to equip ( Fixes #2776 )
2015-07-15 18:52:23 +02:00
scrawl
17ada63fcb
Don't play turning animations on the upperbody when in first person mode ( Fixes #2287 )
2015-07-15 16:43:11 +02:00
scrawl
3656851750
Remove the now unused changeBlendMask
2015-07-15 16:43:11 +02:00
scrawl
83cceeee72
Use the extended animation priority for Block animations, allow starting attacks during a block animation ( Fixes #2761 )
2015-07-15 16:43:11 +02:00
scrawl
cf14d1748c
Use the extended animation priority for Hit animations
2015-07-15 16:33:10 +02:00
scrawl
50db6ed396
Use the extended animation priority for weapon animations
2015-07-15 14:40:36 +02:00
scrawl
e93a578f23
Extend the animation priority system to one priority value per bone group / distinct blend mask
2015-07-15 14:18:31 +02:00
