Brad Davis
fb2ea3185e
Merge branch 'master' into infoview
2015-04-28 16:42:20 -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
ZappoMan
512a109023
add call to perror() to get OS level error details on failed backups
2015-04-28 13:48:51 -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
9836ffed97
Merge branch 'vr_menus' into infoview
...
Conflicts:
tests/ui/src/main.cpp
2015-04-28 01:17:51 -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
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
Brad Davis
7bd8bbf565
Merge branch 'vr_menus' into infoview
2015-04-27 18:33:45 -07:00
Brad Davis
10b5935063
Let QML take care of more of the height/width stuff
2015-04-27 18:11:19 -07:00
Philip Rosedale
5fad6b97ff
Merge pull request #4706 from ZappoMan/useAvatarCrashFix
...
fix crash in scripts using useAvatar methods
2015-04-27 17:10:10 -07:00
ZappoMan
62a421361c
fix crash in scripts using useAvatar methods
2015-04-27 16:58:34 -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
Seth Alves
1fb40652f1
Merge pull request #4699 from jherico/build-notes
...
Updating the build notes to refelect the new Qt version requirement
2015-04-27 16:18:36 -07:00
Stephen Birarda
ec2f54b90a
add a macro to recursively correctly handle resources
2015-04-27 16:02:52 -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
Brad Davis
1beaf18d1b
Prevent the login dialog from spawning the address bar on enter keys
2015-04-27 16:00:23 -07:00
Seth Alves
d22ca6a390
Merge pull request #4703 from ZappoMan/rootEntitiesBugFix
...
fix bug in parsing root element data
2015-04-27 15:52:04 -07:00
Seth Alves
32f91a86e7
remove some unneeded code
2015-04-27 15:43:47 -07:00
