NissimHadar
8536b44c61
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-02 16:09:06 -08:00
John Conklin II
8f403ebc23
Merge pull request #12543 from zfox23/improveFontLoading
...
Improve font loading via QRC instead of file path
2018-03-02 14:22:17 -08:00
samcake
fc8f1c1e65
Resolving conflicts
2018-03-02 14:20:33 -08:00
Brad Hefta-Gaub
762e36ef19
Merge pull request #12545 from birarda/bug/fix-nlpacket-ascii
...
fix ASCII art for packet headers in NLPacket
2018-03-02 13:49:27 -08:00
Cristian Luis Duarte
76e4a5bef2
Android - Change for test, this cast should avoid crashes due to SIGSEV in ToneMappingDeferred::run inputs.get1().
2018-03-02 18:46:14 -03:00
Brad Hefta-Gaub
746f43c0fc
Merge pull request #12538 from huffman/fix/gzipped-json-export
...
Fix Edit -> Export Entities exporting gzipped json
2018-03-02 13:34:23 -08:00
Gabriel Calero
01699e26a5
Fix QML debug info: print last QML loaded file instead of Desktop.qml
2018-03-02 18:04:36 -03:00
Stephen Birarda
4f151a4237
fix ASCII art for packet headers in NLPacket
2018-03-02 12:41:22 -08:00
Brad Davis
9e8368e50e
Disable virtual trackpad rendering on non-Android builds
2018-03-02 11:12:44 -08:00
Dante Ruiz
55d8cfd4c1
make sure dont make audio devices that don't use stereo use stereo
2018-03-02 10:56:44 -08:00
samcake
b8fb97c824
Resolving conflicts
2018-03-02 10:36:55 -08:00
NissimHadar
000b08f7c0
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-02 08:07:01 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev
...
Android Master
2018-03-01 17:22:34 -08:00
SamGondelman
a66125fbb7
scriptablematerial -> scriptablemateriallayer
2018-03-01 16:56:51 -08:00
David Rowe
7107e1539f
Remove deprecated Window.location.protocolVersion() function from API
2018-03-02 13:45:31 +13:00
Ryan Huffman
70bdedc4b3
Fix Edit -> Export Entities exporting gzipped json
...
We were not respecting the doGzip flag.
2018-03-01 16:42:41 -08:00
SamGondelman
e3b65a9201
Merge remote-tracking branch 'upstream/master' into scriptableMaterials
2018-03-01 16:39:31 -08:00
Brad Hefta-Gaub
d24cea2f07
Merge pull request #12521 from sethalves/no-prelocked-for-non-lockers
...
if a node can't change locks, don't allow it to create an already-locked entity
2018-03-01 14:56:29 -08:00
NissimHadar
0f2cf8ea85
Re-implemented shadow controls.
2018-03-01 14:24:20 -08:00
David Rowe
5e311a86ee
Document the "Image" pseudo-entity type
2018-03-02 10:20:13 +13:00
Cristian Luis Duarte
b5c3b78d57
Android - Virtual Pad - Limit joystick inside base circle.
2018-03-01 17:58:23 -03:00
samcake
a227cf1edb
Fixing bad key/pipeline pair
2018-03-01 10:49:58 -08:00
samcake
5440f62860
fixing a bad key /pipeline pair
2018-03-01 10:46:47 -08:00
Zach Fox
877fa52034
Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading
2018-03-01 10:14:23 -08:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update
...
Image entity has correct orientation and is collisionless
2018-03-01 09:57:08 -08:00
Zach Fox
67034274fa
Improve font loading by using QRC instead of relative paths
2018-02-28 17:59:37 -08:00
samcake
dc286544c5
Merging with nissim's pr
2018-02-28 17:54:54 -08:00
samcake
a7542d5b90
fixing the shadow
2018-02-28 17:46:22 -08:00
Cristian Luis Duarte
9acb83632c
Android - Make joystick move up when showing the bottom bar
2018-02-28 18:52:13 -03:00
David Rowe
1a42722d99
Fix Material roughnessMap etc. JSDoc
2018-03-01 10:50:40 +13:00
Simon Walton
55746433af
Merge remote-tracking branch 'upstream/master'
2018-02-28 13:36:36 -08:00
David Rowe
f9086e31de
Deprecate Entities.getMeshes() in favor of using the new Graphics API
2018-03-01 10:08:50 +13:00
David Rowe
d82a300f5f
Miscellaneous JSDoc improvements
2018-03-01 09:58:35 +13:00
David Rowe
3275846882
Material entity JSDoc
2018-03-01 09:57:42 +13:00
NissimHadar
5d7e6651a7
Use correct pixel shader.
2018-02-28 11:05:02 -08:00
Cristian Luis Duarte
55d52f92df
Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows)
2018-02-28 15:55:50 -03:00
NissimHadar
faad930e35
WIP.
2018-02-28 08:44:01 -08:00
NissimHadar
7ae37c21e0
Merge branch 'master' of github.com:highfidelity/hifi into fixDualQuats
2018-02-28 08:13:00 -08:00
NissimHadar
5764a21c4a
WIP.
2018-02-28 08:12:48 -08:00
Ken Cooke
328b5a1e8b
Merge pull request #12479 from kencooke/audio-nearfield-hrtf
...
Near-field HRTF
2018-02-28 07:44:24 -08:00
Ken Cooke
bc7b983f48
Fast approximation of the azimuth parallax correction
2018-02-28 04:44:20 -08:00
Seth Alves
31115b3cb6
make sure rezzer doesn't ignore adjustment
2018-02-27 20:14:00 -08:00
Seth Alves
9d131a6547
if a node can't change locks, don't allow them to create an already-locked entity
2018-02-27 19:53:54 -08:00
NissimHadar
7cae04883e
WIP.
2018-02-27 17:19:02 -08:00
NissimHadar
f52f146db5
WIP.
2018-02-27 16:28:46 -08:00
Cristian Luis Duarte
428f4b7b9d
Android - Make the virtual pad (joystick) position fixed. Change assets.
2018-02-27 21:24:21 -03:00
David Rowe
1bb8a0fb18
Fix up entity script calling JSDoc
2018-02-28 12:54:49 +13:00
David Rowe
a782b6779a
Merge branch 'master' into 21709
...
# Conflicts:
# interface/src/ui/overlays/Overlays.h
# interface/src/ui/overlays/Shape3DOverlay.cpp
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/EntityScriptingInterface.h
2018-02-28 12:42:05 +13:00
Elisa Lupin-Jimenez
17ddf21028
fixed line length
2018-02-27 15:05:51 -08:00
David Rowe
9c1fa7a8d2
Miscellaneous JSDoc tidying and fixes
2018-02-28 11:44:03 +13:00
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
