David Rowe
ed1c974f75
Use MyAvatar.SELF_ID instead of Uuid.SELF
2017-10-17 15:58:51 +13:00
David Rowe
1e3a2b3e4e
Merge branch 'master' into 21568
2017-10-17 15:15:49 +13:00
Andrew Meadows
339edc67c8
ifdef out more per-frame-per-entity profiling
2017-10-16 17:27:53 -07:00
Nissim
072ac13120
Fixed gcc warnings.
2017-10-16 17:12:59 -07:00
Brad Hefta-Gaub
b0fc050fe2
Merge pull request #11586 from Zvork/hdrcube
...
HDR cube map equirectangular bug fix
2017-10-16 16:49:20 -07:00
Brad Hefta-Gaub
c1ce84b060
Merge pull request #11602 from kencooke/audio-startup-fix
...
Fix loud screeching sound when certain users join a domain
2017-10-16 16:47:42 -07:00
Andrew Meadows
1f09c10fb1
comment out more profiling stuff
2017-10-16 16:43:16 -07:00
John Conklin II
42a018c2c5
Merge pull request #11606 from ElderOrb/case8213
...
8213 Keyboard Input Field: Reveals Passwords (RC-57)
2017-10-16 16:14:43 -07:00
beholder
fa7892e5c6
8217 Search in tablet doesn't update
2017-10-17 02:02:21 +03:00
Andrew Meadows
102a1cb36b
ifdef out detailed profiling
2017-10-16 16:02:11 -07:00
Andrew Meadows
fb1c075a12
fix animating entities
2017-10-16 15:55:25 -07:00
SamGondelman
429905de51
update scripts to use ignoreItems, fix caching bug
2017-10-16 15:52:17 -07:00
Brad Hefta-Gaub
c4e672d6b8
Merge pull request #11582 from ElderOrb/case8213
...
8213 Keyboard Input Field: Reveals Passwords
2017-10-16 14:57:18 -07:00
Nissim
1b42572f99
Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone
...
# Conflicts:
# scripts/system/html/js/entityProperties.js
2017-10-16 14:29:56 -07:00
Bradley Austin Davis
3f99e70af0
C++ cleanup for pointers / picking
2017-10-16 14:20:31 -07:00
Nissim
fd2b0da76d
First version.
2017-10-16 12:20:31 -07:00
Ken Cooke
bd82f47c66
Remove debug logging
2017-10-16 12:11:50 -07:00
Andrew Meadows
23bb8608b1
minor optimizations in updateModelBounds()
2017-10-16 11:52:30 -07:00
Andrew Meadows
e109101acc
update profiling timers
2017-10-16 11:52:30 -07:00
Ken Cooke
7c14d5bbdf
Remove debug logging
2017-10-16 11:43:52 -07:00
Ken Cooke
a702c5a0e4
Fix audio glitches caused by initial burst of SelectedAudioFormat packets.
...
Temporary codec mismatch is expected during audio codec startup, due to packets already in-flight.
2017-10-16 11:41:40 -07:00
Nissim
45ffd3bd58
Merge branch 'master' into hazeZone
2017-10-16 11:01:33 -07:00
Nissim
0a5302ce25
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-10-16 11:01:13 -07:00
Nissim
e51b8047f1
Corrected gcc warning.
2017-10-16 11:00:10 -07:00
beholder
f83040c572
updating code accordingly to the comments
2017-10-14 12:29:06 +03:00
samcake
31ea5d7417
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-10-13 17:09:41 -07:00
samcake
a852d5040d
FIxing the zone entity not stacked properly when created
2017-10-13 16:04:48 -07:00
Ryan Huffman
4a9aa30630
Merge pull request #10956 from birarda/feat/update-default-avatar
...
update default avatar to be better with oculus grab triggers
2017-10-13 15:57:37 -07:00
samcake
918e13b2fc
fixing the zone entity not rendering when created or when avatar appears in one
2017-10-13 15:03:23 -07:00
Stephen Birarda
dabfec9436
ignore unbakeable textures in FBX files
2017-10-13 13:42:39 -07:00
Nissim Hadar
afb8b2d8e7
Merge branch 'master' into hazeZone
2017-10-13 13:40:06 -07:00
Nissim Hadar
9c9dfc7211
Replace light blend with glare.
2017-10-13 13:36:46 -07:00
Nissim Hadar
6697d7c93a
Simplified setHazeColor.
2017-10-13 12:49:38 -07:00
Nissim Hadar
c76229934c
Changed blend-in colour and blend-out colour to colour and glare colour
2017-10-13 12:21:00 -07:00
Brad Hefta-Gaub
b1812c30c9
Merge pull request #11571 from huffman/fix/ktx-thrashing
...
Fix KTX requests thrashing if a mip level can't be assigned
2017-10-13 11:53:24 -07:00
Nissim Hadar
5bfbaf4860
Renamed HazeMode to ComponentMode.
2017-10-13 11:24:56 -07:00
David Rowe
949ed3b33d
Add some Quat and Uuid JavaScript helper properties
2017-10-14 07:17:23 +13:00
Ken Cooke
e4e37e65e6
Handle packets in-flight during audio codec startup
2017-10-13 08:19:30 -07:00
Olivier Prat
01c3ca17ee
Fixed cube map conversion from equirectangular maps when done after HDR conversion
2017-10-13 11:05:27 +02:00
Ryan Huffman
d6366083a7
Fix baking bug with single-part FBX + multiple materials
...
In FBXBaker we were not packing in material IDs if there was only 1 part
in the mesh. This was unintentionally making the assumption that there
was only 1 material at index 0 - if there are more materials, the material index
that the part references may not be 0. The change ensures that we pack
material IDs if there are multiple parts or if the sole part uses a
material ID other than 0 (0 is the default).
2017-10-12 18:33:57 -07:00
Bradley Austin Davis
4dcce6ef45
Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread
...
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
2017-10-12 17:37:05 -07:00
Nissim Hadar
b1174ce40c
Merge branch 'master' into hazeZone
2017-10-12 17:04:42 -07:00
Stephen Birarda
8a331e29a2
Merge pull request #11455 from utkarshgautamnyu/feat/JS-Baker
...
Feat/JS-Baker
2017-10-12 16:16:02 -05:00
Brad Hefta-Gaub
1bba5ff812
Merge pull request #11554 from sethalves/import-av-entities
...
Import av entities
2017-10-12 13:30:53 -07:00
beholder
c31aa6bcdb
8213 Keyboard Input Field: Reveals Passwords
2017-10-12 22:08:46 +03:00
utkarshgautamnyu
49f601329f
Update JSBaker.h
2017-10-12 11:35:38 -07:00
utkarshgautamnyu
f3983b3edc
Update JSBaker.cpp
2017-10-12 11:34:28 -07:00
Nissim Hadar
dc45c7af75
Implemented radio-buttons.
2017-10-12 11:18:18 -07:00
vladest
145149fedd
Merge branch 'master' into tablet_extended_sounds
2017-10-12 18:01:23 +02:00
Nissim Hadar
30fdf9d08e
Merge branch 'master' into hazeZone
2017-10-11 22:12:52 -07:00
Nissim Hadar
a21995db24
Added checkbox for altitude effect.
2017-10-11 22:10:58 -07:00
Nissim Hadar
96fd3123e8
Changed haze altitude to ceiling.
2017-10-11 20:36:24 -07:00
Nissim Hadar
832f9fb6e3
Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED.
2017-10-11 19:10:51 -07:00
Nissim Hadar
ea6b9ed28e
Removed ...ALTITUDE_MODE from combo.
2017-10-11 18:58:59 -07:00
Anthony J. Thibault
0a943fbe7b
Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.
...
When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke
the destructor of Entities and Overlays, which is very NOT thread safe.
The fix is to use a pattern already in use in several places in our codebase.
Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place.
This allows any thread to use shared_ptrs of SpatiallyNestables without fear.
2017-10-11 17:32:34 -07:00
Sam Gateau
7edb41b0ea
Merge pull request #11577 from samcake/orange
...
Fix the HDR generation of cube maps from equirect images (1x2)
2017-10-11 17:12:27 -07:00
Brad Hefta-Gaub
cd2a742974
Merge pull request #11576 from SamGondelman/pointerEvents
...
Remove unused HFMetaEvents
2017-10-11 16:10:43 -07:00
samcake
592a4de1e5
Fix the HDR generation of cube maps from equirect images (1x2)
2017-10-11 15:56:22 -07:00
SamGondelman
403b18977b
remove unused HFMetaEvents
2017-10-11 14:37:23 -07:00
Ryan Huffman
c6672fc4ac
Fix KTX requests thrashing if a mip level can't be assigned
...
When downloading a mip level and assigning it to the underlying
resource, we weren't checking to see if the assignment was successful.
If it was unsuccessful, we would queue up a request for the next mip
which would end up being a request for the same mip that was just
attempted. This change fixes this problem by checking to see if the
texture's available mip level is at least <= the assigned mip level.
2017-10-11 14:20:57 -07:00
Seth Alves
ca128a3251
merge from upstream
2017-10-11 11:09:33 -07:00
Bradley Austin Davis
1e91c5cfce
Merge pull request #11561 from AndrewMeadows/improve-geometry-cache
...
more correct use of BufferView in GeometryCache
2017-10-11 11:03:53 -07:00
utkarshgautamnyu
6e4a5da69d
Update JSBaker.h
2017-10-11 10:44:19 -07:00
utkarshgautamnyu
1d373c2988
Update JSBaker.cpp
2017-10-11 10:38:48 -07:00
John Conklin II
4394415058
Merge pull request #11565 from huffman/fix/fst-texdir
...
Fix .fst texdir not being followed
2017-10-11 10:24:37 -07:00
Andrew Meadows
d9ba75ca72
fix warning about implicit cast from 64 to 32 bits
2017-10-11 06:07:07 -07:00
Ryan Huffman
69b6a8c163
Fix .fst texdir not being followed
...
Although the texdir was being acknowledged and used as the
_textureBaseURL inside of the Geometry* classes, it was being
overwritten in code meant to handle redirects. Basically, when a
geometry resource request is redirected (via ATP, HTTP, etc.), we needed
to update the _textureBaseURL to take the new location into account.
Previously we were overwriting the _textureBaseURL all the time, even
when not being redirected, but this updates it to only be overwritten
when the request is redirected.
There is at least 1 known case that this does not handle: a .fst with
its `texdir` set, that points at an fbx that gets redirected.
2017-10-10 18:29:59 -07:00
Ken Cooke
22f38f2965
Merge branch 'master' of https://github.com/highfidelity/hifi into audio-mac-bugfix2
2017-10-10 17:44:25 -07:00
Andrew Meadows
886422cbef
remove unused variable
2017-10-10 17:07:17 -07:00
Andrew Meadows
4bf99fe9d2
remove unused variable
2017-10-10 17:05:54 -07:00
Andrew Meadows
026195223a
more correct use of BufferView in GeometryCache
2017-10-10 17:02:26 -07:00
Atlante45
6dd49f5c32
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2017-10-10 16:53:34 -07:00
Atlante45
cea0f48e5c
Fix warnings
2017-10-10 15:19:09 -07:00
Sam Gateau
f143c28625
Merge pull request #11542 from SamGondelman/bubbleBoy
...
Move HUD and HUD overlay rendering out of display plugin
2017-10-10 14:26:20 -07:00
Sam Gateau
c44efda978
Merge pull request #11349 from Zvork/hdrcube
...
Under the hood support for HDR cube maps
2017-10-10 11:43:41 -07:00
Clément Brisset
3b48833cc0
Merge pull request #11451 from huffman/feat/upload-user-event
...
Add uploading to asset server event
2017-10-10 11:03:33 -07:00
Nissim Hadar
3070778b39
Fixed typo in comment.
2017-10-10 10:20:04 -07:00
Daniela
a46ef56af9
Merge with hifi:master. Packet Headers version were increased.
2017-10-10 17:26:33 +01:00
Ken Cooke
b026a0461d
Fix clang warnings for left-shift of signed int
2017-10-10 09:13:06 -07:00
Olivier Prat
db9a9e723c
Merged with master
2017-10-10 12:11:23 +02:00
Nissim Hadar
c9be5ea100
Merge branch 'master' of https://github.com/highfidelity/hifi into hazeZone
2017-10-09 18:01:48 -07:00
Seth Alves
559f229bd1
Merge pull request #11552 from SamGondelman/animationMaster
...
Cherry-pick "Model asks for renderUpdate if animating" into master
2017-10-09 17:57:19 -07:00
Nissim Hadar
71f567f15a
Merge branch 'master' into hazeZone
2017-10-09 17:28:10 -07:00
Nissim Hadar
7d5a887f43
Refactoring.
2017-10-09 17:25:19 -07:00
SamGondelman
ee02fa9a91
model asks for renderUpdate if animating
...
(cherry picked from commit 873ae9b9d6
2017-10-09 13:55:48 -07:00
SamGondelman
873ae9b9d6
model asks for renderUpdate if animating
2017-10-09 13:36:38 -07:00
Seth Alves
23f41457be
Revert "Revert "fix importing of avatar entities""
...
This reverts commit 28a8b18060
2017-10-09 11:52:43 -07:00
SamGondelman
3acbd7820b
build error
2017-10-09 11:48:54 -07:00
Stephen Birarda
72b23a0fbb
update default avatar to be better with oculus grab triggers
2017-10-09 10:33:34 -07:00
Andrew Meadows
0bcecdbe66
be picky when finding nearby entities at login
2017-10-09 10:27:46 -07:00
Seth Alves
4d2f16efc3
allow project to be built with clang on Linux
2017-10-08 18:01:41 -07:00
Bradley Austin Davis
c92588685b
Merge pull request #11533 from SamGondelman/modelMaster
...
Fix model loading for real this time
2017-10-08 10:23:13 -07:00
Seth Alves
28a8b18060
Revert "fix importing of avatar entities"
2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub
62fc193bff
Merge pull request #11532 from sethalves/import-av-entities
...
fix importing of avatar entities
2017-10-06 17:59:54 -07:00
Brad Hefta-Gaub
80f0bd3b79
Merge pull request #11494 from humbletim/add-console-output-basenames
...
[experiment/feedback] Include script name with all JS/QML debug output
2017-10-06 17:58:19 -07:00
Nissim Hadar
e02876f1ea
Zone position/direction sent to haze uniform.
2017-10-06 17:24:20 -07:00
SamGondelman
b4a3ab9204
fix debugDeferredLighting
2017-10-06 15:46:10 -07:00
SamGondelman
e95ecc3f27
fix missing sensorToWorld matrix
2017-10-06 15:37:23 -07:00
SamGondelman
7e6d5d9d98
merge with master
2017-10-06 14:57:08 -07:00
Nissim Hadar
e34fb1c874
Merge branch 'master' into hazeZone
2017-10-06 13:20:12 -07:00
