ericrius1
c9c5d3d8bc
removed VRVJ files
2016-03-22 10:32:04 -07:00
ericrius1
94283904b8
update
2016-03-22 10:26:13 -07:00
ericrius1
1c876fe110
update
2016-03-22 10:16:49 -07:00
samcake
67abdab8b2
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2016-03-22 10:13:50 -07:00
ericrius1
f043b27a56
hardcoded num avatars
2016-03-22 10:12:44 -07:00
ericrius1
130eb6b619
working for one;
2016-03-22 10:07:59 -07:00
ericrius1
bc8a8ac703
fix syntax error
2016-03-22 10:00:44 -07:00
ericrius1
2bb11c5dc6
unload baton
2016-03-22 09:59:10 -07:00
Philip Rosedale
f57332e4be
Merge pull request #7421 from ZappoMan/fixBlenderCrashRedux
...
one more crack at fixing the blender
2016-03-22 09:51:21 -07:00
Andrew Meadows
114cb27c4f
Merge pull request #7422 from jherico/tabs
...
Fix occasional crash on creating overlay tool windows
2016-03-22 09:49:22 -07:00
Thijs Wenker
d47e8eb999
Fix setting colors in ParticleExplorer without having the particle entity disappear. Handles Hex strings as well as color arrays.
2016-03-22 17:39:57 +01:00
Brad Davis
a30df07d53
PR feeback, precendence
2016-03-22 09:15:29 -07:00
David Rowe
53b86a0b55
Move the "no entities found" message into the entities list table
2016-03-22 20:02:57 +13:00
David Rowe
7e7e421efa
Tidy some QML
2016-03-22 19:33:57 +13:00
David Rowe
42b606c09d
Merge branch 'master' into 20855
2016-03-22 18:51:07 +13:00
David Rowe
02a62766e0
Size entities list to dialog and scroll when necessary
...
Also add a footer.
2016-03-22 18:03:12 +13:00
Anthony Thibault
9faccabf0d
Merge branch 'master' of https://github.com/highfidelity/hifi into tony/vive-rendering-work
2016-03-21 21:55:53 -07:00
Anthony Thibault
b1286517c6
Removed frame latency in GLEscrow
...
This could occur if the GLEscrow queue has extra frames in it.
When new textures were fetched, before this fix, they were simply popped from the queue.
This commit introduces a loop, that will fetch from the queue until it is empty.
2016-03-21 21:51:16 -07:00
Anthony Thibault
225c462685
Improved NSIGHT instrumentation
...
* Application::idle, physics and avatar processing are tracked
* Application::paintGL frameNumber payload is tracked
* OpenGLDisplayPlugin::present is profiled with corresponding frameNumber payload
* Added color and payload support to Nsight ProfileRange class.
2016-03-21 21:47:59 -07:00
Brad Davis
28f25489f8
Fix occasional crash on creating overlay tool windows
2016-03-21 19:17:31 -07:00
Brad Hefta-Gaub
513138ca98
one more crack at fixing the blender
2016-03-21 18:28:26 -07:00
Philip Rosedale
6b3a4eb327
Merge pull request #7419 from hyperlogic/tony/no-locks-no-problem
...
Prevent deadlocks in AvatarUpdate
2016-03-21 17:54:27 -07:00
Seth Alves
eee4abfd95
Merge pull request #7420 from birarda/octree-leak
...
fix a memory leak in OctreePacketProcessor packet piggybacking
2016-03-21 17:52:04 -07:00
samcake
de374c0cac
Switching emissive and lightmap somewhere but not big issue
2016-03-21 17:51:57 -07:00
Anthony Thibault
0d046b12de
OpenVR: Moved WaitGetPoses after main window preview.
2016-03-21 17:39:10 -07:00
Anthony Thibault
63d6f888e6
Update openvr sdk to 0.9.19
2016-03-21 17:31:13 -07:00
Stephen Birarda
20c923db32
remove leaking unused method from NLPacketList
2016-03-21 17:26:49 -07:00
ericrius1
2dce75bfb0
baton sound
2016-03-21 17:22:18 -07:00
Clément Brisset
59b043d803
Merge pull request #7418 from birarda/ds-uuid-cookie
...
fix a crash in DS and remove storage of cookie UUIDs to disk
2016-03-21 17:17:01 -07:00
Philip Rosedale
c8816f8e76
Merge pull request #7389 from Menithal/on-grab-fix
...
Grab.js: Update Position on Mouse Grab Start
2016-03-21 17:10:00 -07:00
ericrius1
adeaa9475e
num
2016-03-21 16:49:55 -07:00
ericrius1
9c18d6c016
change name
2016-03-21 16:47:51 -07:00
ericrius1
efd56ac22a
spawner
2016-03-21 16:45:23 -07:00
Chris Collins
277f49ef64
Merge pull request #7410 from hyperlogic/tony/limit-accumulate-time-loops
...
AnimUtil: prevent accumulateTime from looping forever
2016-03-21 16:39:37 -07:00
samcake
695e558851
Trying to clena up the problem?
2016-03-21 16:36:47 -07:00
Stephen Birarda
6b28523cb5
don't release the OPP processed packet
2016-03-21 16:29:18 -07:00
Brad Hefta-Gaub
7f3ce6dd26
Merge pull request #7417 from zzmp/fix/skybox-default
...
Default background behavior to stars
2016-03-21 16:15:06 -07:00
Brad Hefta-Gaub
afa6e6e30a
Merge pull request #7414 from zzmp/fix/leaking-reply
...
Delete used QNetworkReply
2016-03-21 16:06:45 -07:00
Anthony J. Thibault
7cab8f63fb
Merge branch 'master' of github.com:highfidelity/hifi into tony/no-locks-no-problem
2016-03-21 16:03:33 -07:00
ericrius1
51508b467c
uupdate
2016-03-21 15:59:03 -07:00
Brad Hefta-Gaub
8cfa6fc960
Merge pull request #7413 from huffman/fix-emit-audio-packet
...
Fix audio packet being used in a thread-unsafe way
2016-03-21 15:58:10 -07:00
ericrius1
98e43a8d0f
more logging
2016-03-21 15:54:47 -07:00
Chris Collins
6324d0e3be
Merge pull request #7393 from ZappoMan/protectMeshBoxes
...
Fix for crash in recalculateMeshBoxes()
2016-03-21 15:46:28 -07:00
ericrius1
b4509e428b
bugs
2016-03-21 15:37:20 -07:00
Brad Hefta-Gaub
a6bf84b90e
Merge pull request #7399 from zzmp/fix/qml-thread
...
Move QML rendering to a defined thread
2016-03-21 15:31:42 -07:00
Brad Hefta-Gaub
5f3c29d3e2
Merge pull request #7416 from zzmp/fix/static-cast-network
...
Static cast avatar network reply
2016-03-21 15:31:20 -07:00
Chris Collins
ed3a9cb24b
Merge pull request #7415 from howard-stearns/thread-safe-entityToElementMap
...
Possible fix for getContainingElement crash.
2016-03-21 15:30:04 -07:00
Stephen Birarda
078872a6db
correct returned OAuth redirect URL
2016-03-21 15:26:26 -07:00
Stephen Birarda
7f3761481c
don't store UUIDs for cookies on disk
2016-03-21 15:22:32 -07:00
Stephen Birarda
510e8e89f2
fix a crash in DS with missing cert/key
2016-03-21 15:22:05 -07:00
