Seth Alves
|
644076214e
|
fix hang
|
2015-10-13 16:55:04 -07:00 |
|
Seth Alves
|
4402242c3c
|
allow an action to suppress sending of physics related edits to the entity-server
|
2015-10-13 16:27:40 -07:00 |
|
Seth Alves
|
2ecb7e8d29
|
fix bug that was making action deletes fail
|
2015-10-13 16:19:12 -07:00 |
|
Seth Alves
|
4fa85441b8
|
tweak
|
2015-10-13 15:14:34 -07:00 |
|
Seth Alves
|
257e3845de
|
get action type correct
|
2015-10-13 14:45:20 -07:00 |
|
Seth Alves
|
755b971906
|
tweak
|
2015-10-13 14:31:52 -07:00 |
|
Seth Alves
|
fcbb107bc0
|
tweak
|
2015-10-13 14:13:53 -07:00 |
|
Seth Alves
|
8b72f6e7c6
|
tweak
|
2015-10-13 13:50:43 -07:00 |
|
Seth Alves
|
54eac099b9
|
tweak
|
2015-10-13 12:52:53 -07:00 |
|
Seth Alves
|
83780296de
|
don't send physical property updates if there's an action on the object
|
2015-10-13 12:12:57 -07:00 |
|
Seth Alves
|
7c52849740
|
change how hold action works
|
2015-10-13 11:36:58 -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 |
|
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 |
|
Howard Stearns
|
e8b074c85c
|
Merge pull request #6031 from AndrewMeadows/ik-moves-hips
IK moves hips
|
2015-10-12 17:03:33 -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 |
|
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 |
|
James B. Pollack
|
84f0c404ad
|
fix bug related to camera lock for entity orbit and pan
|
2015-10-12 14:55:52 -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
|
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 |
|