teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
2698 commits 34 branches 0 tags 66 MiB
Commit graph

1701 commits

Author SHA1 Message Date
Sebastian Wick
d3a6484bbc set the default value for --fallback the right way 2012-04-04 19:59:46 +02:00
Sebastian Wick
a974d88cf1 Revert "set a default value for --fallback" 
This reverts commit 94a220dcdd.
 2012-04-04 19:58:04 +02:00
Sebastian Wick
94a220dcdd set a default value for --fallback 2012-04-04 19:52:07 +02:00
Sebastian Wick
48b7b03453 typo; World::getFallback(std::string key, std::string def) 2012-04-04 16:15:15 +02:00
Sebastian Wick
16e7bf353a remove debug message 2012-04-04 16:08:46 +02:00
Sebastian Wick
de510d445b throw an error if the --fallback syntax is wrong 2012-04-04 15:23:14 +02:00
Sebastian Wick
329ba24eab streamlined command line options 2012-04-04 15:11:30 +02:00
Sebastian Wick
329d59e52b typo 2012-04-03 02:17:15 +02:00
Sebastian Wick
73705dadf6 parse fallback with boost program option custom validators 2012-04-03 02:14:39 +02:00
Sebastian Wick
d87dffa948 should work... but does not even compile 2012-04-03 01:47:43 +02:00
Sebastian Wick
2d23d79fd5 allways merge fallback; better syntax 2012-04-03 00:44:26 +02:00
Sebastian Wick
ab9c430632 fallback in apps/openmw; fix for apps/mwiniimporter 2012-04-02 20:47:09 +02:00
Sebastian Wick
6e19076dc5 fallback for ini importer 2012-04-02 17:07:18 +02:00
Sebastian Wick
16674ad141 open file for writing AFTER reading it :) 2012-04-02 14:42:01 +02:00
Sebastian Wick
89565bacd1 since the default method is not available in older boost we should check by ourselfs if the options are given and dont use notify 2012-04-02 14:34:21 +02:00
Marc Zinnschlag
6022d3ab13 Merge remote branch 'corristo/pgrd-rendering' 
reduced cout spam.

Conflicts:
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	components/bsa/bsa_archive.cpp
	libs/openengine/bullet/physic.hpp
 2012-04-02 12:04:47 +02:00
Marc Zinnschlag
fb44a5da10 Merge remote branch 'ace/win-fix' 2012-04-02 11:46:09 +02:00
Marc Zinnschlag
eccb983c44 Merge remote branch 'chris/sound' 2012-04-02 11:34:48 +02:00
Marc Zinnschlag
cdd0182912 Merge remote branch 'scrawl/occlusionquery' 
Reduced cout spam

Conflicts:
	apps/openmw/mwrender/occlusionquery.cpp
 2012-04-02 11:33:16 +02:00
Chris Robinson
63e0e82049 Implement an Audiere-based decoder 2012-04-01 15:02:07 -07:00
Chris Robinson
2147210ad7 Don't set an underwater environment when there's no water 2012-04-01 12:46:49 -07:00
Alexander "Ace" Olofsson
cec9562282 Fixing an ambigous symbol 2012-04-01 20:29:00 +02:00
Marc Zinnschlag
de41e1118a Merge remote branch 'scrawl/weather' 2012-04-01 17:10:30 +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
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
Marc Zinnschlag
b5b40e2623 Merge remote branch 'lgro/master' 2012-03-31 21:45: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