NissimHadar
00f3682bbe
NOT WORKING YET.
2018-02-27 14:09:31 -08:00
Brad Davis
136ced98c3
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-27 13:44:00 -08:00
David Rowe
9f6f6a9b0d
Entities scripts JSDoc
2018-02-28 10:31:34 +13:00
John Conklin II
b4000c04bc
Merge pull request #12432 from highfidelity/feat/content-settings
...
Add content archives to domain server web interface
2018-02-27 13:30:53 -08:00
SamGondelman
cc53b338db
Merge remote-tracking branch 'upstream/master' into scriptableMaterials
2018-02-27 13:30:03 -08:00
Ken Cooke
41ccf6afd8
Compensate the near-field azimuth correction for the parallax baked into the HRTF dataset
2018-02-27 12:49:32 -08:00
David Rowe
483688a6e1
Web entity EventBridge functions JSDoc
2018-02-28 08:40:36 +13:00
SamGondelman
0fca56eef0
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
...
This reverts commit 3201d2ba21c0f20900a0
2018-02-27 11:33:05 -08:00
Gabriel Calero
1dfdc0ce1b
Hide the selection cursor (android only)
2018-02-27 16:25:04 -03:00
Gabriel Calero
efba05b9a0
Merge branch 'android' into android_bubble_fix
2018-02-27 16:23:51 -03:00
SamGondelman
a4b04d9d43
merge
2018-02-27 10:08:30 -08:00
Stephen Birarda
9cc348ef27
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-27 09:59:37 -08:00
Simon Walton
051d4c0d35
Merge branch 'master' into server-script
2018-02-27 09:57:58 -08:00
Simon Walton
55eccaa7fa
Merge remote-tracking branch 'upstream/master'
2018-02-27 09:56:12 -08:00
John Conklin II
abe7c29b5e
Merge pull request #12492 from thoys/fix/exportBooleanPropertiesProperly
...
Export boolean entity properties properly
2018-02-27 09:18:46 -08:00
Brad Davis
6254e2b569
PR feedback
2018-02-27 09:11:40 -08:00
Brad Davis
f01c42dcc9
Fixing merged dual-quat pipelines
2018-02-27 08:54:46 -08:00
Ken Cooke
bb2f3cac2c
Use named constant for the onset of near-field corrections (1 meter)
2018-02-27 08:51:55 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting
...
Leopoly_Phase1_010 Graphics Scripting
2018-02-27 07:53:25 -08:00
Olivier Prat
2eb7be26cf
Merged with master and fixed tablet NoAA flag
2018-02-27 10:16:25 +01:00
Olivier Prat
2d71d7da9f
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-02-27 09:11:43 +01:00
John Conklin II
25144f0fec
Merge pull request #12456 from Atlante45/fix/min-spec-crash
...
Fix crash when passing --checkMinSpec flag
2018-02-26 17:35:46 -08:00
David Rowe
1fb02d15d7
Entities actions JSDoc
2018-02-27 14:12:20 +13:00
Stephen Birarda
7e3d4d7503
Merge pull request #12506 from birarda/feat/content-settings
...
merge upstream/master into upstream/feat/content-settings
2018-02-26 18:08:58 -07:00
Ryan Huffman
8a8830bbd4
Fix writeSubclassData in octree data
2018-02-26 17:06:25 -08:00
Stephen Birarda
aa7bd2066a
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-26 17:02:00 -08:00
Ryan Huffman
ec210e1750
Move OctreeUtils to OctreeDataUtils
2018-02-26 16:51:42 -08:00
Simon Walton
40f0e63af0
Merge branch 'master' into server-script
2018-02-26 16:39:03 -08:00
Simon Walton
844677d561
Merge remote-tracking branch 'upstream/master'
2018-02-26 16:38:17 -08:00
Ryan Huffman
3fa538d42d
Add RawEntityData subclass
2018-02-26 16:32:09 -08:00
Atlante45
2a204533f4
Add comments to startup processes
2018-02-26 16:25:41 -08:00
humbletim
d3bae87066
* remove unneeded Q_DECLARE_METATYPEs
...
* CR feedback
2018-02-26 19:07:55 -05:00
humbletim
767569bc40
* changes per CR feedback
...
* make MeshPart.topology read-only
* JS Graphics API starter documentation
* remove redundant qscriptvalue sequence registrations
2018-02-26 18:00:22 -05:00
Elisa Lupin-Jimenez
b56c78d36c
image has correct orientation and is collisionless
2018-02-26 14:44:46 -08:00
Ryan Huffman
65a4b3d316
Revert change to packet reading in Socket.cpp
2018-02-26 14:43:50 -08:00
Ryan Huffman
dbfbee5406
CR
2018-02-26 13:53:20 -08:00
Ryan Huffman
24da043937
Merge pull request #12437 from sethalves/fix-qt-5-10-udt
...
fix Qt 5.10 udt packet reading
2018-02-26 13:50:41 -08:00
Simon Walton
e81fba22ed
EntityServer should update a previously matched entity.
...
EntityServer currently keeps a per-Node set of entities that matched
the JSON filter. This commit will send an update for an entity that
no longer matches then remove it from the set.
https://highfidelity.fogbugz.com/f/cases/11244/
2018-02-26 13:43:35 -08:00
Brad Davis
b9387f2a21
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-26 13:18:14 -08:00
Seth Alves
d60d8fe702
Merge pull request #12498 from vladest/fix_crash_startup
...
Search main window by checking object name
2018-02-26 13:06:10 -08:00
SamGondelman
6fe2d46d7c
merge
2018-02-26 12:40:14 -08:00
Brad Davis
24545f8b58
Fixing android errors
2018-02-26 12:32:57 -08:00
Sam Gondelman
d1d6adf447
Merge pull request #12493 from sethalves/fix-shadows-on-osx-1
...
fix osx shadows
2018-02-26 11:46:43 -08:00
Anthony J. Thibault
f5fcaae283
Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions
2018-02-26 10:55:44 -08:00
Brad Davis
5aa15b5422
Fixing build warnings
2018-02-26 10:17:07 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork
...
Shadow control for zones, models and shapes
2018-02-26 10:13:40 -08:00
Anthony J. Thibault
c8af9c6f04
Missing EPSILON
2018-02-26 10:05:15 -08:00
Anthony J. Thibault
0404b722e4
Code review feedback
2018-02-26 10:00:32 -08:00
Brad Davis
3e552e5739
Fix warnings
2018-02-26 09:53:35 -08:00
Simon Walton
5c41f72e76
Merge remote-tracking branch 'upstream/master'
2018-02-26 09:37:51 -08:00
Olivier Prat
12d7e89d7e
Switched back velocity buffer job to original place while I try to get more info on how/where that tablet is rendered
2018-02-26 18:13:41 +01:00
Olivier Prat
d288ebe79e
Moved velocity buffer job just before antialiasing job to be sure tablet model in HMD writes correct velocity and gets properly antialiased
2018-02-26 18:07:44 +01:00
Gabriel Calero
7982d8da58
Set bubble default state off for android.
2018-02-26 13:06:22 -03:00
vladest
77ef0e05a1
Search main window by checking object name
2018-02-26 13:43:50 +01:00
humbletim
3dbe5d79bb
fix windows punctilious warnings
2018-02-26 06:01:16 -05:00
humbletim
54dc0240b0
remove bufferviewscripting refs; fix compiler warnings
2018-02-26 05:26:35 -05:00
humbletim
f824edd04e
* remove Model_temporary_hack
...
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
2018-02-26 04:58:22 -05:00
David Rowe
c2d8c96463
Entities collisions JSDoc
2018-02-26 14:10:33 +13:00
David Rowe
2d9d6035fc
Entities mouse and controller events JSDoc
2018-02-26 10:20:31 +13:00
David Rowe
a8e05824cd
Entities octree sending functions JSDoc
2018-02-25 14:15:39 +13:00
SamGondelman
b56f755034
material reflection
2018-02-23 17:58:46 -08:00
Sam Gondelman
e10af9b83d
Merge pull request #12462 from SamGondelman/entityDelete
...
Fix EntityItems not getting destroyed
2018-02-23 16:17:52 -08:00
Olivier Prat
d3114cbc67
Android compilation fixes again
2018-02-23 21:52:45 +01:00
Brad Davis
0550138609
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-23 12:48:10 -08:00
Olivier Prat
65f3408458
Fixed compilation error with GLES backend on Android
2018-02-23 20:19:55 +01:00
Olivier Prat
37fdf81f1b
Fix warnings on mac and ubuntu
2018-02-23 19:37:12 +01:00
Seth Alves
59bd05aa55
make shadow-related shader compile on osx
2018-02-23 09:22:34 -08:00
Thijs Wenker
a27a5a7e1f
export boolean properties properly
2018-02-23 18:16:38 +01:00
humbletim
7c571cd431
cleanup / addition error message detail
2018-02-23 10:31:57 -05:00
humbletim
058e4d1926
CR feedback; whitespace / remove unnecessary diffs
2018-02-23 09:12:33 -05:00
humbletim
f8fe06213d
CR feedback; whitespace / remove unnecessary diffs
2018-02-23 09:11:23 -05:00
humbletim
ebdb5b3c17
CR feedback; remove unrollVertices; update getFace; guard more debug logging
2018-02-23 08:57:48 -05:00
Olivier Prat
ee253143ff
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-02-23 14:53:14 +01:00
Olivier Prat
6a550e983f
Disable sharpen with FXAA
2018-02-23 14:46:37 +01:00
Olivier Prat
095f426f31
Adjusted default sharpen
2018-02-23 14:43:22 +01:00
humbletim
6ea4b660b7
CR feedback; remove ok bool pointer and all metadata; cleanup
2018-02-23 07:47:39 -05:00
Olivier Prat
c9a6d6bf14
Added adjustable post sharpen filter
2018-02-23 11:53:05 +01:00
Olivier Prat
d316b6e074
Fixed broken TAA on desktop... grrr.
2018-02-23 11:28:00 +01:00
Olivier Prat
4636f43728
Simplified camera view history and TAA is now working in all circumstances.
2018-02-23 10:19:05 +01:00
Olivier Prat
7432c8361e
Added some comments to try to help understand the correction pipeline
2018-02-23 09:11:17 +01:00
David Rowe
895c354257
Entities properties JSDoc fixes
2018-02-23 19:27:40 +13:00
David Rowe
26404a6ce8
Entities functions JSDoc bulk
2018-02-23 19:27:13 +13:00
Atlante45
c106fee659
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration
2018-02-22 19:45:43 -08:00
Anthony J. Thibault
0469eafbe4
Switch between dualQuats and matrix skinning based on model entity scale factor.
2018-02-22 18:35:16 -08:00
Bradley Austin Davis
12d1885dff
Merge pull request #12428 from gcalero/android_ui_fixes
...
Android ui fixes
2018-02-22 18:28:18 -08:00
humbletim
0dd3672162
CR feedback / cleanup
2018-02-22 21:20:56 -05:00
Brad Davis
e0e7fb04f2
Fix merge issues
2018-02-22 18:08:56 -08:00
humbletim
d1c4bde677
revert OBJWriter.cpp
2018-02-22 20:53:27 -05:00
Brad Davis
aeb29db37d
Merge remote-tracking branch 'upstream/stable' into android_stable
2018-02-22 17:35:00 -08:00
Simon Walton
63e2084395
Add a Q_DECLARE_METATYPE in TextureCache.
...
There was a missing declaration that was causing an assert in the
Qt meta-object system on startup in debug builds:
Q_DECLARE_METATYPE(QWeakPointer<NetworkTexture>)
Bug fixed by Clement.
2018-02-22 17:29:06 -08:00
Atlante45
277e556b48
Create a standard function to init Hifi Apps
2018-02-22 17:06:09 -08:00
NissimHadar
3150b963c0
Implemented call to abortTask().
2018-02-22 16:29:58 -08:00
Atlante45
80c0f2a21e
Fix crash when passing --checkMinSpec flag
...
That flag caused a DLL to be loaded before Application was
instanced.
This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
the previous registration pointing the startup function in
the main executable to be overridden with the address of the
function in the DLL (Since they both link the same static
library)
This leads to the correct function running in the wrong address
space (the DLLs), hence not initializing some global variables
correctly.
2018-02-22 16:29:38 -08:00
Ken Cooke
f25b8e8df0
Refactor distance attenuation for near-field HRTF.
...
Adds near-field attenuation from 0.125m to 1m, calibrated to 0dB at 1m. Overload will trigger dynamic range compression at the peak-limiter.
2018-02-22 16:05:01 -08:00
Ken Cooke
e367167709
New HRTF with near-field audio spatialization
2018-02-22 15:53:28 -08:00
Brad Davis
4e2d3f23a6
Fix tonemapping on forward render pipeline / GLES
2018-02-22 15:38:15 -08:00
David Rowe
25b1e9f50b
Fix PickRay JSDoc
2018-02-23 12:05:33 +13:00
Gabriel Calero
925fe477e8
Merge remote-tracking branch 'github/android' into android_ui_fixes
2018-02-22 19:36:56 -03:00
Brad Davis
49dea19b26
Fix BGR/RGB bug on GLES
2018-02-22 14:11:05 -08:00
Olivier Prat
ae63610582
Added history of view to try to adjust for GPU slower than game
2018-02-22 23:03:33 +01:00
NissimHadar
bb04f3f533
CR corrections.
2018-02-22 13:57:46 -08:00
NissimHadar
c6580f642a
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-22 13:45:00 -08:00
David Rowe
c88f9a059d
Fix up JSDoc comment blocks in TabletScriptingInterface
2018-02-23 10:39:46 +13:00
Brad Davis
2f34fb2e42
Merge remote-tracking branch 'upstream/stable' into HEAD
2018-02-22 10:20:10 -08:00
Olivier Prat
ebe05d1f6f
Still have to fix TAA when GPU is slower than game
2018-02-22 18:59:25 +01:00
Zach Fox
90f05f4db7
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-22 09:23:49 -08:00
Anthony J. Thibault
86351f19a9
Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions
2018-02-22 08:44:21 -08:00
humbletim
dd90c8c515
fix ubuntu compile warnings
2018-02-22 10:16:34 -05:00
humbletim
010c714abc
restore original Entities.getMeshes
2018-02-22 08:51:54 -05:00
humbletim
4d43e54346
use shared buffer_helpers::clone
2018-02-22 08:41:15 -05:00
humbletim
b0f444e179
remove dead code
2018-02-22 08:36:37 -05:00
humbletim
ec4f9fdc11
fix displayName
2018-02-22 08:31:05 -05:00
humbletim
d52dce8e09
restore code for debugging
2018-02-22 08:24:56 -05:00
humbletim
e3c269d582
remove debug string
2018-02-22 08:22:13 -05:00
humbletim
4fd3d9bf7b
cleanup; formalize data structures
2018-02-22 08:18:38 -05:00
humbletim
e4a2a589a5
CR fedback and cleanup
2018-02-22 07:56:09 -05:00
humbletim
72fca7e57e
Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge
2018-02-22 05:18:05 -05:00
humbletim
be8d79f53f
CR fedback and cleanup
2018-02-22 05:15:01 -05:00
Olivier Prat
aa46d16699
A bit of cleanup in TAA shaders
2018-02-22 10:09:03 +01:00
Stephen Birarda
946474c615
do not init caching for asset requests in domain-server
2018-02-21 16:33:58 -08:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items
...
Remove some deprecated JavaScript API items
2018-02-21 16:31:16 -08:00
SamGondelman
4b1217f1f6
move all entity items to main thread
2018-02-21 15:54:07 -08:00
Gabriel Calero
f2ce3d0268
Fix focus hack. Add QML debug info
2018-02-21 20:10:03 -03:00
Nissim Hadar
b519ebd6f1
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-21 12:36:56 -08:00
Nissim Hadar
bf4ba07b72
Added parameters to canCastShadow - still sucks.
2018-02-21 12:36:34 -08:00
John Conklin II
9ba1532c26
Merge pull request #12446 from sethalves/more-logging-for-fb-11748
...
more logging for fogbugz 11748
2018-02-21 09:49:51 -08:00
John Conklin II
92249a2bee
Merge pull request #12396 from ElderOrb/double-connection-fix
...
fix 4x 'fromQml' slots execution
2018-02-21 09:01:47 -08:00
Olivier Prat
dca7b7aaba
TAA is working on HMD! Still some issues when game rate is low
2018-02-21 17:34:51 +01:00
Olivier Prat
093a1491cd
Renamed resourcering to resourceswapchain
2018-02-21 15:43:19 +01:00
Olivier Prat
f53c2f41a5
Merge branch 'master' of http://github.com/highfidelity/hifi into prev
2018-02-21 09:46:38 +01:00
Nissim Hadar
af484d0af6
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-20 23:48:12 -08:00
Nissim Hadar
6f84e4c977
Moved shadows and ambient occlusion to menu checkboxes.
2018-02-20 23:45:07 -08:00
Seth Alves
bf73df1265
more logging for fogbugz 11748
2018-02-20 15:45:47 -08:00
SamGondelman
4c6169ec78
merge and a little cleanup
2018-02-20 15:45:34 -08:00
Gabriel Calero
bd9d8ac4f9
Tune radar styles
2018-02-20 19:07:41 -03:00
SamGondelman
4f0f6709c1
fix build errors
2018-02-20 13:56:06 -08:00
Zach Fox
2daa30f125
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-20 12:41:12 -08:00
Gabriel Calero
5e3ad3fe9a
Disable VPAD on bottom bar tapping and modes bar tapping
2018-02-20 17:20:48 -03:00
humbletim
5791ca4c51
interim checkin
2018-02-20 12:22:04 -05:00
Olivier Prat
4edfe6c9ab
Trying to keep track of a better previous correction
2018-02-20 14:48:21 +01:00
Olivier Prat
247a1f5769
Working ring frame buffer with antialiasing but still issues with TAA on HMD
2018-02-20 09:22:19 +01:00
ZappoMan
76d611d563
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-02-19 19:15:33 -08:00
Nissim Hadar
b2a06cdb98
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/ShapeEntityItem.h
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2018-02-19 13:05:57 -08:00
Nissim Hadar
9921217807
Shapes casting shadows OK.
2018-02-19 12:32:11 -08:00
Nissim Hadar
6a9bbaf0a5
WIP - clean-up.
2018-02-19 12:00:30 -08:00
Gabriel Calero
779e45aae7
Restore avatar overlays
2018-02-19 16:12:41 -03:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals
...
Material Entities
2018-02-19 10:58:02 -08:00
Olivier Prat
18af60f3eb
Added RingBuffer mechanism to gpu lib
2018-02-19 18:48:58 +01:00
Olivier Prat
9cfe53be3e
Merged from orgin taa
2018-02-19 17:50:10 +01:00
Olivier Prat
f5a2557a2e
Merged with master
2018-02-19 17:28:39 +01:00
Brad Hefta-Gaub
a4783ded15
Merge pull request #12414 from hyperlogic/bug-fix/scramlbed-avaatrs
...
Bug fix for Scrambled Avatars
2018-02-18 19:06:53 -08:00
David Rowe
9e37230aa1
Miscellaneous code tidying
2018-02-19 12:21:56 +13:00
David Rowe
86a6f73fb4
Quat JSDoc improvement
2018-02-19 12:21:21 +13:00
David Rowe
67cfe783be
Entity properties JSDoc
2018-02-19 12:17:31 +13:00
Nissim Hadar
81c9e449e6
Models casting shadows (again). (Something stupid happened...)
2018-02-18 10:19:17 -08:00
Seth Alves
0a92596452
don't rely on return value of pendingDatagramSize() when hasPendingDatagrams() is false
2018-02-18 10:04:22 -08:00
Seth Alves
3027d3461e
Qt 5.10 seems to indicate pendingDatagramSizes of 0. Reading from these would block and causes an QAbstractSocket::TemporaryError to be thrown
2018-02-17 15:24:50 -08:00
Nissim Hadar
a69816f885
WIP.
2018-02-17 15:21:57 -08:00
Nissim Hadar
7ba8a9935a
No extraneous shadows.
2018-02-16 19:23:31 -08:00
Nissim Hadar
dc3b03c9bc
Added shadows to shapes - still sucks...
2018-02-16 18:37:47 -08:00
Stephen Birarda
769d5677b1
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-16 17:41:14 -08:00
Nissim Hadar
a2cc78b200
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-16 14:01:57 -08:00
Nissim Hadar
4c1f22f84e
Models and Avatar cast shadows (box doesn't, yet).
2018-02-16 14:01:33 -08:00
Ryan Huffman
27c26bab86
Fix ambiguous int64_t in HTTPConnection
2018-02-16 13:57:38 -08:00
Ryan Huffman
bb8caa0ce3
Update HTTPConnection to not use QIODevice when given a QByteArray
2018-02-16 13:07:45 -08:00
John Conklin II
24a3eb6e80
Merge pull request #12419 from druiz17/fix-edit-avatar-entities
...
Don't update avatar entities of the avatars ID is AVATAR_SELF_ID
2018-02-16 09:48:19 -08:00
Brad Davis
458b944d2d
Use pikachu for android builds
2018-02-16 09:29:31 -08:00
Nissim Hadar
194c7f4101
WIP - for review.
2018-02-16 09:28:15 -08:00
Gabriel Calero
72e02d6207
Restore default precision qualifier (needed for pixel)
2018-02-16 09:14:20 -08:00
Gabriel Calero
3effb6097b
Add precision qualifier in fragment shaders for struct fields
2018-02-16 09:14:14 -08:00
Ryan Downe Karpf
a621cb3c2c
Merge pull request #12417 from hyperlogic/bug-fix/rc64-scramlbed-avaatrs
...
RC64: Bug fix for Scramlbed Avaatrs
2018-02-16 08:41:28 -08:00
MiladNazeri
331b253ba0
Merge pull request #12386 from cain-kilgore/21668
...
WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null
2018-02-16 06:57:03 -08:00
SamGondelman
2d0b85af72
workaround bug
2018-02-15 17:28:59 -08:00
Sam Gateau
f809862870
Merge pull request #12412 from samcake/blue
...
Introduce task abort feature for early exit of task branch
2018-02-15 15:50:43 -08:00
SamGondelman
b189433855
merge
2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
Dante Ruiz
52f576e6f6
don't update avatar entities if the avatars ID is AVATAR_SELF_ID
2018-02-15 15:48:29 -08:00
Stephen Birarda
f5cad5683d
make sure backup handlers end up on the correct thread
2018-02-15 15:39:25 -08:00
Dante Ruiz
bbcf865db3
Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-avatar-entities
2018-02-15 15:03:12 -08:00
Dante Ruiz
e4db09fef8
don't update avatar entities if the avatars ID is AVATAR_SELF_ID
2018-02-15 15:02:45 -08:00
Nissim Hadar
72e89851f3
Added READ_ENTITY_PROPERTY_TO_PROPERTIES
2018-02-15 14:16:56 -08:00
Zach Fox
8072372822
Lots of changes
2018-02-15 13:27:13 -08:00
Anthony J. Thibault
cee0bbf8a5
Revert "FBX node IDs aren't alphanumerically ordered per logical structure"
...
This reverts commit a7ec4501e6http://doc.qt.io/qt-5/qset.html
This was bug was causing scrambled avatars, because both the transmitter and receiver of the AvatarData packets
make the strong assumption that the joint orders are same. When they are not the avatar's appear scrambled.
(cherry picked from commit f07b1fa4c5
2018-02-15 13:26:39 -08:00
Gabriel Calero
82f9416b3f
Restore default precision qualifier (needed for pixel)
2018-02-15 17:39:01 -03:00
samcake
c70b655fbc
A bit more explanations to the Task Flow class
2018-02-15 11:55:16 -08:00
Nissim Hadar
ff43e4c2ad
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# scripts/system/html/js/entityProperties.js
2018-02-15 11:53:11 -08:00
Nissim Hadar
df7a8389b3
Fixed possible crash.
2018-02-15 11:51:06 -08:00
Nissim Hadar
777862f253
can cast shadow flag now works correctly (UI/JS aspects).
2018-02-15 11:50:38 -08:00
Anthony J. Thibault
f07b1fa4c5
Revert "FBX node IDs aren't alphanumerically ordered per logical structure"
...
This reverts commit a7ec4501e6http://doc.qt.io/qt-5/qset.html
This was bug was causing scrambled avatars, because both the transmitter and receiver of the AvatarData packets
make the strong assumption that the joint orders are same. When they are not the avatar's appear scrambled.
2018-02-15 11:32:29 -08:00
samcake
b21b98c810
Add a way to early abort a task from a Job, apply that to the highlight effect to shave unecessary work
2018-02-15 11:24:20 -08:00
humbletim
145a0df082
interim checkin
2018-02-15 14:14:07 -05:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals
2018-02-15 11:02:49 -08:00
Alexander Ivash
beb595266d
fix 4x 'fromQml' slots execution
...
note: per discussion with Austion & Seth, TabletRoot should be the only entity sending 'sendToScript' signals to C++
2018-02-15 21:45:35 +03:00
Gabriel Calero
1b08ce6ac2
Set default location to pikachu/160.45,-2.45,159.106 for non-stable branches
2018-02-15 15:31:02 -03:00
Ryan Huffman
145a8b385b
Move HTTP_RESPONSE_CHUNK_SIZE into lambda for http response
2018-02-15 10:22:35 -08:00
Ryan Huffman
2cfa91be06
Add memory include to HTTPConnection
2018-02-15 10:22:35 -08:00
Ryan Huffman
8a69c69bec
CR
2018-02-15 10:22:35 -08:00
Ryan Huffman
8b07e7e28f
Add backup DS APIs
...
Add backup apis
2018-02-15 10:22:35 -08:00
Ryan Huffman
e63b692d80
Add BackupHandler for entity file backups
2018-02-15 10:22:35 -08:00
Atlante45
272f95efa2
Specify wich packet can ignore verification at DS level
2018-02-15 10:09:21 -08:00
