Bradley Austin Davis
475c399d22
Menu polish on OSX
2015-04-29 02:54:47 -07:00
Brad Davis
87ef98005d
menu polish
2015-04-29 02:42:57 -07:00
Bradley Austin Davis
75f6ad3b99
Working on menus look
2015-04-29 00:43:18 -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
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
samcake
ff2b1af18c
Merge pull request #4720 from ZappoMan/hackTest
...
Fix entities rendering wrong when avatar scale !== 1.0
2015-04-28 17:30:15 -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
ZappoMan
664d126465
remove scale from Camera class since it was only used by avatar and was causing problems with no obvious benefit
2015-04-28 16:34:33 -07:00
ZappoMan
aec0bd1693
dont change camera scale with avatar scale
2015-04-28 16:26:17 -07: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
a121ac08b3
Merge pull request #4715 from jherico/audio_crash
...
Attempting to resolve possible crash case for scripts playing sounds
2015-04-28 15:58:54 -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
ZappoMan
bfbad539e0
hack test
2015-04-28 14:54:58 -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
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
20d77fae3c
Merge pull request #4704 from sethalves/assignment-scripts-can-rez
...
Assignment scripts can rez
2015-04-28 12:15:19 -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
Seth Alves
e6da5ea711
formatting
2015-04-28 09:28:42 -07:00
Andrew Meadows
e646ff6847
Merge pull request #4708 from ctrlaltdavid/fix-audio-mouth
...
Fix audio-driven mouth viewed by others
2015-04-28 09:28:22 -07:00
Seth Alves
49783c1550
formatting
2015-04-28 09:28:17 -07:00
Seth Alves
7aa2013473
formatting
2015-04-28 09:26:39 -07:00
Seth Alves
436fe03d10
formatting
2015-04-28 09:26:20 -07:00
Seth Alves
30e78a37cd
formatting
2015-04-28 09:26:03 -07:00
Seth Alves
a1da96e971
formatting
2015-04-28 09:23:30 -07:00
Seth Alves
dc0b033101
formatting
2015-04-28 09:23:19 -07:00
Seth Alves
eb36bf3aa0
formatting
2015-04-28 09:23:00 -07:00
Seth Alves
be8764424e
formatting
2015-04-28 09:20:38 -07:00
Seth Alves
8db46d859e
formatting
2015-04-28 09:19:45 -07:00
Seth Alves
38ba0ab352
remove useless added code
2015-04-28 09:18:00 -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
Clément Brisset
bc8f6708b6
Merge pull request #4698 from ctrlaltdavid/fps-facetracker
...
Facetracker FPS refactor
2015-04-28 14:04:17 +02:00
Brad Davis
f49f37ac89
Merge pull request #4670 from thoys/fix-run_one_interface_per_user
...
Multiple instances of interface on Windows (one per user)
2015-04-28 01:22:21 -07:00
Brad Davis
c685874b05
Merge pull request #4705 from birarda/avatar-mixer-throttling
...
add macro to recursively correctly handle OS X bundle resources
2015-04-28 01:19:36 -07:00
Brad Davis
b4e9dbedbc
Merge remote-tracking branch 'upstream/master' into vr_menus
2015-04-28 00:28:57 -07:00
Brad Davis
d1d1830b2f
Importing peferred dialog look from browser branch
2015-04-28 00:26:24 -07:00
samcake
1acd27db08
Merge pull request #4709 from jherico/resources
...
Removing debug hack to load resources from source folder
2015-04-27 23:42:45 -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
David Rowe
d6eb04c3b0
Fix audio-driven mouth viewed by others
2015-04-27 21:43:57 -07:00
Brad Hefta-Gaub
086abe8468
Merge pull request #4707 from sethalves/dont-rez-if-no-rez-rights
...
don't create entities in local tree if the entity-serer isn't going to accept them.
2015-04-27 20:33:03 -07:00
