Seth Alves
3c24d42d93
improve display of box and model entities when in simulator-id debug mode
2015-04-30 14:17:20 -07:00
Seth Alves
5d5624053f
drow boxes as aabox when we are the simulator
2015-04-30 13:15:55 -07:00
Seth Alves
a0ad7a22a6
Merge branch 'master' of github.com:highfidelity/hifi into json-skip-default-values
2015-04-30 11:28:33 -07:00
Seth Alves
f75b599288
don't save default values in json file
2015-04-30 11:28:27 -07:00
Seth Alves
09eea83461
don't give timers owners while also keeping track of them in as class instance variables
2015-04-29 19:18:58 -07:00
Seth Alves
3c2894adb3
Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-exits
2015-04-29 15:59:53 -07:00
Seth Alves
69766f6e59
cleanups
2015-04-29 15:34:31 -07:00
Seth Alves
e985f56b12
cleanups
2015-04-29 15:30:13 -07:00
Seth Alves
009bb9dc71
all 4 types of assignment-client appear to exit cleanly, now
2015-04-29 15:16:00 -07:00
Seth Alves
e7d8bccd5d
cleanups
2015-04-29 12:03:54 -07:00
Seth Alves
d2cd4fc405
types 0 and 1 exit cleanly, type 6 crashes
2015-04-29 11:56:45 -07:00
Andrew Meadows
5a388a0c14
Merge pull request #4722 from birarda/avatar-mixer-debug
...
add option to display AvatarData receive stats with display name
2015-04-29 10:00:24 -07:00
Stephen Birarda
61b4025526
remove the uneeded curly braces for default ctor
2015-04-29 09:33:23 -07:00
Seth Alves
b2e99b754f
Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-exits
2015-04-29 08:23:27 -07:00
Brad Hefta-Gaub
7414201845
Merge pull request #4721 from ctrlaltdavid/20514
...
DO NOT MERGE - QA for 20514 - Move "Stereo Audio" option into developerMenu.js
2015-04-28 20:44:09 -07:00
Brad Hefta-Gaub
b422ffe528
Merge pull request #4719 from ericrius1/avatarRange
...
Added ability to check if an avatar is within specified range of a posit...
2015-04-28 20:39:03 -07:00
Seth Alves
02fd9987c7
rework audio mixer so it can exit cleanly
2015-04-28 18:38:41 -07:00
Stephen Birarda
1995fa6a5e
fix return value comment in SimpleMovingAverage
2015-04-28 18:28:12 -07:00
Stephen Birarda
c52426385d
code review comments for #4713
2015-04-28 18:28:05 -07:00
Stephen Birarda
f2dcacffd0
show avatar data receive rate by default with display name
2015-04-28 18:27:42 -07:00
Philip Rosedale
cd159b7ae2
Merge pull request #4690 from AndrewMeadows/bispinor
...
use fallback avatar movement logic when skeleton model still downloading
2015-04-28 17:45:09 -07:00
Stephen Birarda
404cd67bb7
Merge pull request #4716 from sethalves/assignment-client-exits
...
assignment-client shouldn't try to save contents of its nonexistent address bar
2015-04-28 19:40:44 -04:00
Andrew Meadows
ce7bad40ac
Merge pull request #4717 from ZappoMan/backupErrors
...
add call to perror() to get OS level error details on failed backups
2015-04-28 16:01:01 -07:00
samcake
85cd6cbff2
Merge pull request #4700 from jherico/vr_menus
...
VR menus
2015-04-28 15:59:46 -07:00
Andrew Meadows
5537c9e042
merge upstream/master into andrew/bispinor
...
Conflicts:
libraries/physics/src/DynamicCharacterController.cpp
2015-04-28 15:18:02 -07:00
Eric Levin
342d3576c9
Added ability to check if an avatar is within specified range of a position from javascript
2015-04-28 14:46:39 -07:00
David Rowe
9576ad19a7
Move "Stereo Audio" option into developerMenu.js
...
And rename it "Stereo Input" to better relect what it does.
2015-04-28 14:14:10 -07:00
ZappoMan
512a109023
add call to perror() to get OS level error details on failed backups
2015-04-28 13:48:51 -07:00
Seth Alves
a234c02d7d
Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-exits
2015-04-28 13:41:56 -07:00
Seth Alves
28ad80936a
assignment-client shouldn't try to save contents of its nonexistent address bar. interface still needs to save the address.
2015-04-28 13:21:14 -07:00
Brad Davis
2575352485
Attempting to resolve possible crash case for scripts playing sounds
2015-04-28 12:51:01 -07:00
Philip Rosedale
07f30fb9f7
Merge pull request #4714 from sethalves/login-updates-rights
...
force reconnection after successful login
2015-04-28 12:13:34 -07:00
Seth Alves
f9c0493c61
when a login is completed, reset the node list in order to force a re-connection to the domain-server (thereby giving the interface any new rights it deserves, such as the ability to edit entities)
2015-04-28 10:23:08 -07:00
Brad Hefta-Gaub
50eecb15b3
Merge pull request #4712 from Atlante45/compound_zones_fix
...
Compound zones fix
2015-04-28 09:48:05 -07:00
Atlante45
ab9d81b5e2
Correct comments
2015-04-28 18:09:09 +02:00
Atlante45
fe0bd456e1
Zones now use Models instead of FBXGeometries
2015-04-28 17:07:40 +02:00
Atlante45
b7263eeacf
Added a more efficient convexHullContains to Model
...
New version computes each submesh's bounding box once and checks against it
before checking against triangles.
2015-04-28 17:05:38 +02:00
Atlante45
4911aa58bc
Fix Model setURL with delayload
...
Without this condition the model stays in a state where the geometry
is downloaded but not referenced
That way, another call to setURL with update the geometry reference
instead of returning.
2015-04-28 17:02:32 +02:00
Brad Davis
b4e9dbedbc
Merge remote-tracking branch 'upstream/master' into vr_menus
2015-04-28 00:28:57 -07:00
Brad Davis
897e47e8e6
Removing debug hack to load resources from source folder
2015-04-27 23:17:56 -07:00
Brad Davis
b0eccc40c2
Fix crash cause when Menu::instance() is before offscreen ui startup
2015-04-27 22:58:09 -07:00
Brad Davis
19ca543c2c
Cleaning up code and tweaking menu layout
2015-04-27 19:07:53 -07:00
Seth Alves
6f441e3490
if our Node isn't allowed to create entities in this domain, don't try.
2015-04-27 19:07:53 -07:00
Seth Alves
e48552f243
Merge pull request #4702 from AndrewMeadows/thermonuclear
...
PhysicsEngine cleanup in preparation for colliding avatars
2015-04-27 16:20:27 -07:00
Brad Davis
59b8b80148
Merge remote-tracking branch 'upstream/master' into vr_menus
...
Conflicts:
interface/src/Menu.cpp
2015-04-27 16:02:13 -07:00
ZappoMan
1ef58139a4
fix bug in parsing root element data
2015-04-27 15:07:32 -07:00
Andrew Meadows
31e5758422
namechange updateObjectEasy()-->updateBodyEasy()
2015-04-27 13:04:59 -07:00
Andrew Meadows
72deb2e49b
merge upstream/master into andrew/thermonuclear
...
Conflicts:
libraries/entities/src/EntityItem.h
libraries/physics/src/EntityMotionState.cpp
2015-04-27 12:54:21 -07:00
Bradley Austin Davis
ca16d37ce5
Mac testing
2015-04-27 12:46:34 -07:00
Seth Alves
bdc6bb3c2d
Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic
2015-04-27 12:20:58 -07:00
