Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 17:34:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45673 commits 76 branches 59 tags 1.2 GiB
Commit graph

45673 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
63aa0f8c3f remove weird n 2016-08-04 16:18:13 -07:00
James B. Pollack
f93ed56124 cleaner code 2016-08-04 16:17:21 -07:00
James B. Pollack
c0cfee371e cancel mode for teleporting 2016-08-04 16:08:51 -07:00
Brad Hefta-Gaub
67cf105720 Merge pull request #8369 from SamGondelman/loadingFade 
Loading fade progress
 2016-08-04 15:24:37 -07:00
Ryan Huffman
d775a92dab Update implementation of ConnectionMonitor timeout 2016-08-04 14:45:10 -07:00
Ryan Huffman
26b9da7eef Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-connection-display 2016-08-04 14:41:03 -07:00
Ryan Huffman
a37bcdafda Remove debug logging in ConnectionMonitor 2016-08-04 14:40:41 -07:00
Ryan Huffman
8044910bf2 Add show-address-bar when disconnected from domain 2016-08-04 14:39:53 -07:00
SamGondelman
3107d63ad8 one more warning 2016-08-04 14:31:44 -07:00
Seth Alves
a2441ca84c back out some uneeded chagnes 2016-08-04 14:09:12 -07:00
Seth Alves
981a8d76fa code review 2016-08-04 13:47:43 -07:00
Seth Alves
45c21ca523 make UNSET_VALUE still work while still returning and empty string value for undefined keys 2016-08-04 13:37:08 -07:00
SamGondelman
b6e73e06a2 merge from master 2016-08-04 13:34:38 -07:00
Seth Alves
2ac0a0d343 Merge branch 'master' of github.com:highfidelity/hifi into fix-settings-missing-key 2016-08-04 13:29:32 -07:00
SamGondelman
004b0158a4 fix warnings on osx 2016-08-04 13:09:09 -07:00
SamGondelman
ac9a80131a refactoring _fadeStartTime and isTransparent, make simple renderables switch to transparent when fade finishes 2016-08-04 12:34:46 -07:00
Chris Collins
be87f294d8 Merge pull request #8351 from thoys/fix-handcontrollergrab-grab-message 
fix remote triggering handControllerGrab
 2016-08-04 11:55:48 -07:00
Seth Alves
aeadbda1e1 adjust ground-to-fly logic 2016-08-04 11:34:42 -07:00
Ken Cooke
7629e34586 optimized distance-attnuation calculation 2016-08-04 11:05:34 -07:00
SamGondelman
6604c27f23 polyvox fade WIP 2016-08-04 10:55:37 -07:00
Seth Alves
4c258b9568 fix bug which caused getValue for a non-existent key to return the integer 2 2016-08-04 10:16:08 -07:00
Seth Alves
1b571f3be3 Merge branch 'master' of github.com:highfidelity/hifi into overlay-children 2016-08-04 09:58:41 -07:00
Seth Alves
905c6147cf Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails 2016-08-04 09:56:32 -07:00
Seth Alves
e1c7ced652 increase GROUND_TO_AUTOFLY_THRESHOLD 2016-08-04 09:54:26 -07:00
Seth Alves
1930bde005 Merge branch 'master' of github.com:highfidelity/hifi into no-accidental-fly 2016-08-04 09:52:18 -07:00
Stephen Birarda
f3e30221f0 only force a new temp name if already a temp domain-server 2016-08-04 09:33:31 -07:00
Stephen Birarda
ba49fd2c61 don't heartbeat immediately unless metaverse domain 2016-08-04 09:33:31 -07:00
Brad Hefta-Gaub
a1dc9beddb Merge pull request #8348 from ZappoMan/beltAndSuspenders 
implement codec renegotiation in client
 2016-08-03 21:22:28 -07:00
SamGondelman
d521315475 fade polylines (needs testing) 2016-08-03 17:03:52 -07:00
Chris Collins
2473bbf1db Merge pull request #8313 from imgntn/tweak_lazers 
Tweak Teleport + Hand Lasers
 2016-08-03 16:40:28 -07:00
SamGondelman
d7052f6250 try to make text entities fade 2016-08-03 16:27:51 -07:00
Seth Alves
7740420b96 Merge pull request #8361 from hyperlogic/bug-fix/avatar-debug-draw 
Bug fix for avatar debug marker rendering.
 2016-08-03 16:07:49 -07:00
SamGondelman
7713c1f4bf try to fade in web entities 2016-08-03 15:56:41 -07:00
Zander Otavka
a826f4eca1 Fix console errors for javascript: urls 2016-08-03 15:55:51 -07:00
Anthony J. Thibault
f24c92f3a1 Bug fix for avatar debug marker rendering. 
"Developer > Hands > Show Hand Targets" works again
"Developer > Avatar > Draw Position" works again
 2016-08-03 15:43:31 -07:00
Seth Alves
78e59106b4 adjust threshold for how far above the ground will cause the avatar to auto-fly 2016-08-03 15:21:49 -07:00
Philip Rosedale
f0c944b0c3 Merge pull request #8350 from sethalves/ignore-touch 
if the oculus HMD isn't on someone's head, don't take input from the controllers
 2016-08-03 15:21:43 -07:00
Philip Rosedale
98e40d54e1 Merge pull request #8355 from SamGondelman/touchDeadZone 
Added dead zones to Hydra and Oculus Touch joysticks
 2016-08-03 15:17:15 -07:00
James B. Pollack
e012d3cebb Merge branch 'tweak_lazers' of github.com:imgntn/hifi into tweak_lazers 2016-08-03 15:00:05 -07:00
James B. Pollack
7a41ed25db Merge remote-tracking branch 'upstream/master' into tweak_lazers 2016-08-03 14:59:51 -07:00
Seth Alves
707fa2cafe Merge branch 'master' of github.com:highfidelity/hifi into ignore-touch 2016-08-03 14:51:28 -07:00
SamGondelman
27bacc9165 try to fade in procedural shapes 2016-08-03 14:33:05 -07:00
Seth Alves
40a5e4abc8 in full-screen mirror camera mode, arrow keys move camera but don't make the avatar walk 2016-08-03 13:54:25 -07:00
Zander Otavka
f9b6db12e3 Fix parsing of embedded entity scripts 
Now correctly identifies when scripts are not urls as well as
javascript: urls.
 2016-08-03 13:48:27 -07:00
SamGondelman
2eb0c7735f working on fading shape entities 2016-08-03 13:30:05 -07:00
Brad Hefta-Gaub
eb230071a0 Merge branch 'master' of https://github.com/highfidelity/hifi into beltAndSuspenders 2016-08-03 11:53:28 -07:00
Seth Alves
c743cf379e use loadCollisionModelURLFinished when collisions model is finished 2016-08-03 11:31:51 -07:00
Seth Alves
b48d4f6d2d Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails 2016-08-03 10:42:26 -07:00
Seth Alves
ad4fc8c656 merge from upstream, don't hold up enabling of physics if a collision hull fails to load 2016-08-03 10:42:15 -07:00
SamGondelman
458e43fadc added dead zones to hydras, style fixes 2016-08-03 10:18:57 -07:00