Brad Davis
9b34003e2d
Merge pull request #4599 from Atlante45/fix_quit_vrmode_on_close
...
Quit VRMode before aboutToQuit runs
2015-04-07 17:06:29 -07:00
Andrew Meadows
92b4e2f1e1
Merge pull request #4572 from jherico/console
...
Remove the console window created when you start interface on win32 platforms
2015-04-07 16:49:26 -07:00
Philip Rosedale
af3073e6c3
Merge pull request #4584 from jherico/menu
...
Stop the menu from breaking on leaving HMD mode
2015-04-07 16:41:41 -07:00
Andrew Meadows
40c94fa00e
merge upstream/master into andrew/isentropic
2015-04-07 16:23:38 -07:00
Andrew Meadows
b5f0c57dd1
jumping and hovering works with dynamic controller
2015-04-07 15:07:46 -07:00
Brad Davis
c1a1157df9
Merge branch 'master' into menu
2015-04-07 14:41:17 -07:00
David Rowe
09b929b729
Restart looped animation running at shutdown when Interface starts
2015-04-07 14:02:24 -07:00
David Rowe
670d455b90
Fix manually entered attachment model URL not being used
2015-04-07 13:47:37 -07:00
David Rowe
ccf3afadfb
Fix manually entered joint mask value not being applied
2015-04-07 13:43:58 -07:00
David Rowe
082a9196ff
Fix manually entered animation URL not being able to be started
2015-04-07 13:43:04 -07:00
Clément Brisset
61028d12b5
Merge pull request #4600 from jherico/render_crash_on_exit
...
Ensure the frame timer doesn't re-engage on exit
2015-04-07 22:17:47 +02:00
Andrew Meadows
a47170b02c
Merge pull request #4601 from samcake/temp1
...
Introducing gpu::State and using it in the Model rendering path and more...
2015-04-07 12:48:42 -07:00
Brad Davis
2f4c3057f3
Merge pull request #4604 from Atlante45/oculus_pick_offset
...
Oculus pick offset
2015-04-07 11:48:21 -07:00
Seth Alves
ef5dffecf6
fix filenames in comments
2015-04-07 10:03:14 -07:00
Seth Alves
9014397167
try again without macro
2015-04-07 09:59:04 -07:00
Seth Alves
e63b39f061
oops missed one
2015-04-07 09:15:40 -07:00
Seth Alves
fc5b442e12
interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging
2015-04-07 09:15:11 -07:00
Thijs Wenker
af34add63c
added example for the new Scripts functions:
...
example\misc\scriptsExample.js
2015-04-07 17:39:50 +02:00
Atlante45
5e3ed1c8e4
Compute correct mouse position
2015-04-07 17:15:16 +02:00
Atlante45
1cc4384404
Add new frame of reference for cursor
2015-04-07 17:13:30 +02:00
Atlante45
ae6ee54569
Fix ray collision not using inverse rot
2015-04-07 17:11:02 +02:00
Atlante45
73f9276c74
Fix warning
2015-04-07 17:10:31 +02:00
Thijs Wenker
a783f03025
New scripting functions Scripts.getPublic(), Scripts.getLocal() and Scripts.getRunning() functional.
2015-04-07 16:48:11 +02:00
Seth Alves
fb607e2b26
logging groups for library/shared and interface
2015-04-06 18:45:06 -07:00
Thijs Wenker
484b014fa7
Merge branch 'master' of https://github.com/worklist/hifi into 20367
2015-04-07 01:07:04 +02:00
Thijs Wenker
2b23108e61
ScriptsScripting Interface
2015-04-07 01:06:39 +02:00
Andrew Meadows
435ce106eb
Add DynamicCharacterController prototype
2015-04-06 16:03:13 -07:00
David Rowe
ce104e8c40
Merge branch 'master' into 20447
2015-04-06 15:18:19 -07:00
Bradley Austin Davis
1a02255033
Remove the console window created when you start interface on win32 platforms
...
Fixing cmake typo
2015-04-06 12:59:44 -07:00
Brad Davis
74cf4b57b3
Ensure the frame timer doesn't re-engage on exit
2015-04-06 11:25:47 -07:00
Sam Gateau
7de54917b8
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-04-06 10:20:23 -07:00
Sam Gateau
ecdffadcb7
trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct
2015-04-06 10:17:31 -07:00
Sam Gateau
d6f74aa0ad
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-04-06 09:56:16 -07:00
Atlante45
a120e50cc0
Account for actual eye position in oculus pick ray
2015-04-06 18:29:02 +02:00
Andrew Meadows
96a834183f
Merge pull request #4594 from jherico/oculus3
...
Enable Direct HMD mode only on windows
2015-04-06 09:24:53 -07:00
Atlante45
a3f8076641
Quit VRMode before aboutToQuit runs
2015-04-06 17:55:48 +02:00
Clément Brisset
efbd74f539
Merge pull request #4597 from huffman/light-overlays
...
Light overlays
2015-04-06 16:02:44 +02:00
Sam Gateau
10269bd556
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-04-05 18:37:28 -07:00
Sam Gateau
00817ab64f
MErging with origin/orange, brinign the fix for shadows
2015-04-05 18:36:39 -07:00
David Rowe
765d66eee5
Fix running without DDE available
2015-04-04 19:20:44 -07:00
David Rowe
65c1fea689
Increase DDE head translation to make avatar better reflect RL
2015-04-04 19:08:23 -07:00
David Rowe
1eb5716ab7
Shut down DDE when Interface shuts down
2015-04-04 19:04:47 -07:00
David Rowe
00f5469fa8
Add menu item that resets DDE tracking
2015-04-04 17:31:32 -07:00
Seth Alves
e06dada756
Merge pull request #4592 from AndrewMeadows/thermonuclear
...
profiling for physics simulation
2015-04-04 15:00:44 -07:00
David Rowe
0d42c7a1c1
Start and stop DDE as separate process
2015-04-03 19:16:07 -07:00
David Rowe
f6bf1d4141
Disable DDE code if not Windows or OSX
2015-04-03 17:41:19 -07:00
ZappoMan
0bc1b02895
improvements to tracking model names
2015-04-03 17:24:53 -07:00
ZappoMan
50479d5d5e
set name to Default when using default url
2015-04-03 17:06:54 -07:00
ZappoMan
1a463a0256
more work on improved avatar UI adding model names and backward compatible support
2015-04-03 17:03:22 -07:00
Bradley Austin Davis
f75ddb95f5
Enable Direct HMD mode only on windows
2015-04-03 17:01:21 -07:00
Ryan Huffman
ce2c23de51
Fix color not working for wire circle3d
2015-04-03 16:28:12 -07:00
ZappoMan
aaf191b6dc
first cut at new avatar preferences UI
2015-04-03 14:31:43 -07:00
Sam Gateau
423434af10
FInd one of the issue with shadows for avatars
2015-04-03 12:34:30 -07:00
Sam Gateau
7718680091
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-04-03 10:33:24 -07:00
Andrew Meadows
88ee1c313a
Merge pull request #4583 from huffman/fix-script-editor-icons
...
Update script editor to set icons programatically
2015-04-03 09:31:58 -07:00
Bradley Austin Davis
44c9d4a742
Working on removing some of the warnings in the xcode build
2015-04-02 16:12:44 -07:00
Andrew Meadows
2089a8c2dd
temporary debug setup: dump physics stats on F key
2015-04-02 15:33:06 -07:00
Andrew Meadows
eaef08abd5
add break to Key_Comma switch case
2015-04-02 15:25:55 -07:00
Sam Gateau
f96079f4f9
fixed the getViewFUrstum warning in DEBUG mode
2015-04-02 14:43:15 -07:00
Brad Davis
605cf19f6f
Merge pull request #4565 from ctrlaltdavid/20422
...
CR for #20422 - Add the ability to manage friends via Interface
2015-04-02 14:10:40 -07:00
Andrew Meadows
a824403132
Merge pull request #4582 from sethalves/island
...
Comma toggles rendering of collision hulls; more changes to vhacd stuff
2015-04-02 10:37:17 -07:00
Bradley Austin Davis
8a757a4b6e
Further work on menu handling on OSX in fullscreen / VR mode
2015-04-02 10:27:11 -07:00
Bradley Austin Davis
fb2b1204db
Stop the menu from breaking on leaving HMD mode
2015-04-02 10:16:52 -07:00
Seth Alves
41ec2fdbe3
Merge branch 'master' of github.com:highfidelity/hifi into island
2015-04-02 09:19:54 -07:00
Ryan Huffman
df5a03b447
Update script editor to set icons programatically
2015-04-02 09:10:47 -07:00
Andrew Meadows
fc4e6e9355
merge upstream/master into andrew/bispinor
2015-04-02 09:04:15 -07:00
Andrew Meadows
f804b2311d
remove hover-friendly behavior
2015-04-02 08:40:47 -07:00
Clément Brisset
01dc1b058c
Merge pull request #4580 from birarda/master
...
use non-persistent settings to avoid lobby crash confusion
2015-04-02 17:37:24 +02:00
David Rowe
349cc3241d
Restore minimized windows to view
2015-04-01 18:59:34 -07:00
David Rowe
49de54de48
Use improved WebWindowClass for friends window
2015-04-01 18:58:59 -07:00
Seth Alves
abf83bcf9e
Merge branch 'master' of github.com:highfidelity/hifi into island
2015-04-01 18:26:26 -07:00
Seth Alves
79b1a6aeb0
comma key toggles rendering of collision hulls
2015-04-01 17:45:47 -07:00
Stephen Birarda
b27a86fb25
always render yourself, handle change of render values elsewhere
2015-04-01 17:36:43 -07:00
Andrew Meadows
b537625e59
Merge pull request #4574 from ZappoMan/crashOnExit
...
fix crash on shutdown related to entity scripts connecting to signals
2015-04-01 17:26:33 -07:00
Brad Hefta-Gaub
ad27d7353b
Merge pull request #4386 from jherico/oculus_old_renderer
...
DO NOT MERGE - Update Oculus SDK integration
2015-04-01 17:17:32 -07:00
Stephen Birarda
ee088e12f3
leverage scene scripting values to toggle rendering
2015-04-01 17:06:06 -07:00
Brad Hefta-Gaub
e5757575de
Merge pull request #4578 from samcake/orange
...
tweak the default specular value for the Primitive entities to less shiny
2015-04-01 16:36:53 -07:00
Bradley Austin Davis
58908f44ef
Fixing crash on exit when using (or used) VR mode
2015-04-01 16:05:46 -07:00
Sam Gateau
4a6046b07c
tweak the default specular value for the Primitive entities (sphere and cubes) so they do not shine so much
2015-04-01 15:50:04 -07:00
Bradley Austin Davis
fd47d4f3a5
Working on putting some more timing measurement into the code
2015-04-01 15:47:51 -07:00
Andrew Meadows
b37384d759
exit hover now not quite automatic when over floor
...
remove MyAvatar::jump() method for more general API
2015-04-01 15:13:27 -07:00
David Rowe
96e888864a
Merge branch 'master' into 20422
2015-04-01 14:56:48 -07:00
Stephen Birarda
526c9217a1
fix signup link from login dialog
2015-04-01 14:43:56 -07:00
Bradley Austin Davis
3b77118baa
Merge branch 'master' into oculus_old_renderer
2015-04-01 14:09:29 -07:00
Andrew Meadows
245729cba8
fix for avatar unable to jump into hover on mac
2015-04-01 13:47:40 -07:00
ZappoMan
aac824fb99
fix crash on shutdown
2015-04-01 13:47:25 -07:00
Bradley Austin Davis
a7dc1d26e6
Working on SDK vs client distortion performance differences
2015-04-01 13:23:55 -07:00
Sam Gateau
3b92910a91
Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters
2015-04-01 12:22:35 -07:00
David Rowe
e519928320
Move friends window to own class
2015-04-01 11:38:32 -07:00
ZappoMan
da9a8e8a97
CR feedback
2015-04-01 09:27:58 -07:00
ZappoMan
827e37b920
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI
2015-04-01 09:09:50 -07:00
Bradley Austin Davis
e520a62bcf
Merge branch 'master' into oculus_old_renderer
2015-04-01 09:09:06 -07:00
Sam Gateau
ad11503466
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-03-31 23:12:17 -07:00
Stojce Slavkovski
8514a39812
Use constants for URLs
2015-04-01 07:24:16 +02:00
Stojce Slavkovski
7b3d33c2a4
Merge branch 'master' of https://github.com/highfidelity/hifi into 20429
2015-04-01 06:48:09 +02:00
David Rowe
e06f28b7c5
Merge branch 'master' into 20422
...
Conflicts:
examples/users.js
interface/src/Application.cpp
2015-03-31 21:01:54 -07:00
Bradley Austin Davis
db9ab3e699
Merge branch 'master' into oculus_old_renderer
2015-03-31 18:25:34 -07:00
Bradley Austin Davis
eb816f7f6a
Adding support for eye per frame mode and offscreen render scaling
2015-03-31 18:24:58 -07:00
Philip Rosedale
d57959503b
Merge pull request #4560 from AndrewMeadows/bispinor
...
improved bounding shape calculation for Mery model
2015-03-31 18:19:34 -07:00
Sam Gateau
0d721ec1e9
merging
2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72
Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations
2015-03-31 17:35:34 -07:00
Andrew Meadows
ef10e5734d
bounding box for skeleton with bad mesh weights
2015-03-31 16:53:33 -07:00
Stephen Birarda
61806935bb
add a networking constants class with metaverse URL
2015-03-31 16:40:21 -07:00
ZappoMan
d68143675a
first simple pass at using marketplace windows in preferences
2015-03-31 16:24:27 -07:00
Brad Hefta-Gaub
b6f670a8d8
Merge pull request #4554 from samcake/yellow
...
Better support for Nvidia Optimus Laptop
2015-03-31 15:56:01 -07:00
Bradley Austin Davis
a7eebfd002
Merge remote-tracking branch 'upstream/master' into oculus_old_renderer
2015-03-31 15:42:01 -07:00
Sam Gateau
b4d11e2eb5
Add the needed global variable exported to enable the nvidia gpu on optimus platform (laptops with intel integrated) also log the opengl version and gpu and driver used
2015-03-31 15:18:59 -07:00
Bradley Austin Davis
6757dfcc0c
Working on 0.5.0.1 port and addressing the direct HMD/v-sync conflict
2015-03-31 14:52:21 -07:00
David Rowe
154dacf791
Fix typo
2015-03-31 14:21:56 -07:00
Bradley Austin Davis
c4c6cf82a2
Working on migration to SDK 0.5.0.1
2015-03-31 13:27:11 -07:00
Stojce Slavkovski
e1fba3c0c0
correct signup URL
2015-03-31 21:57:59 +02:00
Stojce Slavkovski
18b3a52f21
Merge branch 'master' of https://github.com/highfidelity/hifi into 20429
2015-03-31 21:50:46 +02:00
Bradley Austin Davis
56b5ad2e6b
Merge branch 'master' into oculus_old_renderer
2015-03-31 11:10:23 -07:00
Philip Rosedale
5325478940
Merge pull request #4528 from ZappoMan/avatarUI
...
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
2015-03-30 21:31:22 -07:00
Sam Gateau
ee4b9a483b
found the issue brekaing the render, i didn't do the Blend enable sync properly
2015-03-30 18:04:44 -07:00
Philip Rosedale
ce05d3104a
Merge pull request #4535 from ZappoMan/scriptCaching
...
Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts
2015-03-30 18:02:52 -07:00
ZappoMan
64fdca7d6d
fix no root joint warning
2015-03-30 17:32:42 -07:00
Sam Gateau
ee3ec3fe1a
found the issue brekaing the render, i didn't do the Blend enable sync properly
2015-03-30 17:28:58 -07:00
ZappoMan
3475bfb396
fix typos
2015-03-30 17:04:47 -07:00
Bradley Austin Davis
5e5bdec88d
Merge branch 'master' into oculus_old_renderer
2015-03-30 16:36:00 -07:00
Andrew Meadows
9b13f186e3
remove character from PhysicsEngine on shutdown
2015-03-30 15:51:58 -07:00
ZappoMan
36657c9473
first cut at script caching
2015-03-30 14:36:48 -07:00
Andrew Meadows
10af59296d
Merge pull request #4499 from sethalves/multi-hull-collisions
...
Multi hull collisions
2015-03-30 12:11:56 -07:00
Andrew Meadows
2404fb126f
Merge pull request #4527 from sethalves/valgrind
...
Valgrind told me to do it
2015-03-30 11:56:17 -07:00
Seth Alves
186cb1ec7a
merge from upstream
2015-03-30 11:28:47 -07:00
Sam Gateau
ab9be0cb41
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-03-30 10:11:08 -07:00
Sam Gateau
2a58a65a8f
back to the office monday morning, State almost working in the full piupeline
2015-03-30 10:10:39 -07:00
Seth Alves
7de15cda87
quiet compiler
2015-03-30 09:30:13 -07:00
Stojce Slavkovski
d0e2697cbb
"Create account" link
2015-03-30 18:26:33 +02:00
Philip Rosedale
099a2b5319
Merge pull request #4521 from ctrlaltdavid/20416
...
CR for Job #20416 - Update notification.js to include a notification about being blocked from a server
2015-03-30 08:49:29 -07:00
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
ZappoMan
3bda65f4fe
if installing a body, and you have no head, make your head the default head
2015-03-28 19:19:11 -07:00
ZappoMan
80df8caefb
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI
2015-03-28 18:43:03 -07:00
Seth Alves
fc1e45fc58
valgrind says this is used before it's initialized
2015-03-28 17:10:46 -07:00
Seth Alves
986bc71e93
quiet compiler
2015-03-28 17:10:26 -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
ZappoMan
002fba8018
first cut at predicting FST type for set avatar
2015-03-27 16:56:03 -07:00
ZappoMan
baa2f947e5
classifying FSTReader and moving ModelType into that class
2015-03-27 16:30:00 -07:00
Seth Alves
fd69a54f10
Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions
2015-03-27 15:55:20 -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
ZappoMan
6189926105
add type hint to FST in model packager
2015-03-27 13:23:29 -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
David Rowe
90c1da2094
Merge branch 'master' into 20416
...
Conflicts:
examples/notifications.js
2015-03-27 12:13:29 -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
Seth Alves
16875338bf
Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions
2015-03-26 18:55:43 -07:00
Seth Alves
7da87d6e15
set up a way to request ResourceCache downloads from a non-networking thread.
2015-03-26 18:37:55 -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
David Rowe
cb6abfb2e6
Display notification if domain connection refused
2015-03-23 12:05:56 -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
David Rowe
7dbe92f56f
Building with Sixense build requires four of the SDK libraries
2015-03-21 14:22:09 -07:00
Bradley Austin Davis
1d56266044
Merge branch 'master' into oculus_old_renderer
2015-03-20 09:56:54 -07:00
Brad Hefta-Gaub
3d6d79ae3a
Merge pull request #4478 from sethalves/maximum-capacity
...
Maximum capacity redux
2015-03-20 09:28:22 -07:00
Brad Hefta-Gaub
96bfb96936
Merge pull request #4468 from ctrlaltdavid/20399
...
CR for 20399 - Fix near field clipping on avatars with large heads
2015-03-19 20:02:17 -07:00
Andrew Meadows
a7dbd6779f
Merge pull request #4467 from huffman/avatar-thrust
...
Fix thrust not being applied w/ Physics + Avatar
2015-03-19 16:40:10 -07:00
ZappoMan
5f825211df
Merge branch 'master' of https://github.com/highfidelity/hifi into dragDropLinkAvatars
2015-03-19 15:12:06 -07:00
Seth Alves
baa8e9c86f
remove uneeded #includes
2015-03-19 13:05:30 -07:00
Seth Alves
817a6130ef
return a reason as part of the domain server's connection-denied packet. Don't apply max-capacity check to users in the editors list
2015-03-19 13:01:57 -07:00
