Jiří Kuneš
75f5972898
show owned - better settings
2015-07-18 17:13:20 +02:00
Jiří Kuneš
df077f8649
color tooltip red when taking item would result in crime
2015-07-18 16:56:57 +02:00
scrawl
111cf5462b
Merge pull request #666 from scrawl/animation
...
Animation refactoring & fixes
2015-07-18 13:33:41 +02:00
Marc Zinnschlag
4fa2cd288d
Merge branch 'openmw-36'
...
Conflicts:
apps/openmw/mwworld/store.hpp
2015-07-18 12:47:05 +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
39ab9948f6
updated credits file
2015-07-18 11:40:18 +02:00
Marc Zinnschlag
964cd44e96
Merge remote-tracking branch 'kunesj/master'
2015-07-18 11:34:04 +02:00
scrawl
05d2790601
Merge pull request #672 from slothlife/windows-icon-fix
...
Fix for loading window icon on Windows
2015-07-18 05:00:23 +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
753d35b0de
Merge pull request #667 from slothlife/static-deps-build
...
Add support for linking OpenSceneGraph statically and fixes for MyGUI and QT static linking
2015-07-18 03:28:07 +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
slothlife
420789baa9
Remove an unused include
2015-07-17 15:26:04 -05:00
slothlife
1b3cc957f8
Move some OSG static library setup code
2015-07-17 15:13:43 -05: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
slothlife
df99d5a59d
Move setup code for OSG when statically linked
2015-07-17 09:56:21 -05:00
Jiří Kuneš
72728b9c01
disable cusor when item/container is owned
2015-07-17 16:32:35 +02:00
slothlife
43b1f15af9
Merge remote-tracking branch 'upstream/master' into static-deps-build
2015-07-17 01:03:19 -05:00
slothlife
83ef1f7eea
Add support for linking OpenSceneGraph statically
...
Added some basic support for linking to OpenSceneGraph and its plugins
statically. Also added a library necessary to statically link MyGUI
(previously Ogre pulled it in).
2015-07-17 00:56:15 -05: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
9a115fedbc
Add ability to copy&paste the version label in the main menu
2015-07-16 20:11:33 +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
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
scrawl
335ef97cf5
Rename Animation::Group to Animation::BlendMask
...
The old naming is problematic, because the term group was being used for another feature (text key groups) already.
2015-07-15 13:49:16 +02:00
scrawl
355ef14d23
Merge pull request #665 from Koncord/master
...
Add ${MYGUI_LIBRARIES} to components/CMakeLists.txt
2015-07-14 20:10:27 +02:00
Koncord
73731d27e9
Add ${MYGUI_LIBRARIES} to components/CMakeLists.txt
2015-07-14 23:54:47 +09:00
scrawl
de6dc21552
Create hardware cursors in advance ( Fixes #2660 )
2015-07-13 23:36:25 +02:00
scrawl
c4866bdfc6
Disable mipmaps for GUI textures
...
For some reason, the mipmap generator seems to be broken on Linux Intel graphics (works on Nvidia). This was breaking the scrollbar arrows, which are minified enough to show using a mipmap.
2015-07-13 19:13:26 +02:00
scrawl
dca4704b4b
Print exceptions in CharacterCreation::spawnDialog
2015-07-13 18:40:05 +02:00
scrawl
f1b52c964a
Select the current resolution in resolution list on game start ( Fixes #2768 )
2015-07-13 18:00:41 +02:00
