Commit Graph

2961 Commits (f7a03b39c4db9e50604520e8e552d8a97941a419)
 

Author SHA1 Message Date
scrawl 0a5757791c Merge branch 'master' into minimap 13 years ago
scrawl c2a82c3d89 Merge branch 'master' into gamesettings 13 years ago
Roman Melnik 911ca4be89 Move MapWindow to separate files
Separate MapWindow from bunch of classes in layouts.cpp/hpp
Inherit it from WindowPinnableBase.

TODO: map arrow (player position) updates orientation only
when you open the inventory. When the map window is pinned,
the arrow direction is not updated.
13 years ago
Roman Melnik d09f0610ea Add basic windows pinning
Create WindowPinnableBase class for windows which should be
allowed to be pinned.

Add skin for pinnable windows - currently just a copy of normal
window with 1 extra button (hopefully this can be improved later).

Handle clicking on PinToggle button (pinning/unpinning a window).
13 years ago
scrawl 7b3adb27a3 backend changes, terrain num lights setting 13 years ago
Alexander "Ace" Olofsson 54ce95cfaf Make sure it doesn't find the wrong file 13 years ago
Marc Zinnschlag da5207f8e3 Merge remote branch 'kromgart/master' 13 years ago
scrawl f4bbcb48a6 settings-default.cfg 13 years ago
Marc Zinnschlag de41e1118a Merge remote branch 'scrawl/weather' 13 years ago
scrawl 6091a0504d first settings test (config file has to be created manually) 13 years ago
Roman Melnik ed58e9e553 Merge remote-tracking branch 'upstream/master' 13 years ago
scrawl 308df7caa8 add method for keeping track of settings that changed 13 years ago
Nikolay Kasyanov 30d6c880ff Feature #37 (In Progress) Render Path Grid
tuned sized a bit
13 years ago
Nikolay Kasyanov cab412c225 Feature #37 (In Progress) Render Path Grid
optimisation, now it takes only two batches per cell.
13 years ago
scrawl 9a261a02aa changed the cloud movement direction like suggested on the forum 13 years ago
scrawl ee754eda6c don't create sky until entering an exterior cell 13 years ago
scrawl df8e0bbff2 player check 13 years ago
scrawl 80456778be fix for pickup up transparent objects, workaround for doors 13 years ago
scrawl 30407d3a2c Merge branch 'master' into occlusionquery 13 years ago
scrawl 4e63f89829 silence an error regarding faced handle 13 years ago
Marc Zinnschlag 8aa4001937 compile fix 13 years ago
Marc Zinnschlag 38066d9ecb Merge remote branch 'swick/initocfg' 13 years ago
Jason Hooks 0021ccf862 Merge remote-tracking branch 'upstream/master' 13 years ago
Chris Robinson 9c06bfc8fc Merge remote branch 'zini/master' into sound 13 years ago
Sebastian Wick a2a7539fd5 fix for more than 10 game files; delete both master and plugin settings if called with --game-files 13 years ago
Sebastian Wick 1d596d6c72 use std::map<std::string, std::vector<std::string> > instead of std::map<std::string, std::string> 13 years ago
Marc Zinnschlag 40310f3663 Merge remote branch 'scrawl/occlusionquery' 13 years ago
Roman Melnik 35f787c4bf Merge remote-tracking branch 'upstream/master' 13 years ago
Marc Zinnschlag b5b40e2623 Merge remote branch 'lgro/master' 13 years ago
scrawl 55c984c179 Merge branch 'master' into gamesettings 13 years ago
Lukasz Gromanowski bdc4c79b4e Fix for segfault when doing 'coc "seyda neen"'.
This is a fix for segfault:

==8683== Process terminating with default action of signal 11 (SIGSEGV)
==8683==  Access not within mapped region at address 0x0
==8683==    at 0x59DFE4: MWRender::Animation::handleShapes(std::vector<Nif::NiTriShapeCopy, std::allocator<Nif::NiTriShapeCopy> >*, Ogre::Entity*, Ogre::SkeletonInstance*) (animation.cpp:503)
==8683==    by 0x5A4ECE: MWRender::Actors::update(float) (actors.cpp:134)
==8683==    by 0x5937A9: MWRender::RenderingManager::update(float) (renderingmanager.cpp:168)
==8683==    by 0x629AD6: MWWorld::World::update(float) (world.cpp:705)
==8683==    by 0x68B022: OMW::Engine::frameRenderingQueued(Ogre::FrameEvent const&) (engine.cpp:157)
==8683==    by 0x51F9574: Ogre::Root::_fireFrameRenderingQueued(Ogre::FrameEvent&) (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F964F: Ogre::Root::_fireFrameRenderingQueued() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F9681: Ogre::Root::_updateAllRenderTargets() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F98CF: Ogre::Root::renderOneFrame() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x51F990C: Ogre::Root::startRendering() (in /usr/lib/libOgreMain.so.1.8.0)
==8683==    by 0x68A669: OMW::Engine::go() (engine.cpp:408)
==8683==    by 0x51CECB: main (main.cpp:254)
==8683==  If you believe this happened as a result of a stack
==8683==  overflow in your program's main thread (unlikely but
==8683==  possible), you can try to increase the size of the
==8683==  main thread stack using the --main-stacksize= flag.
==8683==  The main thread stack size used in this run was 8388608.

when doing 'coc "seyda neen"' when animations are enabled
(Animation::animate member variable is set to 1).
13 years ago
Marc Zinnschlag 89fb3146ab Merge remote branch 'ace/win-fix' 13 years ago
Marc Zinnschlag ca4ad74151 more cleanup 13 years ago
Sebastian Wick 6d875dfd54 handle master/plugin properly 13 years ago
Alexander "Ace" Olofsson 64f792c01d Fix a value defined at the wrong place 13 years ago
Alexander "Ace" Olofsson 4ef921c43f Prevent internal classes from being marked dllimport 13 years ago
scrawl 13efe68fc3 disabled some debug output 13 years ago
scrawl cfb194f1d1 fix 6 13 years ago
scrawl 5f78f6c723 change queue 13 years ago
scrawl b018d00fd3 fix 5 13 years ago
Chris Robinson e8e8d3fb1b Fully reset the music before starting the next track 13 years ago
Eli2 3cc81d74bc Cleanup, replaced if with switch 13 years ago
Chris Robinson 3a57746ee4 Remove an unneeded volume special-case 13 years ago
Chris Robinson 4944a29b21 Keep track of the sound pitch 13 years ago
scrawl c9067249dd fix 4 13 years ago
scrawl c08a2b2942 fix 3 13 years ago
scrawl 909abb480d fix 2 13 years ago
scrawl f8d45eae52 fix #1 13 years ago
Chris Robinson cbf6c0404a Implement a basic underwater sound environment 13 years ago
Sebastian Wick 092de45924 std::map to std::multimap 13 years ago