Seth Alves
b1a015affd
Merge pull request #10117 from huffman/fix/unlock-propagation
...
Fix entity "unlock" edits not being propagated to clients
2017-04-06 15:28:05 -07:00
Seth Alves
3c6429cdf3
Merge pull request #10103 from vladest/master-qml-bugfixes
...
Master qml bugfixes
2017-04-06 14:22:06 -07:00
Chris Collins
494c8d868e
Merge pull request #10126 from samcake/brown
...
Fixing the rendering of Image3D overlay when drawn in the scene
2017-04-06 13:40:09 -07:00
David Kelly
34a2cefb98
Merge pull request #10132 from davidkelly/dk/analyticsForConnections
...
initial analytics for connections
2017-04-06 10:45:39 -07:00
Anthony Thibault
be2fdd9388
Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects
...
Vive: Expose all 16 tracked poses to the controller system
2017-04-05 16:53:47 -07:00
samcake
309c6b8d9b
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-04-05 13:11:12 -07:00
David Kelly
1b6bf90843
initial analytics for connections
2017-04-05 11:10:06 -07:00
Seth Alves
384f404602
Merge pull request #10109 from mittens/21240
...
OBJ Loader Rewrite to Support Multiple Materials
2017-04-04 15:56:44 -07:00
samcake
8b4696f4ec
Merge and solve conflicts
2017-04-04 13:28:03 -07:00
samcake
6385a702cd
FIxing the bug for image3D overlay drawn in scene
2017-04-04 12:56:43 -07:00
samcake
b18d82bd19
adding different shaders for transparent for simpel
2017-04-04 11:50:38 -07:00
Anthony J. Thibault
c58fdb590a
Fix for sliding feet when leaning in HMD mode.
2017-04-04 11:00:34 -07:00
Seth Alves
b0b214012c
Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts
...
Fix broken eventBridge on tablet after Reload All Scripts.
2017-04-04 10:45:08 -07:00
Vladyslav Stelmakhovskyi
aa487faad1
Fixed No such signal QmlWindow_QMLTYPE_490::resized(QSizeF) and No such signal QmlWindow_QMLTYPE_490::moved(QVector2D) warnings
2017-04-04 16:59:09 +02:00
trent
362ffba117
Fixes to OBJReader.cpp style inconsistencies.
2017-04-03 21:54:19 -04:00
samcake
a882beb2fd
Trying to fix the overlay Image3D shading pipeline used
2017-04-03 17:35:28 -07:00
Brad Davis
9942770761
Merge pull request #10105 from samcake/ambient
...
Fixing the bad rendering of the instanced primitives on 4.1
2017-04-03 17:04:56 -07:00
trent
5cc87ccc4a
Fixed warning for subtly-stupid unused variable.
2017-04-03 19:38:34 -04:00
Anthony J. Thibault
8ff457a1b6
Fix broken eventBridge on tablet after Reload All Scripts.
...
The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object.
For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.
2017-04-03 16:03:55 -07:00
Ryan Huffman
b9fffc10f8
Fix entity "unlock" edits not being propagated to clients
...
The lastEditedBy property was not being updated when changing the locked
property of entities from true to false.
2017-04-03 15:51:19 -07:00
trent
bec46747dd
Merge branch 'master' of https://github.com/highfidelity/hifi into 21240
2017-04-03 16:46:36 -04:00
trent
2991332652
Rewrote the OBJ reader (again) to use FBXMeshPart instead of separate meshes. Works now! Multi-material support win.
2017-04-03 16:46:22 -04:00
Andrew Meadows
66ff551a7c
Merge pull request #10080 from ZappoMan/footActions
...
add foot IK targets as actions, map Kinect feet to foot targets
2017-04-03 12:06:14 -07:00
samcake
c3c73b209a
Fixing the bad rendering of the instanced primitives on 4.1
2017-04-03 11:49:00 -07:00
Anthony Thibault
999bd0d339
Merge pull request #10075 from sethalves/tablet-ui
...
Tablet ui -- misc changes + landscape mode
2017-04-03 10:43:34 -07:00
Vladyslav Stelmakhovskyi
990e1379e3
Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task
...
(cherry picked from commit d966979c2368b159cf5b96c5fd535411cda019b8)
2017-04-03 19:33:41 +02:00
Vladyslav Stelmakhovskyi
7318ec468b
Fixed warning QObject::connect: No such signal Desktop_QMLTYPE_217::sendToScript(QVariant)
...
(cherry picked from commit ef4bea2cd4811364e65baec2c48ce2205a0e2cb3)
2017-04-03 19:33:41 +02:00
Seth Alves
43e1cec8a3
merge from upstream
2017-04-03 06:28:59 -07:00
David Rowe
405e8cfc9e
Fix typo noticed in passing
2017-04-02 12:58:24 +12:00
Chris Collins
6fe210da66
Merge pull request #10094 from sethalves/tablet-ui-fix-hmd-login
...
fix login-screen for hmd+tablet
2017-03-31 17:17:30 -07:00
Zach Fox
8a96969471
Merge pull request #9873 from highfidelity/PAL_v2
...
PAL v2.0
2017-03-31 17:00:41 -07:00
Seth Alves
3cd134d138
fix login-screen for hmd+tablet
2017-03-31 16:41:21 -07:00
Andrew Meadows
0181783290
Merge pull request #10064 from samcake/ambient
...
Fix the sharp reflection happening after pr 10036 and bugs on backend 4.1
2017-03-31 16:04:00 -07:00
samcake
467ea787c6
Adress Seth's review
2017-03-31 14:54:00 -07:00
Howard Stearns
0c07003768
Merge pull request #10049 from AndrewMeadows/avoid-invisible-avatars
...
Avoid invisible avatars
2017-03-31 13:48:41 -07:00
samcake
c8970dd704
Fixing the warning on windows
2017-03-31 11:34:03 -07:00
samcake
6a0c07a692
Fixing a bad counter for numFaces
2017-03-31 10:39:13 -07:00
Sam Cake
dd73cb7b8e
Use a magic number gpu::Texture::SINGLE_MIP instead of 1
2017-03-30 23:46:37 -07:00
Sam Cake
61d78bc931
BRinging the cool texture management of the gl45 backend to gl41, which fixes the broken ao on 41 among other things
2017-03-30 23:29:37 -07:00
ZappoMan
53c439ffba
add foot IK targets as actions
2017-03-30 19:11:16 -07:00
samcake
47e9668b8f
improving the gl41 backend to mimic the gl45
2017-03-30 17:59:59 -07:00
Seth Alves
9ef4d01772
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-30 17:00:07 -07:00
trent
e9035a1efb
More fixes for the OBJ reader. The data seems to be fine. The rendering seems not so fine.
2017-03-30 19:10:15 -04:00
trent
c5bb419bd1
Fixed OBJ reader crash, did not fix OBJ reader not working properly.
2017-03-30 18:16:55 -04:00
samcake
25edb44b75
Fix the problem with the cursor and scattering,
2017-03-30 15:15:14 -07:00
trent
864184a107
wip OBJ loader rewrite; wip because it crashes.
2017-03-30 17:11:40 -04:00
trent
5bf3da9a7f
Restoring hifi version of the OBJ files to get rid of my debug nonsense.
2017-03-30 16:14:42 -04:00
trent
dd2ed559b6
Merge branch 'master' of https://github.com/highfidelity/hifi into 21240
2017-03-30 16:13:28 -04:00
samcake
26000288d7
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-03-30 11:45:12 -07:00
Seth Alves
c62b07d26f
add setLandscape call to tablet
2017-03-30 11:36:21 -07:00
