Seth Alves
|
ed9907ce66
|
do avatar simulation before physics simulation so that physics actions can update based on avatar
|
2015-10-12 16:23:12 -07:00 |
|
Howard Stearns
|
6cbeb6e7c3
|
Fix my bug, introduced in PR#6012, in which startup position goto got
cancelled out.
|
2015-10-12 15:40:16 -07:00 |
|
James B. Pollack
|
6265563084
|
Merge pull request #6056 from ericrius1/entityResetFix
Fixed syntax error in hiddenEntityResetScript
|
2015-10-12 15:38:18 -07:00 |
|
Atlante45
|
b7ba99380a
|
Pretty up loading debug
|
2015-10-12 15:32:44 -07:00 |
|
Atlante45
|
7eadb11404
|
Remove optional upload caching
|
2015-10-12 15:09:17 -07:00 |
|
Atlante45
|
0e0a8301eb
|
Collapse line
|
2015-10-12 15:06:51 -07:00 |
|
Atlante45
|
cfba5752ce
|
Change checkbox text
|
2015-10-12 15:03:37 -07:00 |
|
Atlante45
|
0cdad78581
|
Move debug to helper functions
|
2015-10-12 15:03:37 -07:00 |
|
Atlante45
|
4abac35c72
|
Cache on upload
|
2015-10-12 15:03:37 -07:00 |
|
Atlante45
|
51acf07c15
|
Factor couple methods in AssetUtils
|
2015-10-12 15:03:37 -07:00 |
|
Stephen Birarda
|
ae32b0dc98
|
Merge pull request #6058 from Atlante45/asset-drop
All file types eligible for upload to asset server
|
2015-10-12 15:02:34 -07:00 |
|
ericrius1
|
8d39f9c760
|
Syntax fixes
|
2015-10-12 15:02:03 -07:00 |
|
James B. Pollack
|
84f0c404ad
|
fix bug related to camera lock for entity orbit and pan
|
2015-10-12 14:55:52 -07:00 |
|
ericrius1
|
d01dda9c81
|
Adding in functionality to include only specified Ids in ray picking
|
2015-10-12 14:40:11 -07:00 |
|
Atlante45
|
eea89ba010
|
CR - Rename method
|
2015-10-12 14:26:28 -07:00 |
|
Andrew Meadows
|
8ebdd25b71
|
more cleanup
|
2015-10-12 14:07:23 -07:00 |
|
Atlante45
|
c666c9fb9b
|
Fix warning
|
2015-10-12 13:40:33 -07:00 |
|
Andrew Meadows
|
22786dea7d
|
cleanup
|
2015-10-12 13:35:26 -07:00 |
|
Atlante45
|
7b41efcf86
|
All file types eligible for upload to asset server
|
2015-10-12 13:35:21 -07:00 |
|
Andrew Meadows
|
e1a5afcff3
|
re-enable avatar position update when moving HMD
|
2015-10-12 11:42:03 -07:00 |
|
Andrew Meadows
|
44243aaa52
|
remove some debug code
|
2015-10-12 11:39:54 -07:00 |
|
U-GAPOS\andrew
|
f01847de14
|
experimental HMD hips tracking
|
2015-10-12 11:39:54 -07:00 |
|
Andrew Meadows
|
35d2a5b5ea
|
track tipRotation for HmdHead target
|
2015-10-12 11:39:54 -07:00 |
|
Andrew Meadows
|
5f1068c404
|
cleanup and optimization of IK loop
|
2015-10-12 11:39:54 -07:00 |
|
Andrew Meadows
|
6a96d5f0c5
|
don't bother to create targets with bad types
|
2015-10-12 11:39:54 -07:00 |
|
Andrew Meadows
|
bc48f70877
|
move IKTarget into its own files
|
2015-10-12 11:39:54 -07:00 |
|
Andrew Meadows
|
56f038d5a7
|
simpler logic for tracking hips offset
|
2015-10-12 11:39:54 -07:00 |
|
Andrew Meadows
|
03eaa95258
|
initial hip translation from IK
works for 2D 3rd person but probably not well for HMD
|
2015-10-12 11:39:54 -07:00 |
|
ericrius1
|
8dddf0e17a
|
Added findRayIntersection, and confirmed judder grew a lot worse
|
2015-10-12 11:15:04 -07:00 |
|
ericrius1
|
96fd634138
|
Pre- ray cast
|
2015-10-12 11:02:47 -07:00 |
|
ericrius1
|
56a2aa101c
|
baseline judder test for whiteboard painting- pre entity ray test
|
2015-10-12 10:44:18 -07:00 |
|
ericrius1
|
fb4aad1f32
|
adding whiteboard
|
2015-10-12 10:11:46 -07:00 |
|
Thijs Wenker
|
a6da91ee35
|
Fix walk.js script
|
2015-10-12 19:03:34 +02:00 |
|
Thijs Wenker
|
309b381bab
|
Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX
|
2015-10-12 18:51:18 +02:00 |
|
ericrius1
|
08a94189b7
|
explicitly setting isSpotlight to false
|
2015-10-12 09:31:12 -07:00 |
|
ericrius1
|
ab32470699
|
Fixed syntax error in hiddenEntityResetScript
|
2015-10-12 09:12:33 -07:00 |
|
Brad Hefta-Gaub
|
f8956a853b
|
Merge pull request #6051 from jherico/marge
Cleanup CMake files
|
2015-10-11 16:22:56 -07:00 |
|
Brad Davis
|
8024d9f017
|
Merge pull request #6055 from ZappoMan/newControllerInterface
implement StandardController and expose it to JS as Controller.Standard.*
|
2015-10-11 16:10:42 -07:00 |
|
Brad Hefta-Gaub
|
21a473035e
|
more CR feedback
|
2015-10-11 15:37:17 -07:00 |
|
Brad Hefta-Gaub
|
312bbf6167
|
CR feedback
|
2015-10-11 15:15:20 -07:00 |
|
Brad Hefta-Gaub
|
9667a103aa
|
actually add new files
|
2015-10-11 15:02:11 -07:00 |
|
Brad Hefta-Gaub
|
0986f86c34
|
implement StandardController and expose it to JS as Controller.Standard.*
|
2015-10-11 14:55:07 -07:00 |
|
Brad Hefta-Gaub
|
61ab1a1935
|
Merge pull request #6054 from ZappoMan/fixEdit
temp fix to get editing working again
|
2015-10-11 14:03:04 -07:00 |
|
Brad Hefta-Gaub
|
e09fe30f05
|
damn you visual studio
|
2015-10-11 14:02:33 -07:00 |
|
Brad Hefta-Gaub
|
b5b4c2153a
|
temp fix to get editing working again
|
2015-10-11 14:00:35 -07:00 |
|
Brad Hefta-Gaub
|
b880855998
|
Merge pull request #6029 from jherico/homer
Low level support for URL overrides when loading content
|
2015-10-11 11:34:07 -07:00 |
|
Thijs Wenker
|
7d3b300037
|
Fix set avatar rotations from scripts (different tread)
|
2015-10-11 14:51:12 +02:00 |
|
Brad Davis
|
cd1b758534
|
PR comments
|
2015-10-11 00:32:31 -07:00 |
|
Brad Davis
|
6f5f6450df
|
Cleanup CMake files
|
2015-10-11 00:01:03 -07:00 |
|
Brad Davis
|
e5fc2e5525
|
Low level support for URL overrides when loading content
|
2015-10-10 23:00:15 -07:00 |
|