Commit graph

19994 commits

Author SHA1 Message Date
scrawl
5d524a6a10 Add custom version of MorphGeometry replacing osgAnimation
Double buffering, custom bounding box and the update in the cull visitor (instead of update) are now all handled internally rather than needing hacks and/or callbacks.
2017-09-01 21:42:36 +00:00
scrawl
f1ebb129c1 Fix ShaderVisitor to deal with the fact RigGeometry no longer derives from Geometry 2017-09-01 21:42:35 +00:00
scrawl
4c5992a0d5 Warn if removing a node fails 2017-09-01 21:42:35 +00:00
scrawl
209e139aa8 Move double buffering implementation inside RigGeometry
The double buffering is an implementation detail so it should be handled as such, rather than mandating the scene graph to be structured in a certain way.

Override accept(NodeVisitor&) instead of using callbacks.
2017-09-01 21:42:34 +00:00
scrawl
132ac6001b Fix bug of Animation::mSkeleton not being assigned
This bug resulted in deactivating a Skeleton not working properly for creatures (that are out of processing range), therefore reduced performance.
2017-09-01 21:42:34 +00:00
scrawl
7a79ebb713 Merge pull request #1428 from akortunov/stancechangefixes
[Feedback needed] Stance switching changes, part II
2017-09-01 21:42:08 +00:00
John
51c7efa3f3 [CMake] CMake fix install 2017-09-01 19:57:11 +02:00
Andrei Kortunov
7f5f5458d4 Reset player attack animation when unequip weapon or tool 2017-09-01 18:03:23 +04:00
Andrei Kortunov
a5b01fefec Allow to interrupt an attack, if attack button is held 2017-09-01 14:28:21 +04:00
Andrei Kortunov
0d7279ea2a Fixes a regression with bound weapons equipping (bug #4050) 2017-09-01 08:59:05 +04:00
scrawl
a8005c33d9 Revert unintended change to mOnGround variable that was somehow introduced with 38a2de3c51 2017-08-31 21:58:12 +00:00
scrawl
45f7563a55 Revert "Revert "Check for a Geometry node when attaching bodyparts""
Issue with shaders has been fixed with b9931fb71c

This reverts commit a1e3fb7604.
2017-08-31 21:40:35 +00:00
scrawl
b9931fb71c Set the shader on the node containing the StateSet 2017-08-31 21:39:21 +00:00
David Cernat
da7253bb57 [Documentation] Update documentation for 0.6.1 2017-08-31 23:06:16 +03:00
David Cernat
08df8f8d83 [General] Update version to 0.6.1 2017-08-31 18:45:41 +03:00
David Cernat
2e8718a0e0 Merge pull request #282 from OpenMW/master
Add OpenMW commits up to 31 Aug 2017, part 2
2017-08-31 18:42:54 +03:00
David Cernat
3fc1bdecb3 [Client] Shorten player names to 31 characters after they are inputted 2017-08-31 18:41:37 +03:00
David Cernat
ac3254d85f [General] Don't send PlayerAttribute and PlayerSkill packets as werewolf
This will prevent the server from overwriting a player's human form stats with their werewolf form stats.

Additionally, share PlayerShapeshift packets last when exchanging data with another player.
2017-08-31 18:21:38 +03:00
scrawl
d749b7f2a7 Merge pull request #1426 from akortunov/multiplesoundfix
Allow to play only one copy of given sound at time (bug #3647)
2017-08-31 14:59:08 +00:00
David Cernat
93d1aa2e4a [Client] Comment out the broken sending of custom spells until 0.7.0 2017-08-31 17:07:45 +03:00
Koncord
1c0adc47ee [Server] Fix [get/set]MajorSkills and [get/set]MinorSkills 2017-08-31 20:51:05 +08:00
David Cernat
e81dafb28a Merge pull request #281 from TES3MP/0.6.0
Add hotfix commits for 0.6.0 up to 31 Aug 2017
2017-08-31 15:46:06 +03:00
David Cernat
98a7769b91 Merge branch 'master' into 0.6.0 2017-08-31 15:44:27 +03:00
Andrei Kortunov
1aaa8a76c5 Allow to play only one copy of given sound at time (bug #3647) 2017-08-31 16:14:48 +04:00
David Cernat
4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts
# Conflicts:
#	.gitignore
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
2017-08-31 15:14:13 +03:00
Koncord
54f5104345 [General] Escape format for strings 2017-08-31 20:09:05 +08:00
David Cernat
499c7db121 [Server] Initialize interiors correctly if exterior 0, 0 has been loaded 2017-08-31 14:48:23 +03:00
Andrei Kortunov
91dcd5bc6e Do not allow to unequip weapon from inventory during attack 2017-08-31 13:28:09 +04:00
Andrei Kortunov
6f22d819c5 Do not allow to switch weapon to probe or lockpick during attack 2017-08-31 12:36:54 +04:00
Koncord
66fdba957b [Server] Add getDataFolder() to Script API 2017-08-31 16:25:43 +08:00
Koncord
1d16958910 [Server] Fix multiple calls of ON_POST_INIT 2017-08-31 16:20:50 +08:00
David Cernat
cca4991e74 [Utils] Use consistent names for utility functions added by tes3mp 2017-08-31 10:12:22 +03:00
David Cernat
cf4021a7b5 [Client] Only add valid quests to journal 2017-08-31 09:08:29 +03:00
David Cernat
134dd06d48 [Client] Only add valid inventory & equipment items to LocalPlayer
Also add related debug information.
2017-08-31 08:35:46 +03:00
David Cernat
c3d1eada89 [Client] Only add spells to players that are ensured to exist 2017-08-31 06:42:11 +03:00
David Cernat
f6d36d5d80 [Client] Ensure that objects searched for have a valid reference number 2017-08-31 03:40:36 +03:00
scrawl
8c6a8ca48d Respect the framelimit in all cases (Fixes #3531)
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
2017-08-30 21:26:30 +00:00
Koncord
b18c6dec9d [Server] Fix sendList()
Remove return from requestContainers()
Rename "Cells" usertype to "Cell"
2017-08-30 22:50:47 +08:00
Koncord
991a1fe8d8 [General] Update submodules 2017-08-30 17:10:37 +08:00
Koncord
60fc0bedb8 [Server] Use lower case for methods 2017-08-30 13:56:53 +08:00
Koncord
7717f9bece [Server] Replace getKillRefId/getKillNumber with getKill 2017-08-30 13:56:22 +08:00
scrawl
dc53573de4 Merge pull request #1405 from akortunov/stancechangefixes
Do not allow player to change weapon/spell during attack or spellcast
2017-08-29 23:11:23 +00:00
scrawl
a1e3fb7604 Revert "Check for a Geometry node when attaching bodyparts"
This reverts commit 3fc8634206.
2017-08-29 22:40:19 +00:00
David Walley
47d6c5091f OpenMW CS Manual - typo fixes etc (#1422)
* Update files-and-directories.rst
* OpenMW CS Manual - minor typo fixes
2017-08-29 22:39:24 +00:00
scrawl
43fda6cf07 Merge pull request #1423 from akortunov/spellpriority
Combat AI: use effective cast cost when rate enchanted weapon
2017-08-29 22:38:36 +00:00
scrawl
8a1e014bb8 Merge pull request #1424 from akortunov/guifixes
Display negative values on fatigue progress bars
2017-08-29 22:38:21 +00:00
David Cernat
833d2a5dbe Merge pull request #277 from TES3MP/0.6.0
Add hotfix commits for 0.6.0 up to 29 Aug 2017, part 1
2017-08-29 19:32:21 +03:00
David Cernat
92553b8e29 [Server] Log startup errors by not deleting logger too early 2017-08-29 19:30:37 +03:00
Andrei Kortunov
73d5efabee Display negative values on fatigue progress bar 2017-08-29 18:53:21 +04:00
scrawl
3fc8634206 Check for a Geometry node when attaching bodyparts (Fixes #3957) 2017-08-29 12:55:42 +00:00