Commit Graph

14381 Commits (edde1fb727e6765a62bb6831fd765ab412145e45)
 

Author SHA1 Message Date
Marc Zinnschlag edde1fb727 Merge remote-tracking branch 'scrawl/master' 10 years ago
Marc Zinnschlag 39ab9948f6 updated credits file 10 years ago
Marc Zinnschlag 964cd44e96 Merge remote-tracking branch 'kunesj/master' 10 years ago
scrawl 05d2790601 Merge pull request #672 from slothlife/windows-icon-fix
Fix for loading window icon on Windows
10 years ago
slothlife f8f0380413 Fix for loading window icon on Windows 10 years ago
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
10 years ago
scrawl 6e493500c9 Show custom map markers on the tooltip of the world map marker (Fixes #2711) 10 years ago
slothlife 420789baa9 Remove an unused include 10 years ago
slothlife 1b3cc957f8 Move some OSG static library setup code 10 years ago
scrawl 41bed4c7d9 Use multimap to speed up custom map marker code 10 years ago
Jiří Kuneš 4a6d806127 fixed comment, save settings to member variable, removed usless include, changed variable to const 10 years ago
Jiří Kuneš e68b388d16 removed setCrosshairOwned from windowmanager 10 years ago
Jiří Kuneš c019f8e23d use correct mechanics manager 10 years ago
Jiří Kuneš 15107ca5cf crosshair owned - settings option 10 years ago
Jiří Kuneš 66edae9b93 change collor of crosshair 10 years ago
slothlife df99d5a59d Move setup code for OSG when statically linked 10 years ago
Jiří Kuneš 72728b9c01 disable cusor when item/container is owned 10 years ago
slothlife 43b1f15af9 Merge remote-tracking branch 'upstream/master' into static-deps-build 10 years ago
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).
10 years ago
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.
10 years ago
scrawl 9a115fedbc Add ability to copy&paste the version label in the main menu 10 years ago
scrawl f8d360190d Remove an unneeded virtual 10 years ago
scrawl 992b770315 Don't set OnPcEquip for items that failed to equip (Fixes #2776) 10 years ago
scrawl 355ef14d23 Merge pull request #665 from Koncord/master
Add ${MYGUI_LIBRARIES} to components/CMakeLists.txt
10 years ago
Koncord 73731d27e9 Add ${MYGUI_LIBRARIES} to components/CMakeLists.txt 10 years ago
scrawl de6dc21552 Create hardware cursors in advance (Fixes #2660) 10 years ago
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.
10 years ago
scrawl dca4704b4b Print exceptions in CharacterCreation::spawnDialog 10 years ago
scrawl f1b52c964a Select the current resolution in resolution list on game start (Fixes #2768) 10 years ago
scrawl 5a0af772dd Update README.md
- Remove "an attempt at". I think we are far enough into the project to say that the "attempt" has been successful, at least to a degree. ;)
- Added Current Status section.
- Added line about OpenMW-CS.
10 years ago
Marc Zinnschlag d22f8703e5 Merge remote-tracking branch 'dteviot/refactoringAiWander' 10 years ago
dteviot ddeabcdfbe Removed unused field that was giving compiler warning. 10 years ago
dteviot e294cd95cd extracted function playIdleDialogueRandomly() 10 years ago
dteviot 22059d68f6 Remove duplicated code. 10 years ago
dteviot 0b089a5564 extracted function evadeObstacles() 10 years ago
dteviot 1ef78b1e56 extracted playGreetingIfPlayerGetsTooClose() 10 years ago
dteviot df421fce92 extracted function setPathToAnAllowedNode() 10 years ago
dteviot b508846a64 Renamed mStoredAvailableNodes to mPopulateAvailableNodes.
Don't call getAllowedNodes() needlessly.
10 years ago
Marc Zinnschlag dacb93c57f Merge remote-tracking branch 'scrawl/coverity_scan' 10 years ago
scrawl 0ed3e3e489 Fix cout/cerr mixup 10 years ago
scrawl 24ae1d5ace Fix some issues found by coverity 10 years ago
scrawl 667c80fb2a Add brackets around a correct expression to fix coverity warning 10 years ago
scrawl ebdd5dc993 Fix code that I forgot to uncomment (thanks coverity) 10 years ago
scrawl 3d3b37324d Change build targets again 10 years ago
scrawl 4b002863c8 Re-enabled a few build targets 10 years ago
scrawl 05400d469a Merge remote-tracking branch 'upstream/master' into HEAD 10 years ago
Alexander "Ace" Olofsson 12f413ba9b Don't instantiate specialized templates
This fixes the VS2012 build issue
10 years ago
Marc Zinnschlag 11d24fd23b Merge remote-tracking branch 'maqifrnswa/patch-2' 10 years ago
Marc Zinnschlag ba9a9d16bb Merge remote-tracking branch 'scrawl/master' 10 years ago
Marc Zinnschlag 08d2b196bd Merge remote-tracking branch 'ace/explicit-instantiation' 10 years ago