James B. Pollack
2052b617b3
fix name for tilt maze ball
2016-04-11 13:07:16 -07:00
James B. Pollack
ee210c5038
cleanup
2016-04-10 16:42:00 -07:00
James B. Pollack
02f69607d7
Merge remote-tracking branch 'upstream/master' into homereset
2016-04-10 11:23:16 -07:00
James B. Pollack
f5f603f56e
update cuckoo clock lock
2016-04-10 11:13:33 -07:00
James B. Pollack
6781a7cb91
add headers, add virtual baton, try another way of disabling grab while trigger already held when using music box
2016-04-10 11:08:27 -07:00
Andrew Meadows
013f575cc9
Merge pull request #7632 from sethalves/fix-physics-feedback-loop
...
avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.
2016-04-10 10:40:09 -07:00
Seth Alves
43f735dd21
avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.
2016-04-09 22:18:43 -07:00
James B. Pollack
d849154466
try to lock cuckoo
2016-04-08 17:26:38 -07:00
James B. Pollack
ce670fbd21
fans, avatars, desk lamp, reset script
2016-04-08 17:22:35 -07:00
Brad Davis
b87e8220c4
Merge pull request #7619 from imgntn/noRefresh
...
Remove refresh feature from edit.js for now
2016-04-08 13:35:17 -07:00
Brad Davis
2353daa254
Merge pull request #7614 from ctrlaltdavid/20876
...
Disable arrow keys being able to move between HTML form fields
2016-04-08 13:28:30 -07:00
Brad Davis
8e1e11a6f8
Merge pull request #7615 from zzmp/fix/amd-particles
...
Add explicit layout to textured particle shader
2016-04-08 13:19:41 -07:00
Brad Hefta-Gaub
7ba08dd137
Merge pull request #7613 from hyperlogic/tony/model-entity-render-fix
...
Reading animation properties without an entityTree lock is considered harmful
2016-04-08 10:37:17 -07:00
James B. Pollack
b407e20e4b
remove regexp
2016-04-08 00:52:09 -07:00
James B. Pollack
fba6a74cf6
remove refresh for now
2016-04-08 00:50:15 -07:00
Brad Hefta-Gaub
35c8ae3381
Merge pull request #7618 from sethalves/fix-voxel-icons
...
host voxel icons on s3 rather than hungry.com
2016-04-07 20:58:08 -07:00
Seth Alves
723af9bcbd
host voxel icons on s3 rather than hungry.com
2016-04-07 20:34:34 -07:00
Zach Pomerantz
4e3ab73941
layout std140 in particle shader
2016-04-07 17:27:51 -07:00
Brad Hefta-Gaub
d79d66c34e
Merge pull request #7601 from ctrlaltdavid/20871
...
Entities editor fixes
2016-04-07 17:14:00 -07:00
Brad Hefta-Gaub
5287c174b4
Merge pull request #7605 from jherico/route_log_errors
...
Fixing logging errors on initial load of controller routes
2016-04-07 17:13:13 -07:00
James B. Pollack
4961b38aef
end of day
2016-04-07 16:18:27 -07:00
David Rowe
86d314f31a
Clarify code comment
2016-04-08 10:47:45 +12:00
David Rowe
e37e46d34a
Disable arrow keys being able to move between HTML form fields
...
Moving between form fields with arrow keys makes it to easy to make
unintended changes to adjacent fields.
2016-04-08 10:30:00 +12:00
Brad Hefta-Gaub
3d94558d6b
Merge pull request #7589 from jherico/oculus_input
...
Support oculus remote input
2016-04-07 15:05:45 -07:00
Brad Hefta-Gaub
157dd96303
Merge pull request #7612 from ZappoMan/mirrorReturnsToLastView
...
when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror
2016-04-07 14:56:53 -07:00
Brad Davis
d3f5f6ed00
Merge pull request #7609 from ZappoMan/reduceLogSpam
...
reduce log spam for the deadlock watchdog
2016-04-07 14:51:02 -07:00
Brad Hefta-Gaub
772e7b95f6
Merge pull request #7584 from zzmp/log/dep-is-set
...
Avoid warning for expected unset PresentThread
2016-04-07 14:47:56 -07:00
Brad Hefta-Gaub
e7d75cb22e
Merge pull request #7573 from sethalves/update-collision-hulls-of-avatar-children
...
Update collision hulls of avatar children
2016-04-07 14:47:44 -07:00
Brad Davis
72d8990fed
Fix menu launch from Oculus remote
2016-04-07 14:13:02 -07:00
Anthony J. Thibault
8f530ceaf9
Reading animation properties without an entityTree lock is considered harmful
...
In RenderableModelEntityItem::update() make a copy of the _animationProperties, which is under the entityTree lock.
In RenderableModelEntityItem::render() read from the copy of _animationProperties when not under the entityTree lock.
2016-04-07 13:42:40 -07:00
Brad Hefta-Gaub
d1a2a30c02
fix build buster
2016-04-07 13:41:05 -07:00
Brad Hefta-Gaub
09004680d0
handle a couple edge cases
2016-04-07 13:32:26 -07:00
Brad Davis
2f28c64edb
Fixing menu navigation in oculus remote
2016-04-07 13:21:00 -07:00
Brad Davis
a58a627fdf
Support oculus remote input
2016-04-07 13:20:59 -07:00
Brad Davis
4c78c0b330
Fix broken xbox controllers
2016-04-07 13:17:49 -07:00
Seth Alves
45733478da
make auto-unequip code smarter -- equipping a long thing by the end is now possible
2016-04-07 13:15:39 -07:00
Brad Hefta-Gaub
81bb5ff07d
when using the fullscreen mirror hot key, return to the view mode you were in when leaving full screen mirror
2016-04-07 13:13:19 -07:00
Brad Hefta-Gaub
bd1eb5842a
fix crash related to menu vs watchdog create order
2016-04-07 12:45:24 -07:00
Brad Hefta-Gaub
f3275b680b
Merge branch 'master' of https://github.com/highfidelity/hifi into reduceLogSpam
2016-04-07 12:10:15 -07:00
Brad Hefta-Gaub
dc4751a95b
Merge pull request #7595 from ZappoMan/depthReticleWork
...
Fix a random case of the depth reticle hiding when it shouldn't
2016-04-07 12:06:20 -07:00
Brad Davis
d8310cc6b1
Reduce controller log spam
2016-04-07 10:41:55 -07:00
Brad Davis
85019b2b5e
Fixing logging errors on initial load of controller routes
2016-04-07 10:41:54 -07:00
Brad Hefta-Gaub
2c3aeddbe4
reduce log spam for the deadlock watchdog
2016-04-07 10:25:08 -07:00
Seth Alves
8158d34b20
Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children
2016-04-07 09:59:49 -07:00
Brad Hefta-Gaub
50a081db00
Merge pull request #7596 from jherico/texture_transfer_fix
...
Move the texture transfer context back to the main thread for shutdown
2016-04-07 09:31:42 -07:00
Brad Hefta-Gaub
ce1625b551
Merge pull request #7600 from sethalves/fix-entity-script-error-message
...
attempt to make the failed-to-load-entity-script error-message be more helpful
2016-04-07 09:17:04 -07:00
Brad Hefta-Gaub
94e797d752
Merge pull request #7585 from zzmp/log/failed-routes
...
Log failed routes
2016-04-07 09:16:26 -07:00
Brad Hefta-Gaub
e78b202433
Merge pull request #7602 from ZappoMan/default1PView
...
default to first person view
2016-04-07 09:16:04 -07:00
Brad Hefta-Gaub
7f164a7959
CR feedback
2016-04-07 08:42:40 -07:00
Brad Hefta-Gaub
07a508f3ac
Merge pull request #7604 from ZappoMan/loginRedraw
...
fix redraw issue when logging in to or out of a domain
2016-04-07 08:30:59 -07:00
