Zach Pomerantz
5bf9b8bc76
Set grid minor div min to 0.01
2016-02-22 11:59:15 -08:00
Brad Hefta-Gaub
e369c1f327
fix unix warning
2016-02-22 10:28:00 -08:00
samcake
377ee5a486
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-22 09:23:14 -08:00
Brad Hefta-Gaub
19d0968ccb
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
...
Conflicts:
interface/src/ui/ApplicationCompositor.h
2016-02-22 09:18:40 -08:00
Brad Hefta-Gaub
cbe80bffd6
go into away mode if you the HMD loses mouse capture
2016-02-21 12:57:14 -08:00
Brad Hefta-Gaub
9f602a938d
don't move mouse on reset sensors
2016-02-21 12:42:02 -08:00
Brad Hefta-Gaub
ba36eed9eb
whitespace fixes
2016-02-21 11:40:15 -08:00
Brad Hefta-Gaub
68771c92f7
change position to use mutex instead of atomic<>
2016-02-21 11:38:26 -08:00
Brad Hefta-Gaub
3e6cddede3
CR feedback
2016-02-21 10:03:51 -08:00
Brad Hefta-Gaub
32a7179c62
CR feedback
2016-02-21 09:59:19 -08:00
Brad Hefta-Gaub
1a4591db58
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
2016-02-21 09:30:41 -08:00
Brad Hefta-Gaub
31b895058b
depth reticle work
2016-02-21 09:30:26 -08:00
Brad Hefta-Gaub
9c3abd3eb7
some cleanup and standardization in how headPose is gathered
2016-02-20 11:40:30 -08:00
Brad Hefta-Gaub
9066fb0622
Merge pull request #7145 from howard-stearns/lod-pid-removal
...
Lod pid removal
2016-02-20 10:29:42 -08:00
Brad Hefta-Gaub
e6614fb9e5
Merge pull request #7141 from sethalves/fix-avatar-fade
...
Fix avatar fade
2016-02-20 10:26:07 -08:00
Brad Hefta-Gaub
db448c240f
Merge pull request #7122 from howard-stearns/audio-output-buffer
...
Audio output buffer
2016-02-20 09:40:06 -08:00
samcake
9b2a90b430
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-02-19 19:50:02 -08:00
Brad Hefta-Gaub
4e2c514eb1
fix mac warning
2016-02-19 18:27:25 -08:00
Brad Hefta-Gaub
04fa37324f
tweak to virtual desktop size, to make text more readable, 240d horz FOV
2016-02-19 18:24:32 -08:00
Brad Hefta-Gaub
1fa6e294e7
allow mouse to move outside of the overlay extents
2016-02-19 17:49:33 -08:00
Zach Pomerantz
665ef17fce
Remove avatar usage from grid3d
2016-02-19 16:38:53 -08:00
Stephen Birarda
f553becabe
data-server name tweak and isAgent behaviour change
2016-02-19 16:04:45 -08:00
Anthony Thibault
942f2c13ab
Vive: smoother updates for IK driven by vive controllers
...
Before this PR the simulation rate was clamped to never exceed 60htz.
This had problems when waving the vive hand controllers in the world,
they would jitter. The simulation rate is now clamped to never exceed
120 htz. This has the effect of synchronizing the display and the
update rates to 90htz.
Also there are improvements to vive support if threaded present is
disabled.
2016-02-19 15:58:13 -08:00
Zach Pomerantz
c9362a4073
Set grid major div min to 1
2016-02-19 15:58:08 -08:00
Zach Pomerantz
5d78867197
Set grid height via global y-coord
2016-02-19 15:41:38 -08:00
Howard Stearns
13c602e2a3
Remove mumbleUnsynchronizedFPS, which is obsolete now that the update/render rate is not in power-of-two lockstep with present rate, and which had users other than the LOD PID.
2016-02-19 15:12:44 -08:00
Zach Pomerantz
3418488c2f
Fool octree to avoid ui grid overlay culling
2016-02-19 14:44:33 -08:00
Anthony J. Thibault
b94410a323
MyAvatar: fix for turning with arrow keys on start up
2016-02-19 14:39:46 -08:00
Howard Stearns
a22b25aad9
Make defaults match our performance statements. (Half of present rate.)
2016-02-19 14:37:58 -08:00
Brad Hefta-Gaub
7219a925d2
remove getTrueMouse()
2016-02-19 14:17:28 -08:00
Howard Stearns
00f3d6e382
Remove LODPreference enum.
2016-02-19 14:05:21 -08:00
Howard Stearns
9f7feed544
Remove LOD PID controller.
2016-02-19 14:00:22 -08:00
Zach Pomerantz
0b4e82405f
Snap grid overlay to major worldlines
2016-02-19 13:57:33 -08:00
Zach Pomerantz
fd6aa9a78b
Add layering to renderGrid, draw edit grid not layered
2016-02-19 13:57:32 -08:00
Brad Hefta-Gaub
d9aa5d8857
cleanup dead code
2016-02-19 13:25:53 -08:00
Brad Hefta-Gaub
7be5811f34
tweak to UI size, clean up screen to overlay
2016-02-19 13:22:37 -08:00
Howard Stearns
30b4eace95
Remove LOD PID-related preferences and the related toggling of preferences.
2016-02-19 11:52:07 -08:00
Zach Pomerantz
9daefbdb94
Fix grid antialiasing
2016-02-19 11:39:11 -08:00
Zach Pomerantz
07a5c7bd16
Update grid shader for major/minor lines
2016-02-19 11:22:01 -08:00
Andrew Meadows
c53e583bf4
Merge pull request #7129 from hyperlogic/tony/no-hands-in-body
...
Prevent avatar's wrists from entering torso
2016-02-19 10:53:12 -08:00
Seth Alves
01d3977bf1
make avatars shrink faster
2016-02-19 10:04:58 -08:00
Brad Hefta-Gaub
d1e1067e5a
allow hydra mouse to know the correct size of screen to target
2016-02-18 22:30:31 -08:00
Brad Hefta-Gaub
bc5d4cfb7f
better handling of mouse capture to account for overlapping child windows
2016-02-18 20:20:30 -08:00
Brad Hefta-Gaub
0de5c1cf71
don't capture the mouse if you're not the active window or if a menu is popped up
2016-02-18 17:11:40 -08:00
Zach Pomerantz
af791e8f72
Make grid overlays unpickable
2016-02-18 15:50:18 -08:00
Zach Pomerantz
0c1353e6cc
Update grid overlay to use new renderGrid, sane properties
2016-02-18 15:48:23 -08:00
Brad Hefta-Gaub
adcadedc65
slight rework of handleRealMouseMoveEvent
2016-02-18 14:40:55 -08:00
Brad Hefta-Gaub
843039f741
fix mac warnings
2016-02-18 12:04:38 -08:00
Brad Hefta-Gaub
935af6d2cc
clean up debug logs
2016-02-18 12:01:03 -08:00
howard-stearns
30ae1950d2
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-output-buffer
2016-02-18 11:35:41 -08:00
Zach Pomerantz
f79fc30b83
Update audioscope to use new renderGrid
2016-02-18 11:30:53 -08:00
Brad Hefta-Gaub
0467930c57
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
...
Conflicts:
examples/controllers/handControllerGrab.js
2016-02-18 10:30:43 -08:00
Brad Hefta-Gaub
c4fc3e4057
more work on dragging in hmd
2016-02-18 10:07:37 -08:00
Brad Hefta-Gaub
279519b6d5
hmd mouse check point
2016-02-18 08:44:22 -08:00
Brad Hefta-Gaub
8b8b99c7e0
HMD mouse checkpoint
2016-02-17 21:19:01 -08:00
samcake
b88501784c
Making progress toward the PBR material
2016-02-17 18:47:52 -08:00
Anthony J. Thibault
73ac47724a
Rig: Prevent the hand IK targets from entering the body.
...
Use a 2d circle/circle intersection test to keep the hands outside of the body.
2016-02-17 16:23:18 -08:00
Anthony Thibault
e863da5a68
Merge pull request #7118 from jherico/hmd_mono
...
Remove distortion on HMD previews, both mono and stereo
2016-02-17 15:39:48 -08:00
Seth Alves
784dc2b538
Merge pull request #7124 from samcake/red
...
Fixing the disappearing avatars maybe ?
2016-02-17 12:05:04 -08:00
Brad Hefta-Gaub
38430d8d2c
Merge pull request #7112 from howard-stearns/snap-turn-preference
...
Snap turn preference
2016-02-17 09:19:38 -08:00
Howard Stearns
6d70584b5a
Change name and use only when in HMD.
2016-02-16 18:09:56 -08:00
Howard Stearns
983a0ccb9b
Change internal preference names so that old users pick up the new default values, and change name in dialog.
2016-02-16 18:00:39 -08:00
samcake
640bf81339
Forcing an update from teh avatar manager to the avatar renderItems when beeing updated
2016-02-16 17:19:31 -08:00
Brad Hefta-Gaub
a25581c656
clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor)
2016-02-16 12:11:58 -08:00
samcake
0ad7bacf02
Changing diffuse to albedo and breaking everything...
2016-02-15 21:50:10 -08:00
Brad Davis
56fc9ea301
Remove distortion on HMD previews, both mono and stereo
2016-02-15 21:46:29 -08:00
Brad Hefta-Gaub
0d873c7732
consolidate all calls to QCursor::pos() and QCursor.setPosition() to use common ControllerScriptingInterface
2016-02-15 16:11:25 -08:00
Zach Pomerantz
0d29f59e39
Remove drawOnHUD from 3d overlays
2016-02-15 14:04:02 -08:00
howard-stearns
4150d318d3
"Leave it on by default" (and change name of route variable to SnapTurn).
2016-02-15 13:39:53 -08:00
howard-stearns
20406a5a14
Remove comfortMode menu item, but add a Settings for snapTurn within MyAvatar.
2016-02-15 13:26:40 -08:00
Zach Pomerantz
8feace62b7
Conform text3d initializers to coding standard
2016-02-15 13:05:19 -08:00
Zach Pomerantz
5d1aedf707
Update scene items on overlay3d edits
2016-02-15 13:05:19 -08:00
Zach Pomerantz
452b6f4e59
Fix opacity check for Overlay ItemKey
2016-02-15 13:02:29 -08:00
Zach Pomerantz
f2b716f90a
Alias text3d's backgroundAlpha to alpha
...
getAlpha(), across 3d overlays, refers to the behavior
of the overlay as a whole. This conforms text3d, and
adds a new property, textAlpha, to replace the old
alpha semantic.
2016-02-15 13:02:29 -08:00
howard-stearns
7057d5c40c
Snap Turn avatar preference. (Still tied to Developer menu item.)
2016-02-15 12:38:40 -08:00
samcake
0c0089f736
REnamed Octree.h/cpp to SpatialTree and fixing some coding guidelines
2016-02-15 11:08:12 -08:00
samcake
545f276fdf
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-15 09:29:00 -08:00
Brad Davis
b5cba79f0c
Merge pull request #7095 from ZappoMan/hmdHacking
...
Various bug fixes in related to HMD overlay support
2016-02-12 17:50:42 -08:00
Andrew Meadows
6baf181453
Merge pull request #7093 from hyperlogic/tony/input-poses-in-avatar-space
...
Controller Pose values are relative to Avatar.
2016-02-12 17:13:36 -08:00
Brad Hefta-Gaub
d85a8a4fb9
Merge pull request #7103 from jherico/render-rate
...
Don't drop to half the vsync rate when we can't keep up
2016-02-12 17:11:03 -08:00
Brad Davis
df225afd05
PR feedback
2016-02-12 16:25:46 -08:00
Brad Hefta-Gaub
df6437236e
some CR feedback
2016-02-12 16:13:12 -08:00
Brad Davis
908e153c36
Don't drop to half the vsync rate when we can't keep up
2016-02-12 15:57:27 -08:00
samcake
9bfeb4a1d5
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-12 11:31:47 -08:00
Brad Hefta-Gaub
1160ecb335
improvements in HMD UI behavior
2016-02-12 10:51:33 -08:00
samcake
ef92a52777
Merge pull request #7051 from zzmp/feat/graphics-dialog
...
Move graphics settings to a new dialog
2016-02-12 10:46:00 -08:00
samcake
f12030c1a4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 18:41:02 -08:00
Anthony J. Thibault
8bde897cee
Application: removed unused myAvatar local variable.
2016-02-11 18:14:42 -08:00
Anthony J. Thibault
111ed65bf8
Controller Pose values are relative to Avatar.
...
Pass a InputCalibrationData to each inputPlugin and inputDevice.
This contains the most up sensorToWorldMatrix, avatarMat and hmdSensorMatrix.
Each input plugin can use this data to transform it's poses into Avatar space
before sending it up the chain.
This fixes a bug in the handControllerGrab.js script that relied on the hand controller
rotation/positions being in the avatar frame.
2016-02-11 17:18:01 -08:00
Seth Alves
90d81bc17b
Merge pull request #7091 from jherico/overlayCrash
...
Prevent overlay cleanup from crashing the app
2016-02-11 16:26:07 -08:00
Andrew Meadows
b6456889ef
Merge pull request #7050 from Atlante45/fix/audio-stats
...
Fix audio stats
2016-02-11 15:56:45 -08:00
Brad Davis
e06bc26896
Prevent overlay cleanup from crashing the app
2016-02-11 15:17:58 -08:00
Brad Hefta-Gaub
894c75f8fc
Merge pull request #7066 from zzmp/fix/circle3d-radii
...
Add radius as property to circle3d
2016-02-11 13:07:24 -08:00
Brad Hefta-Gaub
d14b9ab9b6
Merge pull request #7065 from zzmp/fix/circle3d-click
...
Fix circle3d FindRayIntersection
2016-02-11 13:07:00 -08:00
Chris Collins
ca15638463
Merge pull request #7080 from ZappoMan/fixPersistMono
...
add support for persisting the mono preview mode option
2016-02-11 13:03:49 -08:00
Chris Collins
38ba852c2e
Merge pull request #7075 from Atlante45/fix/add-to-scene
...
Fix "Add to scene" option while dropping model
2016-02-11 13:02:36 -08:00
Zach Pomerantz
a7778daed2
Change graphics dialog to persisted dropdowns
2016-02-11 10:15:13 -08:00
Stephen Birarda
62e842bf2b
Merge pull request #7052 from huffman/bugsplat
...
BugSplat integration
2016-02-11 10:10:44 -08:00
samcake
31230e81bb
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 10:05:58 -08:00
samcake
355b8ee40d
THursday morning the frustum culling seems broken in one particular angle
2016-02-11 10:05:39 -08:00
Zach Pomerantz
84197e5eb2
Add persistent render engine configuration file
2016-02-11 10:00:44 -08:00
Zach Pomerantz
5eeaa9a33e
Move graphics settings to dedicated dialog
2016-02-11 10:00:44 -08:00
Ryan Huffman
d226416306
Update params to MiniDmpSender to be const
2016-02-11 09:46:31 -08:00
Zach Pomerantz
eb6ff725c4
Fix circle3d FindRayIntersection to scale by radius
2016-02-11 08:24:48 -08:00
Ryan Huffman
3355019cbe
Add custom bugsplat flags
2016-02-11 08:17:20 -08:00
Brad Hefta-Gaub
d77d102384
add support for persisting the mono preview mode option
2016-02-10 22:01:17 -08:00
Atlante45
913172b490
Fix extension checking
2016-02-10 18:17:13 -08:00
Atlante45
1fe4ff5319
Make stats code more readable
2016-02-10 16:35:06 -08:00
Chris Collins
b1c6d1d256
Merge pull request #7070 from sethalves/no-sink-upon-server-restart
...
don't sink through floor when server restarts
2016-02-10 14:42:28 -08:00
Seth Alves
11d296a477
if we are told to clear the octree, disable physics until we have (re)loaded entities
2016-02-10 14:08:35 -08:00
Zach Pomerantz
7e474dba60
Add radius as property to circle3d
2016-02-10 12:27:00 -08:00
Andrew Meadows
132169395c
use const reference for std:vector
2016-02-10 10:36:34 -08:00
Seth Alves
43592fd699
Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform
...
Better avatar animation when attached to a moving entity
2016-02-09 14:30:02 -08:00
Anthony J. Thibault
2b10fea006
SpatiallyNestable: warn on failure.
2016-02-09 14:03:39 -08:00
Brad Hefta-Gaub
a8ec4bb844
Merge pull request #7049 from jherico/antistutter
...
Anti-stutter work
2016-02-09 12:16:15 -08:00
Ryan Huffman
27384dbe0a
Clean up BugSplat initialization
2016-02-09 11:33:50 -08:00
Chris Collins
cc576dd5e3
Merge pull request #7045 from sethalves/fix-query-cube
...
fix queryAACube lastEdited bug
2016-02-09 11:23:56 -08:00
Ryan Huffman
65b82b9bba
Add BugSplat to interface
2016-02-09 10:48:32 -08:00
Chris Collins
e61636e8a7
Merge pull request #7028 from zzmp/fix/overlay
...
Add transparency and layering for overlays
sam is doing it
2016-02-09 09:18:32 -08:00
Anthony Thibault
aa3cb8fb20
Merge pull request #7047 from AndrewMeadows/hide-the-razor-blades
...
MyAVatar::rebuildCollisionShape() is not a slot
2016-02-09 09:11:14 -08:00
Brad Davis
6a66d74e19
Limit the number of concurrent file parsing threads
2016-02-08 23:55:03 -08:00
Anthony J. Thibault
072172b1a2
SpatiallyNestable: now with velocity support!
...
Moved velocity and angularVelocity into the SpatiallyNestable base class.
Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.
MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
2016-02-08 19:43:23 -08:00
samcake
07759bb5db
Merge pull request #7034 from zzmp/feat/render-to-json
...
Add toJson methods to render config objects in JS
2016-02-08 18:00:25 -08:00
Andrew Meadows
65ca25ff47
MyAVatar::rebuildCollisionShape() is not a slot
2016-02-08 17:08:40 -08:00
Seth Alves
d5f3447fbc
when updating queryAACubes for children, use the lastEdited from the parent's properties
2016-02-08 16:22:41 -08:00
Anthony J. Thibault
97bcc54360
CharacterController: separate target velocity from parent velocity.
...
Also, disable damping on the rigidBody used by the CharacterController.
2016-02-08 16:01:36 -08:00
Seth Alves
7f2b822796
only setLastEdited on properties to be sent
2016-02-08 15:15:49 -08:00
Seth Alves
3030944ca1
set last-edited when updating a child's queryAACube
2016-02-08 15:09:11 -08:00
Anthony J. Thibault
2667fe3c24
Merge branch 'master' into tony/avatar-on-moving-platform
2016-02-08 14:32:46 -08:00
Zach Pomerantz
a7bafed61b
Change ShapeKey::CULL to NO_CULL_FACE
2016-02-08 13:44:42 -08:00
Brad Hefta-Gaub
7939f1381c
Merge pull request #7036 from jherico/qml
...
Fix native text rendering by forcing positions to integer values
2016-02-08 09:45:57 -08:00
Anthony Thibault
c4f9a4805c
MyAvatar: moving platform support
...
* pass sum of desired and parent velocity onto avatar's character controller.
* pass local position and velocity to Rig for animation purposes.
2016-02-07 14:07:40 -08:00
Philip Rosedale
a98efbc660
Merge pull request #6997 from jagwire/WorkingEnergy
...
Working energy usage for entity manipulation.
2016-02-05 17:17:45 -08:00
Zach Pomerantz
8bf6c66327
Add (de)serializer for QObject->JSON
2016-02-05 13:03:46 -08:00
Howard Stearns
47694b90ee
Fix inverted boolean that was preventing other people's avatars from mouth-animating.
2016-02-05 11:47:21 -08:00
Bradley Austin Davis
ebf0bf394a
Fix native text rendering by forcing positions to integer values
2016-02-05 11:43:31 -08:00
Babiuch, Ryan Nicholas
aab98db812
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-05 12:49:38 -06:00
Andrew Meadows
725f9e29a3
Merge pull request #7026 from hyperlogic/tony/fly-like-an-eagle
...
MyAvatar: Use head to turn while flying in HMD mode
2016-02-04 17:52:47 -08:00
Brad Hefta-Gaub
817245accc
Merge pull request #7025 from jherico/qml
...
QML Work
2016-02-04 16:03:39 -08:00
Babiuch, Ryan Nicholas
fb5236e9b2
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-04 16:50:43 -06:00
Zach Pomerantz
3fceaba2fe
Remove extra qualifications to getShapeKey from overlay headers
2016-02-04 10:01:34 -08:00
Babiuch, Ryan Nicholas
dca7ff967c
Conform to coding standard.
2016-02-04 08:26:56 -06:00
Babiuch, Ryan Nicholas
142ec76600
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-04 08:18:47 -06:00
Zach Pomerantz
53bd595b77
Update all appropriate overlays to use plumber
2016-02-03 19:18:56 -08:00
Zach Pomerantz
8d0f82fa6a
Split DrawOverlay3D to Transparent/Opaque
2016-02-03 19:18:56 -08:00
Zach Pomerantz
60f3ee5a18
Initialize Volume3dOverlay to a valid scale
2016-02-03 19:18:56 -08:00
Stephen Birarda
058bba7b55
move avatar invokables from AvatarManager to AvatarHashMap
2016-02-03 17:13:35 -08:00
Anthony J. Thibault
d2068678f4
MyAvatar: bumped up size of head, w.r.t. head cauterization.
...
This is to avoid some issues where face is visible when looking straight down.
Specifically, with the Albert avatar.
2016-02-03 16:08:11 -08:00
Anthony J. Thibault
027a2166f5
MyAvatar: Use head to turn while flying in HMD mode
2016-02-03 15:44:06 -08:00
Bradley Austin Davis
0a99086617
Moving to QML based dialogs
2016-02-03 14:51:02 -08:00
Bradley Austin Davis
c1d45b0c78
Remove declarative form creation from WindowScriptingInterface
2016-02-03 14:50:59 -08:00
Andrew Meadows
63df34541d
Merge pull request #6802 from huffman/agent-simulation
...
Fix Agents bidding on simulation ownership
2016-02-03 13:45:12 -08:00
Babiuch, Ryan Nicholas
d7951f4300
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-03 14:52:08 -06:00
Andrew Meadows
861082964e
Merge pull request #7017 from hyperlogic/tony/fly
...
MyAvatar: Improved Jump / InAir / Fly behavior
2016-02-03 12:22:30 -08:00
Brad Hefta-Gaub
839ce50bde
Merge pull request #7018 from jherico/qml
...
QML fixes
2016-02-03 11:59:27 -08:00
Babiuch, Ryan Nicholas
3d727d76c2
Merge branch 'master' of github.com:highfidelity/hifi
2016-02-03 13:39:13 -06:00
Stephen Birarda
93530fca72
fix the last of the current override warnings for OS X
2016-02-03 11:08:41 -08:00
Andrew Meadows
cd56d635e1
Merge pull request #7012 from sethalves/adjust-palm-position
...
base palm position on finger joint rather than an offset from hand joint
2016-02-03 10:34:39 -08:00
Bradley Austin Davis
f24f2749e1
Make users.js show QML window for edit friends
2016-02-02 15:19:12 -08:00
Anthony J. Thibault
6cc3b2b47f
Fixed unused variable warnings on OSX and Linux
2016-02-02 15:04:28 -08:00
Bradley Austin Davis
5adf9adb0e
Make mirror rectaqngle move with mirror controls
2016-02-02 12:00:17 -08:00
Anthony J. Thibault
c4e1509aa2
CharacterController: better debug support of internal state machine
...
Head is no longer visible when flying fast, in first-person HMD mode.
2016-02-02 11:26:18 -08:00
Anthony J. Thibault
2936811484
Added takeoff animation, WIP
...
Character controller still has some jump/in-air bugs.
2016-02-02 11:26:15 -08:00
Anthony J. Thibault
61c55ebf6c
Updated character controller with a state enumeration
...
Also, adjusted checkForSupport logic such that very slanted walls are not considered support.
2016-02-02 11:26:15 -08:00
Anthony J. Thibault
e9fd439ffd
Added inAir animations
2016-02-02 11:23:46 -08:00
Ryan Huffman
eff02d3e3a
Fix Agents bidding on simulation ownership
2016-02-02 10:47:51 -08:00
Andrew Meadows
e394f64540
Merge pull request #6991 from seefo/master
...
Added camera sensitivity dialog preferences
2016-02-02 08:22:45 -08:00
Seth Alves
1e69c12e87
move grab position to front of palm
2016-02-01 18:47:26 -08:00
Seth Alves
2501be16cb
base palm position on finger joint rather than an offset from hand joint. double size of near-grab sphere
2016-02-01 18:11:27 -08:00
Seth Alves
8d8e3520d5
Merge pull request #7007 from samcake/hdr
...
Fixing the darkening rendering bug
2016-02-01 16:46:32 -08:00
samcake
e645f8a1f1
FIxing the rendering bug, current zone enity lighting and skybox were not applied anymore
2016-02-01 16:25:55 -08:00
Brad Davis
1d4dc636af
Merge pull request #7002 from hyperlogic/tony/qml-overlay-delete-fix
...
QmlOverlay: Fix for issue use after delete
2016-02-01 16:03:58 -08:00
Brad Davis
3fcea102ed
Remove unused variable
2016-02-01 16:03:47 -08:00
Anthony J. Thibault
bea5ced3eb
QmlOverlay: remove unnecessary capture by value sigil from lambda
2016-02-01 15:46:49 -08:00
Anthony J. Thibault
db5e750fd7
Removed debug code
2016-02-01 15:45:57 -08:00
Anthony J. Thibault
64b56207f2
QmlOverlay: Fix for issue use after delete
...
Sometimes, it was possible to set the qmlElement bounds AFTER the qmlElement itself was deleted on another thread.
To fix this we use a shared_ptr to hold the qmlElement, then use a weak_ptr in the setProperties lambda, to verify that the qmlElement still exists.
The script that was previously causing this code to fail is: "users.js".
Because, it creates a textSizeOverlay then immediately deletes it.
2016-02-01 14:20:29 -08:00
samcake
1b52d700a0
Merge pull request #6871 from Atlante45/feat/draw-call-info
...
Unify normal and named draw paths
2016-02-01 14:19:15 -08:00
Brad Hefta-Gaub
6779bc4073
Merge pull request #7000 from jherico/qml
...
Snapshot UI in QML
2016-02-01 14:00:25 -08:00
Brad Hefta-Gaub
711787a997
Merge pull request #6981 from howard-stearns/animate-iff-visible-with-step2-billboard-removal
...
Animate iff visible with step2 billboard removal
2016-02-01 13:54:25 -08:00
Brad Davis
27c38599a9
Snapshot dialogs
2016-02-01 11:07:48 -08:00
Brad Davis
eb7988e4ef
Cleaning up unused code
2016-02-01 11:07:46 -08:00
Atlante45
7e8ea4dc77
Update primitive instance rendering calls
2016-02-01 18:50:01 +01:00
howard-stearns
277dbdbc37
Merge branch 'master' of https://github.com/highfidelity/hifi into better-head-joint-setup
2016-02-01 09:35:30 -08:00
Seth Alves
753fc44c12
Merge pull request #6996 from thoys/hydra-scaling-fix
...
Fix for controller palm movement for scaled avatars
2016-02-01 09:17:22 -08:00
Seth Alves
b553c8400d
Merge pull request #6988 from huffman/market-import-fail
...
Fix marketplace imports failing silently if edit.js not running
2016-02-01 07:06:34 -08:00
Babiuch, Ryan Nicholas
47f7d55e2c
Working energy usage for entity manipulation.
...
- Working example in examples/example/ui/MyEnergyBar.js
2016-02-01 08:32:52 -06:00
Thijs Wenker
8f6e7018bd
Fix for Hydra scaling
...
This PR fixes the hydra (and probably other hand controllers) while scaling.
Testing notes:
- Enable your hydra's
- Grow your avatar (x5 or x10) (With the `+` key)
- Spreading your arms in a T-pose should work without any scaling issues
- Reset your scale using the `=` key
2016-01-31 23:39:43 +01:00
Seefo
07043d537f
Fixed Ubuntu warnings
2016-01-29 21:11:44 -05:00
Seefo
0fad9b6755
Changed literals to follow coding standard
2016-01-29 20:07:45 -05:00
Seefo
56c3a37cdd
Fixed indentation
2016-01-29 19:59:28 -05:00
Seefo
77050b13dc
Adjusted default pitch/yaw speed
2016-01-29 19:41:34 -05:00
Seefo
33a01819e3
Fixed indentation
2016-01-29 19:36:23 -05:00
Seefo
ffa6687af3
Added setting dialogs for camera pitch and yaw
2016-01-29 19:34:57 -05:00
howard-stearns
ceed571c82
Look harder for head, log if not found, and compute what we need
...
regardless.
2016-01-29 16:02:58 -08:00
Seefo
22044db0b1
Readded center avatar in view option now that third person camera is fixed
2016-01-29 18:48:49 -05:00
Ryan Huffman
acf96a401f
Fix marketplace imports failing silently if edit.js not running
2016-01-29 15:48:08 -08:00
David Rowe
e07baf916b
Fixed a typo noticed in passing
2016-01-30 12:30:21 +13:00
David Rowe
a5bc1cfd19
Periodically store avatar location
2016-01-30 12:27:47 +13:00
David Rowe
d2cdbebc94
Store avatar location after a teleport
2016-01-30 12:26:50 +13:00
David Rowe
be4022983b
Don't store avatar location immediately after a host change
...
Because the avatar location is 0,0,0 rather than the end target.
2016-01-30 12:25:56 +13:00
