Vladyslav Stelmakhovskyi
|
cc10fc81b7
|
Fix crash in sit script
|
2017-05-13 20:57:04 +02: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Seth Alves
|
4aa683363c
|
back out previous changes, do compressionOptions.setPitchAlignment(4) instead
|
2017-05-11 16:22:12 -07:00 |
|
Zach Fox
|
9289cd2022
|
Merge pull request #10398 from zfox23/PAL_FixIDPacketOrder
Fix the PAL not showing user info for user who opened PAL
|
2017-05-11 15:16:05 -07:00 |
|
David Kelly
|
ae5f9e4fb1
|
animate scroll of partially visible cards
|
2017-05-11 15:10:19 -07:00 |
|
Dante Ruiz
|
539aaf8c59
|
add debug statment and fixed sorting order
|
2017-05-11 23:00:41 +01:00 |
|
Atlante45
|
6378b96b4c
|
CR
|
2017-05-11 14:41:02 -07:00 |
|
David Kelly
|
52c288bfed
|
Desktop users of different height can shake hands
|
2017-05-11 14:20:42 -07:00 |
|
Seth Alves
|
ac2bc39a27
|
try, try again
|
2017-05-11 14:10:03 -07:00 |
|
Atlante45
|
9138ec53e9
|
Don't send avatars to previous lookup on server restart
|
2017-05-11 14:07:36 -07:00 |
|
druiz17
|
e4df4369ad
|
Merge pull request #10436 from druiz17/config-ui
Added the ability to choose puck configuration from the general settings
|
2017-05-11 13:39:05 -07:00 |
|
Seth Alves
|
a26f9c7887
|
make _size const
|
2017-05-11 13:36:05 -07:00 |
|
Seth Alves
|
9d63113e62
|
Merge pull request #10337 from vladest/audio-source-sync
Audio source sync
|
2017-05-11 12:50:38 -07:00 |
|
Vladyslav Stelmakhovskyi
|
045e93fb95
|
Code style fixes #2
|
2017-05-11 21:49:07 +02:00 |
|
Seth Alves
|
19401af3e1
|
Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage
|
2017-05-11 12:43:05 -07:00 |
|
Atlante45
|
e0863aa50f
|
Only open files for write if necessary
|
2017-05-11 11:54:52 -07:00 |
|
Zach Fox
|
15574f509e
|
Clarifying comments
|
2017-05-11 11:45:07 -07:00 |
|