mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity
2,961 Commits
38 Branches
54 Tags
121 MiB
0.8.1
master
0.8.2
0.8.1-vr
0.8.0-vr
0.8.0
0.7.1-build-fixes
0.7.0
ffi-server-rewrite
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
tes3mp-0.8.0
tes3mp-0.8.1
tes3mp-0.8.1-vr
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'f7a03b39c4'
${ noResults }
Commit Graph

1918 Commits (f7a03b39c4db9e50604520e8e552d8a97941a419)

Author SHA1 Message Date
Roman Melnik bdbb8a8d84 Merge remote-tracking branch 'upstream/master' into windowsPinning 
Conflicts:
	apps/openmw/mwgui/window_manager.cpp (keep both changes)
 13 years ago
Roman Melnik 72b3f6121d Windows Pinning: add files to CMakeLists.txt 
Add new files (map_window and window_pinnable_base)
 13 years ago
Marc Zinnschlag b7614dd0ce Merge remote branch 'chris/sound' 13 years ago
scrawl dbde8405f7 Merge branch 'master' into water 13 years ago
scrawl 50702c5e84 Merge branch 'master' into water 13 years ago
Chris Robinson 87e8917c4d Don't try to play sounds when no sound output is initialized 13 years ago
scrawl c49d5dd40b another sky tweak 13 years ago
scrawl f008ca166b restored moons like they were 13 years ago
scrawl c0f991ac0a underwater depth effect 13 years ago
scrawl 456eb95209 reversed sun and moon paths (sunrise at east) 13 years ago
scrawl 8316a4c2ec add mrt dummy output to sky shaders 13 years ago
scrawl c169f9e171 underwater tweaks 13 years ago
scrawl 2976625b00 better underwater 13 years ago
scrawl ec3fe1ef00 no sun glare in the reflection 13 years ago
scrawl 393530e671 more or less fixed the sky for normal viewing angles, still disappears at a certain height though 13 years ago
scrawl a41eee9a72 specular lighting 13 years ago
Marc Zinnschlag 8bf9b371c7 removed remains of input framelistener 13 years ago
Roman Melnik ef0a185e11 Pinnable windows: hide hud elements 
Hide elements of the HUD (health/magicka/stamina bars,
minimap) when the corresponding windows (stats/map) are pinned.

Rearrange the remaining hud elements in such cases (like in the
original Morrowind).
 13 years ago
scrawl e718d4b6f0 another sky fix 13 years ago
scrawl b36c0d95b8 night transition fix 13 years ago
scrawl e492a69c8f Merge branch 'inputfix' into water 13 years ago
scrawl a3151fe525 fixed input handling priority in the main loop 13 years ago
scrawl 8bfc81f398 Merge branch 'master' into water 13 years ago
scrawl 622fb568cf removed MRT setting and figure it out automatically 13 years ago
scrawl b8a470efcd put transparent objects in a seperate render queue, in order to not mess up the mrt textures 13 years ago
Marc Zinnschlag 000cfad82d Merge remote branch 'scrawl/gamesettings' 13 years ago
scrawl 88c50c5171 Merge branch 'master' into water 13 years ago
scrawl 1b89a9e203 various fixes 13 years ago
Dmitry Marakasov 84b475130a Add missing include 13 years ago
scrawl e1bde415f5 typo 13 years ago
scrawl 43fd0352f4 removed unneeded lines 13 years ago
scrawl f49131e1b8 renamed setting, automatically disable MRT when unsupported 13 years ago
Marc Zinnschlag 1201c271b2 Merge remote branch 'swick/initocfg' 13 years ago
scrawl f6342cfd60 fixed viewport background color, fixed indentation of some old functions 13 years ago
scrawl 5664d879a5 fixed some sky objects 13 years ago
scrawl ab8b74dcac forgot adding a file 13 years ago
Jason Hooks ca4de0606e Some planning 13 years ago
scrawl 3f05aba76d got MRT working, some minor quirks to solve (black viewport background) 13 years ago
Sebastian Wick f7bfea5861 typo 2 -.- 13 years ago
Sebastian Wick 56c9992b29 typo 13 years ago
Sebastian Wick 8c84f68dab fix for older boost versions; unsigned warning 13 years ago
Marc Zinnschlag 6fd3d5c776 Merge remote branch 'lgro/master' 13 years ago
gugus aaa5368fe9 added script instruction pcraiserank. Does not work yet. 13 years ago
gugus 2c7c945208 check playerfaction during dialogue 13 years ago
Lukasz Gromanowski cd2789b15a Revert "Issue #225: Correction to commit ae98904." 
This reverts commit 0e5c90d3e7.
 13 years ago
Sebastian Wick 5dd65c11ee forgot to save the file 13 years ago
Sebastian Wick 57ae1bdc43 Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg 
Conflicts:
	apps/openmw/main.cpp
 13 years ago
scrawl eb67afe552 added MRT output to terrain material 13 years ago
Sebastian Wick 6ccb32d26c import nosound option 13 years ago
Sebastian Wick d3a6484bbc set the default value for --fallback the right way 13 years ago
Sebastian Wick a974d88cf1 Revert "set a default value for --fallback" 
This reverts commit 94a220dcdd.
 13 years ago
Sebastian Wick 94a220dcdd set a default value for --fallback 13 years ago
scrawl 6442d49e16 render queue groups, sky fix 13 years ago
Sebastian Wick 48b7b03453 typo; World::getFallback(std::string key, std::string def) 13 years ago
Sebastian Wick 16e7bf353a remove debug message 13 years ago
Sebastian Wick de510d445b throw an error if the --fallback syntax is wrong 13 years ago
Sebastian Wick 329ba24eab streamlined command line options 13 years ago
scrawl cc4076d42a basic noise 13 years ago
scrawl fe63f2b2aa first reflection test; removed the refraction render (we'll have it for free using MRT and deferred water rendering) 13 years ago
Marc Zinnschlag e403c7158a Merge remote branch 'gus/DialogueSystem' 13 years ago
Marc Zinnschlag cc9696cc2c Merge remote branch 'scrawl/minimap' 13 years ago
gugus a268b89239 changed the way NPC faction is checked. Should be the same way for the player. 13 years ago
gugus be4af711af NPC rank was not loaded. Not sure if it's the right way, but it seems to work. 13 years ago
gugus 07ea63c10c Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 13 years ago
scrawl 6481cf87fc cleanup resources 13 years ago
scrawl 052cc47ee9 fixed waterAdded 13 years ago
scrawl b3a186e729 simple water without shaders that uses original MW textures 13 years ago
scrawl c1693a0c63 Merge branch 'minimap' into water 13 years ago
scrawl 51e33cc090 fixed map of some interiors 13 years ago
scrawl 8aea311797 added visibility flags for everything 13 years ago
scrawl fd45208196 re-added code for reflection & refraction rendering 13 years ago
scrawl d393f2dd4b Merge branch 'master' into water 13 years ago
Jason Hooks 57299571d5 Preparing for clothes/armor 13 years ago
Sebastian Wick 329d59e52b typo 13 years ago
Sebastian Wick 73705dadf6 parse fallback with boost program option custom validators 13 years ago
Sebastian Wick d87dffa948 should work... but does not even compile 13 years ago
Sebastian Wick 2d23d79fd5 allways merge fallback; better syntax 13 years ago
Marc Zinnschlag 26371a82a5 Merge remote branch 'scrawl/crashfix' 13 years ago
Lukasz Gromanowski 0e5c90d3e7 Issue #225: Correction to commit ae98904. 
Changed pointer to LandData struct to simple member variable.
 13 years ago
Sebastian Wick ab9c430632 fallback in apps/openmw; fix for apps/mwiniimporter 13 years ago
scrawl d4a2bdfa3d fix crash when hardware occlusion queries unsupporetd 13 years ago
scrawl bd9e165e3f Merge branch 'master' into water 13 years ago
scrawl 16481b0594 Merge branch 'master' into minimap 13 years ago
scrawl 342464530d rotated map working 13 years ago
scrawl ff15f28787 options for texture filtering and mipmaps 13 years ago
scrawl 39ee9e9ab8 setting for field of view 13 years ago
Sebastian Wick 6e19076dc5 fallback for ini importer 13 years ago
scrawl 5f2a674d93 fixed a typo 13 years ago
scrawl 00cc45c537 FPS is now a setting instead of commandline option 13 years ago
scrawl fd662f937a add settings for viewing distance and fog 13 years ago
scrawl e5cc9adbb0 added settings for rendering distance of small objects 13 years ago
scrawl 2b4b941192 Merge branch 'master' into gamesettings 13 years ago
Sebastian Wick 16674ad141 open file for writing AFTER reading it :) 13 years ago
scrawl e0631dd9be Merge branch 'master' into minimap 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 13 years ago
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 13 years ago
scrawl b380e71832 fixed underwater wireframe mode 13 years ago
scrawl 1445ae992d adding a setting to disable static geometry 13 years ago
scrawl 5accca385c fix crash on exit when no user settings exist 13 years ago
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
 13 years ago
Marc Zinnschlag fb44a5da10 Merge remote branch 'ace/win-fix' 13 years ago
Marc Zinnschlag eccb983c44 Merge remote branch 'chris/sound' 13 years ago
Marc Zinnschlag cdd0182912 Merge remote branch 'scrawl/occlusionquery' 
Reduced cout spam

Conflicts:
	apps/openmw/mwrender/occlusionquery.cpp
 13 years ago
Jason Hooks 07d0203a3c Merge remote-tracking branch 'upstream/master' 13 years ago
Chris Robinson 63e0e82049 Implement an Audiere-based decoder 13 years ago
Roman Melnik 91a377df86 Fix behaviour of the MapWindow 
The map now will track player's position/rotation when
pinned, and will not update if position/rotation didn't
change since last frame.
 13 years ago
Chris Robinson 2147210ad7 Don't set an underwater environment when there's no water 13 years ago
Lukasz Gromanowski ae989040e5 Issue #225: Fix for memleak when loading terrain. 13 years ago
Alexander "Ace" Olofsson cec9562282 Fixing an ambigous symbol 13 years ago
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
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
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
Marc Zinnschlag b5b40e2623 Merge remote branch 'lgro/master' 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