David Rowe
9efeda9716
Adjust gaze target for someone looking at me
2015-07-02 15:43:23 -07:00
Sam Gateau
8d8a902328
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-02 15:06:32 -07:00
ZappoMan
b568e895ec
Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats
2015-07-02 15:00:09 -07:00
Brad Hefta-Gaub
2a03f62bf2
Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership
...
Actions over wire and improved simulation ownership
2015-07-02 14:57:27 -07:00
ericrius1
8be1fd28e5
stripping naked gl calls from overlays to allow vive and oculus plugins to work
2015-07-02 13:57:00 -07:00
David Rowe
3a92878544
Reinstate making someone looking at me look at my camera instead of face
2015-07-02 13:47:52 -07:00
ZappoMan
5c4d4893de
added bytes per edit stats
2015-07-02 13:44:28 -07:00
ZappoMan
63b585da0f
added updates per second stat
2015-07-02 13:28:12 -07:00
Brad Hefta-Gaub
b11172affb
Merge pull request #5254 from jherico/timing_menu_log
...
Inhibiting log spam unless a menu item is selected
2015-07-02 12:48:01 -07:00
Brad Davis
d5fe6f0bdb
Inhibiting log spam unless a menu item is selected
2015-07-02 12:34:32 -07:00
Philip Rosedale
fba569d7db
Merge pull request #5218 from huffman/fix-hmd-displayname-orientation
...
Fix avatar displayname to point towards camera
2015-07-02 12:19:40 -07:00
ZappoMan
b13a4b2a71
add edit update stats
2015-07-02 11:07:47 -07:00
Clément Brisset
b616fff222
Merge pull request #5220 from howard-stearns/avatar-collision-sounds
...
Avatar collision sounds
2015-07-02 10:27:24 -07:00
David Rowe
c20cd40275
Merge branch 'master' into 20601
...
Conflicts:
interface/src/avatar/Head.cpp
2015-07-02 09:51:47 -07:00
Philip Rosedale
0905962d90
Merge pull request #5251 from ctrlaltdavid/20600
...
Fix Show Eye Focus and Show Look-at Vectors
2015-07-02 09:16:20 -07:00
Brad Hefta-Gaub
f16b8d5083
Merge pull request #5246 from jherico/inter_idle_timing
...
Instrument the inter-idle time and tweaking the timeout setting
2015-07-02 09:01:44 -07:00
Howard Stearns
1f3a1f6ac8
Add comments re upcoming physics changes.
2015-07-02 10:07:14 -05:00
Howard Stearns
d0675c7f22
Side-effect new value before emit.
2015-07-02 09:56:02 -05:00
David Rowe
925fd71262
Fix rendering of look-at vectors
2015-07-01 22:45:47 -07:00
David Rowe
0df9ebeda3
Fix rendering of look-at avatar sphere
...
postLighting is never true.
2015-07-01 22:45:13 -07:00
David Rowe
026f6d3690
Add mouth as third gaze target in addition to left and right eyes
2015-07-01 21:22:30 -07:00
David Rowe
4ced0dc6c4
Only deflect eyes for Faceshift; DDE doesn't provide eye pitch or yaw
2015-07-01 20:24:47 -07:00
Seth Alves
246861221c
rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready.
2015-07-01 20:17:21 -07:00
David Rowe
26cbb14f45
Alternative look-at gaze left/right with face trackers too
...
Instead of looking at one or other eye depending on look direction.
2015-07-01 20:09:36 -07:00
David Rowe
fada70fe02
Remove redundant code
2015-07-01 18:32:33 -07:00
David Rowe
bc4c635106
Fix gazing at avatar (when no head tracking or HMD)
...
Randomly look at avatar's left and right eyes if the face is visible.
Otherwise just look at their head.
2015-07-01 18:31:16 -07:00
Sam Gateau
d019ef4373
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-07-01 18:12:11 -07:00
Sam Gateau
e8b11f1198
Exposing the display Item Status to js to turn it on/off
2015-07-01 17:27:41 -07:00
Brad Davis
88a733181e
Fixing comment to reflect code
2015-07-01 16:54:59 -07:00
Brad Davis
4cffa26c01
CR comments and fixing the microsecond display
2015-07-01 16:53:12 -07:00
Brad Davis
59027959b8
CR comments and fixing the average calculation
2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub
af932fde29
Merge pull request #5247 from ericrius1/handRender
...
Fixed broken rendering of hydra visualization paraphernalia
2015-07-01 16:21:32 -07:00
Brad Davis
0c88972f09
Instrument the inter-idle time and tweaking the timeout setting
2015-07-01 16:14:17 -07:00
ericrius1
a24df5c02f
added postLighting check back for rendering avatar Hands
2015-07-01 15:28:48 -07:00
ericrius1
f49f368ec3
removed dead commented out code
2015-07-01 15:16:34 -07:00
ericrius1
8129d0eb1f
hydra lasers are now rendering again
2015-07-01 15:12:37 -07:00
ericrius1
8b00864175
hydra hand spheres and lasers are rendering again
2015-07-01 15:04:19 -07:00
Clément Brisset
eb3bddfe4c
Merge pull request #5209 from ctrlaltdavid/20589
...
QA for #20589 - Vertical field of view preference change should be applied immediately
2015-07-01 13:53:25 -07:00
Clément Brisset
ede2eec283
Merge pull request #5240 from ctrlaltdavid/fix-textoverlay-size
...
Fix TextOverlay font size setting
2015-07-01 13:52:51 -07:00
David Rowe
6a48b56e0f
In mirror mode look directly at the camera in both normal and HMD view
2015-07-01 13:32:50 -07:00
David Rowe
efbccc3a4e
Fix storing Oculus eye positions
2015-07-01 13:32:50 -07:00
David Rowe
e85eb246d2
Delete old TextRenderer after new one is in place
2015-07-01 13:19:46 -07:00
Philip Rosedale
8ed4000560
Merge pull request #5239 from SamGondelman/zooming
...
DO NOT MERGE - quadratic zooming response
2015-07-01 12:22:23 -07:00
Jenkins Slave Access
981ff2d5fa
Enhancing PR installer titles
2015-07-01 14:13:37 -04:00
Seth Alves
5e2f7204b4
responses to code review
2015-07-01 10:29:42 -07:00
Brad Davis
cd63b8a49d
Fix inverted in/out mbps display on stats
2015-07-01 10:10:53 -07:00
David Rowe
215c260c9e
Fix TextOverlay font size setting
2015-06-30 17:08:43 -07:00
Sam Gondelman
c9d205de3e
quadratic zooming response
2015-06-30 14:04:43 -07:00
Seth Alves
0caa8be66e
ignore incoming changes for a hold action that's flagged as 'mine'
2015-06-29 19:50:19 -07:00
Seth Alves
88fc74374b
if a hold action is edited by a local script, mark it as 'mine'. if it's not 'mine', let the spring action handle the wire protocol
2015-06-29 19:27:10 -07:00
Seth Alves
0a734c9d3d
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership
2015-06-29 16:56:04 -07:00
Seth Alves
a0fd75c54f
don't enable hold actions from remote nodes
2015-06-29 16:08:37 -07:00
Seth Alves
fbede0a23f
guard against feeding bullet a NaN
2015-06-29 15:54:24 -07:00
Stephen Birarda
3dc3d8b4c1
make the tooltip background darker
2015-06-29 11:05:59 -07:00
Stephen Birarda
133247ec6d
Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo
2015-06-29 10:57:16 -07:00
Stephen Birarda
f93ad34282
add spacing above and below tooltipPic
2015-06-29 10:57:09 -07:00
Brad Davis
5cfa22396c
Merge pull request #5219 from venkatn93/master
...
Changing tooltip reticle
2015-06-29 10:51:16 -07:00
Seth Alves
1d122060a6
merge andrew's sim-ownership branch
2015-06-29 09:50:38 -07:00
Howard Stearns
51782bd17d
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-29 09:30:44 -07:00
David Rowe
386b3d8ae3
Fix text overlay font rendering
...
Use the same font size as used in TextRenderer to avoid scaling issues.
2015-06-27 14:02:49 -07:00
Seth Alves
0970f010a4
provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are
2015-06-27 13:31:00 -07:00
Howard Stearns
af4b804d37
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-27 12:50:13 -07:00
Seth Alves
97cd5b8b99
Merge pull request #5223 from SamGondelman/cameraMode
...
misc. key binding/camera fixes
2015-06-27 10:55:34 -07:00
Seth Alves
7f609dca26
Merge branch 'cameraMode' of github.com:SamGondelman/hifi into actions-over-wire
2015-06-27 10:49:12 -07:00
Seth Alves
567d98dfab
Merge branch 'cursor_fix' of github.com:jherico/hifi into actions-over-wire
2015-06-27 10:45:34 -07:00
Howard Stearns
dc7360cdc2
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-27 08:37:30 -07:00
Andrew Meadows
cf74dbe1dc
partial progress toward sim ownership negotiations
...
works well for just a few objects but fails for piles
committing some debug stuff that will have to be torn out later
2015-06-26 21:57:04 -07:00
Seth Alves
5ecc39b811
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 20:06:10 -07:00
Brad Davis
e6fade8c13
Prevent tooltips from appearing with stale data
2015-06-26 18:16:56 -07:00
Brad Davis
3b987c1e73
Fixing always-on link cursor
2015-06-26 18:14:31 -07:00
Sam Gondelman
2f0fcba1eb
key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode
2015-06-26 17:28:02 -07:00
Ryan Huffman
760a5bfa37
Fix call to atan2 when params are 0
2015-06-26 17:23:06 -07:00
Niraj Venkat
9101b4ad70
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-26 16:28:01 -07:00
Niraj Venkat
fe8d539cf5
changing link icon
2015-06-26 16:27:04 -07:00
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
Seth Alves
db580d1e0b
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 15:45:24 -07:00
Stephen Birarda
ff33922716
handle conflicts on merge with upstream master
2015-06-26 15:33:35 -07:00
Stephen Birarda
5b660e8c91
Merge pull request #5214 from venkatn93/master
...
Changing formatting of tooltip
2015-06-26 18:27:59 -04:00
Niraj Venkat
87fce44271
Changing formatting of tooltip
2015-06-26 14:41:38 -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
7e19a540fd
add the new placeholder image
2015-06-26 14:13:23 -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
Seth Alves
798c9492d3
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-26 11:47:21 -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
Brad Davis
8dcd91fdab
Merge pull request #5192 from venkatn93/master
...
Hyperlink tooltip and address bar remodel
2015-06-26 10:28:52 -07:00
Seth Alves
c95db5672a
include argument-packing version in serialized argument data
2015-06-26 10:01:45 -07:00
Niraj Venkat
b1c361b324
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-26 09:45:39 -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
Niraj Venkat
23f4f7d824
Place name is underlined
2015-06-25 15:56:40 -07:00
Niraj Venkat
8ea01b45ae
Word wrap implementation
2015-06-25 15:46:43 -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
Niraj Venkat
6b14a64c8c
Formatting changes and teleport on click
2015-06-25 15:15:44 -07:00
Niraj Venkat
de26dc9c49
Further changes to tooltip
2015-06-25 14:15:06 -07:00
Niraj Venkat
210a1205a7
More layout changes
2015-06-25 14:07:03 -07:00
Sam Gondelman
56944afd39
avatar doesn't move in independent mode, alphabetized menu options
2015-06-25 12:36:36 -07:00
Niraj Venkat
1a6acdc5b7
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-25 09:39:13 -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
Niraj Venkat
be053cfdc7
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-24 17:33:57 -07:00
Niraj Venkat
d89ff2f720
Merge pull request #5188 from AlexanderOtavka/master
...
Improve address bar and edit.js entity properties list.
2015-06-24 16:48:24 -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
Seth Alves
28582ed14d
Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire
2015-06-23 19:50:35 -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
Zander Otavka
05b668484c
Change address bar back/forward button color.
2015-06-23 16:41:15 -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
Niraj Venkat
0c2e208044
Added basic layout to tooltip QML
2015-06-23 13:54:19 -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
Niraj Venkat
d1526c25b2
Starting new tooltip design in QML
2015-06-23 10:08:48 -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
Niraj Venkat
98fa996752
Cleaning out comments
2015-06-22 16:56:49 -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
d94cc3d785
Merge pull request #5182 from venkatn93/master
...
Fixed tooltip position relative to the cursor
2015-06-22 13:57:47 -07:00
Philip Rosedale
111b0f286d
Merge pull request #5160 from ctrlaltdavid/addressbar-tidy
...
Tidy address bar code
2015-06-22 12:08:33 -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
Niraj Venkat
e66206ec4f
Fixed tooltip position relative to the cursor
2015-06-22 11:29:44 -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
David Rowe
0b13accf94
Merge branch 'master' into addressbar-tidy
...
Conflicts:
interface/resources/qml/AddressBarDialog.qml
2015-06-19 17:42:27 -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
1494aa4faa
Adding new icon and getters
2015-06-19 11:18:16 -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
