Seth Alves
|
91d509f5a4
|
fix a crash when grabbing a non-dynamic entity with an overlay child
|
2018-07-27 10:35:26 -07:00 |
|
Sam Gateau
|
a95ddb0492
|
Merge pull request #13616 from AndrewMeadows/remove-cruft-001
remove cruft for rendering collision shapes
|
2018-07-27 19:19:44 +02:00 |
|
Seth Alves
|
41af82a7f6
|
Merge pull request #13702 from r3tk0n/17016-flying-settings
17016 flying settings
|
2018-07-27 10:07:13 -07:00 |
|
Simon Walton
|
4d559bbaee
|
Don't initialize an atomic; squelch gcc warning
|
2018-07-27 10:05:34 -07:00 |
|
David Back
|
1d8b7bea65
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues
|
2018-07-27 09:23:26 -07:00 |
|
Sam Gondelman
|
3284f7b9d6
|
Merge pull request #13654 from huffman/fix/mirror-mode-create
Fix computePickRay when in mirror mode
|
2018-07-27 09:05:58 -07:00 |
|
Andrew Meadows
|
cf04a91a83
|
use smaller CCD spheres for thin objects
|
2018-07-27 09:02:19 -07:00 |
|
David Rowe
|
3bfdd3ff58
|
Maintain virtual and real world orientations when teleport
|
2018-07-27 15:18:40 +12:00 |
|
Simon Walton
|
0cec9a72d6
|
Implement client-side enable physics once indicated EntityData has arrived
Also now use Entity Server Protocol sequence numbers.
|
2018-07-26 18:10:38 -07:00 |
|
SamGondelman
|
f5364f752f
|
fix scaling
|
2018-07-26 18:01:24 -07:00 |
|
David Back
|
cd842afc1c
|
prevent both hands triggering same time, allow one to trigger after other
|
2018-07-26 17:52:25 -07:00 |
|
David Back
|
dcdf734114
|
remove unneeded
|
2018-07-26 16:43:07 -07:00 |
|
David Back
|
82e5d6ad29
|
use triggerClicks from controllers for edit handles
|
2018-07-26 16:38:25 -07:00 |
|
Alexander Ivash
|
29f7cab7df
|
FB16702 - Avatar App does not save Animation JSON Override URL
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
|
2018-07-27 02:08:44 +03:00 |
|
Dante Ruiz
|
74bb2301b0
|
minimize diff
|
2018-07-26 16:05:56 -07:00 |
|
Dante Ruiz
|
31d31af941
|
minimize diff
|
2018-07-26 16:05:18 -07:00 |
|
David Back
|
7faec21b1d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into resetPropertiesNoSelection
|
2018-07-26 15:40:32 -07:00 |
|
David Back
|
ff6ed971d8
|
comments, re-org, submesh number
|
2018-07-26 15:40:27 -07:00 |
|
r3tk0n
|
f3d0d9b4a0
|
Clean up garbage comments.
|
2018-07-26 15:37:42 -07:00 |
|
r3tk0n
|
f8c611b1d0
|
Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp
|
2018-07-26 15:35:12 -07:00 |
|
Dante Ruiz
|
02232daa58
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-grabbing-problem
|
2018-07-26 15:26:24 -07:00 |
|
Dante Ruiz
|
6edd109dfe
|
revert back to the old way we checkForChildTooFarAway
|
2018-07-26 15:23:54 -07:00 |
|
SamGondelman
|
74b3143bc3
|
remove scaling from teleport script
|
2018-07-26 12:23:14 -07:00 |
|
SamGondelman
|
6a52b7b8f3
|
CR improvements
|
2018-07-26 12:15:12 -07:00 |
|
amantley
|
12cb212dc7
|
used avatar constants from AvatarConstants.h to initialize tpposehips and tposerightfoot, and added space between multiplication to meet coding standards
|
2018-07-26 12:05:17 -07:00 |
|
howard-stearns
|
699d1647ca
|
typo, and more conservative item limit
|
2018-07-26 12:01:56 -07:00 |
|
Anthony Thibault
|
6c92949aed
|
Merge pull request #13672 from luiscuenca/fixElbowPoleVector
Redesign and enable hand's Pole Vectors for elbow simulation
|
2018-07-26 11:51:33 -07:00 |
|
howard-stearns
|
9b61e8c4ad
|
Merge branch 'master' of github.com:highfidelity/hifi into forget-you
|
2018-07-26 11:50:15 -07:00 |
|
SamGondelman
|
1c1b68ee66
|
emitterShouldTrail fix, review comments, rotateWithEntity
|
2018-07-26 11:41:16 -07:00 |
|
Thijs Wenker
|
6e23caca0d
|
handle both wantsTrigger and triggerable in CreateApp
|
2018-07-26 20:25:42 +02:00 |
|
David Back
|
cb8e9f218b
|
reset all property fields when no selection
|
2018-07-26 11:23:28 -07:00 |
|
John Conklin II
|
5efd981ecd
|
Merge pull request #13693 from NissimHadar/bug16943
Corrects loading of texture and default visibility.
|
2018-07-26 09:10:55 -07:00 |
|
David Rowe
|
9a9d190918
|
Remove unnecessary duplicate function
|
2018-07-26 20:26:13 +12:00 |
|
David Rowe
|
baf88ab508
|
Revise scriptable resource caches' interfaces
|
2018-07-26 16:12:16 +12:00 |
|
Simon Walton
|
a15e78a0f4
|
Missed an identifier change
|
2018-07-25 17:36:53 -07:00 |
|
Simon Walton
|
2c06487df0
|
Move sending of completion packet up to EntityTreeSendThread
I hadn't appreciated the continuous nature of the scene
traversal. Looks good now. Also changed some identifier names.
|
2018-07-25 17:05:05 -07:00 |
|
NissimHadar
|
ce53b44b02
|
CR comments.
|
2018-07-25 15:58:46 -07:00 |
|
Zach Fox
|
cc921ed9c4
|
Merge pull request #13685 from zfox23/MS16820_rateLimitPolaroids
Fix MS16820: Rate limit Snapshot Polaroids
|
2018-07-25 15:45:51 -07:00 |
|
SamGondelman
|
9b41cb5554
|
improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot
|
2018-07-25 15:19:25 -07:00 |
|
David Rowe
|
51865294ac
|
Fix radius and alpha start/finish values
|
2018-07-26 09:54:42 +12:00 |
|
Ryan Huffman
|
0e0966004c
|
Fix edit.js not being able to delete after creating entity
This fix puts focus back on the main window when creating an entity so that the user can use shortcuts like 'f' and 'delete'
|
2018-07-25 14:52:56 -07:00 |
|
Simon Walton
|
8f02834447
|
Set params.stopReason in another place
|
2018-07-25 14:46:47 -07:00 |
|
Simon Walton
|
7cb917f735
|
Angles aren't boolean!
|
2018-07-25 14:45:26 -07:00 |
|
John Conklin II
|
21d043d179
|
Merge pull request #13534 from huffman/fix/ess-avatar-entities
Fix crash when editing avatar entities with no myAvatar
|
2018-07-25 14:21:12 -07:00 |
|
NissimHadar
|
630df7c233
|
Corrects loading of texture and default visibility.
|
2018-07-25 13:28:23 -07:00 |
|
John Conklin II
|
89e7e3b938
|
Merge pull request #13682 from zfox23/MS16704_removeWearableAvatar
Fix MS16704: Remove worn Avatar/Wearable before updating
|
2018-07-25 12:12:50 -07:00 |
|
amantley
|
85b7a9b67c
|
added the changes committed to the hot fix rc70.1 in AvatarConstants.h
|
2018-07-25 11:31:02 -07:00 |
|
John Conklin II
|
6a491d1ac6
|
Merge pull request #13690 from danteruiz/fix-audio-hmd-issue
Fix audio page being set to desktop when starting in HMD.
|
2018-07-25 10:53:29 -07:00 |
|
amantley
|
37540c79b3
|
removed print statement and added const upper leg fraction
|
2018-07-25 10:51:19 -07:00 |
|
amantley
|
c5599623f7
|
added a reset when the hips go below 1/3 of the default avatar height of the hips also reset the vertical this prevents real life sitting
|
2018-07-25 10:29:29 -07:00 |
|