Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:33:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45163 commits 71 branches 56 tags 1.2 GiB
Commit graph

45163 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony Thibault
a43e9a5710 Fix for crash on avatars with missing "Hips" joint 2016-07-22 16:00:40 -07:00
James B. Pollack
5202038210 Merge pull request #8282 from hyperlogic/bug-fix/avatar-embedded-in-floor 
Vive HMD fixes to prevent user from becoming embedded in the floor.
 2016-07-22 09:04:40 -07:00
Brad Hefta-Gaub
566e0f5dbf Merge pull request #8287 from AndrewMeadows/fix-simple-compound 
fix bug breaking simple-compound shape type
 2016-07-21 18:18:04 -07:00
Brad Hefta-Gaub
c24472d390 Merge pull request #8290 from howard-stearns/cleanup-heartbeat 
cleanup domain-server heartbeat code
 2016-07-21 18:17:19 -07:00
Brad Davis
f64d53e109 Merge pull request #8291 from ZappoMan/fixSilenceOnBadCodecs 
fix silence on no codec after previous codec has been set
 2016-07-21 17:32:00 -07:00
howard-stearns
b303c6df8e strong type checking my arse 2016-07-21 16:04:12 -07:00
Brad Hefta-Gaub
bb8224be8c fix silence on no codec after previous codec has been set 2016-07-21 13:57:11 -07:00
Howard Stearns
51bc3c51ca less logging, change constant name. 2016-07-21 08:35:21 -07:00
Anthony Thibault
592a50356b Merge pull request #8211 from highfidelity/skin 
Skin sub-surface lighting
 2016-07-20 15:48:25 -07:00
Andrew Meadows
20eebb90f8 fix build -- remove some accidental changes 2016-07-20 14:08:25 -07:00
Chris Collins
cc4c21e899 Merge pull request #8284 from davidkelly/dk/noMoBuzzsaw 
Potential cause of that buzzsaw when resetting
 2016-07-20 14:00:31 -07:00
Chris Collins
71c12c30a2 Merge pull request #8286 from sethalves/build-server-only-plugins 
Build server only plugins
 2016-07-20 14:00:13 -07:00
Andrew Meadows
3fdfc0db14 fix bug breaking simple-compound shape type 2016-07-20 12:55:13 -07:00
Seth Alves
4e308914b2 when cmake is told SERVER_ONLY, still build server-side plugins 2016-07-20 11:37:30 -07:00
Seth Alves
5485b3ee13 when cmake is told SERVER_ONLY, still build server-side plugins 2016-07-20 11:34:44 -07:00
Seth Alves
c36d0d91ad when cmake is told SERVER_ONLY, still build server-side plugins 2016-07-20 11:29:57 -07:00
Seth Alves
406b08ffa1 when cmake is told SERVER_ONLY, still build server-side plugins 2016-07-20 11:29:00 -07:00
samcake
569fdde7f1 Merge pull request #8285 from samcake/skin 
Merging upstream master and fixing comments from review
 2016-07-20 11:06:22 -07:00
samcake
1c4742e710 Fixing comments from review 2016-07-20 11:02:27 -07:00
samcake
853f31f6ea Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-20 10:49:27 -07:00
David Kelly
7b2d5e7fab Potential cause of that buzzsaw when resetting 2016-07-20 10:41:16 -07:00
Ryan Huffman
1dd7d108d8 Merge pull request #8271 from thoys/fix-duplicate-teleport-target-overlays 
FIX duplicate teleport target overlays
 2016-07-20 09:10:16 -07:00
Thijs Wenker
be0ccad0d3 Merge branch 'fix-duplicate-teleport-target-overlays' of github.com:thoys/hifi into fix-duplicate-teleport-target-overlays 2016-07-20 03:12:26 +02:00
Anthony J. Thibault
90beb30e8a Filter out bad openvr HMD poses that are below the floor 
When interface is launched and steam vr is NOT running, openvr can return bad HMD poses for a few frames.
To workaround this, filter out any hmd poses that are obviously bad, i.e. beneath the floor.
 2016-07-19 18:12:20 -07:00
Thijs Wenker
b3b1bf7884 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-duplicate-teleport-target-overlays 2016-07-20 03:12:02 +02:00
Howard Stearns
0b5cdcef42 Merge pull request #8252 from howard-stearns/suggestions 
suggestions
 2016-07-19 15:46:23 -07:00
Chris Collins
0632f6df2d Merge pull request #8279 from birarda/master 
fix crash with multiple solo nodes in closeCurrentPacket
 2016-07-19 14:57:00 -07:00
Anthony J. Thibault
837b19ed1b fix for pushing avatar into floor when exiting away mode. 
* Removed MyAvatar.reset() access from JavaScript
* Added HMD.centerUI() to JavaScript, which can be used to reset the 3D UI sphere around the current HMD orientation.
* Added MyAvatar.clearIKJOintLimitHistory() which can be used to reset any remembered IK joint limit history.
* Added MyAvatar.centerBody() which can be used to instantly re-orient the avatar's so that the hips and toes
  are facing the same direction as the current HMD orientation.

away.js now uses the above new API's instead of MyAvatar.reset()
 2016-07-19 14:42:24 -07:00
Chris Collins
de06c7c370 Merge pull request #8276 from ZappoMan/addCodecNameToStream 
Fix issues with mismatched codecs
 2016-07-19 13:45:45 -07:00
samcake
91a0b86d40 Merge pull request #8280 from samcake/skin 
Update the upstream skin with master changes and bug fixes for skin
 2016-07-19 13:43:45 -07:00
howard-stearns
4a6132874f encodeURIComponent of the protocol signature 2016-07-19 13:43:28 -07:00
samcake
8f663f20e0 FIx warnings 2016-07-19 13:24:03 -07:00
samcake
7f169b8e4f Adjust qml positions and fix one shader bug 2016-07-19 13:20:19 -07:00
samcake
3e7126f5be Removed reference to LIghtingModel.slh in teh DefereedBufferWrite.slh to avoid side effects 2016-07-19 13:06:26 -07:00
Thijs Wenker
2adff24a05 silly workaround- workaround 2016-07-19 21:34:42 +02:00
samcake
4742f40128 Separating the normal packing into it s own file and make sure to sclae the filter radius correctly dpeending on the resolution of diffusion 2016-07-19 12:23:57 -07:00
Stephen Birarda
f28f3d7fcf force removal of an old solo node when added new one 2016-07-19 12:02:37 -07:00
Anthony Thibault
897627ebd6 Merge pull request #8272 from hyperlogic/bug-fix/mac-os-quality-of-life-fixes 
Mac OS X fixes
 2016-07-19 11:18:46 -07:00
Brad Hefta-Gaub
866ba2f185 Merge pull request #8273 from hyperlogic/bug-fix/far-grab-zoom 
far-grabbed objects no longer fly away when the avatar body shifts
 2016-07-19 10:40:48 -07:00
samcake
36d58a2b82 Finish the integration of the diffusion pass in the SurfaceGeometryPass job, clean up ui 2016-07-19 10:34:06 -07:00
Anthony J. Thibault
212175bdaa bug fix for far-grab pulling the object in the wrong direction 2016-07-19 10:23:00 -07:00
samcake
18ec4aa4e2 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-19 09:27:33 -07:00
Brad Hefta-Gaub
48705d33c5 Merge pull request #8277 from jherico/pause_lighting 
Ensure the pause overlay is unlit (emissive)
 2016-07-19 08:34:15 -07:00
Brad Hefta-Gaub
1ee5023f6d fix warnings 2016-07-19 08:33:54 -07:00
Brad Davis
d98ae1ba9c Ensure the pause overlay is unlit (emissive) 2016-07-19 07:10:34 -07:00
samcake
ff132fa712 Gathering the diffusion passes in the SUrfaceGEometryPAss job 2016-07-19 02:11:22 -07:00
samcake
3638a3b9c3 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 23:15:21 -07:00
Brad Hefta-Gaub
c484fec51d cleanup 2016-07-18 22:54:57 -07:00
Brad Hefta-Gaub
dbf60a594c Merge branch 'master' of https://github.com/highfidelity/hifi into addCodecNameToStream 2016-07-18 22:43:16 -07:00
Brad Hefta-Gaub
c6ffd81c4b some cleanup 2016-07-18 22:42:38 -07:00