Seth Alves
8d00f0ab8f
allow obj reader to either combine meshes or keep parts separate
2017-04-07 15:59:01 -07:00
Andrew Meadows
b9c7d6351f
Merge pull request #10135 from samcake/ambient
...
Rename render::PendingChanges to render::Transaction
2017-04-07 09:54:10 -07:00
samcake
f82310545c
Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65""
2017-04-07 02:03:58 -07:00
samcake
ab3d39951e
Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"
2017-04-07 02:03:31 -07:00
samcake
ac9b181786
Merge pull request #10157 from samcake/brown
2017-04-07 02:01:05 -07:00
Sam Cake
b1a4bc329b
Introducing a fix to the graphics bug
2017-04-07 01:10:18 -07:00
Sam Cake
da1355dc32
Introducing a fix to the graphics bug
2017-04-07 01:03:07 -07:00
samcake
aae7349c40
trying to understand the bug with nvidia new driver
2017-04-06 18:31:03 -07:00
samcake
0254c3372f
Merge pull request #10143 from jherico/ktx_crash
...
Don't crash if KTX file is invalid
2017-04-06 16:28:19 -07:00
Chris Collins
4e9e3cccea
Merge pull request #10116 from birarda/bug/rel-ext-textures
...
fix relative/absolute path handling for external FBX textures
2017-04-06 15:58:02 -07:00
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
samcake
19d080c4cc
Merging
2017-04-06 11:33:41 -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
Brad Davis
057a9feaf1
Don't crash if KTX file is invalid
2017-04-06 10:09:57 -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
Stephen Birarda
e4021c168e
add special handling for abs drive letter paths from windows
2017-04-05 16:52:22 -07:00
samcake
8267db6ce5
Add a description of the Transaction class
2017-04-05 14:19:00 -07:00
samcake
026e7bc249
Add a description of the Transaction class
2017-04-05 14:17:26 -07:00
samcake
5629cf425e
Cleaning up the files updated
2017-04-05 13:49:07 -07:00
samcake
309c6b8d9b
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-04-05 13:11:12 -07:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -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
Stephen Birarda
70eada0f76
replace backslashes in parsed fbx relative filepaths
2017-04-04 15:01:18 -07:00
Stephen Birarda
0b57b98970
change readFBX calls to use QUrl where possible
2017-04-04 14:53:14 -07:00
Stephen Birarda
137e73cf21
check absolute path before relative path
2017-04-04 14:42:03 -07:00
Stephen Birarda
0a7100e2d8
pass URLs to readFBX, not just URL path
2017-04-04 14:34:10 -07:00
Stephen Birarda
4e07a6a865
add new logic for absolute texture paths in FBX
2017-04-04 14:02:00 -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
Stephen Birarda
b9783d768e
remove fileOnUrl since it is no longer used
2017-04-04 11:08:30 -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
Stephen Birarda
d4112f0e36
use full relative filepath for texture caching/referencing
2017-04-03 14:57:02 -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
