Stephen Birarda
|
9ff7bfd0b5
|
some header cleanup in UDTTest output
|
2015-08-25 11:21:04 -07:00 |
|
Stephen Birarda
|
92116dd6e7
|
added stats for receive rate in Mbits
|
2015-08-25 11:04:24 -07:00 |
|
Stephen Birarda
|
5e5bd77870
|
add initialization for all atomics in SendQueue
|
2015-08-25 09:55:21 -07:00 |
|
Atlante45
|
083a14bf4d
|
Merge branch 'protocol' of https://github.com/birarda/hifi into protocol
|
2015-08-25 15:08:52 +02:00 |
|
Philip Rosedale
|
ff3a0480fe
|
Merge pull request #5652 from birarda/master
tweaks to domain-server web interface
|
2015-08-24 21:36:52 -07:00 |
|
Brad Davis
|
f9f5743fd7
|
Merge pull request #5650 from ZappoMan/fixCrashInController
Fix a couple crashes in the Controller scripting interface
|
2015-08-24 18:49:50 -07:00 |
|
Stephen Birarda
|
17befac262
|
use fixed width for stats tables
|
2015-08-24 18:10:21 -07:00 |
|
Stephen Birarda
|
b8ac9aa5eb
|
update jquery and bootstrap in DS
|
2015-08-24 18:02:26 -07:00 |
|
Brad Hefta-Gaub
|
34e32ddaeb
|
Merge pull request #5636 from howard-stearns/marketplace-avatars
marketplace avatars
|
2015-08-24 17:49:20 -07:00 |
|
Brad Hefta-Gaub
|
5ea6d2704a
|
Merge pull request #5628 from ctrlaltdavid/webwindow-external-links
Make WebWindow hyperlinks with target="_blank" open in user's browser
|
2015-08-24 17:45:35 -07:00 |
|
Brad Hefta-Gaub
|
53ae958c74
|
Merge pull request #5643 from hyperlogic/tony/renderable-particle-crash-fix
Fix for RenderableParticleEffectEntity crash.
|
2015-08-24 17:44:39 -07:00 |
|
Brad Hefta-Gaub
|
c6174ad88a
|
Merge pull request #5647 from jherico/homer
Removing tabs from our javascript
|
2015-08-24 17:33:57 -07:00 |
|
Stephen Birarda
|
f7799bcf8f
|
add TODO for settings fail, cleanup
|
2015-08-24 17:02:47 -07:00 |
|
Stephen Birarda
|
e84595af49
|
add a wait condition for empty queue and loss list
|
2015-08-24 17:02:40 -07:00 |
|
Stephen Birarda
|
9275b954f4
|
Merge pull request #13 from huffman/ordered-sending
Ordered sending
|
2015-08-24 16:41:50 -07:00 |
|
Brad Hefta-Gaub
|
13a9dc4df2
|
cleanup controller interface, add getActionNames() and getDeviceNames()
|
2015-08-24 15:35:55 -07:00 |
|
Brad Davis
|
380b0cb23c
|
Removing tabs from our javascript and C++
|
2015-08-24 15:26:46 -07:00 |
|
Seiji Emery
|
4d9f45475e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into gputest
|
2015-08-24 14:38:26 -07:00 |
|
Brad Hefta-Gaub
|
6549e47dbc
|
fix crash in Controller when asking for device name out of bounds
|
2015-08-24 14:35:19 -07:00 |
|
Seiji Emery
|
bd18951be8
|
fixed AUTOSCRIBE_SHADER_LIB to work for targets outside of libraries/
|
2015-08-24 13:13:24 -07:00 |
|
Ryan Huffman
|
4191ccd60d
|
Move *ResourceRequest objects to separate files
|
2015-08-24 12:16:20 -07:00 |
|
Seiji Emery
|
691cb48a08
|
Fixed to use standard shaders from render-utils
|
2015-08-24 11:26:56 -07:00 |
|
Anthony J. Thibault
|
47b8ab373c
|
Fix for RenderableParticleEffectEntity crash.
The render item payload now keeps a shared_ptr to the entity.
|
2015-08-24 11:15:30 -07:00 |
|
Brad Hefta-Gaub
|
275cdf9d8f
|
Merge pull request #5581 from larsnaesbye/master
Preliminary da_DK translation of Interface
|
2015-08-24 10:36:30 -07:00 |
|
Brad Davis
|
78a08ed7c7
|
Merge pull request #5641 from thoys/20660
CR for Job #20660 - Render the world Axis markers into negative space, add view option
|
2015-08-24 10:16:56 -07:00 |
|
Howard Stearns
|
bb91b17314
|
Merge pull request #5634 from hyperlogic/tony/animation-resource-fix
Fix for animation resources
|
2015-08-24 08:13:33 -07:00 |
|
Nex Pro
|
8d8a9535a0
|
Merge branch '20660' of github.com:thoys/hifi into 20660
|
2015-08-24 16:07:38 +01:00 |
|
Nex Pro
|
3f4323e084
|
Added overload for renderDashedLine
|
2015-08-24 16:07:07 +01:00 |
|
Andrew Meadows
|
1d7d5071ae
|
Merge pull request #5633 from howard-stearns/restore-body-indicators
Restore body indicators (e.g., lookAt vectors).
|
2015-08-23 15:46:57 -07:00 |
|
Brad Hefta-Gaub
|
0eaeb99064
|
Merge pull request #5640 from jherico/maggie
Fixing build problem with 3d connexion
|
2015-08-23 13:46:49 -07:00 |
|
Thijs Wenker
|
bbd6f25ff7
|
style fixes
|
2015-08-23 20:01:58 +02:00 |
|
Thijs Wenker
|
0f8cf80d45
|
Merge branch 'master' of https://github.com/worklist/hifi into 20660
|
2015-08-23 19:53:50 +02:00 |
|
Thijs Wenker
|
63f0173665
|
extend world boundaries
|
2015-08-23 19:52:29 +02:00 |
|
Brad Davis
|
b7237fb5ca
|
Fixing build problem with 3d connexion
|
2015-08-23 09:32:58 -07:00 |
|
Nex Pro
|
53a63fed79
|
Changed constants red, green, blue and grey to uppercase as per style guide.
|
2015-08-23 17:16:23 +01:00 |
|
Thijs Wenker
|
748625399e
|
"View -> World Axes" menu option
|
2015-08-23 17:59:58 +02:00 |
|
Thijs Wenker
|
b7f9bc13da
|
Merge branch '20660' of github.com:thoys/hifi into 20660
|
2015-08-23 17:52:51 +02:00 |
|
Nex Pro
|
0ef2def56e
|
changed default DASH_LENGTH and GAP_LENGTH to 1.0f
|
2015-08-23 16:52:12 +01:00 |
|
Thijs Wenker
|
9de35511fc
|
Merge branch '20660' of github.com:thoys/hifi into 20660
|
2015-08-23 17:50:28 +02:00 |
|
Nex Pro
|
3e8970cc1e
|
corrected declaration of float constants DASH_LENGTH and GAP_LENGTH as per style guide.
|
2015-08-23 16:49:39 +01:00 |
|
Thijs Wenker
|
90c8200d66
|
Merge branch '20660' of github.com:thoys/hifi into 20660
|
2015-08-23 17:44:43 +02:00 |
|
Nex Pro
|
ad315cf68a
|
Merge branch '20660' of github.com:thoys/hifi into 20660
Conflicts:
interface/src/Util.cpp
|
2015-08-23 16:30:46 +01:00 |
|
Nex Pro
|
1f08444369
|
Modified the world box to render axes in negative space
Also Modified renderDashedLine to accept params for dash len and gap len so we can display negative axes as dashed lines with 500mm dashes and gaps.
|
2015-08-23 16:21:20 +01:00 |
|
Brad Hefta-Gaub
|
53f9815f69
|
Merge pull request #5639 from jherico/maggie
Stereo rendering work
|
2015-08-22 20:48:54 -07:00 |
|
Brad Davis
|
d3135dcfa6
|
Stereo rendering work
|
2015-08-22 16:15:10 -07:00 |
|
Brad Hefta-Gaub
|
62d8b14b8b
|
Merge pull request #5635 from samcake/punk
Improve the light attenuation formulae
|
2015-08-22 15:49:59 -07:00 |
|
Brad Hefta-Gaub
|
2bca05fb2e
|
Merge pull request #5629 from ctrlaltdavid/displayname-assert
More temporary logging to track down cause of assert
|
2015-08-22 15:48:58 -07:00 |
|
Brad Hefta-Gaub
|
fe44442ffe
|
Merge pull request #5577 from vastcharade/horizAmbOcclPerf
Horiz amb occl performance updates
|
2015-08-22 12:39:51 -07:00 |
|
Philip Rosedale
|
2bfa121925
|
Merge pull request #5637 from hyperlogic/tony/fbx-texture-fix
Resource fix for textures in FBX files.
|
2015-08-21 22:20:18 -07:00 |
|
Anthony J. Thibault
|
80d3ae68c2
|
Removed redundant ends with ‘fbx’ check.
|
2015-08-21 22:11:53 -07:00 |
|