Brad Davis
ac93d2c721
Working on display plugins
2015-05-21 18:50:11 -07:00
Brad Davis
c0d84cfc54
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
2015-05-21 11:04:06 -07:00
Seth Alves
52ce26d80d
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-21 09:20:56 -07:00
Philip Rosedale
1b0ef406ed
Merge pull request #4921 from birarda/domain-toggle
...
add a global toggle for restricted users
2015-05-20 21:27:10 -07:00
Seth Alves
38edc27cbb
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-20 18:24:40 -07:00
Stephen Birarda
427e2e7dbf
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-toggle
2015-05-20 18:00:40 -07:00
Stephen Birarda
b6f458eaf1
Merge branch 'master' of https://github.com/highfidelity/hifi into ac-ice-connect
2015-05-20 17:59:40 -07:00
Seth Alves
aa1d3eb82a
respond to code review
2015-05-20 17:31:57 -07:00
Stephen Birarda
7373bb6817
contain QSharedMemory for local server port to reader
2015-05-20 17:11:08 -07:00
samcake
496898273c
Merge pull request #4846 from jherico/dk1
...
Second attempt at fixing the HMD eye projections, without breaking the camera this time.
2015-05-20 17:02:28 -07:00
Stephen Birarda
6306b69ec8
add a version and handle remapping for restricted access
2015-05-20 16:27:53 -07:00
Seth Alves
782402b4c8
Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux
2015-05-20 14:53:05 -07:00
Seth Alves
4a59dc24c5
split entity-add and entity-edit messages
2015-05-20 14:52:03 -07:00
Brad Hefta-Gaub
39ab2f43bf
Merge pull request #4885 from Atlante45/warings
...
Quiet warnings
2015-05-20 14:45:55 -07:00
Brad Hefta-Gaub
07366ca173
Merge pull request #4917 from huffman/fix-spotlight-size
...
Fix spotlight dimensions
2015-05-20 14:45:23 -07:00
Seth Alves
124ff68cee
make EntityItemID a subclass of QUuid
2015-05-20 14:22:08 -07:00
Seth Alves
f522334c99
sort out script interface changes
2015-05-20 12:30:06 -07:00
Howard Stearns
c5b8dd51d8
Fix https://app.asana.com/0/32622044445063/34195351184789
...
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
2015-05-20 11:07:03 -07:00
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -07:00
Brad Davis
827d7f6221
Merge branch 'master' into dk1
2015-05-20 09:41:20 -07:00
Ryan Huffman
6f69ed2561
Fix calculated dimensions of spotlight
...
The spotlights region of effect is the intersection of the spotlight
with radius r, and the sphere of radius r
2015-05-20 09:11:48 -07:00
Ryan Huffman
bb38b3eb3f
Update default light cutoff to PI / 2
2015-05-20 09:11:21 -07:00
Seth Alves
b32e069f1d
bump protocol version
2015-05-19 14:45:01 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Howard Stearns
bb4df26690
Fix indentation.
2015-05-18 14:25:35 -07:00
Howard Stearns
95be605233
Typo: unlock=>lock in rednerDebugMeshBoxes.
2015-05-18 14:05:13 -07:00
Howard Stearns
7e1b6a48c5
Merge branch 'master' of https://github.com/highfidelity/hifi into grab-picking-crash
2015-05-18 13:35:28 -07:00
Howard Stearns
f2a66f3106
Simplest fix for the grab crash that occurs with animated complex models.
...
(e.g., clicking on air hockey props in front of a spinning windmill).
2015-05-18 13:08:11 -07:00
ZappoMan
1bb682180c
workaround for segregateMeshGroups() crash
2015-05-18 12:24:18 -07:00
Stephen Birarda
2eb796eca6
resolve conflicts on merge with upstream/master
2015-05-18 10:25:24 -07:00
Brad Davis
7f2552c690
Merge branch 'master' into plugins
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
2015-05-16 22:38:15 -07:00
Philip Rosedale
1f8008e5b5
Merge pull request #4897 from samcake/yellow
...
Remove the loading time when moving to a zone
2015-05-16 20:50:26 -07:00
Andrew Meadows
180590145d
check for NULL before using pointer to EntityItem
2015-05-16 11:12:19 -07:00
Sam Cake
c3dfd574b4
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-15 15:27:14 -07:00
Sam Cake
07fe43e175
moving forward with the void* hack for gpu::Texture
2015-05-15 15:26:40 -07:00
Atlante45
407d1bd013
Merge branch 'master' of https://github.com/highfidelity/hifi into warings
2015-05-15 23:27:04 +02:00
Philip Rosedale
36031eb308
Merge pull request #4886 from sethalves/finglonger
...
rays never pick a line entity. some fixes to pointer.js
2015-05-15 13:27:13 -07:00
Seth Alves
bb3d1a6a58
rays never pick a line entity. some fixes to pointer.js
2015-05-15 13:10:16 -07:00
Atlante45
cb02ef9277
Remove warnings
2015-05-15 21:35:47 +02:00
Sam Cake
97b18fcd52
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-15 11:29:43 -07:00
Sam Cake
765145b898
Moving the load of the texture and the generation of the cube map irradiance in the same thread
2015-05-15 11:28:59 -07:00
Howard Stearns
9f7a56e3e5
Ask audio injector to delete itself.
...
Put in null guards.
Tune parameters (including higher threshold).
2015-05-15 11:00:28 -07:00
Stephen Birarda
e462617a6b
add error log debug for script fail
2015-05-15 10:29:24 -07:00
Sam Cake
ad9834283d
Fixing the magic numbers!
2015-05-14 15:54:40 -07:00
Philip Rosedale
15d2ce6ecc
Merge pull request #4876 from AndrewMeadows/thermonuclear
...
adjust margin for hulls with small dimensions
2015-05-14 15:53:34 -07:00
Sam Cake
e3d80088da
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-14 15:22:18 -07:00
Sam Cake
40ee78195e
remove magic numbers
2015-05-14 15:21:57 -07:00
Stephen Birarda
5645fdc8b9
send user to token creation page
2015-05-14 15:21:33 -07:00
Howard Stearns
5accb4d0d2
Remove debug logging.
2015-05-14 15:12:31 -07:00
Andrew Meadows
7a47e04b9c
adjust margin for hulls with small dimensions
2015-05-14 14:57:18 -07:00
