Howard Stearns
9a04fdf10a
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-26 16:24:27 -07:00
Howard Stearns
98f165f2ae
Avatar collision sounds.
...
collisionsSoundURL can be set in preferences:
Currently defaults to https://s3.amazonaws.com/hifi-public/sounds/Collisions-hitsandslaps/airhockey_hit1.wav .
Can be empty, which means no sound, rather than restoring default.
MyAvatar.collisionSoundURL can read/written in scripts.
Preloads when set, so that it won't have to fetch on first collision.
Plays at start of collision only, with volume proportional to "velocity change"^2.
2015-06-26 16:23:16 -07:00
Ryan Huffman
abe8cfe90f
Fix avatar displayname to point towards camera
...
Previously it used the camera orientation, which means all display names
have the same orientation, and will all rotate when you turn your head.
Instead, you only want to change the orientation of a particular display
name when you move.
2015-06-26 16:17:11 -07:00
Stephen Birarda
9b84eabd18
Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo
2015-06-26 14:40:01 -07:00
Seth Alves
bc7271769c
merge from master
2015-06-26 14:29:40 -07:00
Stephen Birarda
18e2b62ecc
initial image replacement for hyperlink preview
2015-06-26 14:12:26 -07:00
David Rowe
1898c6bd55
Merge branch 'master' into 20547
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-06-26 13:05:51 -07:00
Stephen Birarda
522b715628
remove comment, styling cleanup
2015-06-26 11:41:34 -07:00
Stephen Birarda
c6df573933
fix some OS X warnings, add description to tooltip
2015-06-26 10:50:31 -07:00
Seth Alves
c95db5672a
include argument-packing version in serialized argument data
2015-06-26 10:01:45 -07:00
Seth Alves
f5f1d0829c
Merge branch 'physics-lock-entity-tree' of github.com:sethalves/hifi into actions-over-wire
2015-06-26 07:20:51 -07:00
Seth Alves
a0d77c061c
lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does
2015-06-26 07:00:28 -07:00
Brad Hefta-Gaub
63812f28ad
Merge pull request #5206 from SamGondelman/cameraMode
...
fix bug that was preventing camera mode switches
2015-06-25 18:55:13 -07:00
Seth Alves
7c26641560
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-25 17:40:27 -07:00
David Rowe
f47cff1332
Remove duplicate method call
2015-06-25 15:41:27 -07:00
David Rowe
377979e380
Make field of view preference change be applied immediately
2015-06-25 15:41:10 -07:00
Sam Gondelman
56944afd39
avatar doesn't move in independent mode, alphabetized menu options
2015-06-25 12:36:36 -07:00
David Rowe
d38a5a1771
Back out saccade speed limit
2015-06-25 07:38:06 -07:00
Brad Hefta-Gaub
6c4a4866d3
Merge pull request #5202 from Atlante45/overlay
...
Overlay have correct bounds
2015-06-24 19:00:55 -07:00
Brad Hefta-Gaub
77bbb23a1e
Merge pull request #5175 from hyperlogic/ajt/first-person-avatar
...
Render a different model when in first person view.
2015-06-24 18:54:47 -07:00
Anthony J. Thibault
c480c85f85
Fixes for switching between fullAvatar and head & body avatars while in first person.
...
Need to always add _skeletonModel to the main scene when switching to head/body avatar.
Need to always remove _firstPersonSkeletonModel from main scene when switching to head/body avatar.
2015-06-24 17:35:23 -07:00
Atlante45
55c490043f
Restore InterfaceConfig.h includes
2015-06-24 16:13:42 -07:00
Atlante45
e3d22ef94b
Fix overlays getBounds + code cleanup
2015-06-24 16:13:42 -07:00
Anthony J. Thibault
71639a7466
Fix for switching avatars while mirror is not enabled.
...
When the avatar is changed via set*URL, we need to set the associated model visibility appropriately.
This way when it gets added to the scene later in preRender, initWhenReady, it will render with the correct visibility settings.
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
3853395298
Bug fixes for switching between head/body and full body avatars
...
The head model visibility is now updated in preRender()
Moved the near clip plane in a bit more
Invalidate head bone vector on LOD switching.
Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
b88d7c2e05
Added FIXME comment to preRender
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
8f03ead74e
Bug fix for two piece avatars.
...
The head was not rendering
2015-06-24 16:10:47 -07:00
Anthony J. Thibault
99a03bac21
Render a different model when in first person view.
...
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
2015-06-24 16:10:47 -07:00
Brad Hefta-Gaub
734a11e12a
Merge pull request #5199 from jherico/scale_rez_fix
...
Fixing misplaced UI on scale resolution
2015-06-24 16:10:33 -07:00
Atlante45
233d92c315
Some code cleanup
2015-06-24 15:44:47 -07:00
Atlante45
31a98c5b40
Replace pos/rot by a transform in Base3DOverlay
...
Also keep getBounds a pure virtual methods
2015-06-24 15:44:47 -07:00
Atlante45
c22f1aa7e1
Overlay2D return correct getBounds
2015-06-24 15:44:46 -07:00
Atlante45
e8da8e374c
Simplify Overlays payloadGetBounds
2015-06-24 15:44:46 -07:00
Atlante45
6bb21b7a48
Use dynamic_pointer_cast instead of static_cast
2015-06-24 15:44:45 -07:00
Brad Hefta-Gaub
1cb7d0c1a5
Merge pull request #5194 from jherico/qml_warnings
...
Removing qml warnings
2015-06-24 15:42:36 -07:00
Clément Brisset
6db4184748
Merge pull request #5171 from huffman/fix-edit-rotate
...
Fix edit.js rotation display
2015-06-24 15:35:15 -07:00
Sam Gondelman
19ec080e2b
Merge with master
2015-06-24 15:04:03 -07:00
Philip Rosedale
0bef506be2
Merge pull request #5190 from jherico/mirror_zoom
...
Mirror zoom
2015-06-24 14:43:14 -07:00
Ryan Huffman
4df1bea4ec
Merge pull request #5167 from SamGondelman/hmdControls
...
hmdControls.js for movement when wearing an HMD
2015-06-24 14:40:31 -07:00
Philip Rosedale
b7c64ef246
Merge pull request #5193 from SamGondelman/master
...
hydra dead zone to prevent drifting
2015-06-24 13:52:48 -07:00
Brad Davis
a5428ae24a
Merge remote-tracking branch 'upstream/master' into plugins
2015-06-24 10:39:31 -07:00
Seth Alves
28582ed14d
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-23 19:50:35 -07:00
Brad Davis
5818805931
Fixing some merge issues
2015-06-23 17:34:44 -07:00
Andrew Meadows
1ceed98ca2
Merge pull request #5166 from jherico/64bit
...
Enable Windows 64 bit builds
2015-06-23 17:03:42 -07:00
Brad Davis
8f8bda327c
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
interface/src/devices/OculusManager.h
2015-06-23 16:54:32 -07:00
Brad Davis
fb2fb06371
Fixing misplaced UI on scale resolution, PC edition
2015-06-23 15:42:32 -07:00
Seth Alves
146f51faac
quiet compiler
2015-06-23 15:26:43 -07:00
Ryan Huffman
8a1f446f05
Fix textoverlay3d text position
2015-06-23 14:43:41 -07:00
Sam Gondelman
778e19ac11
fixed camera mode issue
2015-06-23 11:45:08 -07:00
Brad Davis
da031b039c
Removing qml wanrings
2015-06-23 10:58:52 -07:00
Sam Gondelman
c1fdbeb3b4
hydra dead zone to prevent drifting
2015-06-23 10:52:44 -07:00
Seth Alves
6e34678a59
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-23 10:48:21 -07:00
Ryan Huffman
3e576fea92
Remove vertical scaling from Text3DOverlay
2015-06-23 10:27:01 -07:00
Sam Gondelman
824c219fa0
started fixing camera mode issue
2015-06-23 09:26:38 -07:00
Bradley Austin Davis
07dce3856a
Fixing some math functions
2015-06-22 20:10:21 -07:00
Bradley Austin Davis
62af30761e
Fixing inverted mirror zoom setting
2015-06-22 20:07:51 -07:00
Seth Alves
bd1c9f0be5
quiet compiler
2015-06-22 19:56:14 -07:00
Seth Alves
32be044d6a
quiet compiler
2015-06-22 19:56:00 -07:00
Bradley Austin Davis
f833121032
Fixing the initial missing UI on retina displays, again
2015-06-22 19:55:52 -07:00
Seth Alves
cc3854be8a
quiet compiler
2015-06-22 19:55:43 -07:00
Seth Alves
7eafe2d48d
quiet compiler
2015-06-22 19:55:25 -07:00
Seth Alves
f579027430
quiet compiler
2015-06-22 19:55:15 -07:00
Seth Alves
20f173a474
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 19:36:09 -07:00
Seth Alves
300a879ff4
Merge pull request #5186 from AndrewMeadows/antimony
...
fix crash when other avatar disconnects unexpectedly
2015-06-22 19:34:13 -07:00
Brad Hefta-Gaub
de39049a56
Merge pull request #5187 from jherico/fix_overlay_backgrounds
...
Fix the 2D text overlay backgrounds to stop using a previously bound …
2015-06-22 17:32:06 -07:00
Brad Hefta-Gaub
ee85ad8bf8
Merge pull request #5185 from jherico/mouse_flicker
...
Removing flickering mouse cursor in HMD
2015-06-22 17:23:40 -07:00
Brad Hefta-Gaub
81541e6013
Merge pull request #5180 from jherico/hmd_offset
...
Fixing HMD position offset bug in picking & stereo rendering in HMD
2015-06-22 17:22:26 -07:00
Bradley Austin Davis
ce3d1bd9a4
Fix the 2D text overlay backgrounds to stop using a previously bound texture
2015-06-22 16:19:31 -07:00
Andrew Meadows
ce9dfc098b
unhook motionstate before removing avatar
2015-06-22 15:40:26 -07:00
Andrew Meadows
b7c728a794
assert AvatarMotionState unhooked before delete
2015-06-22 15:40:02 -07:00
Seth Alves
f75506bf1b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 15:37:10 -07:00
Brad Davis
967fc62da7
Working on syncing with master
2015-06-22 13:46:03 -07:00
Brad Davis
9f98547390
Merge branch 'master' into plugins
2015-06-22 13:35:40 -07:00
Brad Davis
1cfc0b2e42
Fixing mac/linux compilation
2015-06-22 12:06:08 -07:00
Brad Davis
8c9deb9d16
Removing flickering mouse cursor in HMD
2015-06-22 12:04:55 -07:00
Brad Davis
4cd1c52987
Fixing HMD position offset bug in picking & stereo rendering in HMD
2015-06-22 11:20:48 -07:00
Philip Rosedale
293a88b3d4
Merge pull request #5158 from ctrlaltdavid/20545
...
DO NOT MERGE - QA for #20545 - Eye saccades are too jittery and too fast
2015-06-22 10:31:10 -07:00
Brad Davis
3231bbba5a
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
2015-06-22 09:44:16 -07:00
Seth Alves
bce8b0cc1b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-22 07:19:55 -07:00
samcake
be8ae9580d
Merge pull request #5177 from bwent/doubleClickEvent
...
Expose mouseDoublePressEvents to js
2015-06-22 11:13:05 +02:00
Seth Alves
3afdcfd6d1
quiet compiler
2015-06-21 18:12:58 -07:00
Bradley Austin Davis
02510790c3
Fixing projection during star rendering
2015-06-21 17:16:30 -07:00
Brad Davis
012b0973b9
removing cruft
2015-06-21 14:26:19 -07:00
Bradley Austin Davis
5bbfb97c37
Fixing blurry UI on retina displays
2015-06-21 13:31:18 -07:00
Seth Alves
746033f3bd
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-21 07:34:48 -07:00
Brad Davis
e66b2d4141
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-20 22:54:45 -07:00
Brad Hefta-Gaub
13c5c830d7
Merge pull request #5173 from huffman/fix-line-bounds
...
Add correct line3doverlay bounds
2015-06-20 11:39:08 -07:00
Bradley Austin Davis
577962cb67
Merge branch 'master' into overlay
2015-06-20 10:37:55 -07:00
Seth Alves
5381e6e9bb
entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion
2015-06-19 16:20:07 -07:00
Brad Davis
3ab8025b82
Responding to Sam's comments
2015-06-19 16:14:05 -07:00
Sam Gondelman
a0d4b7ec7c
without script, doesn't limit you to constant degree turns
2015-06-19 16:11:43 -07:00
Niraj Venkat
482f12be8c
Returning ref to stack to view controller
2015-06-19 16:05:45 -07:00
bwent
c315bcec24
Expose mouseDoublePressEvents to js
2015-06-19 15:52:27 -07:00
Brad Davis
cc6b589ae5
Merge remote-tracking branch 'upstream/master' into overlay
2015-06-19 14:48:38 -07:00
Brad Davis
99c217184b
Fixing the mic/camera buttons and the mirror UI buttons
2015-06-19 14:46:39 -07:00
Niraj Venkat
03c10d15e6
Adding lambdas and removing dead code
2015-06-19 14:37:21 -07:00
Niraj Venkat
054e12a315
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-19 11:22:50 -07:00
Niraj Venkat
b15e7cec21
Back and forward are red if not possible
2015-06-19 11:17:56 -07:00
Sam Gondelman
e78ce8055a
hmdControls turns on when you enter VR mode, turns off when you exit, can toggle with CTRL+G
2015-06-19 11:17:36 -07:00
Ryan Huffman
ff66eb584d
Add correct line3doverlay bounds
2015-06-19 10:48:07 -07:00
Ryan Huffman
665baff665
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate
...
Conflicts:
interface/src/ui/overlays/Circle3DOverlay.cpp
libraries/render-utils/src/RenderDeferredTask.cpp
libraries/render-utils/src/RenderDeferredTask.h
2015-06-19 10:07:57 -07:00
Ryan Huffman
690e2e38f2
Move circle3d and text overlays to batches
2015-06-19 09:45:13 -07:00
Seth Alves
89ec3c21b4
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-19 09:36:11 -07:00
Clément Brisset
5192796851
Merge pull request #5168 from samcake/daft
...
Improving the rendering job architecture
2015-06-19 18:00:39 +02:00
Sam Gateau
598d0a5375
Just remove these changes on SkeletonModel.cpp
2015-06-19 17:44:56 +02:00
Atlante45
9c7f24eeb6
Add culled option for simple programs
2015-06-19 16:50:38 +02:00
Atlante45
67473ac254
Fix rotation handle crash
2015-06-19 16:40:42 +02:00
Sam Gateau
9adfdb06fe
undo local modif to SKeletonModel.cpp
2015-06-19 11:00:27 +02:00
Sam Gateau
31633eca10
IMproving the probe system and cleaning the engine script
2015-06-19 10:41:40 +02:00
Sam Gateau
b09991d75b
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-19 09:35:40 +02:00
Brad Davis
9bef5f011b
Reverting mirror functionality
2015-06-19 00:03:46 -07:00
Brad Davis
0fa6ac175f
Merge branch 'master' into overlay
2015-06-18 21:56:11 -07:00
Brad Davis
d65e5882aa
Working on 64 bit builds
2015-06-18 21:44:12 -07:00
Sam Gondelman
aab8161fa4
remove unused function
2015-06-18 18:57:04 -07:00
Niraj Venkat
afc2db6c6a
address bar commit
2015-06-18 18:25:48 -07:00
Brad Davis
48b27acc79
Merge remote-tracking branch 'upstream/master' into overlay
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
Brad Hefta-Gaub
a7a53d8be7
Merge pull request #5148 from SamGondelman/rotationModes
...
center player in view mode
2015-06-18 18:02:47 -07:00
Seth Alves
32cf669d8b
moving toward sending actions over wire
2015-06-18 17:51:41 -07:00
Brad Hefta-Gaub
750ce250fa
Merge pull request #5150 from SamGondelman/mouseLook
...
mouse look script
2015-06-18 17:41:20 -07:00
Niraj Venkat
894a245318
Further changes to address bar
2015-06-18 17:35:50 -07:00
Philip Rosedale
2f080a8e29
Merge pull request #5147 from sethalves/more-actions
...
offset action
2015-06-18 17:35:50 -07:00
Niraj Venkat
55b6efb1e9
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-18 15:48:37 -07:00
Seth Alves
816726efdc
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-18 15:33:46 -07:00
Niraj Venkat
5645491170
Further changes to address bar
2015-06-18 15:09:13 -07:00
Niraj Venkat
1be303e3ed
Address bar polish
2015-06-18 15:07:27 -07:00
Brad Davis
edfb25bfe2
Removing debug define for VR overlay
2015-06-18 15:05:32 -07:00
Seth Alves
021dc64789
merge from upstream
2015-06-18 15:03:09 -07:00
Seth Alves
3c90c851e9
start on code to de/serialize actions
2015-06-18 15:01:34 -07:00
Sam Gondelman
53bbd519a3
two new customizable actions for use in js
2015-06-18 14:37:09 -07:00
Brad Davis
68595ef5dc
Delete sync object after use
2015-06-18 14:27:19 -07:00
Bradley Austin Davis
e75b1a6794
Merge branch 'temp' into overlay
2015-06-18 14:03:25 -07:00
Bradley Austin Davis
96ac5070f6
Adding some more protection to the viewport
2015-06-18 14:00:17 -07:00
Sam Gondelman
fd0efd91ff
added shift action, added timers and fast mode to hmdControls.js
2015-06-18 13:59:37 -07:00
Bradley Austin Davis
7bbaf026f3
use a monospace font on all platforms
2015-06-18 13:33:37 -07:00
Seth Alves
99afd07395
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-18 12:45:40 -07:00
Brad Davis
1243c54767
More merge bugs
2015-06-18 12:44:57 -07:00
Brad Davis
4404917003
Fix HMD projection post-merge
2015-06-18 11:16:25 -07:00
David Rowe
c88ba2c6d1
Increase the saccade interval
2015-06-18 10:41:51 -07:00
David Rowe
0c7c5f6301
Limit the speed of eye saccades
2015-06-18 10:21:36 -07:00
Seth Alves
53b5c8e6e7
more merge fallout
2015-06-18 10:19:12 -07:00
Seth Alves
b258aeaa3d
merge from master
2015-06-18 10:04:14 -07:00
Sam Gondelman
f752534f7c
actionEvent signal, captureActions, began work on hmdControls.js
2015-06-18 09:52:36 -07:00
Atlante45
d0f27f1648
Change display names size
2015-06-18 15:23:53 +02:00
Atlante45
c38fa46eb1
Increase anti z-fighting value
2015-06-18 15:23:53 +02:00
Atlante45
045a6a6ad9
Use render args frustum
2015-06-18 15:23:52 +02:00
Atlante45
be261cd038
Increase anti z-fighting value
2015-06-18 15:23:52 +02:00
Atlante45
fb6de91cbe
HACK Prevent head hight value explosion
2015-06-18 15:23:51 +02:00
Atlante45
3b41a8f209
Cancel display names roll
...
This is annoying in HMD
2015-06-18 15:23:51 +02:00
Atlante45
e1b5a3c204
Fix display name transform
...
They now have a fixed pixel size and ar pixel aligned
2015-06-18 15:23:51 +02:00
Atlante45
d7b9a1b032
Cleanup TextRenderer3D methods args
2015-06-18 15:23:49 +02:00
