Marcel Verhagen
|
7c5961ea63
|
Merge remote-tracking branch 'upstream/master'
|
2015-07-27 17:22:41 +02:00 |
|
Brad Hefta-Gaub
|
a9d5723eb3
|
Merge pull request #5410 from kevinmthomas-carpool/20618
CR for Job #20618 - Move Reload Content item to Developer menu.
|
2015-07-26 21:54:55 -07:00 |
|
Brad Hefta-Gaub
|
8a34df380c
|
Merge pull request #5432 from sethalves/quiet-compiler
quiet compiler
|
2015-07-26 12:06:40 -07:00 |
|
Brad Hefta-Gaub
|
89d1e82f89
|
Merge pull request #5431 from jherico/homer
Limit the amount of time consumed by QML rendering
|
2015-07-26 11:54:05 -07:00 |
|
Seth Alves
|
24fff719c5
|
quiet compiler
|
2015-07-25 21:11:23 -07:00 |
|
Brad Davis
|
f66492b444
|
Merge pull request #5422 from ctrlaltdavid/20591
CR for 20591 - Fix setting WebWindow's width and height
|
2015-07-25 11:49:53 -04:00 |
|
Brad Davis
|
843a333727
|
Merge pull request #5424 from samcake/yellow
Cleaning up the FBO cache and the output stage in general
|
2015-07-25 11:49:22 -04:00 |
|
Bradley Austin Davis
|
7be33dcb58
|
Limit the amount of time consumed by rendering QML
|
2015-07-25 11:40:58 -04:00 |
|
Philip Rosedale
|
e24395a226
|
Merge pull request #5383 from ctrlaltdavid/20630
Improve looking-at-me indication
|
2015-07-24 16:15:13 -07:00 |
|
Sam Gateau
|
776d4747b2
|
Cleaning up the FBO cache and the output stage in general
|
2015-07-24 14:47:44 -07:00 |
|
Kevin M. Thomas
|
67c9a33cc0
|
Update Menu.cpp
|
2015-07-24 15:16:02 -04:00 |
|
Kevin M. Thomas
|
5f7fe30b9b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20618
# Conflicts:
# interface/src/Menu.cpp
|
2015-07-24 15:10:34 -04:00 |
|
David Rowe
|
3893add148
|
Fix setting WebWindow's width and height
Width and height parameters now set the WebWindow's width and height
instead of its minimum size, when not part of a tool window.
|
2015-07-24 10:43:24 -07:00 |
|
samcake
|
f3dc159e33
|
Merge pull request #5401 from ZappoMan/renderLaserPointers
remove renderLaserPointers()
|
2015-07-24 10:41:32 -07:00 |
|
Seth Alves
|
5f2e8f5b71
|
Merge pull request #5419 from birarda/master
only output the no listener for type message once
|
2015-07-24 10:41:11 -07:00 |
|
Brad Hefta-Gaub
|
939638a3a8
|
Merge pull request #5414 from birarda/slow-events
allow the QEvent queue in Application to get behind
|
2015-07-24 10:10:42 -07:00 |
|
Brad Davis
|
6eec04c798
|
Merge pull request #5407 from samcake/yellow
Removing the glNaked code for capturing the billboard snaphot and rendering the rearViewMirror in a separate render target
|
2015-07-24 13:09:07 -04:00 |
|
Stephen Birarda
|
71557a1846
|
only output no listener for type message one time
|
2015-07-24 09:36:27 -07:00 |
|
samcake
|
e6f2504514
|
FIx the problem of clear when the color mask is not WRITE_ALL
|
2015-07-24 09:26:32 -07:00 |
|
Brad Davis
|
6899279d7d
|
Merge pull request #5399 from ZappoMan/fixJSRayPick
Fix JS calls to computePickRay() when mini-mirror is showing
|
2015-07-24 11:46:07 -04:00 |
|
Andrew Meadows
|
c6b2644539
|
Merge pull request #5418 from sethalves/hull-tool-fatten-ignore-walls
hull creation tool ignores walls in fatten-mesh mode
|
2015-07-24 08:37:47 -07:00 |
|
Seth Alves
|
bd1a661d01
|
Merge pull request #5416 from ctrlaltdavid/webwindow-title
Add ability to update title of WebWindow after it's created
|
2015-07-24 08:27:54 -07:00 |
|
Philip Rosedale
|
f04291ef65
|
Merge pull request #5408 from thoys/20626
CR for Job #20626 - edit.js - entities list html - multi select using shift key / working delete key
|
2015-07-24 07:47:30 -07:00 |
|
Seth Alves
|
6841a47c4b
|
Merge pull request #5412 from AndrewMeadows/bohrium
decouple FPS from rotation rate during mouse drag
|
2015-07-24 07:44:22 -07:00 |
|
Seth Alves
|
6ba135de09
|
when creating a walking surface collision hull from a flat mesh, ignore triangles with a normal that's not mostly up or down
|
2015-07-24 07:16:40 -07:00 |
|
Kevin M. Thomas
|
28e6a4ac63
|
Updating master as old job related to AudioClient.h was incorretly included with current job.
|
2015-07-24 09:36:35 -04:00 |
|
MarcelEdward
|
a3483e2da5
|
Merge pull request #4 from highfidelity/master
sync with hifi
|
2015-07-24 15:32:23 +02:00 |
|
samcake
|
52ac5b3ef6
|
On mac cannot get ther erendering to properly display the overlay if the rear view mirror is active on resize
|
2015-07-24 03:38:21 -07:00 |
|
Sam Gateau
|
cb375e8ece
|
FIund a nasty bug with the scissor which was the reason for many issues, tried to integrate the framebuffer setup and clear as part of the enginepipeline so calling display side is simpler
|
2015-07-24 02:15:50 -07:00 |
|
Sam Gateau
|
66cd17ec66
|
REmove the crappy solution for drawing transparent texture into overlay by a proper shader
|
2015-07-23 23:09:40 -07:00 |
|
David Rowe
|
c1e1caa709
|
Add ability to update title of WebWindow after it's created
|
2015-07-23 21:59:19 -07:00 |
|
Brad Hefta-Gaub
|
2e83378c23
|
Merge pull request #5411 from birarda/master
don't allow sending of billboards > MTU size
|
2015-07-23 18:40:30 -07:00 |
|
samcake
|
8421aafe33
|
try to fix the scaling issues on mac
|
2015-07-23 18:17:10 -07:00 |
|
Stephen Birarda
|
cdcab299b6
|
bring back delayed queue of Application events
|
2015-07-23 18:00:35 -07:00 |
|
Philip Rosedale
|
a1544956e3
|
Merge pull request #5348 from ctrlaltdavid/20602
DO NOT MERGE - QA for #20602 - Fix and improve eye saccades
|
2015-07-23 17:42:24 -07:00 |
|
Andrew Meadows
|
2fc158246d
|
decouple FPS from rotation rate during mouse drag
|
2015-07-23 17:30:50 -07:00 |
|
Stephen Birarda
|
974108734a
|
add a comment for size guard
|
2015-07-23 17:17:59 -07:00 |
|
Stephen Birarda
|
f919d2985b
|
don't attempt to send the avatar billboard if too large
|
2015-07-23 17:17:15 -07:00 |
|
Sam Gateau
|
ded95a3dde
|
removing dead code
|
2015-07-23 16:58:21 -07:00 |
|
Sam Gateau
|
a424ff98ca
|
Fixing issues with the review process
|
2015-07-23 16:55:18 -07:00 |
|
Sam Gateau
|
a002560003
|
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
|
2015-07-23 16:32:00 -07:00 |
|
Sam Gateau
|
d56b5f39fb
|
strenghening the checks in GLBackend::downloadFramebuffer before actually calling the true glReadPixels
|
2015-07-23 16:31:11 -07:00 |
|
Sam Gateau
|
be9d99264f
|
Introducing the download Framebuffer call on the context to capture a snapshot
|
2015-07-23 16:15:10 -07:00 |
|
Brad Davis
|
2ac6304752
|
Merge pull request #5404 from ZappoMan/renderBug
Fix rendering of primitive objects on Windows
|
2015-07-23 19:10:54 -04:00 |
|
Howard Stearns
|
e59304ae74
|
Merge pull request #5406 from huffman/variadic-print
Update script print() to be variadic
|
2015-07-23 18:03:37 -05:00 |
|
ZappoMan
|
8007fba909
|
add type to shader include
|
2015-07-23 15:37:56 -07:00 |
|
Ryan Huffman
|
396bb613f8
|
Avoid creating a new variable in js print
|
2015-07-23 15:32:40 -07:00 |
|
Ryan Huffman
|
5f33ac5459
|
Update script print() to be variadic
|
2015-07-23 15:30:54 -07:00 |
|
Seth Alves
|
849715953d
|
Merge pull request #5405 from AndrewMeadows/bohrium
fix for underdamped avatar rotation momentum
|
2015-07-23 15:26:49 -07:00 |
|
Sam Gateau
|
dc10f30d3d
|
Merged
|
2015-07-23 15:10:42 -07:00 |
|