Stephen Birarda
c7a7bc1646
handle sending of JSONBreakableMarshal data via sendStats
2015-04-29 10:44:17 -07:00
Stephen Birarda
68998f4423
cleanup AudioMixer stats to be properly nested
2015-04-28 18:19:16 -07:00
Stephen Birarda
4e6979cac8
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-mixer-throttling
2015-04-28 16:50:07 -07:00
Stephen Birarda
698fcdfbbf
add JSONBreakableMarshal to help with MTU stats sending
2015-04-28 16:50:00 -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
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
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
Stephen Birarda
b917afa3cc
show avatar data receive rate by default with display name
2015-04-28 09:47:19 -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
Seth Alves
2e5049a190
fix bug caused by no-longer reusing a variable
2015-04-27 12:20:01 -07:00
Brad Davis
76ce34a74b
Scanning for code style
2015-04-27 11:41:10 -07:00
Brad Davis
d55d467d3f
Tweaking VR menu for PR
2015-04-27 11:35:57 -07:00
Brad Davis
1a912787c2
Merge branch 'ui-refactor' into vr_menus
2015-04-27 11:05:14 -07:00
Seth Alves
e14b4c6ad4
cleanups
2015-04-27 11:01:48 -07:00
Brad Davis
a12bfd95f4
Merge remote-tracking branch 'upstream/master' into ui-refactor
...
Conflicts:
libraries/render-utils/src/MatrixStack.h
2015-04-27 10:59:57 -07:00
Seth Alves
8278f52a79
cleanups
2015-04-27 10:59:51 -07:00
Seth Alves
2cdbe8bf7b
merge from upstream
2015-04-27 09:57:36 -07:00
Seth Alves
e007617112
hook up menu-items to control debug rendering of collision hulls and owned simulations
2015-04-27 09:56:24 -07:00
Seth Alves
26511575c2
Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic
2015-04-27 06:44:59 -07:00
Brad Davis
3032b1fb67
Merge branch 'ui-refactor' into vr_menus
2015-04-26 20:14:04 -07:00
Brad Davis
3071be162a
Coding standards
2015-04-26 20:11:27 -07:00
Andrew Meadows
e3d29d74af
name changes and preparation for more cleanup
2015-04-26 15:24:30 -07:00
Andrew Meadows
b760a03360
pass arguments by const reference
2015-04-26 15:24:00 -07:00
Brad Davis
d4d469b881
Adding note to change filename
2015-04-25 20:13:59 -07:00
Brad Davis
b77b3e4f3d
Merge branch 'ui-refactor' into menu2
2015-04-25 17:00:07 -07:00
Brad Davis
2e61b5a933
Coding standards
2015-04-25 16:59:43 -07:00
Brad Davis
198224c4ec
Merge branch 'ui-refactor' into menu2
2015-04-25 16:48:05 -07:00
Brad Davis
0afe8c0e32
Coding standards
2015-04-25 16:46:05 -07:00
Brad Davis
7c16fd05c1
Merge branch 'master' into ui-refactor
2015-04-25 16:35:43 -07:00
