David Rowe
cbf2012bf5
Add menu items that set visibility
...
And synchronize visibility settings between Interface and users.js.
2015-03-29 18:35:56 -07:00
David Rowe
be69c0b58f
Add add/remove friends menu item
...
This must display the dialog whether or not users.js is running. Both
C++ and JavaScript need to open or restore the same dialog, hence a new
dialog rather than using WebWindow with its JavaScript baggage.
2015-03-28 13:05:23 -07:00
Philip Rosedale
d908b7fdc6
Merge pull request #4523 from AndrewMeadows/inertia
...
enable avatar physics by default
2015-03-27 14:53:40 -07:00
Grayson Stebbins
0fd17b3303
editEntities.js --> edit.js
2015-03-27 14:40:16 -07:00
Andrew Meadows
5b85a2aa44
merge upstream/master into andrew/inertia
2015-03-27 13:56:54 -07:00
Andrew Meadows
be5fdbf217
enable avatar collisions by default
...
also remove old gravity features
2015-03-27 13:36:20 -07:00
Philip Rosedale
6550b4e311
Merge pull request #4509 from AndrewMeadows/inertia
...
character transitions into "hover" when stepping over abyss
2015-03-27 13:16:36 -07:00
Brad Hefta-Gaub
2255c30d58
Merge pull request #4512 from Atlante45/ordered_fst
...
Hint order for FST files
2015-03-27 09:41:50 -07:00
Andrew Meadows
e75bb3cd9c
merge upstream/master into andrew/inertia
2015-03-27 08:14:36 -07:00
Stephen Birarda
647e2d7829
Merge pull request #4517 from ZappoMan/menuCleanup
...
menu and display tweaks at Philip's request
2015-03-26 20:06:16 -07:00
Andrew Meadows
821ac605f5
smoother motion on steps
...
faster motion when "flying"
cleanup of MyAvatar::updatePosition()
2015-03-26 19:48:52 -07:00
Stephen Birarda
ba82436d95
add user heartbeat if they choose not to send location
2015-03-26 16:50:40 -07:00
ZappoMan
6cff99f9d6
menu and display tweaks
2015-03-26 16:36:46 -07:00
Atlante45
716e9bfe4f
Hint order for FST files
2015-03-26 15:40:48 +01:00
ZappoMan
9e34dda7c9
Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks
2015-03-25 16:54:37 -07:00
Brad Hefta-Gaub
918154e407
Merge pull request #4491 from huffman/export-json
...
Update export entities to export as JSON
2015-03-25 16:49:23 -07:00
ZappoMan
c031ce15a7
dead code
2015-03-25 16:45:51 -07:00
ZappoMan
19feeacc51
dead code
2015-03-25 16:38:57 -07:00
ZappoMan
f46067b634
better tracking of being done with downshifting
2015-03-25 16:30:33 -07:00
Clément Brisset
b81e89ad3d
Merge pull request #4488 from ctrlaltdavid/20407
...
CR for 20407 - Make Sixense emulate mouse only if controllers aren't at the base
2015-03-26 00:24:17 +01:00
ZappoMan
68e730af45
handle throttle render case and clean up code logic to be more obvious
2015-03-25 15:48:50 -07:00
Seth Alves
c0b1ff4a57
Merge pull request #4500 from AndrewMeadows/inertia
...
avatar can jump when using CharacterController
2015-03-25 14:48:54 -07:00
Ryan Huffman
1c0e7e26a2
Merge pull request #4507 from birarda/friends-only-location
...
make friends-only discoverability mode work as described
2015-03-25 13:48:08 -07:00
Stephen Birarda
f075674415
Merge pull request #4502 from huffman/webwindow-open-url
...
Add more functionality to WebWindow (get/set url, raise)
2015-03-25 13:25:29 -07:00
ZappoMan
0c2a630a59
Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks
2015-03-25 12:51:21 -07:00
ZappoMan
ec2b11640c
more tweaks to LOD logic
2015-03-25 12:51:13 -07:00
Stephen Birarda
7a9c1e20ab
use new AccountManager API in DiscoverabilityManager
2015-03-25 12:04:47 -07:00
Stephen Birarda
89e5fef808
send friends_only key for discoverability
2015-03-25 11:46:08 -07:00
Leonardo Murillo
c3c1d4a5ae
Switching to .com
2015-03-25 12:36:37 -06:00
Ryan Huffman
bb4417acc6
Merge branch 'master' of github.com:highfidelity/hifi into webwindow-open-url
2015-03-25 10:49:24 -07:00
Clément Brisset
e6ac502fb5
Merge pull request #4497 from huffman/update-edit-help
...
Update edit help
2015-03-25 14:09:22 +01:00
Andrew Meadows
d497620976
avatar can jump with E key when walking
2015-03-24 23:05:46 -07:00
Andrew Meadows
b87360f0f5
merge upstream/master into andrew/inertia
2015-03-24 17:41:07 -07:00
Andrew Meadows
44eca08fa4
PhysicsEngine doesn't need AvatarData
...
MyAvatar now owns its CharacterController
fix for bug of phantom collision obj when avatar's physics are disabled
2015-03-24 17:38:35 -07:00
Philip Rosedale
fe61387121
Merge pull request #4498 from ZappoMan/LODUITweaks
...
Some LOD UI Tweaks
2015-03-24 17:34:27 -07:00
Ryan Huffman
d54526b8bb
Merge branch 'master' of git://github.com/highfidelity/hifi into webwindow-openurl
2015-03-24 15:43:36 -07:00
ZappoMan
b67cf3af24
more tweaks to LOD tools dialog
2015-03-24 14:33:06 -07:00
ZappoMan
f43b8bbe8e
make AvatarLODMultiplier based on octreeSizeScale
2015-03-24 13:59:46 -07:00
Ryan Huffman
3f986229d1
Rename edit-entities-commands.html to edit-commands.html
2015-03-24 13:43:10 -07:00
Ryan Huffman
6c941d73d5
Update edit.js help
2015-03-24 13:34:14 -07:00
ZappoMan
619428c325
move LOD FPS settings to Preferences
2015-03-24 13:32:22 -07:00
Stephen Birarda
1a6865b41b
send immediate location update when domain changes
2015-03-24 13:15:30 -07:00
Ryan Huffman
2fc0ef80d0
Add SVO_JSON_EXTENSION to accepted extensions
2015-03-24 10:40:46 -07:00
Ryan Huffman
6d932508ff
Add support for .svo.json extension
2015-03-24 10:27:53 -07:00
ZappoMan
fa122a227b
tweaks to the LOD Tools UI
2015-03-23 16:44:07 -07:00
Ryan Huffman
61dc31ffe7
Update export entities to export as JSON
2015-03-23 14:09:45 -07:00
Brad Hefta-Gaub
92a639d2ee
Merge pull request #4486 from ctrlaltdavid/sixense-build-instructions
...
Building with Sixense build requires four of the SDK libraries
2015-03-23 11:17:33 -07:00
ZappoMan
9fb53e3d72
CR feedback
2015-03-23 11:13:42 -07:00
David Rowe
3de7222007
Make Sixense emulate mouse only if controllers aren't at the base
2015-03-23 09:06:15 -07:00
ZappoMan
19c8e526e1
add guards to _jointStates array size
2015-03-23 08:47:06 -07:00
