samcake
b3acde4462
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-11 17:49:00 -08:00
Clément Brisset
c160a98c5c
Merge pull request #6636 from samcake/controllers
...
Fix the broken skybox and simplify a bit the vertex shader used
2015-12-11 17:06:33 -08:00
samcake
68134aafe5
Fix the broken skybox and simplify a bit the vertex shader used
2015-12-11 16:14:55 -08:00
James B. Pollack
f61ce98527
Merge pull request #6635 from sethalves/fix-flashlight-crash
...
don't crash when a child no longer has a containing element
2015-12-11 16:10:00 -08:00
Brad Hefta-Gaub
8f6b637909
Merge pull request #6634 from jherico/escrow
...
Refactoring escrow due to long unsignaled syncs reported by Philip
2015-12-11 16:03:59 -08:00
Brad Davis
1bcf42a799
Merge pull request #6629 from ZappoMan/resetSkyBoxOnDomainChange
...
reset skybox on changing domains
2015-12-11 15:48:20 -08:00
Seth Alves
920e2941b9
don't crash when a child no longer has a containing element
2015-12-11 15:31:56 -08:00
Bradley Austin Davis
04b8251a83
Refactoring escrow due to long unsignaled syncs reported by Philip
2015-12-11 15:05:38 -08:00
Brad Hefta-Gaub
64dd36d140
Merge pull request #6503 from imgntn/ratsteer
...
Add rats to Drylake environment
2015-12-11 13:08:03 -08:00
James B. Pollack
35da54fc6c
dead code and print statements
2015-12-11 11:51:32 -08:00
James B. Pollack
a31ba089c1
semicolons and print statements
2015-12-11 11:49:00 -08:00
Brad Hefta-Gaub
30fd96b509
Merge pull request #6613 from jherico/threaded_qml
...
Moving QML rendering off the main thread
2015-12-11 11:43:04 -08:00
Brad Hefta-Gaub
d918eca030
reset skybox on changing domains
2015-12-11 11:36:02 -08:00
Brad Hefta-Gaub
c417b2b462
Merge pull request #6627 from samcake/controllers
...
Changing the path to the win sdk to x64
2015-12-11 11:33:53 -08:00
Brad Davis
f6652c0b2a
Merge pull request #6628 from ZappoMan/reloadMyAvatarOnContentReload
...
reload own avatar on Content Reload
2015-12-11 11:23:47 -08:00
Brad Hefta-Gaub
a1a3c4470c
reload own avatar on Content Reload
2015-12-11 11:02:16 -08:00
Bradley Austin Davis
ae1345bb13
Adding nsight instrumenting to the QML render thread
2015-12-11 11:00:33 -08:00
samcake
93dbc92c61
Adding the correct selection of the winSDK based on the generator used
2015-12-11 10:59:36 -08:00
samcake
94b6ca4450
FIxing the bad lambda capture for local variables
2015-12-11 10:48:58 -08:00
Clément Brisset
0d93466fc4
Merge pull request #6624 from samcake/graphicsMaster
...
Graphics: Merging upstream master with upstream graphics
2015-12-11 10:37:29 -08:00
samcake
8497931cb4
Changing the path to the win sdk to x64
2015-12-11 10:29:14 -08:00
Bradley Austin Davis
265bd8ee67
Moving QML rendering off the main thread
2015-12-11 10:28:31 -08:00
Brad Hefta-Gaub
a7a924153a
Merge pull request #6617 from huffman/entity-query-keyhole
...
Add keyhole radius to OctreeQuery
2015-12-11 09:35:46 -08:00
Brad Hefta-Gaub
b5e07d9af5
Merge pull request #6625 from howard-stearns/scriptable-anim-var-triggers
...
Scriptable anim var triggers
2015-12-11 09:21:15 -08:00
Brad Hefta-Gaub
ff49ed7a65
Merge pull request #6621 from samcake/controllers
...
Fixing the Collision Geometry display
2015-12-11 09:15:52 -08:00
Ryan Huffman
87e30a2157
Remove EntityQuery version and just append new data to end
2015-12-11 09:03:39 -08:00
Philip Rosedale
4a1d0e5a26
Merge pull request #6623 from ZappoMan/switchToJulySixenseSDK
...
switch to july sixense SDK
2015-12-10 21:21:01 -08:00
Howard Stearns
e8ffa598a2
Merge branch 'master' of https://github.com/highfidelity/hifi into scriptable-anim-var-triggers
2015-12-10 20:40:42 -08:00
Howard Stearns
dfec222c81
Report animation triggers to normal javascript animationStateHandlers, and update away.js as an example.
2015-12-10 20:39:01 -08:00
James B. Pollack
99bc47867a
cleanup
2015-12-10 18:16:01 -08:00
samcake
bf039a505a
Merge branch 'graphics' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-10 18:07:04 -08:00
samcake
5d395ae54f
Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster
2015-12-10 18:06:43 -08:00
Brad Hefta-Gaub
a472d293bb
Merge pull request #6599 from jherico/aeryn-sdl2
...
Moving SDL2 to external plugin
2015-12-10 18:02:15 -08:00
Brad Hefta-Gaub
e5a5c05e84
switch to july sixense SDK
2015-12-10 17:56:31 -08:00
Brad Hefta-Gaub
c1fe30ff49
Merge pull request #6620 from huffman/fix-agent-entity-delete
...
Fix EntityErase packets not being handled on agents
2015-12-10 17:27:21 -08:00
samcake
40bf721ac5
Fixing merging problem
2015-12-10 17:16:06 -08:00
samcake
3728a9c6f0
Merging with Master
2015-12-10 16:55:30 -08:00
samcake
20f3d6abe1
REmoving comments
2015-12-10 16:52:03 -08:00
samcake
dffb83a488
Potentially working correctly
2015-12-10 16:31:00 -08:00
Ryan Huffman
4c8b7aa800
Fix EntityErase packets not being handled on agents
2015-12-10 16:26:16 -08:00
James B. Pollack
8006842041
Merge pull request #6616 from imgntn/explorer_visibility
...
Make Particle Explorer Particles Visible
2015-12-10 16:20:01 -08:00
Howard Stearns
f6cd04680d
Merge pull request #6618 from hyperlogic/tony/sixense-debug-draw-fix
...
Fix for sixense debug draw after migration to plugin.
2015-12-10 16:14:43 -08:00
Howard Stearns
585911fe98
Merge pull request #6612 from sethalves/no-physics-until-ready
...
No physics until ready
2015-12-10 16:09:49 -08:00
Anthony Thibault
3daf80f498
Merge pull request #6490 from Atlante45/particle
...
Particle speedup
2015-12-10 15:27:35 -08:00
Anthony J. Thibault
1af780a664
Fix for sixense debug draw after move to plugin.
...
static variables used to hold a Singleton cannot be shared across dll boundaries by default.
This uses the globalInstance template to store the instance as a property on the QApplication.
2015-12-10 15:05:27 -08:00
Seth Alves
d050670c82
Merge pull request #6614 from ZappoMan/possibleFix
...
Fix whiteboard problems
2015-12-10 15:02:52 -08:00
samcake
5805cc8f2b
Adding the AABox transform features (from Extents) adn introducing a simple MeshPartPayload to render simple geometry
2015-12-10 14:59:04 -08:00
Ryan Huffman
6acf3603d0
Update naming and number of entity query version
2015-12-10 14:58:08 -08:00
Brad Davis
98263f0c0d
Moving sdl2 to external plugin
2015-12-10 14:56:41 -08:00
Ryan Huffman
cfcc07da2e
Fix current version for EntityQuery
2015-12-10 14:49:28 -08:00
