samcake
|
43d96afc89
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2015-09-21 13:23:54 -07:00 |
|
samcake
|
d3b1bcb86d
|
Redistributing the files to create the model-networking lib and separate that from the redner-utils
|
2015-09-21 13:21:35 -07:00 |
|
Brad Hefta-Gaub
|
25f506f3dc
|
Merge pull request #5860 from ctrlaltdavid/20686
QA for 20686 - Clear entity list when you change domains
|
2015-09-21 12:01:43 -07:00 |
|
Ryan Huffman
|
8f061bcf2e
|
Merge pull request #5861 from birarda/master
fix for asset upload on Windows
|
2015-09-21 11:02:22 -07:00 |
|
Stephen Birarda
|
5ebc8d6036
|
fix for file upload to ATP on Windows
|
2015-09-21 10:24:11 -07:00 |
|
David Rowe
|
52f6fe1d04
|
Clear entity list when you change domains
|
2015-09-21 09:59:00 -07:00 |
|
samcake
|
2875cb99bb
|
Fixing the compilation issue
|
2015-09-21 09:47:00 -07:00 |
|
samcake
|
6a714f405c
|
Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map
|
2015-09-21 00:53:48 -07:00 |
|
samcake
|
3614812681
|
MOving the actual creation of the texture and the pixel manipulation required from TextureCache to TextureSOurce
|
2015-09-20 23:31:59 -07:00 |
|
samcake
|
6914caac9d
|
Renaming TextureStorage.x to TextureMap.x
|
2015-09-20 18:14:03 -07:00 |
|
samcake
|
d6d95ff86b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2015-09-20 14:33:23 -07:00 |
|
samcake
|
a41c20a1b7
|
Fixing buggy hash map look up and cleaning of name
|
2015-09-20 14:17:55 -07:00 |
|
Brad Hefta-Gaub
|
ba5109c458
|
Merge pull request #5858 from howard-stearns/see-other-default-avatars
Let other users see your default avatar.
|
2015-09-20 13:57:29 -07:00 |
|
Howard Stearns
|
4fadf986e4
|
Merge pull request #5857 from hyperlogic/tony/look-whos-talking
Talking idle animation support
|
2015-09-20 13:46:40 -07:00 |
|
Howard Stearns
|
4d2048c6f6
|
Let other users see your default avatar.
Fixes https://app.asana.com/0/26225263936266/51001490412567
|
2015-09-20 13:12:13 -07:00 |
|
samcake
|
c9cb768945
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2015-09-19 09:00:19 -07:00 |
|
samcake
|
9a8dc6ca5d
|
Fix compilation issues on mac
|
2015-09-19 08:59:47 -07:00 |
|
samcake
|
8941741508
|
Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap
|
2015-09-18 18:47:18 -07:00 |
|
Anthony J. Thibault
|
eadf212418
|
Updated avatar.json with talking idle animation.
|
2015-09-18 18:31:53 -07:00 |
|
Brad Hefta-Gaub
|
ec87502f49
|
Merge pull request #5840 from jherico/bart
Instanced rendering for Box entities
|
2015-09-18 18:06:25 -07:00 |
|
Anthony J. Thibault
|
44eb448cbe
|
Hooked up isTalking flag to Rig and AnimGraph.
|
2015-09-18 18:05:51 -07:00 |
|
Brad Hefta-Gaub
|
213cc25c75
|
Merge pull request #5856 from sethalves/hand-controller-adjustment
fix releaseGrab in test script
|
2015-09-18 17:52:12 -07:00 |
|
Seth Alves
|
fd1c8f6389
|
fix releaseGrab in test script
|
2015-09-18 17:39:50 -07:00 |
|
Philip Rosedale
|
aebadb1ab9
|
Merge pull request #5854 from sethalves/hand-controller-adjustment
tone down distance throwing
|
2015-09-18 17:20:22 -07:00 |
|
Seth Alves
|
cfde86a7ea
|
tone down distance throwing
|
2015-09-18 17:07:10 -07:00 |
|
Philip Rosedale
|
5e64420ea1
|
Merge pull request #5850 from jherico/dargo
Remove overcalling of glVertexAttrib4f
|
2015-09-18 16:38:22 -07:00 |
|
Philip Rosedale
|
bbc1c551eb
|
Merge pull request #5853 from sethalves/hand-controller-adjustment
fix when releaseGrab is called
|
2015-09-18 16:30:01 -07:00 |
|
Brad Davis
|
8a703d0363
|
Instanced rendering, first pass
|
2015-09-18 16:29:29 -07:00 |
|
Seth Alves
|
236831d385
|
fix when releaseGrab is called
|
2015-09-18 16:28:15 -07:00 |
|
Philip Rosedale
|
928a74a306
|
Merge pull request #5852 from sethalves/hand-controller-adjustment
Hand controller adjustment
|
2015-09-18 16:21:12 -07:00 |
|
Seth Alves
|
5db3af3f4c
|
formatting
|
2015-09-18 15:58:47 -07:00 |
|
Seth Alves
|
5367de35c1
|
fix distance-grab throwing
|
2015-09-18 15:45:36 -07:00 |
|
Eric Levin
|
35e38a443c
|
Merge pull request #5849 from sethalves/hand-controller-adjustment
Hand controller adjustment
|
2015-09-18 15:22:29 -07:00 |
|
Andrew Meadows
|
269e3d7f23
|
Merge pull request #5836 from ZappoMan/getEntityPropertiesPerformance
Entities.getEntityProperty() performance improvements
|
2015-09-18 15:19:06 -07:00 |
|
Bradley Austin Davis
|
f851c6204f
|
Remove overcalling of glVertexAttrib4f
|
2015-09-18 15:14:04 -07:00 |
|
Seth Alves
|
3d18edd9d1
|
update detectGrabExample.js
|
2015-09-18 15:13:09 -07:00 |
|
Seth Alves
|
612e906a44
|
change the names of entityMethods which the grab script will call. adjust the release velocity multiplier
|
2015-09-18 15:09:05 -07:00 |
|
Brad Davis
|
2f0ba40347
|
Merge pull request #5844 from ZappoMan/cruftRemovalMachine
Cruft removal machine
|
2015-09-18 14:59:16 -07:00 |
|
Seth Alves
|
d1a7aca7f0
|
add continue-distance-holding state. don't call callEntityMethod unless action creation works. increase distance-holding multiplier.
|
2015-09-18 14:45:49 -07:00 |
|
Brad Hefta-Gaub
|
d2a468b31d
|
Merge pull request #5845 from hyperlogic/tony/vive-controller-offset-fix
Adjust controller offset from 6 inches to 3 inches
|
2015-09-18 14:26:27 -07:00 |
|
Brad Hefta-Gaub
|
020fb25ace
|
CR feedback
|
2015-09-18 14:24:01 -07:00 |
|
Seth Alves
|
c5716b715d
|
merge from upstream
|
2015-09-18 14:22:11 -07:00 |
|
Seth Alves
|
26c14ab730
|
Merge pull request #5847 from ZappoMan/callEntityMethods
fix grab behavior with toys, add better mechanism for toys to detect grab
|
2015-09-18 14:21:59 -07:00 |
|
Seth Alves
|
7a8cee4cc3
|
fix release velocity so throwing things works reliably
|
2015-09-18 14:13:08 -07:00 |
|
Brad Hefta-Gaub
|
0d37511071
|
add support for scripts to call methods on entity scripts
|
2015-09-18 14:06:38 -07:00 |
|
Howard Stearns
|
868b541ca1
|
Merge pull request #5837 from AndrewMeadows/ik-repairs-002
blend rotations between distinct IK end effector solutions
|
2015-09-18 14:02:06 -07:00 |
|
samcake
|
a804767d8f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2015-09-18 13:59:56 -07:00 |
|
Brad Hefta-Gaub
|
8f5055d212
|
Merge pull request #5838 from sethalves/hand-controller-adjustment
rework handControllerGrab.js
|
2015-09-18 13:30:29 -07:00 |
|
Brad Hefta-Gaub
|
416acb1d4a
|
remove call to _entities.render() in displaySide()
|
2015-09-18 12:03:58 -07:00 |
|
Shared Vive Room
|
3c64db5c86
|
Adjust controller offset from 6 inches to 3 inches
When using the vive controller the position of your wrist should
match your actual wrist a bit better, unless your name is Shaquille O'Neal.
|
2015-09-18 12:02:05 -07:00 |
|