Commit graph

53722 commits

Author SHA1 Message Date
Seth Alves
b2de5ebdaf Merge pull request #10136 from mittens/21217
Added quadratic ease-in-and-out smoothing to remote avatars
2017-04-18 10:05:48 -07:00
Thijs Wenker
9ea28ab8d6 remove Script.require-less code now that the release with Script.require is out. 2017-04-18 18:02:53 +02:00
Brad Hefta-Gaub
8c1ca1dc33 Merge pull request #10236 from highfidelity/stable
Stable back to master...
2017-04-18 09:01:16 -07:00
Chris Collins
a8e43c99ca Merge pull request #10197 from highfidelity/RC-37
Beta Release 37
2017-04-18 07:58:04 -07:00
volansystech
e5c7587ad8 Improve far grabbing based on timescale. 2017-04-18 20:01:02 +05:30
Dante Ruiz
31b61c3225 removed white space 2017-04-18 00:24:34 +01:00
Dante Ruiz
e46d9da98f fixed merge conflict 2017-04-18 00:22:35 +01:00
Zach Fox
d1a11740f0 Whoops 2017-04-17 13:00:23 -07:00
volansystech
7e0efed062 Improve speed of grabbing. 2017-04-18 00:54:01 +05:30
Zach Fox
9c4e367245 Merge pull request #10213 from zfox23/fixGoToFocus
FB 4156; Fix GoTo text field focus; other GoTo tweaks
2017-04-17 12:13:41 -07:00
Zach Fox
e6edce5352 Entirely remove addressBarToggle() 2017-04-17 12:13:01 -07:00
Brad Hefta-Gaub
f841a18de4 Merge pull request #10230 from zfox23/fixGetAvatarACScripts
Fix getAvatar() not working for AC scripts
2017-04-17 12:04:11 -07:00
Zach Fox
e13000410e Whoops 2017-04-17 11:02:27 -07:00
David Kelly
af08df85c8 Merge pull request #10229 from davidkelly/dk/shareableURLForUserStories
put shareable_url in UserStory details when creating
2017-04-17 10:55:47 -07:00
Zach Fox
7a7cfb84e5 Remove HMD keyboard focus toggle on AddressBar input 2017-04-17 10:08:40 -07:00
Dante Ruiz
3eb9b37c29 Merge branch 'master' of github.com:highfidelity/hifi into webview-redesign 2017-04-17 16:41:15 +01:00
David Kelly
3e268fbf68 put shareable_url in UserStory details when creating 2017-04-17 07:38:24 -07:00
Thijs Wenker
588ddfde8d fix the Script.require based entity import functionality 2017-04-17 13:35:28 +02:00
Thijs Wenker
12ef157316 cr fixes and some more style/ESLINT/structure 2017-04-17 13:16:10 +02:00
Thijs Wenker
d101bdb952 Merge branch 'master' of https://github.com/highfidelity/hifi into gameTable2 2017-04-17 13:12:12 +02:00
Sam Cake
2d35f95930 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-04-16 23:31:06 -07:00
Seth Alves
fbd4677a9a add a way to set hinge-constraint motor speed from javascript 2017-04-15 21:10:02 -07:00
Seth Alves
b4ff3a8691 don't destroy and recreate constraints when reinserting rigid body 2017-04-15 21:08:59 -07:00
Seth Alves
d42970d480 fix hinge-constraint constructors to use otherAxis 2017-04-15 08:51:08 -07:00
Seth Alves
db98020974 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-15 07:22:16 -07:00
Sam Cake
61ed5c3ce9 THank you mac 2017-04-15 01:35:28 -07:00
Sam Cake
2b97171061 Avoiding temp variable reference to appease mac and fixing a warning 2017-04-15 01:06:01 -07:00
Sam Cake
038d01ce04 Avoiding temp variable reference to appease mac and fixing a warning 2017-04-15 00:45:50 -07:00
Sam Cake
96960a505d COmpleted the Resource Buffer, compilation and binding works. Now need to help on the shader side 2017-04-14 23:22:45 -07:00
Zach Fox
e65079f826 Merge pull request #10224 from zfox23/fixGifSharing
Fix GIFs not sharing
2017-04-14 18:44:41 -07:00
Seth Alves
2a76061ef3 Merge branch 'bullet-constraints-0' of github.com:sethalves/hifi into bullet-constraints-1 2017-04-14 16:38:50 -07:00
Seth Alves
5fba4654c8 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-14 16:37:48 -07:00
Seth Alves
41fb05ecf7 bump protocol version 2017-04-14 16:26:54 -07:00
Seth Alves
371118a6c0 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 16:26:30 -07:00
Zach Fox
b410399a16 Resolve your paths, silly! 2017-04-14 16:26:29 -07:00
Seth Alves
f08fecbfa7 make sure new constraint data gets transmitted over network 2017-04-14 16:25:27 -07:00
Zach Fox
85e5173abe Fix embedded location 2017-04-14 16:11:37 -07:00
Zach Fox
f81dce5e70 Fix the bug 2017-04-14 15:42:19 -07:00
Seth Alves
66137e78a2 grab script checks for touch devices continually, rather than just when the script starts 2017-04-14 15:28:56 -07:00
Andrew Meadows
6a8ddee878 send keep-alive packets but don't resend identity 2017-04-14 15:16:14 -07:00
Andrew Meadows
06b9fd6a7e don't keep stale avatars alive 2017-04-14 15:16:02 -07:00
Andrew Meadows
d72f6cf45e avatar-mixer to send identity packets as 'reliable' 2017-04-14 15:15:54 -07:00
Andrew Meadows
eaefa3d3f2 avatar-mixer resends to avoid stale avatar 2017-04-14 15:15:45 -07:00
Chris Collins
6a6800b8c3 Merge pull request #10222 from sethalves/fix-late-touch-cant-grab-tablet
fix can't grab tablet
2017-04-14 14:57:06 -07:00
Andrew Meadows
45bb639ef5 Merge pull request #10128 from kunalgosar/fingerpainting
Make it easier to exit FingerPaint
2017-04-14 14:34:57 -07:00
Seth Alves
110cfb47d1 turn off handControllerGrab debug prints 2017-04-14 14:23:27 -07:00
Seth Alves
6420ddd038 grab script checks for touch devices continually, rather than just when the script starts 2017-04-14 14:20:04 -07:00
kunalgosar
891d52909e fixed typo in comments 2017-04-14 14:10:19 -07:00
Seth Alves
708008d8a5 cleanups 2017-04-14 13:43:48 -07:00
Sam Gateau
3519a72f8a Merge pull request #10190 from samcake/ambient-bis
Introducing a tool to debug the current Zone Stack
2017-04-14 13:28:59 -07:00