Nissim Hadar
16a10a8a0c
WIP - working on byte order in server messages.
2017-10-03 20:57:56 -07:00
Nissim Hadar
89381e7c8e
Moved _hazeProperties.getProperties(properties); into the ReadLock
2017-10-03 19:43:35 -07:00
Nissim Hadar
c1f4735468
Replaced HazeMode with uint8_t in transport protocol.
2017-10-03 19:39:34 -07:00
Brad Hefta-Gaub
a1979a2600
Merge branch 'master' into RC-56
2017-10-03 18:16:21 -07:00
Nissim Hadar
d4acb00aa5
Merge branch 'master' into hazeZone
2017-10-03 17:44:31 -07:00
Nissim Hadar
48e5b9d1bc
Haze enable/disable from UI works.
2017-10-03 17:42:04 -07:00
Seth Alves
75d2a2bd47
Merge pull request #11517 from SamGondelman/registration
...
Fix entities with registration points rendering in the wrong place
2017-10-03 16:09:27 -07:00
SamGondelman
fa838e4715
merge from master
2017-10-03 15:53:33 -07:00
SamGondelman
fc6e5df2cb
fix text/web registration point usage
2017-10-03 15:02:21 -07:00
SamGondelman
c9d2d40e1e
possibly fix registration offset issue
2017-10-03 14:44:11 -07:00
Seth Alves
6040c4a3e8
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-03 14:06:01 -07:00
Anthony Thibault
2dc080479c
Merge pull request #11513 from hyperlogic/bug-fix/set-compund-shape-url-deadlock
...
Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()
2017-10-03 13:31:01 -07:00
Seth Alves
05e173a1d0
Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities
2017-10-03 13:11:03 -07:00
SamGondelman
a6f2545511
fix local t pose
2017-10-03 12:51:37 -07:00
Andrew Meadows
46e809bbb2
use a better variable name
2017-10-03 12:35:03 -07:00
Andrew Meadows
ef326a3851
expose performance hot spot in stats details
2017-10-03 12:35:02 -07:00
Anthony J. Thibault
1389c2e31d
Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()
...
The fix was to prevent ModelEntityItem::hasCompoundShapeURL() from taking
a readlock on the entity, instead a finer grained lock (ThreadSafeValueCache)
is made around the _compoundShapeURL QString.
2017-10-03 12:15:23 -07:00
Zach Fox
ea3da6c9dd
Merge pull request #11495 from zfox23/pop_interfaceChanges2
...
Commerce: One step closer!
2017-10-03 11:56:00 -07:00
Sam Gateau
ab8757eeb2
Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit
...
Tweak debug stats for more clarity
2017-10-03 11:23:16 -07:00
Nissim Hadar
86c497a12f
Merge branch 'master' into hazeZone
...
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2017-10-03 10:34:33 -07:00
Howard Stearns
22f0ef33ed
Merge pull request #11496 from howard-stearns/certificate-properties
...
Certificate properties
2017-10-03 10:06:48 -07:00
Nissim Hadar
1cf7f5a732
For testing.
2017-10-03 09:54:44 -07:00
Seth Alves
41dfdf4d82
Merge pull request #11509 from druiz17/fix-hud-module
...
Hud module. check if laser is pointing at UI element without moving the reticle first
2017-10-03 09:44:45 -07:00
Daniela
2b18296cfd
Merge remote-tracking branch 'upstream/master'
...
# the commit.
2017-10-03 15:26:22 +01:00
Daniela
1d6985a9eb
Fix Animation hue bug.
2017-10-03 15:25:54 +01:00
Sam Gateau
316156db46
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-10-02 21:31:59 -07:00
Sam Gateau
acb99592ee
fixing th e bug on exit due to the debug anim draw of the avatars
2017-10-02 21:31:30 -07:00
Nissim Hadar
93a2776cb5
Changes for debug
2017-10-02 18:13:23 -07:00
Nissim Hadar
999c3201c3
Merge branch 'master' into hazeZone
2017-10-02 16:54:45 -07:00
Nissim Hadar
cdbf067a24
Rename (haze)getParametersBuffer to getHazeParametersBuffer.
...
Add corrections from Sam
2017-10-02 16:54:02 -07:00
druiz17
8a0ecf4e6f
propertly determine is laser intersects with HUD UI
2017-10-02 16:46:43 -07:00
Seth Alves
e7fa8131ea
make json importer understand AVATAR_SELF_ID
2017-10-02 16:44:03 -07:00
Howard Stearns
9b0ebf0e07
doh! string not boolean
2017-10-02 16:18:28 -07:00
Seth Alves
ca11d19b3e
allow importing of avatar entities from json
2017-10-02 16:06:44 -07:00
Howard Stearns
0b7af66016
more linux warnings
2017-10-02 15:38:59 -07:00
Nissim Hadar
ca4c5969d9
Clean-up.
2017-10-02 14:36:45 -07:00
druiz17
68780f56b7
Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module
2017-10-02 14:06:26 -07:00
Howard Stearns
136381adb9
fatal compiler warning on mac/linux
2017-10-02 13:56:15 -07:00
Andrew Meadows
8d2153d2f3
cleanup debug stats, use more correct names
2017-10-02 13:08:17 -07:00
Andrew Meadows
e9d48a2713
fix warning about double-to-float conversion
2017-10-02 13:08:17 -07:00
Andrew Meadows
7df8816a81
faster rate counting
2017-10-02 13:08:17 -07:00
Nissim Hadar
29d5e772d4
Removed "..Is.." from various methods.
2017-10-02 12:42:46 -07:00
Howard Stearns
7b0321c1e1
guess for mac/linux openssl
2017-10-02 12:30:25 -07:00
beholder
cc8f1352da
7951 Reload button in Running Scripts dialog stops script
2017-10-02 22:18:03 +03:00
Nissim Hadar
93bc3bec52
Removed (unused) _haze.
2017-10-02 12:14:21 -07:00
Nissim Hadar
48fb7522c0
Removed blank line
2017-10-02 11:42:04 -07:00
Howard Stearns
5c5f052bc2
explicit free, and remove header that isn't available on mac/linux
2017-10-02 10:28:47 -07:00
Nissim Hadar
20a42d6fbd
Fixed model name string
2017-10-02 10:11:34 -07:00
Howard Stearns
0f6884dd80
fix mac/linux compiler error
2017-10-02 09:44:10 -07:00
Zach Fox
1ec0f5d9a0
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2
2017-10-02 09:26:59 -07:00
Nissim Hadar
97756146b1
Attempt to add qml configuration
2017-10-02 09:09:36 -07:00
vladest
e360c1363e
Merge branch 'master' into tablet_extended_sounds
2017-10-02 18:03:49 +02:00
Nissim Hadar
bdd469cec4
Integrated haze shader into this branch.
2017-10-01 21:52:34 -07:00
Nissim Hadar
ffecf42ebb
Some clean-up.
2017-10-01 21:12:29 -07:00
Nissim Hadar
5a7fed022c
Merging haze branch.
2017-09-30 00:04:28 -07:00
Nissim Hadar
95f8f1ffc5
Added Varying8
2017-09-29 18:05:48 -07:00
samcake
577378f539
Adding stuff that seems to break?
2017-09-29 17:45:10 -07:00
Nissim Hadar
951ce247a2
Working on adding zone to haze.
2017-09-29 17:36:14 -07:00
druiz17
20918641f4
saving work
2017-09-29 16:48:25 -07:00
Howard Stearns
73c8da99dc
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-09-29 16:46:43 -07:00
Howard Stearns
58255abe12
animation url and computing certificateID
2017-09-29 16:32:25 -07:00
Nissim Hadar
2e1919eba5
Merge branch 'master' into hazeZone
2017-09-29 15:16:46 -07:00
Nissim Hadar
f26345a3f0
Working on adding zone to haze.
2017-09-29 15:15:49 -07:00
samcake
225d2bbbb4
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-29 13:47:37 -07:00
SamGondelman
b8ea6c22fa
no tpose when switching avatars
...
(cherry picked from commit fcfac9efc0
2017-09-29 13:47:09 -07:00
Sam Gateau
fb5fd346ff
Merge pull request #11492 from SamGondelman/tPose
...
Fix getting stuck in T-Pose on avatar switch
2017-09-29 13:37:31 -07:00
Zach Fox
96b6a2f013
Fix entity add after incomplete rezCertified implementation
...
(cherry picked from commit 0f66fb41fd
2017-09-29 13:27:21 -07:00
humbletim
fd917917c4
include the source basename in Script.print() && QML/Script console.*() debug output
2017-09-29 14:48:01 -04:00
Andrew Meadows
8134e2b7f9
fix const violation
2017-09-29 11:34:36 -07:00
Andrew Meadows
32910e6f40
use [this] for lambda capture list
2017-09-29 11:34:35 -07:00
Andrew Meadows
f5f1a64c92
use const ref on pointer, and use dynamic_cast
2017-09-29 11:34:35 -07:00
Andrew Meadows
b16d666026
remove dupe addToNeedsParentFixupList() call
2017-09-29 11:34:35 -07:00
Andrew Meadows
0c934e863b
clarify some comments
2017-09-29 11:34:35 -07:00
Andrew Meadows
5dcd6bc496
namechange: apparentAngle --> angularDiameter
2017-09-29 11:34:35 -07:00
Andrew Meadows
1c30f7424e
remove cruft and add comments
2017-09-29 11:34:35 -07:00
Andrew Meadows
49e11d2173
fix Differential scan logic for LOD culling
2017-09-29 11:34:35 -07:00
SamGondelman
f2de03bc38
small fixes and LOD cull children instead of parent
2017-09-29 11:34:35 -07:00
Andrew Meadows
b1b7764056
use 20 degrees of OVERSEND
2017-09-29 11:34:35 -07:00
SamGondelman
c39ac93fc8
fix isVerySimilar
2017-09-29 11:34:35 -07:00
Andrew Meadows
355a59edb1
fix missing entities in differential traversal
2017-09-29 11:34:35 -07:00
Andrew Meadows
d55d45f6aa
check radius in ViewFrustum::isVerySimilar()
2017-09-29 11:34:35 -07:00
Andrew Meadows
a55661e1ff
remove ViewFrustum::calculateProjection()
2017-09-29 11:34:35 -07:00
Andrew Meadows
a22e577100
zero out OVERSEND hack
2017-09-29 11:34:35 -07:00
Andrew Meadows
d061627a1d
reasonable values for iitial OctreeQueryNode view
...
make sure newViewFrustum is fully initialized before using it
2017-09-29 11:34:34 -07:00
Andrew Meadows
0597970bb4
faster, more correct ViewFrustum::isVerySimilar()
...
remove OVERSEND hack
add ViewFrustum::calculateProjection() method used by OctreeQueryNode
2017-09-29 11:34:34 -07:00
SamGondelman
defed80be7
edited entities are not repeatedly sent if out of view, handles cases where usesViewFrustum changes
2017-09-29 11:34:34 -07:00
SamGondelman
7938e301e7
full scene traversal and json filters
2017-09-29 11:34:34 -07:00
SamGondelman
0ad5f47bfd
trying to fix entity editing bugs, needs testing
2017-09-29 11:34:34 -07:00
SamGondelman
6c066605cd
add state to entity tree send thread
2017-09-29 11:34:34 -07:00
Andrew Meadows
b6818c4369
first-pass sending entities from _sendQueue
2017-09-29 11:34:34 -07:00
Andrew Meadows
1562fb153e
cherrypick traverseTreeAndBuildNextPacketPayload()
2017-09-29 11:34:34 -07:00
Andrew Meadows
cf2e500ec4
remove unnecessary const qualifiers
2017-09-29 11:34:33 -07:00
SamGondelman
bb5368eb55
use correct rootSizeScale
2017-09-29 11:34:33 -07:00
Andrew Meadows
0b0de96894
use memcpy instead of copying one byte at a time
2017-09-29 11:34:33 -07:00
Andrew Meadows
7597088c7c
simpler logic flow
2017-09-29 11:34:33 -07:00
Andrew Meadows
3e50d01734
more correct handling of LOD
2017-09-29 11:34:33 -07:00
Andrew Meadows
8b7c43f3b1
add LOD culling in DiffTraversal
2017-09-29 11:34:33 -07:00
Andrew Meadows
0758b60afc
abstract DiffTraversal out of EntityTreeSendThread
2017-09-29 11:34:33 -07:00
Andrew Meadows
8d535f9c5a
remove bump to changeFromRemote for server case (revert)
2017-09-29 11:34:33 -07:00
Andrew Meadows
3665a3fbee
libraries/entities/src/EntityTreeElement.cpp
2017-09-29 11:34:33 -07:00
Andrew Meadows
dd1febba2f
add missing bump to element changed content
2017-09-29 11:34:33 -07:00
Andrew Meadows
481df49386
on server: note time of entity edit by remote
2017-09-29 11:34:33 -07:00
Andrew Meadows
2b31a746e3
add content timestamp for EntityTreeElement
2017-09-29 11:34:32 -07:00
Andrew Meadows
ca470d67b4
fix indentation
2017-09-29 11:34:32 -07:00
Andrew Meadows
7edd99ca0b
add basics for send queue and tree traversal
2017-09-29 11:34:32 -07:00
Andrew Meadows
82ed19386f
make Octree::readBitstreamToTree() virtual
2017-09-29 11:34:32 -07:00
Andrew Meadows
56bc48b31a
don't use octcode data in entity update packets
2017-09-29 11:34:32 -07:00
Andrew Meadows
55e9ced5c3
cleanup MovingEntitiesOperator
2017-09-29 11:34:32 -07:00
Andrew Meadows
4fa60f5108
cleanup AddEntityOperator
2017-09-29 11:34:32 -07:00
SamGondelman
fcfac9efc0
no tpose when switching avatars
2017-09-29 11:14:29 -07:00
SamGondelman
b59ec07171
move hud rendering to render thread, still need to separate out hud overlays
2017-09-29 09:49:08 -07:00
samcake
3265fe62ad
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-29 09:09:27 -07:00
Nissim Hadar
0acf4b9de9
Working on adding zone to haze.
2017-09-28 23:53:53 -07:00
Seth Alves
72cacc4cef
server only deletes and entity if it's still the child of an avatar, not if it has ever been
2017-09-28 19:56:15 -07:00
Howard Stearns
d1350a03c2
working checkpoint, but with a lot of debug/development stuff
2017-09-28 17:06:07 -07:00
Zach Fox
0f66fb41fd
Fix entity add after incomplete rezCertified implementation
2017-09-28 16:07:15 -07:00
utkarshgautamnyu
5c14c7c3b9
Update JSBaker.cpp
2017-09-28 13:24:03 -07:00
utkarshgautamnyu
463afd6be5
made updates to fix building
2017-09-28 11:12:26 -07:00
Zach Fox
b5dc6b791b
Fix commerce setting handle
2017-09-28 10:42:45 -07:00
samcake
b1daae0150
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-28 09:16:02 -07:00
Nissim Hadar
9d0cf16c20
Fixed Ubuntu warnings.
2017-09-27 19:33:04 -07:00
Nissim Hadar
784f928433
After merge.
2017-09-27 18:46:55 -07:00
Nissim Hadar
4d8a1db895
Merge branch 'master' into hazeZone
...
# Conflicts:
# libraries/entities-renderer/src/RenderableModelEntityItem.cpp
2017-09-27 17:50:51 -07:00
Nissim Hadar
55fafeacb1
Implemented HazePropertyGroup and added the haze shader. Shader does not work yet!
2017-09-27 17:43:09 -07:00
Sam Gateau
287f4f1d71
Merge pull request #11466 from SamGondelman/mirrorCrash
...
Fix mirror and fade threading crashes
2017-09-27 16:17:04 -07:00
utkarshgautamnyu
fbe3f2fbe3
Update JSBaker.h
2017-09-27 15:26:17 -07:00
Ryan Huffman
0e3c2f2e50
Fix ambiguous conversion to QVariant in StatTracker
2017-09-27 15:22:23 -07:00
utkarshgautamnyu
4486212e05
Update JSBaker.cpp
2017-09-27 15:20:30 -07:00
Sam Gateau
f25e4203fd
Merge pull request #11469 from SamGondelman/tPose
...
Don't constantly reload animGraph if URL didn't change
2017-09-27 14:46:05 -07:00
Zach Fox
7ad3a5a1e3
Commerce: Tons of Interface changes ( #11463 )
...
* canRez(Tmp)Certified()
* CertifiedItem beginnings
* Skeleton of verifyOwnerChallenge()
* Controlled failure; updateLocation() skeletion
* Controlled failure on checkout page with ctrl+f
* Skeleton Purchases first-use tutorial
* Initial progress on new setup
* Security pic tip
* Skeleton Certificate page
* Updates to Certificate
* General progress; setup is nearly complete
* Better buttons; last step almost done
* Initial progress on wallet home
* Completed recent transactions
* Security page
* Scrollbar
* Fix auth error text
* PassphraseSelection
* Change security pic
* Minor layout changes; beginnings of emulated header
* Various layout changes; wallet nav bar
* Help screen
* Quick onaccepted change
* First pass at new purchases
* Small style updates
* Some error progress
* Lightbox in purchases
* Collapse other help answers when clicking on another
* REZZED notif
* Commerce Lightbox
* Lots of new interactions in Purchases
* Hook up 'view certificate'
* Fix errors, fix close button on cert
* Purchases timer; much faster filter
* Add debugCheckout
* Purchase updates
* GlyphButton; separator; Checkout Success; Ledger fix; debug modes
* Lock glyph below security pic should be white
* Various fixes, round 1
* Circular mask
* Passphrase change button fix; TextField error edge highlighting
* Recent Activity fixes
* Various changes
* Standard Security Pic location
* Color changes
* Filter bar changes
* Styling for multiple owned items
* Minor language change
* Header dropdown (harder than expected)
* Small fixes
* View backup instructions
* marketplaces.js onCommerceScreen
* Beginnign of new injection
* Marketplace injection changes
* Purchase button style changes
* More button styling
* MY PURCHASES button
* marketplace onUsernameChanged
* New help QA
* Help text changes etc
* Downscale security image, reducing filesize
* Lots of bugfixes
* Cleanup before PR
* Only open cert during inspection if commerce switch is on
* Help text changes
* Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey
* Quick glyph change
* New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet
2017-09-27 14:43:51 -07:00
SamGondelman
553829f7ab
make sure FadeEffect dependency is created early
2017-09-27 11:58:35 -07:00
utkarshgautamnyu
5ad1efb923
Update JSBaker.h
2017-09-27 10:49:48 -07:00
utkarshgautamnyu
d4b8559cb2
Update JSBaker.cpp
2017-09-27 10:49:10 -07:00
Ryan Huffman
014a7bc9b0
Fix bytes downloaded stat tracking
2017-09-27 09:33:10 -07:00
Nissim Hadar
eaab056d66
Adding HazeStage
2017-09-27 09:12:57 -07:00
Daniela
c22d2add17
Resolve conflict with hifi/master.
2017-09-27 17:06:12 +01:00
Nissim Hadar
4d501d6510
Adding HazeStage
2017-09-27 08:01:19 -07:00
utkarshgautamnyu
70a39f03f7
Update JSBaker.h
2017-09-26 19:36:41 -07:00
utkarshgautamnyu
167dda9f80
made bakeJS a static function
2017-09-26 19:35:54 -07:00
Nissim Hadar
2394d0931c
Adding HazeStage
2017-09-26 19:05:11 -07:00
SamGondelman
306cf883fe
don't reload animGraph if url didn't change
2017-09-26 18:18:41 -07:00
Nissim Hadar
f92707a00c
WIP
2017-09-26 18:08:41 -07:00
Sam Gateau
9317ad38aa
Merge pull request #11462 from highfidelity/game-render-interface
...
Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing
2017-09-26 17:40:23 -07:00
samcake
f16c552978
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-26 17:18:05 -07:00
SamGondelman
49512c95d7
possibly fix threading crashes, mirror and fade
2017-09-26 16:21:36 -07:00
Andrew Meadows
dafadf82bb
Merge pull request #11458 from jherico/fix/tablet_latency
...
Fix long tablet lag on first load
2017-09-26 16:18:31 -07:00
samcake
328dd9c108
Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue
2017-09-26 16:12:27 -07:00
Howard Stearns
eeab07cd27
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-09-26 15:16:28 -07:00
Bradley Austin Davis
e42068f681
Merge branch 'master' into android_new
2017-09-26 14:31:29 -07:00
Howard Stearns
4403c27b52
working checkpoint. still needs verification/hashing, etc.
2017-09-26 14:14:37 -07:00
samcake
510b446409
mergine with master, resolving conflict
2017-09-26 13:13:46 -07:00
Seth Alves
7397a123c5
Merge pull request #11345 from SamGondelman/textAA
...
Text3D Overlays and Entities fixes and no-AA
2017-09-26 12:26:08 -07:00
Seth Alves
51d5f86989
Merge pull request #11460 from AndrewMeadows/fix-debug-build-20170926
...
remove asserts that break Debug build
2017-09-26 12:22:31 -07:00
utkarshgautamnyu
4fd0452694
Update JSBaker.cpp
2017-09-26 12:04:03 -07:00
Seth Alves
913d3c4d12
Merge pull request #11422 from hyperlogic/feature/ant-man2
...
Secondary IPD fixes
2017-09-26 11:53:45 -07:00
Stephen Birarda
608d42cdf7
Merge pull request #11461 from birarda/bug/too-much-logging
...
remove noisy logging added by auto baking
2017-09-26 13:29:42 -05:00
Dante Ruiz
e397d49564
Merge pull request #11159 from vladest/modal_dialogs_async
...
Modal dialogs async
2017-09-26 11:07:42 -07:00
utkarshgautamnyu
0b387f5b38
Update JSBaker.cpp
2017-09-26 11:01:56 -07:00
utkarshgautamnyu
a9aab67a06
Update JSBaker.h
2017-09-26 11:01:26 -07:00
samcake
b5c942f7f6
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
2017-09-26 10:47:59 -07:00
Stephen Birarda
b77ceab661
remove noisy logging added by auto-baking
2017-09-26 10:45:23 -07:00
Andrew Meadows
ec80846281
Merge pull request #11443 from SamGondelman/sharks
...
Laser Pointer fixes and updates
2017-09-26 10:22:55 -07:00
Howard Stearns
81cd00527a
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-09-26 10:15:37 -07:00
utkarshgautamnyu
1ba7aefd03
Update JSBaker.h
2017-09-26 09:57:02 -07:00
Daniela
e264503b9f
Merge remote-tracking branch 'upstream/master'
2017-09-26 17:49:15 +01:00
Daniela
179a426389
Address QA comments.
2017-09-26 17:44:46 +01:00
Sam Gateau
ff1101cc69
Merge pull request #11453 from Menithal/entity-custom-shader-emit-fix
...
Experimental Fix: Entity Shader Lightmap use / emissive
2017-09-26 09:39:33 -07:00
Andrew Meadows
67481287ff
comment out asserts that fail to compile in Debug
2017-09-26 09:29:43 -07:00
utkarshgautamnyu
b86dd9dea4
Update JSBaker.cpp
2017-09-25 20:20:30 -07:00
Brad Davis
40c42d35a5
Fix long tablet lag on first load
2017-09-25 17:50:04 -07:00
utkarshgautamnyu
209201e592
updates to handle white space within a single line comment
2017-09-25 15:55:12 -07:00
samcake
11c55755d5
Removing unused call
2017-09-25 15:10:40 -07:00
utkarshgautamnyu
0a57874cc2
Made updates to JSBaker
2017-09-25 14:46:38 -07:00
Menithal
19a290be70
Fixed Entity Shader emmissive
...
Makes sure that the emissiveAmount information is used correctly for a custom
shader, instead of using specular rgb information to generate the
emissiveness, which was incorrect
2017-09-26 00:12:45 +03:00
vladest
074362b228
Remove logging
2017-09-25 23:10:26 +02:00
Howard Stearns
ee6bf7f761
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-09-25 12:37:28 -07:00
SamGondelman
a73fdf4397
fix pointer event properties
2017-09-25 10:19:42 -07:00
Nissim Hadar
27af4685e7
Added range and altitude to UI.
2017-09-25 09:32:52 -07:00
vladest
1a2d38e31f
Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds
2017-09-25 17:11:44 +02:00
vladest
5a452fa981
Merge branch 'master' into tablet_extended_sounds
2017-09-25 15:40:40 +02:00
Olivier Prat
f31e9df21c
Fixed incorrect pixel byte size computation in KTX
2017-09-25 10:31:49 +02:00
Olivier Prat
23c77d528a
Merged with master with new abotProcessing in image
2017-09-25 09:48:24 +02:00
utkarshgautamnyu
6c40d39f81
refactored jsbaker.cpp
2017-09-24 20:53:09 -07:00
Sam Gateau
f90dc64241
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-24 19:32:57 -07:00
Nissim Hadar
1a9625d272
Merge branch 'master' into hazeZone
2017-09-24 18:27:36 -07:00
Nissim Hadar
543bc5a71b
HazeMode calls Haze::setIsHazeActive.
2017-09-24 18:25:20 -07:00
Nissim Hadar
6cbf087708
First version with combo for Haze Mode.
2017-09-24 15:08:22 -07:00
Nissim Hadar
678b4e35b1
Before replacing "Haze Active" checkbox with "Haze Mode" combo.
2017-09-24 14:06:00 -07:00
Andrew Meadows
cf0dd6f8c3
Merge pull request #11371 from cain-kilgore/21542
...
WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]
2017-09-23 22:20:52 -07:00
Brad Hefta-Gaub
bafb59e691
Merge pull request #11436 from SamGondelman/missingModels
...
Fix missing models
2017-09-23 13:56:50 -07:00
utkarshgautamnyu
cda5e94b33
Added JavaScript Baking
2017-09-22 20:57:18 -07:00
Nissim Hadar
c4419fede8
Bumped up the version number.
2017-09-22 19:07:05 -07:00
Nissim Hadar
c2eea7d40b
Minor cleanup.
2017-09-22 18:37:21 -07:00
Nissim Hadar
736a6aa311
Haze checkbox in UI doesn't disable the UI.
2017-09-22 18:20:35 -07:00
samcake
59006411c6
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-22 18:00:58 -07:00
Zach Fox
921ebc221e
Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled
...
Enable Inspection Mode for all; change Commerce setting name
2017-09-22 17:52:27 -07:00
SamGondelman
86198606e0
add _modelJustLoaded and updateTransforForSkinnedMesh on creation
2017-09-22 17:12:44 -07:00
SamGondelman
cbe621f2b7
add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate
2017-09-22 15:15:15 -07:00
Howard Stearns
8fdd405593
consistent comments
2017-09-22 15:10:30 -07:00
Howard Stearns
f25e22b463
entityInstanceNumber
2017-09-22 15:06:39 -07:00
Howard Stearns
7724fc204b
working checkpoint
2017-09-22 14:19:54 -07:00
SamGondelman
bc477608ee
fix alpha on glowLines
2017-09-22 13:22:08 -07:00
Zach Fox
430d1b22bb
Update angular size and i behavior
2017-09-22 11:41:28 -07:00
Zach Fox
bb9db3ef6d
Updates to behavior and shader appearance
2017-09-22 11:24:30 -07:00
Anthony Thibault
20cb02dabb
Merge pull request #11440 from hyperlogic/bug-fix/text-entity-rendering
...
Fix for TextEntity rendering, the translation was incorrect
2017-09-22 11:19:24 -07:00
samcake
47b7fcc532
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2017-09-22 11:03:05 -07:00
samcake
061ec69b09
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
2017-09-22 10:52:30 -07:00
SamGondelman
be27376c52
add comment about bottleneck
2017-09-22 10:21:32 -07:00
Nissim Hadar
5e1d470553
WIP
2017-09-22 09:48:22 -07:00
Anthony J. Thibault
d3c60f3057
Fix for TextEntity rendering, the translation was incorrect
...
This was caused by the removal of _dimensions from the SpatiallyNestable scale component.
2017-09-22 09:44:51 -07:00
Howard Stearns
6c47b71356
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-09-22 09:23:46 -07:00
Brad Davis
549cb77902
Fix dimensions of rendered web entities
2017-09-21 20:59:01 -07:00
SamGondelman
9f12d3a365
fix missing models
2017-09-21 17:57:25 -07:00
samcake
eed099502a
minimise the changes compared to upstream
2017-09-21 17:20:32 -07:00
samcake
510ecbb137
Merging with upstream
2017-09-21 16:59:15 -07:00
Cain Kilgore
0d33976035
Real time changes
2017-09-22 00:38:30 +01:00
Nissim Hadar
953ddfdcd3
First version of adding haze to the zone.
2017-09-21 14:54:16 -07:00
Anthony J. Thibault
54e627e2c5
Merge branch 'master' into feature/ant-man2
2017-09-21 13:59:47 -07:00
Ryan Huffman
abbe263142
Fix FBXBaker not properly handling textures with the same name
2017-09-21 13:40:39 -07:00
Howard Stearns
81585afb7c
Merge branch 'master' of https://github.com/highfidelity/hifi into certificate-properties
2017-09-21 12:46:34 -07:00
Ken Cooke
84786ac8e3
Merge pull request #11424 from ctrlaltdavid/21548
...
Fix recording just made not playing back if reload it
2017-09-21 12:19:23 -07:00
David Rowe
a2d8152a3a
Coding standard
2017-09-22 07:13:32 +12:00
Zach Fox
57b5a23373
Enable Inspection Mode for all; change Commerce setting name
2017-09-21 11:18:21 -07:00
Daniela
d054c6dc36
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-09-21 18:29:45 +01:00
samcake
9a9d13e519
Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface
2017-09-21 09:05:46 -07:00
Andrew Meadows
6b3b3a7448
Merge pull request #11382 from ElderOrb/case6618
...
6618 [Worklist] Add Input Field On Top of Keyboard
2017-09-21 08:54:11 -07:00
Andrew Meadows
b803344f0c
Merge pull request #11421 from jherico/fix/transform_log_spam
...
Don't add items to the scene graph until they have a valid parent chain
2017-09-21 08:42:56 -07:00
Ryan Huffman
a56303a3fe
Merge pull request #11379 from highfidelity/feat/auto-bake
...
Add auto baking to Asset Server and mesh compression for FBXs
2017-09-21 08:33:51 -07:00
Daniela
d960a7c42e
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-09-21 16:20:51 +01:00
Olivier Prat
98820f720d
KTX serialization / unserialization working with compressed HDR. Not sure with packed floats
2017-09-21 13:17:25 +02:00
Olivier Prat
f4579d44bc
Merge branch 'master' of git://github.com/highfidelity/hifi into hdrcube
2017-09-21 10:03:16 +02:00
Olivier Prat
5699dc6f42
Added KTX support of compressed HDR and HDR formats
2017-09-21 10:03:05 +02:00
Olivier Prat
5ec9c5bb45
Fixed some coding standard issues
2017-09-21 09:32:34 +02:00
samcake
ad1cab71f3
Merge branch 'master' of https://github.com/highfidelity/hifi into game_render_interface
2017-09-20 18:10:37 -07:00
David Rowe
4ce5e4ac46
Fix recording just made not playing back if reload it
2017-09-21 12:19:32 +12:00
Brad Davis
27350bd7de
Don't add items to the scene graph until they have a valid parent chain
2017-09-20 16:52:23 -07:00
Cain Kilgore
45f79b4341
Small fix
2017-09-21 00:00:24 +01:00
Anthony J. Thibault
09c61deda8
Fixes for Vive puck calibration
2017-09-20 15:41:49 -07:00
Cain Kilgore
322b7fc060
Cleanup from Merge
2017-09-20 23:37:33 +01:00
Cain Kilgore
f06c04e1b0
Fixed things
2017-09-20 23:24:56 +01:00
Cain Kilgore
796e9e7ab3
Fixed things
2017-09-20 23:23:30 +01:00
Cain Kilgore
4d904bd5ce
Changed naming of avatarGrav
2017-09-20 18:43:16 +01:00
Cain Kilgore
506226ead0
Merge branch 'master' into 21542
2017-09-20 18:22:34 +01:00
Anthony J. Thibault
809e986738
Fixes for lasers on 2d HUD
2017-09-20 09:21:14 -07:00
samcake
fd8868f609
Moving the render transform evaualtion in game loop for Models
2017-09-19 17:30:20 -07:00
Bradley Austin Davis
bc4193f276
Merge branch 'master' into android_new
2017-09-19 14:27:31 -07:00
Chris Collins
0a213e24c4
Merge pull request #11389 from highfidelity/RC-55
...
Beta Release 55 - Includes up to Developer Release 7127
2017-09-19 14:23:58 -07:00
Ryan Huffman
20759b0c97
Merge pull request #11404 from birarda/feat/auto-bake
...
add abort on shutdown to Baker/FBXBaker/TextureBaker
2017-09-19 14:20:56 -07:00
Stephen Birarda
a8ac015bc4
address code review comments
2017-09-19 13:56:42 -07:00
Clément Brisset
a6376fcc12
Merge pull request #11402 from huffman/fix/remove-fbxcpp
...
Remove FBX.cpp and other cleanup
2017-09-19 13:54:50 -07:00
