Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 10:32:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43760 commits 75 branches 59 tags 1.2 GiB
Commit graph

17898 commits

Author SHA1 Message Date
Brad Hefta-Gaub
c85923c69b Merge pull request #7956 from jherico/web_entity_crash 
fix crash on click on non-visible web-entity
 2016-06-03 10:29:55 -07:00
Brad Hefta-Gaub
2e4480ee15 Merge pull request #7979 from jherico/steam_vr_exit_fix 
Fix crash on shutdown of SteamVR
 2016-06-03 10:28:53 -07:00
Andrew Meadows
a22de76052 Merge pull request #8003 from ZappoMan/improveActionGlitches 
fix glitches when observer client watches object with action
 2016-06-03 09:35:12 -07:00
Brad Hefta-Gaub
1075ba1599 CR feedback 2016-06-03 08:01:09 -07:00
Brad Hefta-Gaub
7ed35399e9 make the application of redundant physics update idempotent to improve action glitches 2016-06-02 18:01:23 -07:00
Atlante45
3ca158265a Make sure getVelocityChange returns the velocityChange 2016-06-02 16:44:13 -07:00
Brad Davis
cc85ce9c01 fix crash on click on non-visible web-entity 2016-06-02 16:37:45 -07:00
Brad Hefta-Gaub
326aa639fc Merge pull request #7995 from samcake/blue 
Fix the jittering reflection bug and more Normal improvments
 2016-06-02 14:13:44 -07:00
Brad Hefta-Gaub
62d3b171d7 Merge pull request #7985 from ZappoMan/addAudioLimiter 
add audio peak limiter to audio mixer
 2016-06-02 14:11:55 -07:00
samcake
7de5b80179 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-06-01 17:52:36 -07:00
samcake
1dca62f752 Introducing a new technique for normal packing and fixing a bug on the normal buffer format 2016-06-01 17:51:53 -07:00
Brad Hefta-Gaub
3119b654dc additional revert related change 2016-05-31 20:50:12 -07:00
Brad Hefta-Gaub
b8c80e2222 Revert "refresh API info during re-connect - case 570" 
This reverts commit e8d7f9614a.
 2016-05-31 20:39:16 -07:00
samcake
ae7d817705 Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-05-31 15:38:07 -07:00
Brad Hefta-Gaub
1e7cd06d0e add audio peak limiter to audio mixer 2016-05-28 20:34:27 -07:00
samcake
3fe9b67e45 FIxing the reflection jittering by moving the normal into world space 2016-05-27 19:24:56 -07:00
Brad Hefta-Gaub
0ec7eae58c fix shapes to property polymorph and persist 2016-05-27 16:59:42 -07:00
Brad Davis
ac5912df01 Fix crash on shutdown of SteamVR 2016-05-27 13:40:47 -07:00
Andrew Meadows
1132b4666a Merge pull request #7975 from jherico/shared_shapes 
Moving shape definition to a shared location
 2016-05-27 07:28:11 -07:00
Brad Davis
6a962d7aab Unix build fix 2016-05-26 15:51:36 -07:00
Stephen Birarda
1ec421350d send the UUID session ID without curly braces 2016-05-26 14:56:51 -07:00
Chris Collins
4120ed9f0b Merge pull request #7964 from ZappoMan/protocolVersionCheck 
check for all protocols matching when connecting to a domain
 2016-05-26 13:02:18 -07:00
Brad Davis
2c02c963d4 Moving shape definition to a shared location 2016-05-26 12:22:39 -07:00
Brad Hefta-Gaub
88813c47f0 Merge pull request #7960 from howard-stearns/fix-hand-controllers-after-input-changes 
Fix hand controller pointer after input changes.
 2016-05-26 12:16:23 -07:00
Brad Hefta-Gaub
8ec425106a Merge pull request #7968 from birarda/audio-is-playing 
fix collision of isPlaying property and slot for AudioInjectors
 2016-05-26 12:06:00 -07:00
Howard Stearns
8e6853bec6 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-hand-controllers-after-input-changes 2016-05-25 18:54:29 -07:00
Brad Hefta-Gaub
485c8aceac Merge pull request #7942 from sethalves/fix-edit-js-restart 
fix a race that keeps some scripts from restarting
 2016-05-25 17:22:17 -07:00
Brad Hefta-Gaub
78b6a6c661 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
 2016-05-25 17:18:27 -07:00
Brad Hefta-Gaub
f2acc82899 Merge pull request #7971 from birarda/session-id-with-place-request 
optionally include the metaverse session ID as HTTP header when sending usage data
 2016-05-25 17:14:27 -07:00
Brad Hefta-Gaub
06cb625d09 Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision 
Improved Avatar Mixer Rotation Precision
 2016-05-25 17:14:12 -07:00
Brad Hefta-Gaub
0a96b144e3 Merge pull request #7970 from birarda/api-recheck-on-fail 
clear AddressManager previous lookup on 404
 2016-05-25 17:13:44 -07:00
samcake
b76cda3c89 Merge pull request #7945 from Geenz/20901 
20901: Add Range Based Light Attenuation
 2016-05-25 16:39:01 -07:00
Brad Hefta-Gaub
84f541285f Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 2016-05-25 15:01:15 -07:00
Seth Alves
7d4462ba81 Merge branch 'entity_shape_protocol_fix' of github.com:jherico/hifi into fix-edit-js-restart 2016-05-25 13:54:33 -07:00
Brad Davis
b16e701ea3 Fix broken protocol for shapes 2016-05-25 13:53:28 -07:00
Seth Alves
49769f7d29 trying again -- frantic clicking on reload no longer appears to wedge things 2016-05-25 13:39:13 -07:00
Seth Alves
75329c812c Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-25 13:06:24 -07:00
Stephen Birarda
66bdbf910d optionally include the metaverse session ID as an http header 2016-05-25 11:55:04 -07:00
Seth Alves
b0ce65ec01 trying to mimic previous behavior more closely 2016-05-25 11:42:06 -07:00
Stephen Birarda
3137cd64e1 clear AddressManager previous lookup on 404 2016-05-25 11:40:17 -07:00
Brad Davis
8f3918b5ba Fix primitive shape collisions 2016-05-25 11:21:05 -07:00
Stephen Birarda
ba77aaf7ef remove collision of isPlaying property and slot 2016-05-25 11:06:08 -07:00
Seth Alves
ef709c09d0 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-25 09:46:30 -07:00
Anthony J. Thibault
ea8ba7e2d1 Fixes based on code review feedback. 
* Use isNaN instead of glm::isnan
* prefer abort() over writing to a nullptr, in release assert.
* warn if packet size does not match expectations
 2016-05-24 18:12:40 -07:00
Brad Hefta-Gaub
ff45633c21 bump entities version/CR feedback 2016-05-24 17:36:52 -07:00
howard-stearns
a3f1ece978 Do button mapping in C++ and simplify vive.json accordingly. Vive and 
Hydra now use PrimaryThumb and SecondaryThumb. Fix warnings for Neuron.
 2016-05-24 16:10:12 -07:00
Brad Hefta-Gaub
5668db9e4a cleanup and dead code removal 2016-05-24 15:43:30 -07:00
Brad Hefta-Gaub
3b0081fbbb cleanup and dead code removal 2016-05-24 15:42:55 -07:00
Brad Hefta-Gaub
0553ff5f9f cleanup and dead code removal 2016-05-24 15:41:11 -07:00
Brad Hefta-Gaub
2eef07e414 cleanup and dead code removal 2016-05-24 15:38:08 -07:00