luiscuenca
|
ff7995ae18
|
Right fix
|
2019-02-26 18:29:55 -07:00 |
|
Sam Gondelman
|
fd46296e8c
|
Merge pull request #15037 from amerhifi/quest-demo
case 21447: fixed quest debug crash when a case of _widths = 0 for polyline
|
2019-02-26 16:42:01 -08:00 |
|
Simon Walton
|
08d6a2ce7f
|
Avatar Hero debugging & logging
|
2019-02-26 16:40:16 -08:00 |
|
SamGondelman
|
4d591e0624
|
fix web interaction and debug print filling logs
|
2019-02-26 16:30:31 -08:00 |
|
John Conklin II
|
2449693d8b
|
Merge pull request #15006 from Atlante45/fix/shared-connection-master
Case 21407: Delete old nodes with identical socket
|
2019-02-26 16:24:03 -08:00 |
|
amer cerkic
|
19d584f0af
|
added Sams suggestions to the logic
|
2019-02-26 15:28:28 -08:00 |
|
Simon Walton
|
4c071be2bf
|
Merge remote-tracking branch 'upstream/v0.79.HERO-rc' into hero-avatar-zone-79
|
2019-02-26 15:21:00 -08:00 |
|
amer cerkic
|
f5852139f7
|
fixing comment since the original check was correct
|
2019-02-26 15:05:58 -08:00 |
|
amer cerkic
|
5a7c8c3126
|
removed debugg helpers
|
2019-02-26 14:53:44 -08:00 |
|
amer cerkic
|
4c6bea48b2
|
fixed a case where _widths = 0 and widths-1 is not valid.
|
2019-02-26 14:48:34 -08:00 |
|
Simon Walton
|
7039ee471d
|
Move newly-created Connection to NodeList thread
|
2019-02-26 13:49:55 -08:00 |
|
luiscuenca
|
f47ec09927
|
use UP_AXIS_Y
|
2019-02-26 14:01:30 -07:00 |
|
John Conklin II
|
abf2226750
|
Merge pull request #15011 from Atlante45/fix/white-spheres-79
White spheres patch for the hero branch
|
2019-02-26 12:33:33 -08:00 |
|
Wayne Chen
|
028cce5394
|
change short username to 14 characters, displaying as normal text
|
2019-02-26 12:26:50 -08:00 |
|
John Conklin II
|
332a71ac16
|
Merge pull request #15032 from howard-stearns/79-hero-empty
trigger for 79 hero branch
|
2019-02-26 12:09:51 -08:00 |
|
Sam Gondelman
|
f1541c3df4
|
Merge pull request #15023 from SamGondelman/web
Case 21171: Web entity thread safety and fixes
|
2019-02-26 11:37:46 -08:00 |
|
Sam Gateau
|
009bc19c5d
|
Merge pull request #15020 from amerhifi/quest-demo
Adding market place back to the default scripts
|
2019-02-26 11:05:36 -08:00 |
|
howard-stearns
|
b7cc6ecca4
|
trigger for 79 hero branch
|
2019-02-26 10:59:31 -08:00 |
|
Simon Walton
|
0b080471ff
|
Filter on scriptValue to reduce EntityItem load; bump ping timeouts for testing
|
2019-02-26 10:57:35 -08:00 |
|
luiscuenca
|
db1c78246f
|
Read and apply the FBX upVector parameter
|
2019-02-26 11:32:43 -07:00 |
|
Shannon Romano
|
92168f60c6
|
Merge pull request #14993 from SamGondelman/untexture
Case 21071: Handle models with no materials
|
2019-02-26 10:07:37 -08:00 |
|
amer cerkic
|
acc78f2f42
|
Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo
|
2019-02-26 09:54:32 -08:00 |
|
Sam Gateau
|
f7e57ea56f
|
Merge pull request #14990 from jherico/quest/build
Case 20979: Build quest demo apk on Jenkins
|
2019-02-26 09:11:30 -08:00 |
|
Shannon Romano
|
2aa622b855
|
Merge pull request #15014 from sethalves/fix-grab-earthquake
case 21411: don't allow others' grabs to move locked or ungrabbable things
|
2019-02-26 09:03:44 -08:00 |
|
nimisha20
|
ba3895efdd
|
Update AccountServicesScriptingInterface.h
Minor copy-edit
|
2019-02-25 22:56:36 -08:00 |
|
nimisha20
|
736a050e68
|
Update AccountServicesScriptingInterface.h
|
2019-02-25 22:55:56 -08:00 |
|
nimisha20
|
4825ecdbf3
|
Update AccountServicesScriptingInterface.h
|
2019-02-25 22:44:16 -08:00 |
|
Wayne Chen
|
650b34c463
|
adding clock
|
2019-02-25 18:00:56 -08:00 |
|
SamGondelman
|
94a82b8304
|
Merge remote-tracking branch 'upstream/master' into web
|
2019-02-25 17:23:58 -08:00 |
|
Shannon Romano
|
badd0b8bd3
|
Merge pull request #14968 from davidkelly/dk/20726
Guard against accidentally calling wrong api/v1/places endpoint
|
2019-02-25 17:16:33 -08:00 |
|
SamGondelman
|
6e4ec15c9d
|
there we go
|
2019-02-25 17:14:51 -08:00 |
|
Simon Walton
|
a8dd7b7e1f
|
Fix gcc error about defining templates outside their namespace
Also warning about hiding virtual function.
|
2019-02-25 17:14:22 -08:00 |
|
Shannon Romano
|
7fe3bb387e
|
Merge pull request #15012 from SamGondelman/nametag
Case 21397: Trying to fix overlay rotation
|
2019-02-25 16:52:01 -08:00 |
|
Shannon Romano
|
bf3b4e6a57
|
Merge pull request #15015 from SamGondelman/flying
Case 21418: Allow flying in HMD if you would otherwise fall forever
|
2019-02-25 16:48:57 -08:00 |
|
amantley
|
51e4ddd888
|
Merge pull request #15017 from amantley/ikOnByDefault
bug fix: Ik is on by default in desktop mode
|
2019-02-25 19:36:25 -05:00 |
|
SamGondelman
|
f482ae3b63
|
Merge remote-tracking branch 'upstream/master' into untexture
|
2019-02-25 16:26:14 -08:00 |
|
Simon Walton
|
d6f755955d
|
Add _avatarPriorityChanged to EntityItemProperties::markAllChanged()
|
2019-02-25 16:24:12 -08:00 |
|
Simon Walton
|
e5091e7f59
|
Fixes for EntityItem contains test, add MixerAvatar class and use in sort
|
2019-02-25 15:44:52 -08:00 |
|
SamGondelman
|
f235d04601
|
trying to fix web crashes
|
2019-02-25 15:40:17 -08:00 |
|
amantley
|
12dbaa0ea0
|
changed the condition so that you can turn off ik in hmd mode if you want to for debug purposes
|
2019-02-25 14:56:17 -08:00 |
|
amer cerkic
|
0775392759
|
adding market place back to the default scripts
|
2019-02-25 14:05:54 -08:00 |
|
Andrew Meadows
|
6e13203fec
|
avoid nullptr deref
|
2019-02-25 13:52:46 -08:00 |
|
SamGondelman
|
b2e0067c08
|
Merge remote-tracking branch 'upstream/master' into nametag
|
2019-02-25 13:12:48 -08:00 |
|
amantley
|
363c0cc26f
|
moved the update of last ik to outside the if changed statement
|
2019-02-25 13:03:28 -08:00 |
|
Brad Davis
|
5831db3089
|
Build quest demo apk on Jenkins
|
2019-02-25 13:02:37 -08:00 |
|
amantley
|
cff0fd470a
|
re-enabled ik off by default on Desktop
|
2019-02-25 12:23:03 -08:00 |
|
SamGondelman
|
e102ad073e
|
allow flying in HMD if you would otherwise fall forever
|
2019-02-25 11:49:38 -08:00 |
|
Roxanne Skelly
|
292ac88c96
|
Update with new standalone-optimized icon
|
2019-02-25 11:36:45 -08:00 |
|
Sam Gateau
|
0691f02198
|
Merge pull request #15010 from samcake/quest-demo
Case 21408: Quest demo - Fixing the gamma correction
|
2019-02-25 11:36:29 -08:00 |
|
Seth Alves
|
db821487d9
|
don't allow others' grabs to move locked or ungrabbable things
|
2019-02-25 11:27:10 -08:00 |
|