Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 02:30:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58970 commits 25 branches 0 tags 1.1 GiB
Commit graph

3692 commits

Author SHA1 Message Date
vladest
5b033e021a Merge branch 'master' into modal_dialogs_async 2017-09-16 12:30:07 +02:00
Anthony J. Thibault
3f6c88e77f Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-15 11:23:09 -07:00
Thijs Wenker
af4bc59307 clone local avatar entities 2017-09-14 23:31:51 +02:00
vladest
0bfa29d0d4 Merge branch 'master' into modal_dialogs_async 2017-09-14 20:21:29 +02:00
Anthony J. Thibault
745d2ff395 Remove handControllerGrab.js, see controllerDispatcher.js instead. 2017-09-13 17:36:56 -07:00
druiz17
1b288ef860 make garbbing radius the same as master 2017-09-13 16:15:36 -07:00
druiz17
b3ff5c86f7 fixed secondary triggers and chest lid 2017-09-12 14:43:06 -07:00
Dante Ruiz
d90f6320a9 Merge pull request #8 from sethalves/controller-dispatcher-1 
Controller dispatcher 1
 2017-09-12 10:54:10 -07:00
druiz17
b634292261 fixing some small issues 2017-09-12 10:53:04 -07:00
Seth Alves
e9918ca599 add profiling to controller-dispatcher 2017-09-12 10:52:52 -07:00
Seth Alves
a9aa6df93e Merge branch 'controller-dispatcher-1' of github.com:sethalves/hifi into controller-dispatcher-1 2017-09-12 10:44:29 -07:00
Seth Alves
315f874824 add profiling to controller-dispatcher 2017-09-12 10:44:09 -07:00
Seth Alves
2850029f26 add profiling to controller-dispatcher 2017-09-12 10:00:32 -07:00
druiz17
684aef23dc Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1 2017-09-11 15:08:37 -07:00
druiz17
a46e41607c fixed teleport, added avatar scaling, allow laser to be used on tablet when stylus is shown 2017-09-11 15:07:14 -07:00
Seth Alves
9c098f1a0c Merge branch 'controller-dispatcher-1' of github.com:druiz17/hifi into controller-dispatcher-1 2017-09-08 17:10:02 -07:00
druiz17
405d8c3afc fixing cloning and laser 2017-09-08 17:07:27 -07:00
Seth Alves
a1ffc7abd0 distance from controller to object is sometimes decided by pickray 2017-09-08 17:04:09 -07:00
druiz17
42ef397b5e fixed include path 2017-09-08 15:13:19 -07:00
druiz17
5d1a5eea4c added test file 2017-09-08 13:45:45 -07:00
druiz17
b3e2c7ac56 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-08 13:30:48 -07:00
druiz17
e33012e522 laser on tablet update 2017-09-08 13:30:30 -07:00
Sam Gateau
ed8aa8b74d Merge pull request #11160 from Zvork/outline 
Outline effect
 2017-09-08 12:32:01 -07:00
druiz17
dbb91e5953 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-08 11:50:43 -07:00
druiz17
f0c12e50dd some small bug fixes 2017-09-08 11:50:19 -07:00
druiz17
ef050a09f9 made requested changes and also allow entities/overlays to be grabbed by the grip button 2017-09-07 14:42:46 -07:00
Brad Hefta-Gaub
b316f366fc Merge pull request #11198 from druiz17/oculus-tablet-position 
fixed tablet spawn position for oculus menu button
 2017-09-07 12:30:33 -07:00
Brad Hefta-Gaub
fce8715457 Merge pull request #11306 from ElderOrb/case7385 
7385 - Collect Stats on "Exit VR" button
 2017-09-07 10:18:58 -07:00
Olivier Prat
796c59b9c2 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-09-07 10:13:53 +02:00
druiz17
636e906191 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-06 17:15:18 -07:00
druiz17
cc7a222374 fixing Hifi-Hand-Drop for equipEntity 2017-09-06 17:15:05 -07:00
druiz17
0d66bfca05 added far trigger 2017-09-06 14:58:04 -07:00
Olivier Prat
17e992bd14 Merge branch 'master' of git://github.com/highfidelity/hifi into outline 2017-09-06 19:08:37 +02:00
Olivier Prat
fe357671e1 Removed qmlc files 2017-09-06 19:06:40 +02:00
Olivier Prat
25ff132fc7 Debugging scripts working again with correct occlusion management 2017-09-06 19:05:15 +02:00
Dante Ruiz
15c853567d Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-06 08:34:28 -07:00
David Kelly
1fd30b1e0f fix passphrase reset 2017-09-05 17:03:11 -07:00
David Kelly
4bdfe092cf Regression in injection script 2017-09-05 12:28:31 -07:00
Dante Ruiz
cefa65de5e some more small changes 2017-09-05 12:06:32 -07:00
Dante Ruiz
28694dcf8a small change to contextOVerlays in farActionGrab 2017-09-05 11:46:06 -07:00
beholder
c0e7e5a8b2 7385 - Collect Stats on "Exit VR" button 2017-09-05 21:26:35 +03:00
Olivier Prat
b619b2311d Merged with master 2017-09-05 10:27:53 +02:00
David Kelly
8723ff2df2 Merge pull request #11294 from zfox23/commerce_walletPassphraseModal 
Commerce: Wallet Passphrase Input Modal
 2017-09-01 17:46:09 -07:00
Dante Ruiz
3b357ad61e finshed handControllerGrab refactoring 2017-09-01 17:07:26 -07:00
Seth Alves
8ccacf34f4 Merge pull request #11290 from Menithal/21484 
WL21484 - Add an additional parameter for entity animations to "allow translation"
 2017-09-01 15:34:07 -07:00
Zach Fox
3cf0df518f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal 2017-09-01 11:53:47 -07:00
Dante Ruiz
9bd368c0a9 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-09-01 08:27:09 -07:00
vladest
681fc529dc Merge branch 'master' into modal_dialogs_async 2017-09-01 13:31:15 +02:00
druiz17
2948061904 code cleanup 2017-08-31 22:30:30 -07:00
Dante Ruiz
7cf27c18d3 code cleanup and fix broken features 2017-08-31 18:06:55 -07:00