7924ecef3e
Fix definition conflict
10 years ago
9b3d5c958f
Merge remote-tracking branch 'scrawl/music'
10 years ago
137d5e2586
Merge remote-tracking branch 'scrawl/master'
10 years ago
b01abe4d19
Stop title music when the game starts ( Fixes #2468 )
10 years ago
1156668843
Render certain map markers on top of the player arrow ( Fixes #2559 )
10 years ago
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)
10 years ago
77f1387da8
Include cleanup
10 years ago
833ad5a2b4
Merge remote-tracking branch 'origin/master'
10 years ago
cdfa3006a3
incorrect sBribe GMSTs for new omwgame files ( Fixes #2785 )
10 years ago
b2ab0122ab
Merge branch 'scriptbuttons'
10 years ago
f1ac440b78
do not allow editing of deleted scripts
10 years ago
8763a3b3c3
make compilation delay configurable via a user setting
10 years ago
111cf5462b
Merge pull request #666 from scrawl/animation
...
Animation refactoring & fixes
10 years ago
73b6df8280
put script compilation in script subview behind a timer
10 years ago
4fa2cd288d
Merge branch 'openmw-36'
...
Conflicts:
apps/openmw/mwworld/store.hpp
10 years ago
b3ad983f1f
Merge remote-tracking branch 'scrawl/version'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
10 years ago
e921552053
Merge remote-tracking branch 'scrawl/opencs'
10 years ago
edde1fb727
Merge remote-tracking branch 'scrawl/master'
10 years ago
39ab9948f6
updated credits file
10 years ago
964cd44e96
Merge remote-tracking branch 'kunesj/master'
10 years ago
05d2790601
Merge pull request #672 from slothlife/windows-icon-fix
...
Fix for loading window icon on Windows
10 years ago
f8f0380413
Fix for loading window icon on Windows
10 years ago
58720e6a28
Fix the OpenCS rendering crash on exit ( Fixes #2735 )
10 years ago
753d35b0de
Merge pull request #667 from slothlife/static-deps-build
...
Add support for linking OpenSceneGraph statically and fixes for MyGUI and QT static linking
10 years ago
a33ca75742
Pass AnimPriority by const reference
10 years ago
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.
10 years ago
c783b50a83
Fix config file priority in the launcher to match OpenMW
10 years ago
6e493500c9
Show custom map markers on the tooltip of the world map marker ( Fixes #2711 )
10 years ago
420789baa9
Remove an unused include
10 years ago
1b3cc957f8
Move some OSG static library setup code
10 years ago
41bed4c7d9
Use multimap to speed up custom map marker code
10 years ago
4a6d806127
fixed comment, save settings to member variable, removed usless include, changed variable to const
10 years ago
e68b388d16
removed setCrosshairOwned from windowmanager
10 years ago
c019f8e23d
use correct mechanics manager
10 years ago
15107ca5cf
crosshair owned - settings option
10 years ago
66edae9b93
change collor of crosshair
10 years ago
df99d5a59d
Move setup code for OSG when statically linked
10 years ago
72728b9c01
disable cusor when item/container is owned
10 years ago
5febb96012
do not try to jump to source location for errors that do not have a source location
10 years ago
f665919046
consider column when jumping to error in source text
10 years ago
0abd29a3b4
jump to line in source text when clicking on an error in error table
10 years ago
100af80388
made error table read only
10 years ago
56ed0926bd
improved error table layout
10 years ago
eab1ec9160
consider script warning settings for script subview
10 years ago
43b1f15af9
Merge remote-tracking branch 'upstream/master' into static-deps-build
10 years ago
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).
10 years ago
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.
10 years ago
660e7f5d89
Don't update animation states in skipAnim mode ( Fixes #2782 )
10 years ago
9a115fedbc
Add ability to copy&paste the version label in the main menu
10 years ago
cc59493cb2
Don't restart the jump animation when equipping a different weapon ( Fixes #2286 )
10 years ago
Koncord
Marc Zinnschlag
scrawl
slothlife
Jiří Kuneš