Seth Alves
bfac7c6f68
Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3
2016-05-13 13:33:39 -07:00
Seth Alves
ceb6aa582f
don't crash when a moving model entity is deleted
2016-05-13 13:32:45 -07:00
Seth Alves
970e7ca17d
don't crash when a moving model entity is deleted
2016-05-13 13:32:00 -07:00
Seth Alves
efe02c0fa1
make lock/unlock button easier to see
2016-05-13 10:57:41 -07:00
Seth Alves
0ab987faac
Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3
2016-05-13 10:13:10 -07:00
Seth Alves
09317f46e5
Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into update-model-meta
2016-05-13 09:52:59 -07:00
Seth Alves
81af0d0a47
Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3
2016-05-13 09:41:56 -07:00
Seth Alves
574709824e
oops
2016-05-13 09:41:19 -07:00
Seth Alves
36e5751638
Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into avatar-entities-3
2016-05-13 07:12:39 -07:00
Seth Alves
9bd4b4f8d8
Merge branch 'master' of github.com:highfidelity/hifi into fix-update-entity-operator
2016-05-13 07:12:11 -07:00
Seth Alves
dabecb7cc2
merge from other branch
2016-05-13 07:11:57 -07:00
Seth Alves
79141e3869
dry up some code
2016-05-13 07:06:25 -07:00
Seth Alves
eb19c5be13
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-13 07:04:58 -07:00
Seth Alves
dd2a29aace
when a ModelEntityItem moves, also update its meta-render-item
2016-05-12 18:05:28 -07:00
Seth Alves
30fb9349c4
dry up some code
2016-05-12 17:52:40 -07:00
Brad Davis
85272a87ba
Merge pull request #7859 from samcake/lemon
...
Introduce the "Unlit" shading model support and apply it to Web Enitities
2016-05-12 15:09:50 -07:00
samcake
670826effc
appeasing linux gods ?
2016-05-12 14:50:41 -07:00
samcake
c6aeaf308b
appeasing linux gods ?
2016-05-12 14:36:45 -07:00
samcake
a436c54817
make scribe spit out bigger chunks of litteral strings
2016-05-12 14:14:05 -07:00
James B. Pollack
e92b4029b2
Merge pull request #7866 from imgntn/firePit
...
[Home] Updates to content
2016-05-12 13:48:40 -07:00
Seth Alves
2f93a38a6a
Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into avatar-entities-3
2016-05-12 11:17:18 -07:00
Seth Alves
63073301ee
try again to fix update logic
2016-05-12 11:16:42 -07:00
Seth Alves
2101d7dea3
Merge branch 'fix-update-entity-operator' of github.com:sethalves/hifi into avatar-entities-3
2016-05-11 18:50:01 -07:00
Seth Alves
ce3faa2916
fix logic in UpdateEntityOperator
2016-05-11 18:47:20 -07:00
Seth Alves
c784ca9771
debugging
2016-05-11 18:45:56 -07:00
Seth Alves
fcd2e45d67
merge from upstream
2016-05-11 18:45:32 -07:00
Anthony Thibault
8fecb51dde
Merge pull request #7846 from hyperlogic/tony/improved-avatar-debug-draw
...
Eye tracking bug fix and debug rendering improvements
2016-05-11 17:41:49 -07:00
Seth Alves
032fbd9a55
taking something off now makes it an entity-server-aware entity
2016-05-11 16:41:00 -07:00
Brad Hefta-Gaub
d656f61c64
Merge pull request #7759 from jherico/app_plugin_type
...
Don't expose raw pointer to the display plugin
2016-05-11 14:49:22 -07:00
Brad Davis
ba357721bf
Merge pull request #7864 from hyperlogic/tony/vive-controller-improvements
...
Fix for vive controllers sometimes not working
2016-05-11 14:32:33 -07:00
Seth Alves
73c06b3bf4
updating attachedEntitiesManager to work with new system
2016-05-11 14:13:08 -07:00
Anthony J. Thibault
95ef543f25
viveTouchpadTest.js: don't throw if there is no Vive controller attached.
2016-05-11 13:35:17 -07:00
Seth Alves
ac506dc4b7
where needed, copy clientOnly into properties before calling queueEditEntityMessage
2016-05-11 12:46:16 -07:00
samcake
80c80091e4
Cleaning up code
2016-05-11 11:12:39 -07:00
Brad Hefta-Gaub
e01681eb52
Merge pull request #7856 from ZappoMan/NUEtweaks
...
don't show help or login on first run
2016-05-11 10:53:09 -07:00
samcake
99dcfef5a8
Merge branch 'master' of https://github.com/highfidelity/hifi into lemon
2016-05-11 10:47:38 -07:00
samcake
1ec9ef560e
Fixing the srgb color format conversion for web entities
2016-05-11 10:46:54 -07:00
Anthony J. Thibault
c91455a291
Added mapping from Vive LSTouch and RSTouch to Standard.
2016-05-11 10:36:55 -07:00
James B. Pollack
8cac61081d
change cuckoo and whiteboard positions
2016-05-11 10:33:06 -07:00
James B. Pollack
46c6999dd4
add fire sound
2016-05-11 09:59:50 -07:00
Seth Alves
9038647b65
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-11 09:07:44 -07:00
Anthony J. Thibault
09a4e0eaa8
Fix for vive controllers sometimes not working
...
* Fixed bug with input devices that where added, removed then re-added.
The default mappings were being ignored on the second add.
* Fixed potential crash when hardware inputPlugin device poses were polled from the JavaScript thread
by taking the UserInputManager lock during pluginUpdate.
* Renamed Controller.Hardware.Vive.LB & RB to LeftGrip and RightGrip, to better match Oculus touch.
* Updated resource/controller/vive.json to reflect this new mapping.
* Exposed touch pad capacitive touch events to JavaScript as
Controller.Hardware.Vive.LSTouch and RSTouch.
* Added viveTouchpadTest.js script to test LSTouch and RSTouch events.
2016-05-10 19:32:08 -07:00
samcake
e40a795a27
Trying to clean up for pr
2016-05-10 19:25:22 -07:00
Seth Alves
872f1b0c64
clear avatarEntity data for entities that are deleted
2016-05-10 17:48:55 -07:00
James B. Pollack
af8a827c83
add fire remove plant
2016-05-10 17:18:21 -07:00
Seth Alves
e4e0be8fa3
relay owningAvatar from properties to entity on entity creation
2016-05-10 16:51:38 -07:00
Seth Alves
de12680ff1
don't put actions on other people's avatarEntities
2016-05-10 16:43:27 -07:00
Brad Hefta-Gaub
757eea16a6
Merge pull request #7809 from howard-stearns/hand-controller-pointer
...
Hand controller pointer
2016-05-10 16:37:26 -07:00
Seth Alves
356ccdba26
debug icon for clientOnly
2016-05-10 16:16:06 -07:00
Seth Alves
144715f00c
don't make changes to other avatar's avatarEntities
2016-05-10 16:05:40 -07:00
