sam gateau
34203c67b0
Addressing the merge with master
2018-09-26 15:42:13 -07:00
John Conklin II
b02e2c8123
Merge pull request #14081 from SamGondelman/blendshapes
...
Improve ModelBlender queuing
2018-09-26 15:10:02 -07:00
Ryan Huffman
09b2565e76
Remove UndoStack API
...
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
2018-09-26 14:43:11 -07:00
sam gateau
1e112d3c84
bringing back a bug fix from samuel
2018-09-26 14:15:42 -07:00
sam gateau
b5a47b2e76
Finalizing the renaming from Skinned to Deformed
2018-09-26 14:11:22 -07:00
Wayne Chen
db41a1c16b
error state signal for 404/interstitial
2018-09-26 13:48:15 -07:00
sam gateau
09dae5aee3
Addressing merge conflict in HighlightEffect.cpp
2018-09-26 13:24:21 -07:00
John Conklin II
c1dc0ff2ec
Merge pull request #14077 from sabrina-shanman/crash_ray-pick-dtor_pointer-only
...
Prevent thread issues with PickResults modified by Pointers
2018-09-26 12:12:58 -07:00
John Conklin II
6c47ba0dc7
Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps
...
Use C++ chrono system_clock for timestamps
2018-09-26 11:22:49 -07:00
sabrina-shanman
4011660435
Merge branch 'master' into stt_parenting2
2018-09-26 10:17:45 -07:00
John Conklin II
0de433c7c7
Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master
...
fix for deadlock in other avatar entity removal from tree
2018-09-26 09:58:26 -07:00
Seth Alves
ff2a47e7e6
fix several uninitialized reads
2018-09-26 09:33:12 -07:00
David Rowe
b98bd741b8
Indent and reword jumping and flying checkbox
2018-09-26 18:14:02 +12:00
Wayne Chen
de5614500a
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialImprovements
2018-09-25 21:52:01 -07:00
John Conklin II
c5ff72bd20
Merge pull request #14024 from wayne-chen/toggle404Redirect
...
Toggle going to 404 redirect domain
2018-09-25 20:44:57 -07:00
Wayne Chen
e552b69f4c
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialImprovements
2018-09-25 20:27:31 -07:00
Wayne Chen
26b6967ba6
adding overlays to redirect domain
2018-09-25 18:16:18 -07:00
sam gateau
efa1dd0274
rename the files from skin to deformed
2018-09-25 17:32:04 -07:00
John Conklin II
3d71dfc467
Merge pull request #14072 from SamGondelman/highlight
...
Fix avatar highlighting
2018-09-25 16:13:14 -07:00
Seth Alves
87a67a3f0c
call saveRecordingToAsset callback on correct thread
2018-09-25 15:50:47 -07:00
John Conklin II
19438d143e
Merge pull request #14073 from jherico/fix/18069_test
...
Working on Vive shutdown issues
2018-09-25 15:41:32 -07:00
Roxanne Skelly
cbb4bff2db
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-25 14:16:43 -07:00
sam gateau
cc0019479a
fixing review comments
2018-09-25 14:07:07 -07:00
sam gateau
e41b8f06e1
Cleaning up the pipeline and checking that it is working for all cases
2018-09-25 13:57:50 -07:00
Thijs Wenker
80beb6c444
addressed CR feedback
2018-09-25 22:43:58 +02:00
Brad Davis
15de0590e8
Cleaning up commented out code
2018-09-25 13:18:49 -07:00
Brad Davis
5adc4c2290
Protect against null pointer usage in sound scripting wrapper
2018-09-25 13:17:49 -07:00
SamGondelman
21cd3948ae
improve blender queuing
2018-09-25 12:07:05 -07:00
sabrina-shanman
8dd36e465b
Merge branch 'master' into crash_ray-pick-dtor_pointer-only
2018-09-25 09:22:30 -07:00
sabrina-shanman
eca31e7a99
Fix instantiating abstract class when creating visual pick result for pointers
2018-09-25 09:20:57 -07:00
Ryan Huffman
af897bdef2
Fix models with 1^3 dimensions never being resized
2018-09-25 09:13:59 -07:00
sam gateau
9f16024616
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-25 08:27:38 -07:00
luiscuenca
80daf35e77
Animation and particles clean up
2018-09-25 07:17:26 -07:00
luiscuenca
3e2ee119f0
API to configure animation and particle effect
2018-09-25 06:03:29 -07:00
David Rowe
af1b4fef5d
Modify layout of rotation mode settings options
2018-09-25 18:03:57 +12:00
Sam Gateau
69734ce21b
Getting better'
2018-09-24 22:34:43 -07:00
sabrina-shanman
5dbebd4aae
Add comment explaining why visualPickResult is a copy
2018-09-24 17:36:24 -07:00
sam gateau
7cf7eaa7c8
Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape
2018-09-24 17:34:42 -07:00
John Conklin II
be23d07621
Merge pull request #14010 from sethalves/thread-safe-settings
...
make settings thread safe
2018-09-24 17:24:50 -07:00
sabrina-shanman
7f189e4d10
Make visualPickResult used by Pointers a private copy
2018-09-24 17:15:56 -07:00
David Rowe
90ef109476
Remove superseded Pointers API functions
2018-09-25 11:11:53 +12:00
Wayne Chen
69d5299362
patching fix for previous commits
2018-09-24 15:22:46 -07:00
Brad Davis
72fc686ec1
Fix timer managmement during shutdown
2018-09-24 14:52:13 -07:00
John Conklin II
55848e6959
Merge pull request #14008 from sethalves/fix-local-angular-velocity
...
fix bug that caused localAngularVelocity to get zeroed out
2018-09-24 14:32:57 -07:00
SamGondelman
ad73cb3996
fix avatar highlighting
2018-09-24 14:02:35 -07:00
Wayne Chen
ac5814a1f8
Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect
2018-09-24 13:57:23 -07:00
John Conklin II
a602bff217
Merge pull request #13981 from gcalero/android_settings
...
Android settings (AEC)
2018-09-24 13:55:30 -07:00
Roxanne Skelly
6f4c376d9f
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-24 13:45:24 -07:00
John Conklin II
45b206d748
Merge pull request #14065 from SamGondelman/blendshapeCrash
...
Fix blendshape crash on avatar removal
2018-09-24 12:39:52 -07:00
John Conklin II
d520152a95
Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements
...
Small Improvements to Anim Stats
2018-09-24 11:56:01 -07:00
luiscuenca
012cd207b3
No data sent during basic transit
2018-09-24 11:39:10 -07:00
Stephen Birarda
b31837168d
fix bad lock, optimize some operations, clarify comment
2018-09-24 11:27:20 -07:00
SamGondelman
d772cdb34a
please
2018-09-24 10:16:35 -07:00
Sam Gateau
4210ce46aa
bringing the tex corrd transform in the Material struct and shaving one ubo
2018-09-23 23:10:56 -07:00
David Rowe
e29b403abc
Merge branch 'master' into M18586
...
# Conflicts:
# interface/src/raypick/PointerScriptingInterface.cpp
# interface/src/raypick/PointerScriptingInterface.h
# interface/src/raypick/StylusPointer.h
# libraries/pointers/src/Pointer.h
# scripts/system/controllers/controllerModules/teleport.js
2018-09-24 11:44:28 +12:00
Sam Gateau
b3112f898a
Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis
2018-09-22 18:04:24 -07:00
luiscuenca
82b14b6e9b
Merge branch 'master' of https://github.com/highfidelity/hifi into smoothTeleport
2018-09-22 05:47:05 -07:00
luiscuenca
01f87a0645
lerp myavatar
2018-09-22 05:34:17 -07:00
sam gateau
d8984dafa0
ui allows to enable/disable the deformer componenets
2018-09-21 16:45:21 -07:00
Seth Alves
86e502637e
Make Settings thread safe
2018-09-21 15:46:35 -07:00
Roxanne Skelly
61cbee72af
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-21 12:31:36 -07:00
John Conklin II
428ace17e1
Merge pull request #14001 from wayne-chen/fixLoginFailTwiceCall
...
Fixing double loginFailed
2018-09-21 11:36:06 -07:00
Seth Alves
6eb3fa251d
guard against null deref
2018-09-21 10:39:41 -07:00
Seth Alves
f6e57f54b0
don't call enterEntity until script preload has finished
2018-09-21 10:26:55 -07:00
Seth Alves
d5c0c05ab2
wait for an entity's script to load before adding it to the contain-avatar list. do this so the script doesn't miss the 'enterEntity' entity-method due to not being loaded.
2018-09-21 10:26:55 -07:00
John Conklin II
9c2a7931fb
Merge pull request #14036 from AndrewMeadows/crowd-update-tuning
...
tweak avatar update priority coefficients for load tests
2018-09-21 09:44:15 -07:00
sam gateau
aa02dcb087
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-21 08:19:50 -07:00
luiscuenca
a7a128f1f1
Particle effect and ease movement
2018-09-20 18:37:42 -07:00
sam gateau
d3ff4b8630
Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off
2018-09-20 17:26:26 -07:00
John Conklin II
0560b8678c
Merge pull request #14022 from jherico/fix/amd_highlight
...
Fix AMD highlighting effect
2018-09-20 16:17:10 -07:00
sam gateau
5d80a89094
Apply fix to gl41 backend needed for proper Resource BUffer on gl41
2018-09-20 16:09:08 -07:00
David Rowe
5719b7020d
Merge branch 'master' into M17428-f
2018-09-21 10:47:56 +12:00
Thijs Wenker
1094b6722f
self-CR
2018-09-20 23:36:53 +02:00
Thijs Wenker
e2cb96193d
JSDocs
2018-09-20 22:47:14 +02:00
Thijs Wenker
6d72881f3f
remove commented out test code
2018-09-20 21:14:30 +02:00
Thijs Wenker
06491ef12f
API function for retrieving multiple entity properties with better performance
2018-09-20 19:34:00 +02:00
Andrew Meadows
cf85c617a2
tweak avatar update priority coefs for load tests
2018-09-20 09:56:50 -07:00
sam gateau
b04cbbb0ac
Apply fix to gl41 backend needed for proper Resource BUffer on gl41
2018-09-20 09:16:43 -07:00
Sam Gateau
377464f5a2
Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis
2018-09-19 19:00:30 -07:00
sam gateau
6b6551c8bd
the missing file
2018-09-19 17:29:10 -07:00
sam gateau
4fc6466250
update shaders
2018-09-19 17:27:58 -07:00
luiscuenca
cad8425c7b
Time-based frames, max distance and setting animation from script
2018-09-19 16:43:45 -07:00
Wayne Chen
7e796f7e7f
committing requested changes
2018-09-19 14:26:30 -07:00
Roxanne Skelly
aba183b165
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-19 13:40:18 -07:00
Roxanne Skelly
d5f756c79d
Tray Notifier Checkpoint
...
* Add app launch
* Add authentication for auth-related calls
* Refactor notifications code
2018-09-19 12:40:15 -07:00
John Conklin II
6c63f92f39
Merge pull request #13933 from SamGondelman/accelerationSpread
...
Fix particle acceleration spread
2018-09-19 11:49:42 -07:00
John Conklin II
60c07280f8
Merge pull request #13971 from SamGondelman/parabola
...
Correct transparent parabola shader
2018-09-19 11:46:24 -07:00
Brad Davis
783ea21951
Fix AMD highlighting effect
2018-09-19 11:21:12 -07:00
Wayne Chen
01594d7a52
fixing settings check in domain handler
2018-09-19 10:17:14 -07:00
sam gateau
c05cbf065b
fixing the texcoord1 input in skined vertex shader
2018-09-19 10:13:14 -07:00
Wayne Chen
795580f4e1
adding 404 redirect toggle with interstitial
2018-09-19 09:55:15 -07:00
Sam Gateau
61644c48f0
Update the slp tp reflect the chanes in the vertex shaders
2018-09-19 09:18:09 -07:00
Stephen Birarda
3a7785d10f
fix for deadlock in other avatar entity removal
2018-09-18 17:52:24 -07:00
sam gateau
609bc6385e
Merge branch 'black' of github.com:samcake/hifi into black-bis
2018-09-18 17:40:45 -07:00
sam gateau
ec6117e9bb
bringing the blendshape in skin shader only work in master
2018-09-18 17:40:29 -07:00
luiscuenca
96e8b060eb
Enable transit animations
2018-09-18 12:42:37 -07:00
Sam Gateau
d768809fbc
Merge pull request #13969 from SamGondelman/modelBugs
...
Fixing Model animation bugs
2018-09-18 11:28:37 -07:00
luiscuenca
b39391ca7a
From first frame
2018-09-17 13:53:57 -07:00
luiscuenca
f339bbdd7f
Fix bug while walking
2018-09-17 13:29:04 -07:00
luiscuenca
ff319ebd95
Bypass position updates from mixer
2018-09-17 09:47:22 -07:00
Seth Alves
1e8ae1a294
fix scaling of worn shape entities
2018-09-15 16:36:55 -07:00
Seth Alves
1a44054c49
attempt fix for fb-17131
2018-09-15 09:15:43 -07:00
Sam Gateau
cb8af882ca
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-09-14 20:27:52 -07:00
Sam Gateau
986dece4ec
Add name of the batch during tracing and introduce detailed tracing if needed and one error message in the case the materialMap is detected in an fst file but not understood
2018-09-14 20:24:22 -07:00
John Conklin II
49e578ebef
Merge pull request #13998 from AndrewMeadows/dont-zero-kinematic
...
don't zero kinematic velocities when releasing simulation ownership
2018-09-14 15:18:06 -07:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip
...
Safe Teleport Target
2018-09-14 15:11:18 -07:00
Anthony Thibault
b0cde2afcc
Small addition to Anim Stats
...
* During a state machine interp the previous state now shows up in AlphaValues panel, with parentheses around the name.
* Added 3 new fields
* Position - in world coordinate frame.
* Heading - the facing angle in the world corrdinate frame.
* Local Vel - the velocity of the character in the local coordinate frame. (left, forward, up).
2018-09-14 15:05:17 -07:00
Wayne Chen
0afea6fbd1
removing double login fail signal
2018-09-14 11:08:53 -07:00
Andrew Meadows
9390687e2d
remove redundant EntityMotionState::updateSendVelocities() call
2018-09-14 10:37:55 -07:00
Andrew Meadows
9073e1ade3
don't zero kinematic velocity at end of sim ownership
2018-09-14 10:37:17 -07:00
sabrina-shanman
237022d304
Refactor new pick parenting system for use with RayPick, ParabolaPick
2018-09-14 10:28:15 -07:00
John Conklin II
44041fcc14
Merge pull request #13986 from Atlante45/fix/ess-crash
...
Fix ESS crash caused by concurrent access to _entityScripts
2018-09-14 07:56:45 -07:00
SamGondelman
c522d1bc93
merge with master
2018-09-14 00:57:13 -07:00
Simon Walton
727aea2025
Remove comment
2018-09-13 18:21:16 -07:00
Wayne Chen
fd1e64e4e6
Revert "Fix login fail twice call"
2018-09-13 17:01:59 -07:00
John Conklin II
aef3ed3e01
Merge pull request #13989 from wayne-chen/fixLoginFailTwiceCall
...
Fix login fail twice call
2018-09-13 16:59:00 -07:00
David Rowe
bbfb2b1374
Merge branch 'master' into M17428-f
2018-09-14 10:36:49 +12:00
luiscuenca
c5669ef1f5
better property names
2018-09-13 15:22:18 -07:00
John Conklin II
0bf064c451
Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor
...
Fixing Error State for Timeout/localhost Redirection
2018-09-13 15:19:55 -07:00
Clement
e6b4ccef16
Add lock around _entityScripts
2018-09-13 15:10:16 -07:00
Gabriel Calero
1215ddbe88
Remove debug files from linux qt build. Remove extra space
2018-09-13 18:50:46 -03:00
luiscuenca
ceccc6d6ec
make getCollisionCapsule thread safe
2018-09-13 14:49:35 -07:00
Simon Walton
74ea1548a9
Use chrono::system_clock for usecTimestampNow() on all platforms
2018-09-13 14:24:49 -07:00
Wayne Chen
647c4e1694
adding true fix for localhost timeouts
2018-09-13 13:51:42 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling
...
Performance improvements for Avatar Mixer
2018-09-13 13:43:18 -07:00
John Conklin II
28140fc0c0
Merge pull request #13988 from sabrina-shanman/crash_bubble-tp
...
Fix crash when teleporting into avatars with bubble active
2018-09-13 13:07:31 -07:00
Wayne Chen
873859455a
Revert "adding fix for getting DomainHandler into error state"
...
This reverts commit 3fe3f674d0
2018-09-13 11:53:56 -07:00
Wayne Chen
380f24b37f
adding fix, changing window title
2018-09-13 11:53:21 -07:00
sabrina-shanman
f3d86cfc7d
Fix crash when teleporting into avatars with bubble active
2018-09-13 10:51:53 -07:00
Wayne Chen
96ab7d417e
removing connection for on login failed
2018-09-13 10:35:43 -07:00
Wayne Chen
bcd014ddc8
Merge branch 'master' of https://github.com/highfidelity/hifi into fixLoopingConnectionMonitor
2018-09-13 10:29:02 -07:00
Wayne Chen
9a657559ef
Merge branch 'master' of https://github.com/wayne-chen/hifi
2018-09-13 09:52:20 -07:00
Bradley Austin Davis
d90551ac3e
Merge pull request #13954 from jherico/fix/reduce_pointer_duplication
...
Reduce needless smart pointer duplication
2018-09-13 08:56:50 -07:00
Wayne Chen
47b5ce706e
Merge branch 'master' of https://github.com/highfidelity/hifi
2018-09-13 07:09:00 -07:00
Sam Gateau
6285487214
Merge pull request #13976 from SamGondelman/crash
...
Blendshape fixes
2018-09-12 22:19:44 -07:00
Wayne Chen
ad233677b8
adding changes for overriding host change for error state
2018-09-12 18:31:01 -07:00
Wayne Chen
3fe3f674d0
adding fix for getting DomainHandler into error state
2018-09-12 15:45:06 -07:00
Wayne Chen
49f26d968a
adding fix for getting DomainHandler into error state
2018-09-12 15:42:55 -07:00
SamGondelman
2b2091290e
fix everything
2018-09-12 15:32:35 -07:00
Brad Davis
d92c62c742
Make android use the existing shared pointers
2018-09-12 15:04:36 -07:00
Brad Davis
700c6519bf
More PR comments
2018-09-12 15:04:36 -07:00
Brad Davis
37cf37e3e1
PR feedback
2018-09-12 15:04:36 -07:00
Brad Davis
cfff28ad0a
More shared pointer deduplication
2018-09-12 15:04:35 -07:00
Brad Davis
9a435cdca2
Reduce needless smart pointer duplication
2018-09-12 15:04:35 -07:00
Sam Gondelman
42ded53b5f
Merge branch 'master' into modelBugs
2018-09-12 14:35:46 -07:00
Gabriel Calero
2943502c9b
Headset plug/unplug detection
2018-09-12 16:36:04 -03:00
Stephen Birarda
b1f44d2ad7
perform avatar entity cleanup in AvatarManager::handleRemovedAvatar
2018-09-12 12:30:15 -07:00
Stephen Birarda
1789d51d6e
Revert "cycle avatar entity IDs for new avatar mixer"
...
This reverts commit 20912349a4
2018-09-12 12:22:07 -07:00
Stephen Birarda
6d3e6a661f
Revert "XOR incoming trait instance IDs for other avatars"
...
This reverts commit 9b3d9dd0f3
2018-09-12 12:20:31 -07:00
Stephen Birarda
4b93f9f5cd
Revert "use different XORed instance ID for replicas"
...
This reverts commit a37a19da1e
2018-09-12 12:20:03 -07:00
luiscuenca
fa3c6932c6
Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip
2018-09-12 11:47:18 -07:00
luiscuenca
889e033048
fix warnings
2018-09-12 11:20:23 -07:00
Simon Walton
7136698c6b
Move default pose flags out of joint-positions condition
2018-09-12 10:49:26 -07:00
sabrina-shanman
87b5605d69
Add normalOnPick to CollisionPickResult
2018-09-12 10:36:00 -07:00
Simon Walton
0d72e3808c
Small changes per review
2018-09-12 10:31:26 -07:00
luiscuenca
4d381b9d04
Smooth other avatars positions
2018-09-12 10:01:41 -07:00
John Conklin II
f67deb9f65
Merge pull request #13938 from wayne-chen/interstitalMerged
...
Interstitial Page with 404 Redirect
2018-09-12 08:39:52 -07:00
Sam Gateau
f79c92b4ff
Merge pull request #13974 from samcake/black-ter
...
Fix a missing std::chrono::duration_cast
2018-09-12 08:27:19 -07:00
Wayne Chen
20cab87a17
Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-11 18:53:06 -07:00
Wayne Chen
a7321f950a
pushing requested changes - adding timeout refusal
2018-09-11 18:32:17 -07:00
Brad Hefta-Gaub
d319bea2ac
Merge pull request #13973 from hyperlogic/feature/indicate-loading-status-on-avatar-orb
...
Avatar loading orb now indicates loading status
2018-09-11 18:01:40 -07:00
Wayne Chen
cb0aa8055f
Merge pull request #13961 from wayne-chen/loginOnLaunch
...
Pop up login dialog on launch
2018-09-11 17:43:29 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged
2018-09-11 17:17:33 -07:00
Wayne Chen
8bca1bc5fe
reverting, oversight
2018-09-11 17:09:21 -07:00
Wayne Chen
a85a7a6119
adding back goToLastAddress back
2018-09-11 17:07:49 -07:00
Simon Walton
15f06264f9
Remove unneeded #include
2018-09-11 17:03:39 -07:00
SamGondelman
1a36693161
I hate blendshapes
2018-09-11 16:58:38 -07:00
Simon Walton
2a0ee1c532
Cherry-pick of commit cde2dc2e to fix merge issue
2018-09-11 16:58:21 -07:00
Stephen Birarda
2c056e5b22
Merge pull request #13912 from birarda/bug/agent-clear-avatars
...
handle agent avatar clear on avatar mixer disconnect
2018-09-11 16:34:15 -07:00
Wayne Chen
490cdc901e
Merge pull request #3 from danteruiz/interstitalMerged
...
making requested changes and fixing compile issue for jenkins
2018-09-11 16:30:13 -07:00
Wayne Chen
0f25756908
expose domain connection error to Window
2018-09-11 16:29:39 -07:00
sam gateau
8c7781a6d4
use the std::chrono duration the way it should be
2018-09-11 15:57:57 -07:00
Dante Ruiz
c97d646083
making requested changes and fixing compile issue for jenkins
2018-09-11 15:57:44 -07:00
David Rowe
de95ee0a18
Merge branch 'master' into M17428-f
2018-09-12 09:49:29 +12:00
Dante Ruiz
b665dbe13e
finished requested changes
2018-09-11 14:18:12 -07:00
Anthony Thibault
bc5d9a46a2
Avatar loading orb now indicates status
...
white - no url has been received yet for this avatar
purple - a url has been received for this avatar but it's content is still downloading/loading
blue - (only visible breifly) content has succesfully loaded
red - (only visible briefly) content has failed to download.
2018-09-11 13:12:46 -07:00
Dante Ruiz
735ff04fad
fixing merge conflicts
2018-09-11 12:10:19 -07:00
Dante Ruiz
5c9a88868d
first round of requested changes
2018-09-11 12:01:55 -07:00
sam gateau
77586933c8
Merge and fix the default _value of GLquery so it is 0, not broken
2018-09-11 11:43:14 -07:00
Simon Walton
80b7e04bc6
Revert change to chrono<system_clock> for usecTimestampNow()
2018-09-11 10:51:36 -07:00
sam gateau
840c8c95fd
cleaning the code and comments
2018-09-11 09:34:42 -07:00
Wayne Chen
6bcf6eaae7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
2018-09-11 09:13:41 -07:00
Sam Gateau
5e76a0c6d7
changing the cpu timer of the batch to std::chrono instead of using gl cpu time stamp
2018-09-10 22:55:12 -07:00
Wayne Chen
c194c236f1
adding inlines
2018-09-10 17:10:13 -07:00
Stephen Birarda
a50e55b83a
use more efficient iterate and clear for removal
2018-09-10 17:06:57 -07:00
Sam Gateau
47cea49f78
Merge pull request #13922 from samcake/black-bis
...
Optimize the vertex formats of meshes for less input buffer bindings
2018-09-10 16:58:40 -07:00
Wayne Chen
e5a87aa58c
removing unused variables
2018-09-10 16:56:13 -07:00
SamGondelman
0e079e78e6
correct transparent parabola shader
2018-09-10 16:20:50 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms
...
Remove all uniforms from our shaders
2018-09-10 15:42:01 -07:00
luiscuenca
9c6ee18db5
Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip
2018-09-10 15:18:15 -07:00
sabrina-shanman
3b7dac9058
Account for collisionGroup in CollisionRegion implementation
2018-09-10 15:14:48 -07:00
luiscuenca
6f4e9ded09
Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip
2018-09-10 14:42:02 -07:00
sabrina-shanman
9a86b7451b
Add collision group parameter to collision pick and set my avatar as the default
2018-09-10 14:35:04 -07:00
Sam Gateau
082d47d20f
Set the correct assert in replacment of the unecessary if branch
2018-09-10 14:31:49 -07:00
John Conklin II
558f3dc7e5
Merge pull request #13964 from dback2/reloadScriptQThreadCrash
...
Destroy script thread on finish instead of on ScriptEngine destroyed
2018-09-10 14:11:37 -07:00
sam gateau
fed377dc4c
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-10 12:00:09 -07:00
SamGondelman
9a2bdda365
make animation properties threadsafe
2018-09-10 11:58:45 -07:00
Stephen Birarda
19a9fb00c6
Merge pull request #13967 from huffman/fix/jsdoc-note-for-send-fake-handshake
...
Add comment to Assets.sendFakeHandshake about excluding jsdoc
2018-09-10 11:47:30 -07:00
SamGondelman
3daaa0ce81
empty urls are invalid
2018-09-10 11:45:40 -07:00
Wayne Chen
ff86e480ba
adding debug statement to check for window close
2018-09-10 11:36:45 -07:00
John Conklin II
3b0f37c6f7
Merge pull request #13885 from birarda/bug/recording-scripting-stuck
...
fix Agent teardown of recording and ScriptEngine(s)
2018-09-10 10:51:52 -07:00
Simon Walton
d12376187c
Merge branch 'master' into avatar-mixer-scaling
2018-09-10 10:15:49 -07:00
Sam Gondelman
ae8eea32d6
Merge pull request #13960 from SamGondelman/profileUnpacking
...
Add detailed profile range for avatar unpacking
2018-09-10 10:04:08 -07:00
SamGondelman
a4605289a2
animation on switch url
2018-09-10 10:03:05 -07:00
David Back
3601ade8ba
destroy thread from thread finished not scriptEngine destroyed
2018-09-07 18:36:36 -07:00
David Rowe
7dba2e6a2e
Merge branch 'master' into M17428-f
2018-09-08 12:45:11 +12:00
Sam Gateau
5140999445
Forcing all the meshes with 3 buffers aka the blendshape layout
2018-09-07 15:57:04 -07:00
John Conklin II
bafdd06c91
Merge pull request #13934 from SimonWalton-HiFi/assigned-port-check
...
Check that a requested listening port is able to be used
2018-09-07 15:48:12 -07:00
sam gateau
e8cfac2ab1
Merge branch 'black-bis' of github.com:samcake/hifi into black-bis
2018-09-07 15:35:27 -07:00
sam gateau
9350d6f36e
removing performance counters
2018-09-07 15:35:10 -07:00
SamGondelman
b3bdddb3f4
set vec with one number
2018-09-07 15:15:02 -07:00
Stephen Birarda
adac872a11
clear other avatars in agent on avatar mixer disconnect
2018-09-07 15:04:14 -07:00
John Conklin II
472675f9a8
Merge pull request #13956 from hyperlogic/feature/improve-anim-stats
...
Move animation stats into its own Menu
2018-09-07 14:51:46 -07:00
Sam Gondelman
19fe40abe7
Merge pull request #13958 from SamGondelman/bloom
...
Fix bloom on edges
2018-09-07 14:50:31 -07:00
Sam Gateau
81a542982b
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-07 12:02:20 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale
...
Scale Collision Pick to match parent
2018-09-07 11:54:02 -07:00
SamGondelman
32e2a244a1
detailed profile range for avatar unpacking
2018-09-07 11:44:35 -07:00
John Conklin II
2ac0377a6e
Merge pull request #13952 from amantley/steppingReboot
...
Fix for lurching walk(case 16945), when walking in hmd.
2018-09-07 11:43:03 -07:00
Simon Walton
1a67176819
Fix a dangling merge conflict
2018-09-07 11:29:30 -07:00
sam gateau
fa72910ac1
fixing fuckeries
2018-09-07 11:14:12 -07:00
SamGondelman
f9ec53a2e6
fix bloom on edges
2018-09-07 10:25:26 -07:00
sam gateau
d979d02139
why did i do that?
2018-09-07 10:03:55 -07:00
Simon Walton
3dc993c841
Fix small error in translation delta
2018-09-07 09:46:21 -07:00
Anthony Thibault
5a059e9318
Fix for build failure on linux and android.
2018-09-07 09:44:19 -07:00
Simon Walton
741d4ba998
Merge branch 'master' into avatar-mixer-scaling
2018-09-07 09:30:39 -07:00
sabrina-shanman
8d4c47cf8e
Make template specialization of BaseNestableTransformNode explicit
2018-09-07 08:49:44 -07:00
sabrina-shanman
52bc09cd2a
Add override qualifier to BaseNestableTransformNode::getTransform
2018-09-06 17:44:06 -07:00
Wayne Chen
72818f3729
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged
2018-09-06 17:37:36 -07:00
Wayne Chen
ef3449f96d
Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged
2018-09-06 17:36:47 -07:00
sabrina-shanman
f40f40e135
Use more reasonable value for BaseNestableTransformNode::_baseScale when given bad value
2018-09-06 17:35:12 -07:00
Ryan Huffman
22df1b3bc6
Add comment to Assets.sendFakeHandshake about excluding jsdoc
2018-09-06 17:19:41 -07:00
SamGondelman
ed7f993c0d
avatar mixer and manager perf improvements and cleanup
2018-09-06 16:57:20 -07:00
sabrina-shanman
23a6abbaca
Update jsdocs to reflect new collision pick scaling behavior
2018-09-06 16:47:09 -07:00
Andrew Meadows
92210f28b5
cleanup and use correct avatar bounding box
2018-09-06 16:33:30 -07:00
sabrina-shanman
836f810c41
Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code
2018-09-06 16:33:29 -07:00
Anthony Thibault
acc7f1f168
Moved AnimStats into its own qml panels.
...
Added state machine tracking as well.
2018-09-06 16:18:58 -07:00
sam gateau
7349562111
Removing commented code
2018-09-06 15:50:31 -07:00
sam gateau
5ecbdb50c7
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-06 15:36:32 -07:00
Andrew Meadows
021146e4f0
minor tweak to default avatar-update sort coefficients
2018-09-06 15:33:52 -07:00
John Conklin II
8c77749fb6
Merge pull request #13947 from SamGondelman/perf
...
Fix blendshapes crash one last time, one last time
2018-09-06 14:21:18 -07:00
John Conklin II
b486b6d148
Merge pull request #13928 from AndrewMeadows/enable-workload-feedback
...
enable workload regulation by default
2018-09-06 14:20:40 -07:00
sam gateau
6544e9f0b0
Removing the commented debug code
2018-09-06 13:58:03 -07:00
sam gateau
38bfee7b72
Fix compilation on android and add the simple getBufferIDUnsynced in bindUniformBuffer
2018-09-06 13:54:21 -07:00
Gabriel Calero
2d2a4804f7
Add android settings screen. Add AEC setting
2018-09-06 17:49:52 -03:00
amantley
90a51e6181
added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area
2018-09-06 13:12:48 -07:00
sabrina-shanman
714cfc5ef1
Add scaling information to CollisionRegion jsdoc and missing info to CollisionPickProperties jsdoc
2018-09-06 12:14:50 -07:00
Simon Walton
e1aba52c23
Revert to statics for priority sort weights; update defaults from Andrew
2018-09-06 12:09:44 -07:00
sam gateau
e428248472
Adressing build warnings
2018-09-06 11:33:26 -07:00
sam gateau
5aa45b64d2
Adressing build warnings
2018-09-06 11:24:13 -07:00
sam gateau
129e2ce188
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-06 10:30:41 -07:00
