CFresquet
|
55fdf35c4a
|
merge of Request module
|
2017-05-01 13:02:18 -07:00 |
|
Howard Stearns
|
9fab66b66a
|
Merge pull request #10328 from howard-stearns/tablet-discovery-events
fix announcement suggestions
|
2017-05-01 11:28:45 -07:00 |
|
Howard Stearns
|
0146d7550e
|
Merge pull request #10333 from howard-stearns/handshake-cleanup-2
Handshake cleanup
|
2017-05-01 11:15:54 -07:00 |
|
Clément Brisset
|
5c46d1e3ff
|
Merge pull request #10316 from sethalves/fix-stray-edit-laser
fix -- show hand lasers when edit is enabled, but not if there are not hand-controllers
|
2017-05-01 10:48:59 -07:00 |
|
anshuman64
|
5731242e7f
|
Merge pull request #10321 from ZappoMan/fixFrozenBots
fix frozen bots
|
2017-05-01 09:33:33 -07:00 |
|
CFresquet
|
72a6403eb0
|
Merge remote-tracking branch 'upstream/master'
|
2017-05-01 08:11:26 -07:00 |
|
CFresquet
|
28aaa545d8
|
Created RequestModule
|
2017-05-01 08:07:16 -07:00 |
|
Howard Stearns
|
f980d6f435
|
Merge branch 'master' of https://github.com/highfidelity/hifi into handshake-cleanup-2
|
2017-04-30 15:51:12 -07:00 |
|
Howard Stearns
|
e740fb67f4
|
convert foreign handString to jointIndex once, not often
|
2017-04-30 15:50:30 -07:00 |
|
Howard Stearns
|
a057400a92
|
Merge pull request #10323 from davidkelly/dk/gripThresholdGetsBigger
increase minimum grip pressure to initiate handshake
|
2017-04-30 15:49:35 -07:00 |
|
Howard Stearns
|
bc9049cb42
|
remove extra joint search
|
2017-04-30 14:19:33 -07:00 |
|
Howard Stearns
|
292065a918
|
It may be possible to switch hands without endHandshake, and thus not reset currentHandJointIndex on updateTrigger. That was filled in later by startHanshake ONLY if there was already waiting avatars so that we didn't have wait. As a result, our distance measure would be from hips instead of hand. This changes it to always compute currentHandJointIndex on updateTriggers (and not elsewhere).
|
2017-04-30 13:32:21 -07:00 |
|
Howard Stearns
|
eca7292651
|
check your own location data on failure, and notify if it is wrong
|
2017-04-30 09:44:34 -07:00 |
|
Howard Stearns
|
92481bf475
|
standardize data init/clear
|
2017-04-30 08:04:46 -07:00 |
|
Howard Stearns
|
d41a911fd2
|
setupCandidate
|
2017-04-29 19:39:50 -07:00 |
|
Howard Stearns
|
18dbe3568c
|
clarify names, particularly hand vs handString
|
2017-04-29 18:25:33 -07:00 |
|
Howard Stearns
|
9c83e21e17
|
fix that
|
2017-04-29 15:50:04 -07:00 |
|
Howard Stearns
|
d7a2e571a7
|
simplify animation load and code
|
2017-04-29 14:39:35 -07:00 |
|
Howard Stearns
|
274cc5b555
|
unique message for exceeding poll limit
|
2017-04-29 14:29:43 -07:00 |
|
Howard Stearns
|
84ac863a32
|
lint
|
2017-04-29 13:58:20 -07:00 |
|
Seth Alves
|
14d52cdc8a
|
Merge pull request #10329 from 1st-BrainStormer/patch-1
Update EntityDynamicInterface.cpp
|
2017-04-29 08:04:08 -07:00 |
|
1st-BrainStormer
|
953a3f7a6f
|
Update EntityDynamicInterface.cpp
Grammar correction.
|
2017-04-28 20:14:01 -07:00 |
|
Howard Stearns
|
b6ae0a5bde
|
add nextTick, and cleanup
|
2017-04-28 20:06:13 -07:00 |
|
Stephen Birarda
|
fed747a545
|
Merge pull request #10325 from huffman/atp-range-caching
Fix for stuck ATP downloads
|
2017-04-28 16:54:21 -07:00 |
|
howard-stearns
|
f9debf1388
|
checkpoint
|
2017-04-28 16:53:08 -07:00 |
|
David Kelly
|
168cfa9b5d
|
upping polling time plus min grip
|
2017-04-28 16:39:58 -07:00 |
|
Ryan Huffman
|
89fb0a917b
|
Fix poorly indented if in AssetRequest
|
2017-04-28 16:27:44 -07:00 |
|
Ryan Huffman
|
765a061086
|
Fix stuck ATP downloads
Occasionally ATP requests would get stuck because of a race inside
AssetClient::handleAssetReply. This was more likely to happen to small
resources.
|
2017-04-28 16:26:03 -07:00 |
|
Stephen Birarda
|
c518aa55be
|
Merge pull request #10312 from birarda/upload-new-models-to-entity
add an entity file replacement via domain-server content page
|
2017-04-28 16:06:05 -07:00 |
|
David Kelly
|
a99c242646
|
increase minimum grip pressure to initiate handshake
|
2017-04-28 15:52:32 -07:00 |
|
Clément Brisset
|
90e79c7bbc
|
Merge pull request #10317 from birarda/atp-range-caching
don't save ATP range requests to cache
|
2017-04-28 15:16:11 -07:00 |
|
ZappoMan
|
bace47af7c
|
CR review
|
2017-04-28 14:46:27 -07:00 |
|
ZappoMan
|
086941356a
|
fix frozen bots
|
2017-04-28 14:36:38 -07:00 |
|
Stephen Birarda
|
b44a56db80
|
don't save ATP requests to cache if they are range requests
|
2017-04-28 10:32:06 -07:00 |
|
Seth Alves
|
4b0e7ceef5
|
show hand lasers when edit is enabled, but not if there are not hand-controllers
|
2017-04-28 10:24:04 -07:00 |
|
Stephen Birarda
|
9bc0609b1e
|
address code review comments
|
2017-04-28 10:17:48 -07:00 |
|
Seth Alves
|
2a0fc5b34c
|
Merge pull request #10273 from hyperlogic/feature/hips-ik-target
Avatar IK system now supports manipulating the hips.
|
2017-04-28 09:17:33 -07:00 |
|
Howard Stearns
|
a2721d21ef
|
Merge pull request #10278 from zfox23/newSnapshotReview
New Snapshot Review Dialog
|
2017-04-28 07:25:47 -07:00 |
|
Howard Stearns
|
e0282f63f3
|
Merge pull request #10315 from howard-stearns/address-bar-ux
address bar ux
|
2017-04-28 07:21:53 -07:00 |
|
Howard Stearns
|
0ad8f4d985
|
remove debugging
|
2017-04-28 07:15:22 -07:00 |
|
Anthony J. Thibault
|
c61e6a8a9e
|
AnimInverseKinematics: reduce number of magic constants
|
2017-04-27 18:24:21 -07:00 |
|
Anthony J. Thibault
|
b80270400f
|
Merge branch 'master' into feature/hips-ik-target
|
2017-04-27 18:15:12 -07:00 |
|
Stephen Birarda
|
038ac745c8
|
clear domain octree details if ES killed
|
2017-04-27 17:47:18 -07:00 |
|
howard-stearns
|
aed762e986
|
ux
|
2017-04-27 17:16:03 -07:00 |
|
Stephen Birarda
|
a21a34a4a4
|
add entities file replacement to DS and ES
|
2017-04-27 16:56:27 -07:00 |
|
Zach Fox
|
3f146fca9d
|
Fix announcement audience; Fix disabled buttons
|
2017-04-27 15:36:59 -07:00 |
|
Seth Alves
|
2c2f51689a
|
Merge pull request #10300 from vladest/tablet-edit-tocreate
Renamed EDIT to CREATE
|
2017-04-27 15:31:14 -07:00 |
|
Zach Fox
|
4152e44d2c
|
Click anywhere on the image except the bottom to toggle share buttons
|
2017-04-27 14:01:08 -07:00 |
|
Zach Fox
|
3ce81844da
|
Snapshot JS interface for better Settings handling
|
2017-04-27 14:01:08 -07:00 |
|
Zach Fox
|
794751abfa
|
Nested objects aren't REAL!
|
2017-04-27 14:01:08 -07:00 |
|