mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 23:49:55 +00:00
Code Issues Releases Wiki Activity
25071 commits 38 branches 54 tags 122 MiB
Commit graph

401 commits

Author SHA1 Message Date
Andrei Kortunov
5a4d0cec3a Use new logging system for game itself 2018-08-14 23:05:43 +04:00
AnyOldName3
586ac2d12d Revert "Prevent accidental culling of first person meshes" 
This reverts commit c38bf6757a.
 2018-08-08 22:53:56 +01:00
AnyOldName3
c38bf6757a Prevent accidental culling of first person meshes 2018-08-02 15:50:43 +01:00
AnyOldName3
cc23a968d1 Merge upstream/master 2018-08-01 14:13:45 +01:00
Capostrophic
ecafcefae9
Fall back to regular head when getVampireHead fails 2018-06-24 14:39:48 +03:00
AnyOldName3
c3d7c7de21 Prevent first-person meshes disappearing. 2018-01-23 20:13:37 +00:00
scrawl
b06512a60d Fix error message that referred to the wrong file (Bug #4159) 2017-11-10 22:51:32 +00:00
scrawl
95b3c1181a Update shader with a non-color tracking material when equipment is changed during chameleon/invisibility effects (Fixes #4190) 2017-11-08 00:24:52 +00:00
Chris Robinson
780e82480d Make the PlayMode and PlayType enums scoped 
Also shorten them by putting them in the MWSound namespace
 2017-09-15 02:36:59 -07:00
Andrei Kortunov
7f5f5458d4 Reset player attack animation when unequip weapon or tool 2017-09-01 18:03:23 +04:00
Bret Curtis
07f75e1104 replace boost::shared_ptr in extern and components 2017-06-09 19:08:53 +02:00
scrawl
0e37e71ea2 Merge pull request #1266 from akortunov/handsfallbackfix 
Improved hands bodyparts selection fallback
 2017-04-23 00:36:48 +02:00
Andrei Kortunov
4544caf7f3 Improved bodypart select fallback (fixes #2594) 2017-04-22 22:23:10 +04:00
Allofich
ff3e307059 Pass parameters by const reference 2017-04-20 23:47:03 +09:00
scrawl
42a04de37c Fix a crash that occurred when a carried light fails to be attached. 2017-03-04 21:48:31 +01:00
scrawl
29556a1802 More consistent wording of errors/warnings 
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.

An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.

The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.

Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
 2017-03-04 21:48:31 +01:00
scrawl
1692b7f38e Merge pull request #1209 from dhustkoder/master 
Added ConstContainerStoreIterator (Task #3092)
 2017-03-02 18:36:21 +01:00
Rafael Moura
6c2ce2b2a1 Porting more ContainerStoreIterator usage to const version #4 
removed const_cast revision
 2017-02-28 19:11:00 +00:00
Rafael Moura
7fa2703715 Porting more ContainerStoreIterator usage to const version #3 2017-02-28 14:31:51 +00:00
scrawl
75677f03e7 Remove SceneManager::notifyAttached 2017-02-24 02:58:41 +01:00
scrawl
afa39d121f Fix 'part has no parent' warning caused by destructing in the wrong order 2017-02-24 02:58:41 +01:00
scrawl
00d4fea91c Derive Animation from osg::Referenced to allow the UnrefQueue to delete it 2017-02-22 15:27:20 +01:00
scrawl
a5247394dc (Re)set the inventory listener outside of the Animation class 2017-02-22 15:08:22 +01:00
scrawl
767eba941f Speed up finding of attachment node by using the cached nodeMap 2017-02-03 23:15:37 +01:00
scrawl
a76d693627 Speed up ControllerVisitor by skipping sub graphs that have no ChildrenRequiringUpdateTraversal() 2017-02-03 23:10:14 +01:00
scrawl
cca75499ee Clear the Skeleton's bone cache when a node is added/removed (Fixes #3663) 2016-12-16 20:09:20 +01:00
scrawl
f51e06bc47 Recreate shaders if necessary when the NpcAnimation is rebuilt 
This fixes certain equipment losing the 'invisibility' effect after a view-mode switch with shaders enabled. Because the initial build of shaders done by the resource manager is not aware of the override state in the NpcAnimation's object root, we have to build new shaders here.
 2016-11-19 23:53:22 +01:00
scrawl
e823cbf018 Fix incorrect priority of animation sources (Bug #3626) 2016-11-19 23:53:22 +01:00
MiroslavR
11565b5966 Make actors with non-portable lights in inventory glow (Closes #2042, #3338) 2016-10-08 23:17:12 +02:00
Allofich
5aad1d81f4 Remove no longer used parameter 2016-09-15 23:41:20 +09:00
Allofich
dc8ff5e49b Play all sfx and use particle textures for permanent enchantments 2016-09-15 00:27:08 +09:00
scrawl
8f62ea2e80 Fix for "RigGeometry rendering with no skeleton" errors 2016-07-02 20:19:55 +02:00
scrawl
8fb8c2bae5 Fix "part has no parents" warning message caused by nodes being destroyed in the incorrect order 2016-06-07 02:43:25 +02:00
scrawl
30402f75e3 Use xbase_anim_female as the base skeleton for female NPCs (Fixes #3258) 2016-03-18 00:24:38 +01:00
scrawl
2b38d10449 Always add xbase_anim 2016-03-18 00:17:05 +01:00
scrawl
0fc65db6bb Remove parts before setting the new object root 2016-03-06 11:34:15 +01:00
scrawl
e28dc3e72f Preload instances in SceneManager 2016-02-09 18:35:26 +01:00
scrawl
ce3cce24a5 Remove unneeded dynamic_cast 2016-02-09 16:39:05 +01:00
scrawl
ae031b23d4 Do not detach NPC parts in destructor 2016-02-09 16:10:42 +01:00
scrawl
1b8e82e929 Preload NPC body parts 2016-02-09 00:26:22 +01:00
scrawl
5878291064 Fix the path correction for animation sources provided in NPC record (Fixes #2444) 2016-02-03 14:40:21 +01:00
scrawl
446c714727 Fix a possible memory leak in error case 2016-01-04 20:39:08 +01:00
scrawl
e520d37c87 Override the field of view for first person meshes (Fixes #858, Fixes #3051) 2015-12-07 16:29:30 +01:00
scrawl
637cd3a628 Adjust the FirstPersonNeckController to follow the camera with a reduced factor (Fixes #1784) 2015-11-10 01:01:41 +01:00
scrawl
700a0099c3 Remove debug code 2015-10-29 00:25:23 +01:00
scrawl
e13eb625d3 New water WIP 
Changes compared to old (Ogre) water:
- Uses depth-texture readback to handle the underwater fog in the water shader, instead of handling it in the object shader
- Different clipping mechanism (glClipPlane instead of a skewed viewing frustum)
- Fixed bug where the reflection camera would look strange when the viewer was very close to the water surface
- Toned down light scattering, made the waterColor a bit darker at night
- Fixed flipped water normals and strange resulting logic in the shader

Still to do: see comments...
 2015-10-29 00:25:23 +01:00
scrawl
6ef139e1d7 Implement a custom RenderBin for first person models (Fixes #1612) 2015-10-19 22:17:04 +02:00
scrawl
f8d4bc378f Move setAlpha from NpcAnimation to Animation (Fixes #2917) 2015-09-16 16:15:55 +02:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
scrawl
58cd2b1a84 Remove "Tri Bip*" nodes in creature meshes (meant for debugging)? (Fixes #2148) 2015-08-15 19:01:21 +02:00
scrawl
667c80fb2a Add brackets around a correct expression to fix coverity warning 2015-07-11 03:34:08 +02:00
scrawl
ebdd5dc993 Fix code that I forgot to uncomment (thanks coverity) 2015-07-11 03:34:08 +02:00
scrawl
c90841d649 Fix head tracking for NPCs 2015-07-04 21:00:01 +02:00
scrawl
882e359008 Move attackStrength to the CharacterController, where it should have been to begin with 
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
 2015-06-26 05:15:07 +02:00
scrawl
d7695f2560 Remove unused NpcAnimation visibilityFlags 2015-06-22 21:14:44 +02:00
scrawl
d5b73f2a55 Move HeadAnimationTime to the implementation file 2015-06-22 21:12:15 +02:00
scrawl
24bfb44b13 Move head tracking from NpcAnimation to Animation (Bug #2720) 2015-06-22 21:06:27 +02:00
scrawl
c7493eb45c Fix bug with invisibility effect for meshes w/ vertex colors 2015-06-11 16:14:51 +02:00
scrawl
b33fe8fb62 Fix the inventory listener bug 2015-06-07 16:50:34 +02:00
scrawl
30ab15e605 Fix -Wunused-private-field clang warnings 2015-06-04 20:42:05 +02:00
scrawl
b70383d127 Remove last remains of Ogre math 2015-06-03 21:37:21 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
7f9f9a32d2 InitWorldSpaceParticles fix 2015-06-01 16:29:42 +02:00
scrawl
987918ca15 NpcAnimation::setAlpha 2015-06-01 16:18:57 +02:00
scrawl
ed4863ad7d Restore ranged weapon aiming 2015-05-31 18:53:16 +02:00
scrawl
71bafcb52b Restore head tracking 2015-05-31 18:04:14 +02:00
scrawl
60f55997fd Rotate first person meshes, sneak camera offset in first person 2015-05-31 02:26:58 +02:00
scrawl
a066b24303 Restore WeaponAnimation 2015-05-31 01:07:43 +02:00
scrawl
2f97649540 Fix for cleanup issue when exiting after a failed savegame load (Fixes #2580) 2015-05-27 00:30:39 +02:00
scrawl
da24e298ee Fix -Wreorder warnings 2015-05-23 22:44:00 +02:00
scrawl
0fb97bd2e7 Readded baseonly parameter to Animation::setObjectRoot 
Fixes the first person view.
 2015-05-21 23:24:22 +02:00
scrawl
cfe57199d7 Minor cleanup 2015-05-20 04:09:21 +02:00
scrawl
c4452afd89 Inventory item picking 2015-05-20 04:09:21 +02:00
scrawl
b7258c8d23 Readded Objects::updatePtr 2015-05-14 17:34:55 +02:00
scrawl
e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
 2015-05-04 02:41:50 +02:00
scrawl
9cf9c2876e Pathgrid rendering 2015-05-02 22:45:39 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
scrawl
6f3e920f85 Animation port complete 2015-04-23 23:30:06 +02:00
scrawl
09742d5b95 Animation playback works, no movement accumulation yet 2015-04-23 20:41:31 +02:00
scrawl
1a19cd3607 Some cleanup 2015-04-22 19:08:56 +02:00
scrawl
8c810e3620 Move rng to components 2015-04-22 17:58:55 +02:00
scrawl
7a46d4f46a Dead code removal 2015-04-22 17:48:06 +02:00
scrawl
fcc7aa02ab Port addExtraLight 2015-04-19 15:03:08 +02:00
scrawl
c924e64047 Port HeadAnimationTime 2015-04-19 14:42:47 +02:00
scrawl
f7d2a28930 Port BoneOffset 2015-04-19 14:25:36 +02:00
scrawl
9c4b2ea61a CreatureAnimation compiles 2015-04-19 03:05:47 +02:00
scrawl
edc5cad79e Port Animation::addEffect 2015-04-19 01:57:52 +02:00
scrawl
083c41c950 Environment map for enchanted objects 2015-04-17 01:23:37 +02:00
scrawl
5b8c28f641 NpcAnimation compiles 2015-04-15 22:11:38 +02:00
dteviot
3f28634d1f consolidate random number logic 
Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
 2015-03-15 14:07:47 +13:00
dteviot
e197f5318b fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 13:07:29 +13:00
dteviot
45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 2015-03-06 23:19:57 +13:00
scrawl
191c0104f6 Crash fix for creatures with no skeleton base (Fixes #2419) 2015-03-02 15:19:57 +01:00
scrawl
f4c8064d39 Fix camera not being attached properly when player becomes vampire (Fixes #2319) 2015-01-28 19:14:57 +01:00
scrawl
b0c2aec374 Add warning for missing body parts 2015-01-23 17:31:26 +01:00
scrawl
cc7be1600d Make missing hair/head in NpcAnimation non-fatal for consistency with addOrReplaceIndividualPart 2015-01-23 15:34:14 +01:00
scrawl
41b3a9dba9 Rewrite animated collision shape support (Fixes #2123) 2015-01-13 05:37:37 +01:00
scrawl
9c693d078b Fix equipment update removing ammunition (Fixes #2144) 2014-12-30 16:22:06 +01:00
scrawl
59f21c6105 Use "hair" as filter for PRT_Hair parts (Fixes #2218) 2014-12-24 15:45:14 +01:00
scrawl
c2771bc8ab Head tracking fix 2014-12-17 02:15:40 +01:00