ZappoMan
|
89b6a79f68
|
make sure to exit early if box intersection is already larger than best triangle intersection
|
2017-05-12 17:56:45 -07:00 |
|
anshuman64
|
49d4cf4e68
|
Merge pull request #10419 from hyperlogic/feature/ik-solver-init-config
More stable IK when hips, feet and chest are controlled via external input
|
2017-05-12 17:22:29 -07:00 |
|
ZappoMan
|
eb3b27849c
|
only keep one copy of Triangles
|
2017-05-12 17:07:47 -07:00 |
|
ZappoMan
|
6d7e98274b
|
revert debug change
|
2017-05-12 17:07:00 -07:00 |
|
Dante Ruiz
|
e6020e0137
|
added lookup table for tracking result and configs
|
2017-05-13 00:40:07 +01:00 |
|
Brad Hefta-Gaub
|
bffa3185d0
|
Merge pull request #10402 from MrRoboman/W-21305-floating-lanterns
added floating lantern box that spawns floating lanterns
|
2017-05-12 15:57:03 -07:00 |
|
Dante Ruiz
|
052126bdd2
|
Merge branch 'master' of github.com:highfidelity/hifi into puck-lost-tracking
|
2017-05-12 23:39:43 +01:00 |
|
Rob Kayson
|
9fc0ad0d28
|
fix indent floatingLanternBox
|
2017-05-12 15:12:43 -07:00 |
|
Rob Kayson
|
f3d8d1641f
|
fix indent createFloatingLanternBox.js
|
2017-05-12 15:10:40 -07:00 |
|
Rob Kayson
|
a12e8e34db
|
coding standard
|
2017-05-12 15:06:22 -07:00 |
|
Seth Alves
|
9d4411e3f0
|
Merge pull request #10417 from sethalves/motor-action
misc action/constraint changes
|
2017-05-12 14:27:51 -07:00 |
|
Anthony Thibault
|
f4b772d747
|
Merge pull request #10452 from druiz17/bug-irecorder-crash
Fixed input recorder crash
|
2017-05-12 13:46:15 -07:00 |
|
Seth Alves
|
fcc5e12211
|
redelete these
|
2017-05-12 13:19:15 -07:00 |
|
Seth Alves
|
f40c7bde71
|
Merge pull request #9 from AndrewMeadows/motor-action
remove unused parameters from Hinge and ConeTwist constraints
|
2017-05-12 13:14:02 -07:00 |
|
Seth Alves
|
4af0a85aa0
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-12 13:03:58 -07:00 |
|
Seth Alves
|
630d95a812
|
fix constraint import some more
|
2017-05-12 13:03:51 -07:00 |
|
ZappoMan
|
ea8330e4e3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into TriangleSetOptimizations
|
2017-05-12 13:00:14 -07:00 |
|
Thijs Wenker
|
abd7f201b0
|
Merge pull request #10453 from zfox23/Snapshot_FixTweetText
Fix the Twitter @mention reference
|
2017-05-12 21:42:18 +02:00 |
|
Zach Fox
|
d189f3f110
|
Fix the twitter mention
|
2017-05-12 12:39:10 -07:00 |
|
Brad Hefta-Gaub
|
5fbe1fd647
|
Merge pull request #10407 from Atlante45/fix/move-avatar-on-restart
Don't send avatars to previous lookup on server restart
|
2017-05-12 12:30:20 -07:00 |
|
Brad Hefta-Gaub
|
8ce31ccc89
|
Merge pull request #10385 from SimHacker/21280
Implemented chat interface script and tablet web page for worklist #21280
|
2017-05-12 12:29:40 -07:00 |
|
Brad Hefta-Gaub
|
a88f72024d
|
Merge pull request #10243 from birarda/bake-textures
Add an internal tool for domain/model/skybox KTX texture baking
|
2017-05-12 12:26:33 -07:00 |
|
Andrew Meadows
|
10d058af02
|
remove unused parameters from ObjectConstraintConeTwist
|
2017-05-12 12:07:34 -07:00 |
|
Andrew Meadows
|
18b1bb8b7f
|
remove unused parameters from ObjectConstraintHinge
|
2017-05-12 12:04:08 -07:00 |
|
Dante Ruiz
|
6155d31513
|
removed debug statment
|
2017-05-12 19:48:31 +01:00 |
|
Dante Ruiz
|
1f328cc923
|
made requested changes
|
2017-05-12 19:46:12 +01:00 |
|
Clément Brisset
|
1658ced671
|
Merge pull request #10437 from Atlante45/feat/faster-startup
Use baked default skybox
|
2017-05-12 11:35:51 -07:00 |
|
Dante Ruiz
|
9a0fd78e41
|
fixed indentation
|
2017-05-12 19:34:13 +01:00 |
|
Dante Ruiz
|
026daef842
|
fixed input recorder crash
|
2017-05-12 19:26:37 +01:00 |
|
Seth Alves
|
bc6fb182eb
|
pull out motor action, fix import of slider and cone-twist constraints
|
2017-05-12 10:32:28 -07:00 |
|
Seth Alves
|
fabcd7e8e0
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-12 10:31:55 -07:00 |
|
Seth Alves
|
4b0e51ca54
|
Merge pull request #10439 from sethalves/word-align--memorystorage
fix - avoid crash in glTextureSubImage2D
|
2017-05-12 10:31:44 -07:00 |
|
Dante Ruiz
|
3f5a13d5a9
|
Merge branch 'master' of github.com:highfidelity/hifi into puck-lost-tracking
|
2017-05-12 18:18:10 +01:00 |
|
Howard Stearns
|
63f2a1061a
|
Merge pull request #10447 from davidkelly/dk/smoothScrollFeed
animate scroll of partially visible cards
|
2017-05-12 10:13:49 -07:00 |
|
anshuman64
|
840910b42c
|
Merge pull request #10446 from druiz17/better-config-handling
Fixed pucks sorting issue and added debug statements to the calibration process
|
2017-05-12 10:10:05 -07:00 |
|
David Kelly
|
e9908f2f46
|
Merge pull request #10444 from davidkelly/dk/differentHeightDesktopHandshakes
Desktop users of different height can shake hands
|
2017-05-12 09:54:25 -07:00 |
|
Seth Alves
|
c6131916e1
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-12 09:46:21 -07:00 |
|
David Rowe
|
2bed69cfea
|
Display playback errors only for user that initiated playback
|
2017-05-12 15:18:25 +12:00 |
|
David Rowe
|
acd71caae2
|
Inform user when an AC error prevents a recording from playing
|
2017-05-12 14:53:38 +12:00 |
|
David Rowe
|
42aacb07ff
|
Remove check that recording has started playing
|
2017-05-12 14:14:24 +12:00 |
|
Seth Alves
|
b14b0ef403
|
Merge pull request #10449 from sethalves/fix-overlay-rayintersection-crash
lock in Overlays::findRayIntersectionInternal
|
2017-05-11 19:13:43 -07:00 |
|
David Rowe
|
26672b475f
|
Clear timer value when timer stopped
|
2017-05-12 14:13:32 +12:00 |
|
hiflex
|
a4406906f3
|
Fix the Face Camera checkbox on the text entity properties tab.
The checkbox appeared unchecked even if the underlying property was true.
|
2017-05-11 20:12:10 -05:00 |
|
Anthony Thibault
|
c40e3d6ac9
|
Merge pull request #10272 from Triplelexx/21292
21292 - Implement a script to hand-raise while in desktop mode
|
2017-05-11 17:38:27 -07:00 |
|
David Kelly
|
a9716313be
|
cr feedback -- really good feedback in fact
|
2017-05-11 17:02:37 -07:00 |
|
Seth Alves
|
e1c805e76f
|
lock in Overlays::findRayIntersectionInternal
|
2017-05-11 17:02:00 -07:00 |
|
David Rowe
|
d7a4396daa
|
Improve log messages
|
2017-05-12 11:45:11 +12:00 |
|
David Rowe
|
f74e29e4b0
|
Code review
|
2017-05-12 11:43:12 +12:00 |
|
Dante Ruiz
|
5042d4d312
|
add print when device changes tracking result
|
2017-05-12 00:28:31 +01:00 |
|
Seth Alves
|
4aa683363c
|
back out previous changes, do compressionOptions.setPitchAlignment(4) instead
|
2017-05-11 16:22:12 -07:00 |
|