1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-03 08:45:34 +00:00
Commit graph

3366 commits

Author SHA1 Message Date
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).
2012-04-01 20:36:57 +03:00
scrawl
7b3adb27a3 backend changes, terrain num lights setting 2012-04-01 18:48:37 +02:00
Alexander "Ace" Olofsson
54ce95cfaf Make sure it doesn't find the wrong file 2012-04-01 17:25:03 +02:00
Marc Zinnschlag
da5207f8e3 Merge remote branch 'kromgart/master' 2012-04-01 17:17:51 +02:00
scrawl
f4bbcb48a6 settings-default.cfg 2012-04-01 17:14:49 +02:00
Marc Zinnschlag
de41e1118a Merge remote branch 'scrawl/weather' 2012-04-01 17:10:30 +02:00
scrawl
6091a0504d first settings test (config file has to be created manually) 2012-04-01 16:59:35 +02:00
Roman Melnik
ed58e9e553 Merge remote-tracking branch 'upstream/master' 2012-04-01 17:53:12 +03:00
scrawl
308df7caa8 add method for keeping track of settings that changed 2012-04-01 16:26:42 +02:00
Nikolay Kasyanov
30d6c880ff Feature #37 (In Progress) Render Path Grid
tuned sized a bit
2012-04-01 17:51:37 +04:00
Nikolay Kasyanov
cab412c225 Feature #37 (In Progress) Render Path Grid
optimisation, now it takes only two batches per cell.
2012-04-01 17:27:18 +04:00
scrawl
9a261a02aa changed the cloud movement direction like suggested on the forum 2012-04-01 15:14:43 +02:00
scrawl
ee754eda6c don't create sky until entering an exterior cell 2012-04-01 15:07:41 +02:00
scrawl
df8e0bbff2 player check 2012-04-01 14:53:41 +02:00
scrawl
80456778be fix for pickup up transparent objects, workaround for doors 2012-04-01 14:22:04 +02:00
scrawl
30407d3a2c Merge branch 'master' into occlusionquery 2012-04-01 14:16:25 +02:00
scrawl
4e63f89829 silence an error regarding faced handle 2012-04-01 13:09:30 +02:00
Marc Zinnschlag
8aa4001937 compile fix 2012-04-01 10:34:51 +02:00
Marc Zinnschlag
38066d9ecb Merge remote branch 'swick/initocfg' 2012-04-01 10:26:26 +02:00
Jason Hooks
0021ccf862 Merge remote-tracking branch 'upstream/master' 2012-03-31 20:48:42 -04:00
Chris Robinson
9c06bfc8fc Merge remote branch 'zini/master' into sound 2012-03-31 14:26:21 -07:00
Sebastian Wick
a2a7539fd5 fix for more than 10 game files; delete both master and plugin settings if called with --game-files 2012-03-31 23:15:33 +02:00
Sebastian Wick
1d596d6c72 use std::map<std::string, std::vector<std::string> > instead of std::map<std::string, std::string> 2012-03-31 22:48:50 +02:00
Marc Zinnschlag
40310f3663 Merge remote branch 'scrawl/occlusionquery' 2012-03-31 22:09:47 +02:00
Roman Melnik
35f787c4bf Merge remote-tracking branch 'upstream/master' 2012-03-31 22:58:06 +03:00
Marc Zinnschlag
b5b40e2623 Merge remote branch 'lgro/master' 2012-03-31 21:45:15 +02:00
scrawl
55c984c179 Merge branch 'master' into gamesettings 2012-03-31 21:37:15 +02:00
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).
2012-03-31 21:34:40 +02:00
Marc Zinnschlag
89fb3146ab Merge remote branch 'ace/win-fix' 2012-03-31 21:31:16 +02:00
Marc Zinnschlag
ca4ad74151 more cleanup 2012-03-31 21:29:46 +02:00
Sebastian Wick
6d875dfd54 handle master/plugin properly 2012-03-31 21:06:48 +02:00
Alexander "Ace" Olofsson
64f792c01d Fix a value defined at the wrong place 2012-03-31 21:05:33 +02:00
Alexander "Ace" Olofsson
4ef921c43f Prevent internal classes from being marked dllimport 2012-03-31 20:50:22 +02:00
scrawl
13efe68fc3 disabled some debug output 2012-03-31 20:28:07 +02:00
scrawl
cfb194f1d1 fix 6 2012-03-31 20:18:20 +02:00
scrawl
5f78f6c723 change queue 2012-03-31 20:10:34 +02:00
scrawl
b018d00fd3 fix 5 2012-03-31 20:05:23 +02:00
Chris Robinson
e8e8d3fb1b Fully reset the music before starting the next track 2012-03-31 10:59:29 -07:00
Eli2
3cc81d74bc Cleanup, replaced if with switch 2012-03-31 19:50:21 +02:00
Chris Robinson
3a57746ee4 Remove an unneeded volume special-case 2012-03-31 10:43:55 -07:00
Chris Robinson
4944a29b21 Keep track of the sound pitch 2012-03-31 10:41:12 -07:00
scrawl
c9067249dd fix 4 2012-03-31 19:16:14 +02:00
scrawl
c08a2b2942 fix 3 2012-03-31 19:12:02 +02:00
scrawl
909abb480d fix 2 2012-03-31 19:09:36 +02:00
scrawl
f8d45eae52 fix #1 2012-03-31 19:08:05 +02:00
Chris Robinson
cbf6c0404a Implement a basic underwater sound environment 2012-03-31 10:06:12 -07:00
Sebastian Wick
092de45924 std::map to std::multimap 2012-03-31 18:28:48 +02:00
Sebastian Wick
653fbdd10c master/plugin support; needs multimap instead of map 2012-03-31 18:24:43 +02:00
Marc Zinnschlag
08f8701b33 workaround for tga problem 2012-03-31 17:52:58 +02:00
Marc Zinnschlag
a96599d96c Merge remote branch 'chris/sound' 2012-03-31 17:45:26 +02:00