Dante Ruiz
|
07582c2624
|
Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links
|
2017-05-01 23:04:55 +01:00 |
|
druiz17
|
67daa4b0a9
|
Merge pull request #10335 from druiz17/webview-js
Implemented of a web app to bring up the tablet webView
|
2017-05-01 15:03:55 -07:00 |
|
Clément Brisset
|
42294fa8c0
|
Merge pull request #10306 from Atlante45/feat/progressive-load-ktx
Load High Mips before Fbx after skybox
|
2017-05-01 14:56:22 -07:00 |
|
Dante Ruiz
|
b00d7d763a
|
Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links
|
2017-05-01 22:45:42 +01:00 |
|
Dante Ruiz
|
64b8237bd6
|
fix twitter and facebook links
|
2017-05-01 22:45:13 +01:00 |
|
Dante Ruiz
|
62870d85d3
|
Merge branch 'webview-js' of github.com:druiz17/hifi into tabletwebview-fix-links
|
2017-05-01 21:58:09 +01:00 |
|
Dante Ruiz
|
bb9eb98625
|
prevent mouse events from propagating to far
|
2017-05-01 21:49:57 +01:00 |
|
Atlante45
|
4f368cc867
|
Load High Mips before Fbx after skybox
|
2017-05-01 13:35:14 -07:00 |
|
Dante Ruiz
|
c205bf0980
|
working on cleaner navigation
|
2017-05-01 21:23:38 +01:00 |
|
Seth Alves
|
a75544a9fb
|
Merge pull request #10319 from hyperlogic/feature/head-standard-action
Head, Hips and Chest IK can now be controlled from Controller inputs
|
2017-05-01 13:03:23 -07:00 |
|
Seth Alves
|
2b13d4d257
|
Merge pull request #10331 from ctrlaltdavid/21306
Fix keyboard not raising for Facebook username field
|
2017-05-01 13:02:19 -07:00 |
|
Brad Davis
|
40e4e2f307
|
Merge pull request #10327 from jherico/face_tracker_refactor
Remove Faceshift
|
2017-05-01 12:14:55 -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 |
|
Dante Ruiz
|
763feccbe1
|
removed tabs
|
2017-05-01 18:07:42 +01:00 |
|
Dante Ruiz
|
9f33af479d
|
saving work
|
2017-05-01 18:04:22 +01:00 |
|
anshuman64
|
5731242e7f
|
Merge pull request #10321 from ZappoMan/fixFrozenBots
fix frozen bots
|
2017-05-01 09:33:33 -07:00 |
|
Anthony J. Thibault
|
0c09823f67
|
clang warning fixes, unused variables...
|
2017-05-01 09:10:31 -07:00 |
|
druiz17
|
f60deb0cfc
|
fixed the twitter link
|
2017-04-30 22:55:44 -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 |
|
druiz17
|
2bf7b12c7d
|
open webview from tabletwebscreen
|
2017-04-30 15:27:34 -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 |
|
druiz17
|
b1abbbe472
|
Merge branch 'master' of github.com:highfidelity/hifi into webview-js
|
2017-04-30 13:17:28 -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 |
|
David Rowe
|
819f02a988
|
Fix keyboard not raising for Facebook username field
|
2017-04-30 11:40:28 +12: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 |
|
Brad Davis
|
2b43a1989f
|
Moving face and eye trackers out of interface
|
2017-04-28 23:28:17 -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 |
|
Brad Davis
|
5e1bc0d908
|
Remove faceshift
|
2017-04-28 16:34:54 -07:00 |
|
Dante Ruiz
|
59f84a60c5
|
saving work
|
2017-04-29 00:31:09 +01: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 |
|