Brad Hefta-Gaub
|
0d4649ded8
|
Merge pull request #10079 from jherico/entity_thread_safety
Thread safety for property getter/setters on entities
|
2017-04-07 19:01:07 -07:00 |
|
Chris Collins
|
8e12f62cbb
|
Merge pull request #10153 from druiz17/goto-fix
Ability to toggle goto with the crt-l and enter keys
|
2017-04-07 16:36:41 -07:00 |
|
Seth Alves
|
03065ee6c8
|
Merge pull request #9938 from kunalgosar/jsRenderBug
Stop WebEntities Running Files and Commands
|
2017-04-07 13:44:03 -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 |
|
Dante Ruiz
|
22521526ec
|
removed stray space
|
2017-04-06 23:41:30 +01: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 |
|
Dante Ruiz
|
a89081601c
|
fix merge issues
|
2017-04-06 22:31:47 +01:00 |
|
Dante Ruiz
|
52fd446d4d
|
toggle goto in tablet
|
2017-04-06 22:27:37 +01: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 |
|
Dante Ruiz
|
90f5d02c99
|
goto toggle option
|
2017-04-06 00:13:53 +01: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 |
|
Brad Davis
|
15f7e895aa
|
More thread safety
|
2017-04-04 15:09:21 -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 |
|
Brad Davis
|
cd7c1643a3
|
More thread safety
|
2017-04-04 14:03:30 -07:00 |
|
Stephen Birarda
|
4e07a6a865
|
add new logic for absolute texture paths in FBX
|
2017-04-04 14:02:00 -07:00 |
|
Brad Davis
|
54200c03a7
|
Fixing deadlock
|
2017-04-04 13:53:49 -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 |
|
kunalgosar
|
19ab7526d3
|
apply profile to relevant entities
|
2017-04-04 11:54:21 -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 |
|
Brad Davis
|
fe84232ab4
|
More work on thread safety
|
2017-04-04 10:50:56 -07:00 |
|
Brad Davis
|
d89104f69c
|
Use getters instead of direct member access
|
2017-04-04 10:50:55 -07:00 |
|
Brad Davis
|
03c6275268
|
more thread safety
|
2017-04-04 10:50:54 -07:00 |
|
Brad Davis
|
172fab6789
|
Thread safety for property getter/setters on entities
|
2017-04-04 10:50:53 -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 |
|