Sam Gateau
|
1e42878d7f
|
Merge pull request #10460 from samcake/orange
Fix the default skybox texture
|
2017-05-15 13:38:41 -07:00 |
|
samcake
|
0b393c845a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-05-15 13:38:03 -07:00 |
|
Seth Alves
|
66a1dbfcfe
|
Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation
cleanup Head::simulate() code
|
2017-05-15 11:21:43 -07:00 |
|
Seth Alves
|
8ff8d70f84
|
Merge pull request #10457 from vladest/sit-script-crash
Fix crash in sit script
|
2017-05-15 11:07:37 -07:00 |
|
Seth Alves
|
d7432048a0
|
Merge pull request #10456 from vladest/market-crash-fix
Market crash fix
|
2017-05-15 10:58:02 -07:00 |
|
samcake
|
b627fe463b
|
Generate correct KTX for the default Sky
|
2017-05-15 10:50:10 -07:00 |
|
Chris Collins
|
263e4de951
|
Merge pull request #10454 from samcake/orange
Fixing potential crashes when loading invalid KTX cached textures
|
2017-05-14 17:41:06 -07:00 |
|
Philip Rosedale
|
6e82343b29
|
Merge pull request #10406 from amvmoody/21289
21289 - Edit: Add the ability to duplicate an object with hand controller
|
2017-05-13 20:43:52 -07:00 |
|
Vladyslav Stelmakhovskyi
|
cc10fc81b7
|
Fix crash in sit script
|
2017-05-13 20:57:04 +02:00 |
|
Brad Hefta-Gaub
|
ed7a63c89c
|
Merge pull request #10451 from druiz17/puck-lost-tracking
Better handing when the pucks lose tracking and openvr still send you a "valid" data
|
2017-05-13 10:20:42 -07:00 |
|
Vladyslav Stelmakhovskyi
|
49a45f0300
|
Merge branch 'master' into market-crash-fix
|
2017-05-13 14:23:26 +02:00 |
|
Vladyslav Stelmakhovskyi
|
20c27fc133
|
Fix crash on save Map data settings from scripts
|
2017-05-13 14:20:28 +02:00 |
|
Sam Cake
|
b38be7e561
|
warning -1
|
2017-05-12 20:20:03 -07:00 |
|
samcake
|
c4e8885842
|
not testing in storage for alignment
|
2017-05-12 18:27:58 -07:00 |
|
samcake
|
f35b0297fa
|
Replace the alignment test by a nice function
|
2017-05-12 18:25:07 -07:00 |
|
samcake
|
d734358290
|
Adding a comment for debug sake
|
2017-05-12 18:15:00 -07:00 |
|
samcake
|
5bc8e09865
|
Fixing the test...
|
2017-05-12 18:10:48 -07:00 |
|
samcake
|
bdb0414add
|
Adding a validation step at runtime for the cached KTX file in order to regenerate them if anything seems wrong
|
2017-05-12 18:04:22 -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 |
|
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 |
|
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 |
|