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
cb94e1009d
Adding a job...
2017-04-06 18:10:28 -07:00
Al Bernstein
c628b23895
removed whitespace
2017-04-06 17:21:58 -07:00
Al Bernstein
e737456dcd
used thread safe moving average for the quaternions
2017-04-06 16:56: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
Al Bernstein
de1fdfacca
made requested changes in PR10147
2017-04-06 16:18:40 -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
samcake
6fc965072c
Adding the Selection, and not the Tag concept fro real, and beeing able to reset it from the Transaction and simply communicating the ranked zones to the engine through a selection, ready to be used by the ZOneREnderer
2017-04-06 15:19:55 -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
158084369a
Merge branch 'ambient' of https://github.com/samcake/hifi into ambient-bis
2017-04-06 11:34:35 -07:00
samcake
19d080c4cc
Merging
2017-04-06 11:33:41 -07:00
samcake
91f315f9ce
Adding the concept of selection to the scene
2017-04-06 11:27:48 -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
samcake
b8cb79113e
Nitpicking on the correct name maybe...
2017-04-06 10:30:24 -07:00
Brad Davis
057a9feaf1
Don't crash if KTX file is invalid
2017-04-06 10:09:57 -07:00
samcake
3de760abcb
Introduucing the tag to the scene
2017-04-05 18:35:06 -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
Stephen Birarda
c7a28a527a
cleanup Agent recording handling, make loadRecording async
2017-04-04 10:56:25 -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
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
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
Seth Alves
36ad3af48e
attempt to avoid a hang on shutdown
2017-03-30 11:35:24 -07:00
David Kelly
e66c075f8e
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-30 10:14:29 -07:00
samcake
73a8ec3e72
Merge pull request #10068 from kencooke/audio-debugbuild-fix
...
Fix the crash in Debug builds
2017-03-30 10:12:37 -07:00
David Kelly
348674a267
Merge pull request #10034 from davidkelly/dk/avatarEntityIssue
...
bad serialization of Avatar Entity parentID
2017-03-30 10:12:19 -07:00
Ken Cooke
69863dd735
Fix the crash in Debug builds, caused by undeclared metatype for AudioInjector*
2017-03-30 08:52:04 -07:00
Sam Cake
1c9bc2d71e
Trying to debug the crash on gl4.1
2017-03-29 23:28:06 -07:00
samcake
5584853340
Keep on cleaning
2017-03-29 18:22:21 -07:00
Anthony J. Thibault
d47c040768
Vive: Expose all 16 tracked poses to the controller system.
...
This is in preparation for the Vive hockey puck trackers...
2017-03-29 18:15:29 -07:00
samcake
b6504bba56
Moving the num mips per texture to the creator so it s immutable and simpler
2017-03-29 17:58:56 -07:00
humbletim
6f2f1d6452
call finished() when cached resource has already failed to load
2017-03-29 19:42:19 -04:00
Zach Fox
1b74576259
Fix tablet-close behavior for PAL; remove users-tablet.js
2017-03-29 14:53:45 -07:00
Seth Alves
371df35013
remove code related to tablet being a model rather than an overlay. start on landscape mode
2017-03-29 14:16:14 -07:00
samcake
60208bca69
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-03-29 10:58:05 -07:00
samcake
9bc7e41642
Remove extra calls for binding default textures, not needed
2017-03-29 10:57:08 -07:00
trent
ba9aa753f0
Merge branch 'master' of https://github.com/highfidelity/hifi into 21240
2017-03-29 13:41:48 -04:00
samcake
8fd413e7c3
Merge pull request #10037 from highfidelity/revert-10036-revert-10020-ktx_refactor
...
Don't hold KTX files open for longer than transfers require
2017-03-29 10:02:33 -07:00
Andrew Meadows
7100f44927
refresh AvatarData when receiving identity data
2017-03-28 21:03:01 -07:00
Zach Fox
b776f25b3b
Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2
2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b
Revert "Merge from upstream/master"
...
This reverts commit b5ba4a109d
2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d
Merge from upstream/master
2017-03-28 17:37:34 -07:00
Seth Alves
6080c4782a
fix polyvox shader
2017-03-28 16:44:31 -07:00
trent
ada7664749
Merge branch 'master' of https://github.com/highfidelity/hifi into origin/21240
2017-03-28 18:43:30 -04:00
trent
2d0fac794e
Committing this work-in-progress loader as an example of how not to do this.
2017-03-28 18:41:38 -04:00
samcake
a1bf1beab4
Merge pull request #10014 from samcake/blue
...
Fixing the roughness/reflection quantization bug
2017-03-28 14:50:24 -07:00
Seth Alves
4516ddf855
Merge pull request #9847 from highfidelity/tablet-ui
...
Tablet ui
2017-03-28 14:48:02 -07:00
samcake
a2b2e3e169
Revert "Revert "Don't hold KTX files open for longer than transfers require""
2017-03-28 14:45:04 -07:00
samcake
08e1a2ba4c
Revert "Don't hold KTX files open for longer than transfers require"
2017-03-28 14:06:09 -07:00
samcake
e42cb52bd1
Merge pull request #10020 from jherico/ktx_refactor
...
Don't hold KTX files open for longer than transfers require
2017-03-28 14:06:02 -07:00
Seth Alves
6df4dda746
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 11:42:14 -07:00
David Kelly
4b40633104
oops damn space
2017-03-28 11:22:18 -07:00
Seth Alves
1cf6945bf2
pass radials argument to AABox::touchesAAEllipsoid as const reference
2017-03-28 11:12:00 -07:00
Seth Alves
9789476a73
handle case where AAEllipsoid is entirely inside the AABox
2017-03-28 10:57:03 -07:00
Seth Alves
6f6343420c
don't crash if entity dimensions somehow include a zero
2017-03-28 10:56:33 -07:00
Seth Alves
7641677902
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-28 10:14:49 -07:00
Seth Alves
9e675d4c93
Merge pull request #9990 from hyperlogic/bug-fix/sliders
...
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -07:00
Bradley Austin Davis
9fc9253eeb
Fixing warnings
2017-03-28 09:54:18 -07:00
David Kelly
e119c38748
bad serialization of parentID
2017-03-28 09:26:40 -07:00
Seth Alves
b50a02ea19
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 08:16:59 -07:00
Seth Alves
651d87dc2a
move Qt-related stuff out of model and into model-networking
2017-03-28 07:53:25 -07:00
Seth Alves
8da91695df
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-27 20:15:54 -07:00
Andrew Meadows
5fc1e97166
fix windows build of render-utils-test
2017-03-27 16:49:43 -07:00
Bradley Austin Davis
2cf7ba4119
Fixing pending transfer calculation
2017-03-27 16:34:08 -07:00
Bradley Austin Davis
638364497d
Trying a different tactic to avoid multiple concurrent file access
2017-03-27 16:18:04 -07:00
Andrew Meadows
92b41d7a38
fix link error for linux build
2017-03-27 15:50:40 -07:00
Andrew Meadows
ff2f4da4b2
final changes as per samcake
2017-03-27 15:19:28 -07:00
Seth Alves
343c9335b3
Merge pull request #10023 from hyperlogic/bug-fix/stylus-touching-deleted-entity
...
tablet bug fixes
2017-03-27 14:07:14 -08:00
Andrew Meadows
fcf18cba91
render pipeline support for normalized intergers
2017-03-27 14:40:31 -07:00
Andrew Meadows
60bc76e1c4
store cluster indices and weights in uint16_t
2017-03-27 14:40:31 -07:00
Andrew Meadows
f6d6c62fab
move variable closer to context where it is used
2017-03-27 14:40:31 -07:00
Andrew Meadows
18544581e6
remove warnings about implicit float cast
2017-03-27 14:40:31 -07:00
Andrew Meadows
60874e6041
remove unused cruft
2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub
c986077a4f
Merge pull request #10007 from hyperlogic/feature/ik-debug-draw
...
Added Developer > Avatar > Show IK Targets
2017-03-27 14:29:02 -07:00
Brad Hefta-Gaub
3bdcfd8b78
Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick
...
remove properties from RayToEntityIntersectionResult
2017-03-27 14:26:51 -07:00
Anthony J. Thibault
a0c42bacdb
Fix problem with ContextMenu triggering on button up and button down.
...
This is fixed by clearing the ButtonPressedMap in the KeyboardMouseDevice every update.
Previously, this button would never be cleared, causing other controller actions mapped to the same button to have the incorrect state.
In this case, ContextMenu action would become 2 when pressed and 1 when released, anytime after the right mouse button was pressed.
2017-03-27 14:26:17 -07:00
Bradley Austin Davis
f764cd614b
Don't hold KTX files open for longer than transfers require
2017-03-27 13:33:00 -07:00
Seth Alves
a3fce13a04
Merge branch 'brown' of github.com:samcake/hifi into tablet-ui
2017-03-27 12:00:45 -07:00
Seth Alves
a6c54907b4
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-03-27 11:14:24 -07:00
Dante Ruiz
f4255735a9
make login screen show up on the tablet on startup
2017-03-27 18:03:38 +01:00
