ericrius1
|
470c8f7ef8
|
Painting on whiteboard with no judder
|
2015-10-13 11:31:56 -07:00 |
|
Stephen Birarda
|
65976f7891
|
add saving of entity file to ATPAssetMigrator
|
2015-10-13 10:51:57 -07:00 |
|
James B. Pollack
|
c84d2fc36a
|
fix target script url
|
2015-10-13 10:44:43 -07:00 |
|
Stephen Birarda
|
cf74cfb50e
|
add an ATPAssetMigrator for bulk ATP migration
|
2015-10-13 10:38:52 -07:00 |
|
James B. Pollack
|
309cde7f28
|
invert solidity of most toybox objects while held
|
2015-10-13 10:31:36 -07:00 |
|
James B. Pollack
|
0f2ad8dd49
|
Merge branch 'wall_targets_2' into invert_solids
|
2015-10-13 10:15:48 -07:00 |
|
James B. Pollack
|
8d9bcbd793
|
Merge pull request #6067 from hyperlogic/tony/remove-middle-mouse-overlay-toggle
Remove overlay hiding from middle mouse button.
|
2015-10-13 10:14:15 -07:00 |
|
Andrew Meadows
|
ef3775c44d
|
Merge pull request #6059 from Atlante45/warning
Fix warning
|
2015-10-13 08:39:42 -07:00 |
|
Brad Hefta-Gaub
|
8e8ba15aaa
|
Merge pull request #6065 from sethalves/reorder-sims
grab changes
|
2015-10-13 08:35:38 -07:00 |
|
Andrew Meadows
|
25685f97eb
|
Merge pull request #6062 from howard-stearns/fix-startup-position-failure
fix-startup-position-failure
|
2015-10-13 08:34:33 -07:00 |
|
ericrius1
|
47c3df7587
|
Cleaned up spacing
|
2015-10-12 17:38:52 -07:00 |
|
ericrius1
|
2f620e654b
|
Fixed styling
|
2015-10-12 17:37:51 -07:00 |
|
ericrius1
|
04f0d792bb
|
Reverted grab back to 5 hz
|
2015-10-12 17:36:53 -07:00 |
|
ericrius1
|
33ff21f376
|
Got rid of debug message in handControllerGrab script
|
2015-10-12 17:36:07 -07:00 |
|
ericrius1
|
fb040426eb
|
added explanatory comment
|
2015-10-12 17:34:50 -07:00 |
|
Anthony J. Thibault
|
6a8ff676ed
|
Remove overlay hiding from middle mouse button.
Because it conflicts with edit.js camera panning.
You can still toggle the overlay via the O key.
|
2015-10-12 17:33:27 -07:00 |
|
Eric Levin
|
12548df0a3
|
Merge pull request #6060 from imgntn/lighting_explorer
[Scripts] Fix Edit.js bug that would lock Entity camera in orbit or pan mode
|
2015-10-12 17:30:27 -07:00 |
|
Clément Brisset
|
3e65c3bc35
|
Merge pull request #6064 from birarda/default-asset-server
turn on the asset server by default
|
2015-10-12 17:21:33 -07:00 |
|
ericrius1
|
f93b1d3325
|
Correctly whitelisting entities for ray picking
|
2015-10-12 17:05:34 -07:00 |
|
Howard Stearns
|
e8b074c85c
|
Merge pull request #6031 from AndrewMeadows/ik-moves-hips
IK moves hips
|
2015-10-12 17:03:33 -07:00 |
|
James B. Pollack
|
0f998e81af
|
add min reset distance
|
2015-10-12 17:03:32 -07:00 |
|
James B. Pollack
|
fc8a4f4f2d
|
cleanup
|
2015-10-12 17:00:49 -07:00 |
|
James B. Pollack
|
02620c4b0d
|
make targets ungrabbable
|
2015-10-12 16:59:42 -07:00 |
|
Seth Alves
|
f0ce698d78
|
switch back to springy grab
|
2015-10-12 16:57:20 -07:00 |
|
Stephen Birarda
|
60f5a06308
|
turn on the asset-server by default
|
2015-10-12 16:44:51 -07:00 |
|
Stephen Birarda
|
8240dff03f
|
Merge pull request #6061 from Atlante45/asset-drop
Asset drop
|
2015-10-12 16:37:50 -07:00 |
|
James B. Pollack
|
bc4200d8d7
|
push last positions to array
|
2015-10-12 16:35:06 -07:00 |
|
James B. Pollack
|
47471e837f
|
reset targets once they have stopped moving
|
2015-10-12 16:31:36 -07:00 |
|
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 |
|