volansystech
|
8d9cfbdf31
|
Resolve comments of @sethalves . Remove whitespaces.
|
2017-05-26 11:41:35 +05:30 |
|
Clément Brisset
|
efe72e1b85
|
Merge pull request #10530 from Atlante45/fix/default-scripts
Ensure user never loses its running scripts
|
2017-05-25 18:33:11 -07:00 |
|
howard-stearns
|
905b5261d1
|
If collisions are enabled, turn them off in safeLanding, and
restore.
|
2017-05-25 16:32:44 -07:00 |
|
Seth Alves
|
af5ba3a90a
|
ask display-plugins if they are head-controllers
|
2017-05-25 15:14:10 -07:00 |
|
howard-stearns
|
ac8cb63419
|
clean and DRY
|
2017-05-25 14:34:24 -07:00 |
|
Dante Ruiz
|
108c444cc7
|
clean up code
|
2017-05-25 21:59:06 +01:00 |
|
Andrew Meadows
|
3bd0c111d7
|
verify empty ShapeManager in Application dtor
|
2017-05-25 13:47:40 -07:00 |
|
howard-stearns
|
9d73d0c931
|
works with nested enclosing entities
|
2017-05-25 12:09:22 -07:00 |
|
Seth Alves
|
3823ece153
|
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
|
2017-05-25 10:57:46 -07:00 |
|
Seth Alves
|
bdbc6ddcc1
|
change some code to look at head-controller position rather than hmd position
|
2017-05-25 10:50:41 -07:00 |
|
howard-stearns
|
74c163d047
|
snapshot of safeLanding. Works as long as entities don't intersect.
|
2017-05-25 10:25:29 -07:00 |
|
volansystech
|
a2851b5bcb
|
Put proper comments and indentation.
|
2017-05-25 18:47:59 +05:30 |
|
volansystech
|
8d51be644d
|
Merge branch 'master' into 21255
|
2017-05-25 17:48:48 +05:30 |
|
volansystech
|
cab6f3f7c3
|
Solve Jitteriness while scrolling.
|
2017-05-25 17:28:19 +05:30 |
|
volansystech
|
aab80629ea
|
Merge branch 'master' into Wl-21298
|
2017-05-25 15:44:17 +05:30 |
|
volansystech
|
1f24e38585
|
Initial Commit: Switching from Desktop mode to HMD [Oculus Rift] mode automatically when the user wear Oculus Rift.
|
2017-05-25 14:56:06 +05:30 |
|
Sam Cake
|
3eb95d2d19
|
cleaning the commented code
|
2017-05-25 01:16:45 -07:00 |
|
Stephen Birarda
|
f897f3f090
|
send machine fingerprint as uuid without curly braces
|
2017-05-24 19:08:25 -07:00 |
|
Stephen Birarda
|
50285005be
|
add machine fingerprint to the launch event
|
2017-05-24 18:35:57 -07:00 |
|
Stephen Birarda
|
c671817fa3
|
fix cache http request count in stats
|
2017-05-24 17:47:40 -07:00 |
|
Stephen Birarda
|
fefb34512d
|
change asset inbound key to atp
|
2017-05-24 17:44:09 -07:00 |
|
Stephen Birarda
|
c37fd335e1
|
track the number of local socket changes
|
2017-05-24 17:41:52 -07:00 |
|
Stephen Birarda
|
5e61f20df8
|
add more details about pending downloads
|
2017-05-24 17:37:42 -07:00 |
|
Stephen Birarda
|
48c4db1ca4
|
nest the download stats so they are cleaner
|
2017-05-24 17:36:21 -07:00 |
|
samcake
|
575d4abdf7
|
bad include fixed maybe
|
2017-05-24 17:25:21 -07:00 |
|
Stephen Birarda
|
3743cd23b4
|
add detailed download stats for file/http/atp
|
2017-05-24 17:22:38 -07:00 |
|
Stephen Birarda
|
ac55908e42
|
add additional information to stats/launch activities
|
2017-05-24 16:50:06 -07:00 |
|
samcake
|
044110e4f3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-24 15:40:40 -07:00 |
|
Dante Ruiz
|
8cb9bfcc81
|
fixed merge conflict
|
2017-05-24 19:35:41 +01:00 |
|
Sam Gateau
|
f9c6cecb23
|
Merge pull request #10529 from samcake/ambient
Fix compressed texture size evaluation and Cleaning up the texture counters (number and memory) for better reporting
|
2017-05-24 10:48:21 -07:00 |
|
anshuman64
|
2b63eb9d90
|
Merge pull request #10469 from druiz17/improve-rotation-jitter
Added a LowVelocityFilter to the input system.
|
2017-05-24 08:35:13 -07:00 |
|
volansystech
|
0c4cd96bfd
|
Initial Commit : Switch from HMD [Oculus Rift] mode to Desktop mode automatically when user removing Oculus Rift.
|
2017-05-24 12:26:07 +05:30 |
|
Dante Ruiz
|
ac3c9655ec
|
added arms
|
2017-05-24 01:28:08 +01:00 |
|
samcake
|
e7b808cbc1
|
Merging with upstream
|
2017-05-23 12:12:31 -07:00 |
|
Clément Brisset
|
ed86ca3e55
|
Merge pull request #10522 from birarda/bug/version-number-jumps
remove version difference from update dialog
|
2017-05-23 10:28:50 -07:00 |
|
Dante Ruiz
|
0cbdeaa1e8
|
Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks
|
2017-05-23 18:26:58 +01:00 |
|
Dante Ruiz
|
54d63f5155
|
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
|
2017-05-23 18:19:38 +01:00 |
|
Anthony J. Thibault
|
06c26f029a
|
Merge branch 'master' into feature/faster-ik-iterations
|
2017-05-23 09:10:17 -07:00 |
|
Sam Cake
|
7f9c98a922
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-22 22:54:43 -07:00 |
|
Chris Collins
|
978eb0dfa9
|
Merge pull request #10492 from ctrlaltdavid/21359
Fix eye behavior in recording playback
|
2017-05-22 21:53:13 -07:00 |
|
Atlante45
|
10eb353126
|
Ensure user never loses its running scripts
|
2017-05-22 18:55:58 -07:00 |
|
Sam Gateau
|
e4a516dcbf
|
Merge pull request #10497 from AndrewMeadows/crashfix-null-rig
fix crash for Zone with 'compoundURL' property
|
2017-05-22 18:18:08 -07:00 |
|
Dante Ruiz
|
d98e7d5bc6
|
adding left and right arm
|
2017-05-23 00:26:12 +01:00 |
|
samcake
|
e4f9f2935e
|
Solving the size evaluation for compressed format
|
2017-05-22 15:42:18 -07:00 |
|
David Rowe
|
b0962865b2
|
Code review
|
2017-05-23 09:57:53 +12:00 |
|
Stephen Birarda
|
3e09c911f5
|
remove number of versions behind from the update dialog
|
2017-05-22 14:19:36 -07:00 |
|
David Rowe
|
9f83ca518f
|
Merge branch 'master' into 21359
|
2017-05-23 09:18:10 +12:00 |
|
volansystech
|
1cbf685133
|
Merge branch 'master' into Wl-21298
|
2017-05-22 10:58:05 +05:30 |
|
volansystech
|
6da46c2d4c
|
Resolve Mouse hover issue.
|
2017-05-22 10:53:58 +05:30 |
|
Atlante45
|
2928507e48
|
Fix "Reset Settings" window poping up every time
|
2017-05-21 08:37:17 -07:00 |
|
samcake
|
c5b5aa93b1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-19 18:13:42 -07:00 |
|
David Rowe
|
768415695d
|
Tidying
|
2017-05-20 12:43:47 +12:00 |
|
David Rowe
|
eef707e4e9
|
Simplify code
|
2017-05-20 12:42:40 +12:00 |
|
Andrew Meadows
|
d3956b47d0
|
remove bad break
|
2017-05-19 15:35:29 -07:00 |
|
Andrew Meadows
|
bb4d366c40
|
use SmartPointer for Zone _model
|
2017-05-19 15:33:23 -07:00 |
|
Sam Gateau
|
36ac623e66
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-19 13:25:36 -07:00 |
|
Andrew Meadows
|
7b879a7964
|
Model has a Rig rather than a RigPointer
|
2017-05-19 13:24:16 -07:00 |
|
Atlante45
|
c2e2682eff
|
Fix "Reset Settings" window poping up every time
|
2017-05-19 10:50:23 -07:00 |
|
volansystech
|
2691855e2b
|
Merge branch 'master' into Wl-21298
|
2017-05-19 10:43:31 +05:30 |
|
Anthony J. Thibault
|
e99001d86c
|
debug draw ik chains, bug fix for flex coef on tips
And opened up hip constraints.
|
2017-05-18 16:29:55 -07:00 |
|
Zach Fox
|
8efac1e7f1
|
Prevent another GIF from being captured while one is processing
|
2017-05-18 14:30:08 -07:00 |
|
Dante Ruiz
|
984f9e1ba5
|
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
|
2017-05-18 21:23:06 +01:00 |
|
Sam Gateau
|
d9ad45bf4a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-18 09:37:04 -07:00 |
|
samcake
|
2c6e10fbe1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-18 09:21:02 -07:00 |
|
Dante Ruiz
|
90ddc16d09
|
add calibration data to filters
|
2017-05-18 17:07:28 +01:00 |
|
volansystech
|
b2ac4381eb
|
Solve Jitteriness when scrolling the content in HMD mode -> Marketplace using the scrollbar.
|
2017-05-18 19:13:59 +05:30 |
|
samcake
|
80b6fd65ae
|
Cleaning up counters and naming schemes...
|
2017-05-17 18:31:28 -07:00 |
|
Andrew Meadows
|
09433a93ba
|
Merge pull request #10477 from AndrewMeadows/correct-avatar-mass
More correct avatar mass
|
2017-05-17 16:22:06 -07:00 |
|
Zach Fox
|
d4752926b8
|
First pass - checking performance
|
2017-05-17 13:51:27 -07:00 |
|
Seth Alves
|
8a88b30da7
|
Merge pull request #10468 from AndrewMeadows/cleanup-actions
cleanup Actions and Constraints part-1
|
2017-05-17 11:33:53 -07:00 |
|
Sam Gateau
|
0f250e693d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-17 09:49:20 -07:00 |
|
Dante Ruiz
|
a18940142e
|
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
|
2017-05-17 16:23:50 +01:00 |
|
Brad Hefta-Gaub
|
764bfe94f5
|
Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270
Feature/snap turn smoothing 21270
|
2017-05-16 21:05:38 -07:00 |
|
Andrew Meadows
|
d065b569d3
|
support for variable avatar mass by size
|
2017-05-16 16:03:51 -07:00 |
|
Andrew Meadows
|
805d23567d
|
fix simple typo
|
2017-05-16 16:03:50 -07:00 |
|
Atlante45
|
201f81f20a
|
Don't wait on the sandbox
|
2017-05-16 14:41:57 -07:00 |
|
Andrew Meadows
|
e9c703b147
|
add deprecation log for DYNAMIC_TYPE_SPRING
|
2017-05-16 10:34:39 -07:00 |
|
Andrew Meadows
|
9e08dadaf4
|
Remove ObjectActionSpring
|
2017-05-15 22:11:42 -07:00 |
|
Dante Ruiz
|
724f849d88
|
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
|
2017-05-16 00:15:18 +01:00 |
|
Dante Ruiz
|
975b1ab077
|
moved low velocity filter in the input system
|
2017-05-16 00:15:06 +01:00 |
|
samcake
|
2df6d0df48
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-15 13:40:56 -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 |
|
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 |
|
Seth Alves
|
4af0a85aa0
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-12 13:03:58 -07: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 |
|
Seth Alves
|
bc6fb182eb
|
pull out motor action, fix import of slider and cone-twist constraints
|
2017-05-12 10:32:28 -07:00 |
|
samcake
|
3393456d91
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-12 10:15:13 -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
|
e1c805e76f
|
lock in Overlays::findRayIntersectionInternal
|
2017-05-11 17:02:00 -07:00 |
|
Andrew Meadows
|
a43447310d
|
remove physics dependency from avatars-render lib
|
2017-05-11 15:22:22 -07:00 |
|
Andrew Meadows
|
f4df223d23
|
cleanup Head::simulation() code
|
2017-05-11 14:46:00 -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
|
bd6ac7a39e
|
Code style fixes
|
2017-05-11 20:38:09 +02:00 |
|
Andrew Meadows
|
0852852f39
|
Merge pull request #10443 from ctrlaltdavid/21326-2
Fix avatar recording playback mouth not moving
|
2017-05-11 10:41:41 -07:00 |
|
samcake
|
6b32219f5f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-11 10:07:27 -07:00 |
|
Seth Alves
|
4042e2bceb
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-11 09:29:30 -07:00 |
|
Vladyslav Stelmakhovskyi
|
f963233a7b
|
Merge branch 'master' into audio-source-sync
|
2017-05-11 15:25:24 +02:00 |
|
Thijs Wenker
|
0a3a2705af
|
Merge pull request #10426 from huffman/fix/tablet-invisible-by-default
Fix tablet showing up for a short period of time on launch
|
2017-05-11 15:03:52 +02:00 |
|
David Rowe
|
1b855f2c6b
|
Voice modulation and facetrackers write to transient blendshapes
|
2017-05-11 18:15:38 +12:00 |
|
Anthony J. Thibault
|
147d067c4e
|
Merge branch 'master' into feature/ik-solver-init-config
|
2017-05-10 18:12:39 -07:00 |
|
samcake
|
737fdf9dd8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-10 17:28:07 -07:00 |
|
Atlante45
|
79d53d92a1
|
Use baked default skybox
|
2017-05-10 16:03:02 -07:00 |
|
Vladyslav Stelmakhovskyi
|
2328da3c48
|
Merge branch 'master' into audio-source-sync
|
2017-05-10 21:22:40 +02:00 |
|
Vladyslav Stelmakhovskyi
|
2d46f9d30e
|
Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum
|
2017-05-10 21:21:39 +02:00 |
|
Brad Hefta-Gaub
|
f91f42b0c8
|
Merge pull request #10411 from zzmp/feat/tester-flag
Add launch.tester to user_actions
|
2017-05-10 11:58:24 -07:00 |
|
samcake
|
39f6e22da3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-10 09:48:26 -07:00 |
|
Seth Alves
|
9184936496
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-10 09:30:39 -07:00 |
|
Anthony J. Thibault
|
93b8dc550c
|
Merge branch 'master' into feature/ik-solver-init-config
|
2017-05-10 09:03:21 -07:00 |
|
Ryan Huffman
|
bddfdfa838
|
Adjust Web3DOverlay to load QML even if not visible
|
2017-05-09 16:01:20 -07:00 |
|
Zach Pomerantz
|
45feee38b2
|
Merge pull request #10269 from zzmp/fix/audio-bg-join
Cleanup Audio background threads on shutdown
|
2017-05-09 17:23:36 -04:00 |
|
trent
|
a3545661dc
|
Merged hifi/master into this PR and resolved merge conflicts.
|
2017-05-09 15:09:53 -04:00 |
|
samcake
|
c36035d3eb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-09 10:46:38 -07:00 |
|
trent
|
9c8b844e26
|
Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270
|
2017-05-09 12:51:28 -04:00 |
|
trent
|
7faed38bb5
|
Just use the smooth time constant instead of a variable.
|
2017-05-09 12:51:25 -04:00 |
|
Seth Alves
|
1e1968357a
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-09 09:24:50 -07:00 |
|
Andrew Meadows
|
e92e710cdc
|
Merge pull request #10413 from humbletim/fix_lookat_regression
Fix lookAt eye snapping
|
2017-05-09 08:51:10 -07:00 |
|
Vladyslav Stelmakhovskyi
|
7ab6909c77
|
Merge branch 'master' into audio-source-sync
|
2017-05-09 11:08:08 +02:00 |
|
humbletim
|
29b1ac3572
|
optimizations per feedback
|
2017-05-08 21:50:24 -04:00 |
|
humbletim
|
42d1498d20
|
call Model::updateRig (not Parent::updateRig)
|
2017-05-08 21:19:18 -04:00 |
|
Andrew Meadows
|
2835a73c6b
|
Merge pull request #10071 from AndrewMeadows/walk-up-steps
avatar can walk up steps
|
2017-05-08 18:17:16 -07:00 |
|
Zach Pomerantz
|
defc3c1c4f
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join
|
2017-05-08 19:55:10 -04:00 |
|
Seth Alves
|
de589a32f3
|
clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring
|
2017-05-08 16:36:51 -07:00 |
|
Zach Pomerantz
|
929079df97
|
add launch.tester to user_actions
|
2017-05-08 19:33:09 -04:00 |
|
humbletim
|
ef0e32643d
|
update refactored logic to match previous application behavior
|
2017-05-08 18:53:47 -04:00 |
|
Anthony J. Thibault
|
712fcbe27a
|
Removed cruft/debug code & comments
|
2017-05-08 15:06:30 -07:00 |
|
Anthony J. Thibault
|
7af93f9fea
|
Hooked up IK constraint rendering
|
2017-05-08 15:06:29 -07:00 |
|
Anthony J. Thibault
|
e992d6703a
|
WIP: debug render joint constraints.
|
2017-05-08 15:06:28 -07:00 |
|
Anthony J. Thibault
|
a260163aee
|
WIP commit, first pass at generating limit center joints + debug draw
|
2017-05-08 15:06:27 -07:00 |
|
Andrew Meadows
|
afe0447322
|
remove unnecessary virtual keyword
|
2017-05-08 14:27:39 -07:00 |
|
Andrew Meadows
|
138a987a8f
|
_rotationChanged is a timestamp
|
2017-05-08 14:27:18 -07:00 |
|
Vladyslav Stelmakhovskyi
|
d0111ac0bb
|
Merge branch 'master' into audio-source-sync
|
2017-05-08 20:09:34 +02:00 |
|
Seth Alves
|
c8cdad5b4e
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-08 11:02:42 -07:00 |
|
Chris Collins
|
4bfb23b5d2
|
Merge pull request #10388 from humbletim/21308
CR #21308 Fix Script.print
|
2017-05-08 10:46:49 -07:00 |
|
Chris Collins
|
0351ac1575
|
Merge pull request #10401 from jherico/fix_benny_hill_animations
Fix sped up animations
|
2017-05-08 09:11:23 -07:00 |
|
Sam Cake
|
d3724116d9
|
Using the items to pick the key light!
|
2017-05-08 00:20:20 -07:00 |
|
Brad Davis
|
b63015eaea
|
Fix sped up animations
|
2017-05-06 14:34:28 -07:00 |
|
Seth Alves
|
5d539bcc17
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-06 07:49:02 -07:00 |
|
Seth Alves
|
9e0845f17e
|
Merge pull request #10387 from vladest/tablet-performance
Decrease CPU usage in tabletUI periodical updates
|
2017-05-06 07:07:29 -07:00 |
|
Chris Collins
|
820ed5049b
|
Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire
Fix -- dont send non-entity edits to entity-server
|
2017-05-05 16:37:27 -07:00 |
|
samcake
|
bc1e5101ac
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-05 16:13:51 -07:00 |
|
Seth Alves
|
b2ccc33a79
|
Merge branch 'master' of github.com:highfidelity/hifi into motor-action
|
2017-05-05 14:52:07 -07:00 |
|
Zach Pomerantz
|
ca7cd61c64
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join
|
2017-05-05 13:04:01 -04:00 |
|
Chris Collins
|
fd836dcd68
|
Merge pull request #10366 from Atlante45/feat/normal-map-compression
Feat/normal map compression
|
2017-05-05 10:03:01 -07:00 |
|
Chris Collins
|
8d49540f3a
|
Merge pull request #10380 from vladest/rightclick-fix
Rightclick fix
|
2017-05-05 10:01:11 -07:00 |
|
Andrew Meadows
|
63042eea3a
|
fix flawed fix of bad rebase
|
2017-05-05 09:37:00 -07:00 |
|
Andrew Meadows
|
41ad25ade1
|
fix bad rebase of changed menu option
|
2017-05-05 09:37:00 -07:00 |
|
Andrew Meadows
|
fe401c7488
|
improved management of collisionless avatar state
|
2017-05-05 09:37:00 -07:00 |
|
Andrew Meadows
|
d34b667e82
|
remove kinematic character controller implemention
|
2017-05-05 09:35:49 -07:00 |
|
Andrew Meadows
|
0aa579225c
|
even more correct API: MyAvatar.collisionsEnabled
|
2017-05-05 09:35:49 -07:00 |
|