Zach Fox
de0eee52d6
cool
2018-02-22 14:45:32 -08:00
Seth Alves
72234970e3
set sessionUUID for a serverless domain to random rather than AVATAR_SELF_ID
2018-02-22 14:38:46 -08:00
Seth Alves
804ab855d7
Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains
2018-02-22 14:16:15 -08:00
Seth Alves
fdd2b0de15
increment _fullSceneReceivedCounter++ after loading a serverless domain. fix some indentation.
2018-02-22 14:16:11 -08:00
Seth Alves
c7081b28e6
when connected to a serverless domain, set the sessionUUID to be AVATAR_SELF_ID
2018-02-22 14:14:55 -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
ZappoMan
e9cad947d7
add the deadlock watchdog stats to the stats metaverse checkin data
2018-02-22 14:01:56 -08:00
Zach Fox
4d2d7fa51f
lots of fun initial progress!
2018-02-22 13:56:46 -08:00
NissimHadar
c6580f642a
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-22 13:45:00 -08:00
Seth Alves
50cec08efe
look offline when visiting a serverless domain
2018-02-22 13:43:41 -08:00
Brad Davis
2f34fb2e42
Merge remote-tracking branch 'upstream/stable' into HEAD
2018-02-22 10:20:10 -08:00
Nissim Hadar
a843a53427
Improved JSDoc comments.
2018-02-22 10:17:20 -08: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
ZappoMan
aa5542c54b
Merge branch 'master' of https://github.com/highfidelity/hifi into relaxDeadlockWatchdog
2018-02-22 08:43:13 -08:00
Seth Alves
c83dcbc626
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-22 07:42:49 -08:00
humbletim
dd90c8c515
fix ubuntu compile warnings
2018-02-22 10:16:34 -05:00
humbletim
4fd3d9bf7b
cleanup; formalize data structures
2018-02-22 08:18:38 -05:00
humbletim
fe9b67344b
remove unnecessary UUID check
2018-02-22 07:58:49 -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
Seth Alves
d27cbac3f8
loading directly into a serverless domain works. user will have edit permissions
2018-02-21 18:21:45 -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
Seth Alves
e36f39781b
remove some debug prints, fix serverless to servered domain transition
2018-02-21 15:06:23 -08:00
Nissim Hadar
049beba157
Corrected edge case of creating a snapshot with "" as the filename.
2018-02-21 14:15:41 -08:00
Seth Alves
37e16d2e6d
don't save up edit packets when loading a serverless domain
2018-02-21 12:54:41 -08:00
Nissim Hadar
bf4ba07b72
Added parameters to canCastShadow - still sucks.
2018-02-21 12:36:34 -08:00
Zach Fox
74655bde49
Fix skeletonmodelURLchanged signal
2018-02-21 12:12:20 -08:00
ZappoMan
47a98d9d0f
relax the deadlock time to 2 minutes
2018-02-21 10:12:04 -08: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
6f84e4c977
Moved shadows and ambient occlusion to menu checkboxes.
2018-02-20 23:45:07 -08:00
Seth Alves
c5d6f0e10f
don't queue up edit packets while connected to a serverless domain
2018-02-20 17:48:14 -08:00
SamGondelman
4c6169ec78
merge and a little cleanup
2018-02-20 15:45:34 -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
Seth Alves
1f5a65f93e
only could a url as a domain if it ends with .domain.json
2018-02-20 10:58:43 -08: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
Seth Alves
563c19bb91
fix connect
2018-02-19 15:21:46 -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
Seth Alves
25c34403db
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-19 11:24:42 -08:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals
...
Material Entities
2018-02-19 10:58:02 -08: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
David Rowe
03bc1b05d9
Overlays JSDoc improvements
2018-02-19 12:21:07 +13:00
David Rowe
3e7e9fe2c6
Overlay shape is different to Entities shape
2018-02-19 12:19:25 +13:00
Seth Alves
7a5415efbe
working on getting history to work with serverless domains
2018-02-18 07:55:43 -08:00
Seth Alves
a060d0ddb7
allow more than just hifi:// in various places
2018-02-17 06:32:38 -08:00
Seth Alves
dd278b4b1b
go to the default spawn point when loading a serverless domain
2018-02-16 17:45:39 -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
Seth Alves
ed5b28aa2a
clear octree on any sort of domain change
2018-02-16 17:15:15 -08:00
Seth Alves
d58eccd5aa
don't use edit.js to load entities for serverless domain
2018-02-16 16:38:45 -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
Seth Alves
de9ac7f4a5
working to integrate serverless domains into history, etc
2018-02-16 13:56:22 -08:00
Seth Alves
afa059d331
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-16 12:58:56 -08:00
Seth Alves
b2a4181bc0
working to integrate serverless domains into history, etc
2018-02-16 12:58:50 -08:00
Nissim Hadar
194c7f4101
WIP - for review.
2018-02-16 09:28:15 -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
Seth Alves
abc467b919
load json from indicated file to populate serverless domain
2018-02-15 16:09:03 -08:00
SamGondelman
b189433855
merge
2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
Seth Alves
17e2db96c6
make domain-manager and pals be still when interface is in serverless mode
2018-02-15 15:19:50 -08:00
Zach Fox
8072372822
Lots of changes
2018-02-15 13:27:13 -08:00
humbletim
145a0df082
interim checkin
2018-02-15 14:14:07 -05:00
Ryan Huffman
2a667fcd60
Cleanup entity -> ds persist
2018-02-15 10:09:21 -08:00
Ryan Huffman
cb9327e030
Add entity file sync and domain content backups
2018-02-15 10:09:20 -08:00
Seth Alves
0f4b68c038
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-15 07:53:36 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
MiladNazeri
258133f1db
Merge pull request #12335 from ctrlaltdavid/21736
...
Update Overlays circle3d JSDoc per recent code changes
2018-02-14 17:17:04 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
Zach Fox
5a8b8d4ac8
Lots of changes
2018-02-14 16:44:02 -08:00
Bradley Austin Davis
33690e09b7
Merge pull request #12399 from samcake/blue
...
Introducing group culling to avoid the avatar model to be partially culled
2018-02-14 15:38:52 -08:00
Brad Davis
8853bd6388
Fix spectator camera crash
2018-02-14 11:11:28 -08:00
Zach Fox
0fca843667
Integrate 'alreadyOwned' endpoint
2018-02-14 10:24:34 -08:00
samcake
1d3ae1b187
Work in progress to get the render items beeing tagged correctly for groupCulled
2018-02-13 17:50:01 -08:00
John Conklin II
309c2ecba1
Merge pull request #12239 from druiz17/fix-camera-update
...
Do not override sensorToWorldMatrix if animGraph is loading or failed to load
2018-02-13 15:10:13 -08:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
Zach Fox
ae8a8a48eb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-13 13:55:32 -08:00
Zach Fox
1b7253dc7f
Already Owned endpoint
2018-02-13 13:54:50 -08:00
Seth Alves
764447fa24
merge from upstream
2018-02-13 13:01:45 -08:00
Seth Alves
bf9496b46b
start on support for models.json serverless domains
2018-02-13 13:00:27 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images
...
2d images (JPG and PNG) are now supported as (quasi) entities
2018-02-13 11:44:02 -08:00
Zach Fox
0809210dc3
No permission card
2018-02-13 11:16:48 -08:00
Dante Ruiz
45f09dde96
address tony's requests
2018-02-13 10:32:15 -08:00
Zach Fox
95e9eb8e4a
Lots of progress
2018-02-12 17:06:57 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml
...
Migrating QML rendering off the main thread
2018-02-12 15:32:33 -08:00
John Conklin II
3377aaceea
Merge pull request #12343 from NissimHadar/saveSnapshotWithName
...
Added option to select snapshot filename in scripts.
2018-02-12 15:22:04 -08:00
Cain Kilgore
d1ecc85fb3
Merge branch 'master' of https://github.com/highfidelity/hifi into 21668
2018-02-12 23:19:20 +00:00
Cain Kilgore
5048bf16cb
Fixed Async Prompts/Assets/Dialogs
2018-02-12 23:01:19 +00:00
John Conklin II
51bf3c1466
Merge pull request #12323 from Zvork/shadow
...
Shadow performance / acnee improvements
2018-02-12 14:41:13 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs
...
Misc bug fixes
2018-02-12 14:31:38 -08:00
SamGondelman
9e8aa1898c
warnings, load material from URL, shapeID -> parentMaterialID
2018-02-12 12:50:09 -08:00
David Rowe
033b85a3a8
Merge branch 'master' into remove-deprecated-items
...
# Conflicts:
# scripts/system/libraries/entitySelectionTool.js
2018-02-13 09:42:40 +13:00
Brad Davis
1f2760c4b7
Merge remote-tracking branch 'gcalero/android_ui_bottombar3' into android
2018-02-12 12:39:40 -08:00
Dante Ruiz
1a25332575
fix indenting
2018-02-12 10:59:25 -08:00
Dante Ruiz
3c84318918
fixing merge conflict
2018-02-12 10:57:55 -08:00
Dante Ruiz
d381beb213
cleaning up code
2018-02-12 10:53:42 -08:00
Bradley Austin Davis
f6fbac25b0
Prevent deadlock crashes when building shaders at startup
2018-02-12 09:49:28 -08:00
Bradley Austin Davis
4bb329696a
Don't trigger a backtrace exception on quitting while in HMD
2018-02-12 08:49:20 -08:00
Bradley Austin Davis
288443d74b
Fix for deadlock triggering while loading QML engine
2018-02-12 08:49:10 -08:00
Dante Ruiz
5325b22b01
working on lambdas
2018-02-09 16:46:11 -08:00
John Conklin II
a961021101
Merge pull request #12378 from druiz17/save-avatarUrl
...
save avatarUrl when setting new skeletonModelUrl
2018-02-09 16:04:35 -08:00
John Conklin II
88094cae87
Merge pull request #12363 from zfox23/commerce_inspectionCertRedesign_v2
...
Commerce: Inspection Certificate Redesign (Fixed!)
2018-02-09 15:51:46 -08:00
SamGondelman
5337377ef5
Merge remote-tracking branch 'upstream/master' into decals
2018-02-09 14:40:20 -08:00
John Conklin II
64c5b883b1
Merge pull request #12243 from RebeccaStankus/log-filtering
...
Some improvements to the log window
2018-02-09 12:50:49 -08:00
Cristian Luis Duarte
bb4f57f982
Android - Avatar selection window accessible from the bottom bar. Only hardcoded avatars, no marketplace.
2018-02-09 17:32:12 -03:00
Gabriel Calero
917cbd73b1
Don't show help on android. Hide menu bar
2018-02-09 17:32:12 -03:00
Gabriel Calero
0f07d0b493
Add bottom bar and address dialog (Android)
2018-02-09 17:32:12 -03:00
SamGondelman
84cd0e1529
wip live material swapping on model entities, model overlays, avatars,
...
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
John Conklin II
5b63c0523d
Merge pull request #12375 from druiz17/lasers-64
...
RC64 - fix lasers going to origin
2018-02-09 11:11:07 -08:00
Dante Ruiz
b3a3d92131
Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update
2018-02-09 10:31:43 -08:00
Bradley Austin Davis
7102cf44b8
Fixing merge errors
2018-02-09 10:30:57 -08:00
John Conklin II
858e3e987c
Merge pull request #12372 from zfox23/RC64_commerce_inspectionCertRedesign_v2
...
RC64: Commerce: Inspection Certificate Redesign (Fixed!)
2018-02-09 10:12:53 -08:00
Dante Ruiz
beb41495d5
save avatarUrl when setting new skeletonModelUrl
2018-02-09 09:35:24 -08:00
RebeccaStankus
736115b12d
fixed QLabel include
2018-02-09 09:30:25 -08:00
Seth Alves
6471780e21
allow overlay children to follow avatar from one domain to another
2018-02-08 17:43:08 -08:00
Dante Ruiz
2ae976d256
Merge pull request #10 from sethalves/laser-bug
...
allow overlay children to follow avatar from one domain to another
2018-02-08 17:20:18 -08:00
Seth Alves
5e16623c81
allow overlay children to follow avatar from one domain to another
2018-02-08 17:17:04 -08:00
Bradley Austin Davis
023ee35b2e
Merge remote-tracking branch 'upstream/master' into threaded_qml
2018-02-08 17:16:36 -08:00
Brad Hefta-Gaub
a6c8172990
Merge pull request #12370 from jherico/fix/deadlock_shaders
...
Prevent deadlock crashes when building shaders at startup
2018-02-08 14:44:46 -08:00
Brad Hefta-Gaub
5aeadf04cf
Merge pull request #12371 from highfidelity/stable
...
Merge stable back into master
2018-02-08 14:39:37 -08:00
John Conklin II
199321a5f2
Merge pull request #12373 from jherico/rc64_deadlocks
...
Deadlock fixes from master
2018-02-08 14:38:36 -08:00
RebeccaStankus
14839bc5f4
Some improvements to the log window
...
-Renamed button "Clear Filters" to "All Messages"
-Changed search result matching text to a more visible color
-Made Date/Time text more visible
-Added count of current messages in window
-Set window to show all messages with no filtering upon first opening
2018-02-08 11:26:02 -08:00
divya
97abdb63db
Merge pull request #12364 from jherico/fix/display_plugin_crash
...
Don't trigger a backtrace exception on quitting while in HMD
2018-02-08 11:18:19 -08:00
Bradley Austin Davis
7eecc47672
Prevent deadlock crashes when building shaders at startup
2018-02-08 11:12:51 -08:00
Bradley Austin Davis
d2f5645f96
Don't trigger a backtrace exception on quitting while in HMD
2018-02-08 11:12:28 -08:00
Bradley Austin Davis
725eb14163
Fix for deadlock triggering while loading QML engine
2018-02-08 11:12:10 -08:00
Zach Fox
ecc0a2f43b
Bugfix.
2018-02-08 10:41:22 -08:00
Zach Fox
704d4255a5
Comment change
2018-02-08 10:41:17 -08:00
Zach Fox
679d53e2cf
This works, but is it correct?
2018-02-08 10:41:10 -08:00
John Conklin II
d0cfdfb4ca
Merge pull request #12368 from jherico/fix/offscreen_deadlock
...
Fix for deadlock triggering while loading QML engine
2018-02-08 10:37:46 -08:00
Zach Fox
a92e614aff
Bugfix.
2018-02-08 10:35:34 -08:00
Bradley Austin Davis
8748e98b5e
Prevent deadlock crashes when building shaders at startup
2018-02-08 10:23:25 -08:00
Zach Fox
744f679b4e
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2
2018-02-08 09:51:35 -08:00
Bradley Austin Davis
77741c2851
Fix for deadlock triggering while loading QML engine
2018-02-07 16:43:15 -08:00
Zach Fox
f5e2e4f3d8
Comment change
2018-02-07 15:44:21 -08:00
Bradley Austin Davis
2c514b5d1b
Don't trigger a backtrace exception on quitting while in HMD
2018-02-07 15:28:04 -08:00
Zach Fox
7f0915f6ab
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2
2018-02-07 15:14:33 -08:00
Zach Fox
e01e88d4ae
This works, but is it correct?
2018-02-07 15:13:22 -08:00
Seth Alves
a63393bc55
undo part of #12312
2018-02-07 14:50:59 -08:00
Seth Alves
fdbfeab3ea
Merge branch 'master' of github.com:highfidelity/hifi into fix-accountname-and-goto
2018-02-07 14:22:26 -08:00
Seth Alves
84f4453990
undo part of #12312
2018-02-07 13:32:30 -08:00
Seth Alves
3e913cfcfe
AvatarActionHold has positional and rotational targets
2018-02-07 10:45:13 -08:00
Brad Hefta-Gaub
0b6dea3d10
Merge pull request #12350 from ctrlaltdavid/21743
...
Fix the spectator camera
2018-02-06 19:55:02 -08:00
NissimHadar
5579eac034
Nothing...
2018-02-06 16:42:25 -08:00
NissimHadar
d5bf9cdbcd
Updated JSDoc comments.
2018-02-06 16:16:25 -08:00
samcake
72749e139a
changing the Increase LOD gap to 10 to start upping earlier
2018-02-06 16:00:49 -08:00
samcake
3ed633ebea
FIxing the get***LODIncreaseFPS functions evaluation of the threshold FPS for starting increasing LOD again
2018-02-06 15:52:32 -08:00
David Rowe
665bd6825f
Fix the spectator camera
2018-02-07 12:27:56 +13:00
Brad Davis
7d5502eb92
Migrating QML rendering off the main thread
2018-02-06 11:53:09 -08:00
NissimHadar
faec9a62b6
Changed "" to QString()
2018-02-06 11:01:50 -08:00
Olivier Prat
179aca2bf9
Shadow task now uses LOD culling from main view task
2018-02-06 11:47:39 +01:00
NissimHadar
cf87052b7f
Added option to select snapshot filename in scripts.
2018-02-05 17:29:00 -08:00
Dante Ruiz
e87067f93d
fix variable naming and edge case
2018-02-05 15:31:37 -08:00
Dante Ruiz
0c5c4679fb
Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update
2018-02-05 14:25:54 -08:00
John Conklin II
9c1cb60a43
Merge pull request #12333 from ctrlaltdavid/fix-spectator-camera
...
Fix the spectator camera
2018-02-05 11:06:59 -08:00
Stephen Birarda
761321875c
Merge pull request #12195 from birarda/bug/connection-refused
...
clear silent connection attempt counter on DomainHandler soft reset
2018-02-05 11:35:02 -07:00
David Rowe
22b33c7391
Update Overlays circle3d JSDoc per recent code changes
2018-02-05 11:22:40 +13:00
David Rowe
615e54620b
Remove Menu.isInfoViewVisible() and closeInfoView() from JavaScript API
2018-02-04 15:38:33 +13:00
David Rowe
efddec621f
Remove Menu.addActionGroup() and removeActionGroup() from JavaScript API
2018-02-04 15:16:20 +13:00
David Rowe
42498314f1
Remove further unused variable noticed in passing
2018-02-04 14:59:06 +13:00
David Rowe
0c0734a255
Remove unused Overlays property, borderSize, and associated code
2018-02-04 14:54:14 +13:00
David Rowe
dd5cc8677d
Remove Overlays.findRayIntersectionVector() from JavaScript API
2018-02-04 14:46:49 +13:00
David Rowe
8e2a3e8c99
Remove Overlays.getOverlayObject() from JavaScript API
2018-02-04 14:15:48 +13:00
David Rowe
d842e532ee
Remove Window.customPrompt() from JavaScript API
2018-02-04 14:02:30 +13:00
David Rowe
3af7701cac
Fix the spectator camera
2018-02-04 12:06:20 +13:00
Olivier Prat
2940a67b3e
Merged with master
2018-02-03 16:55:25 +01:00
John Conklin II
c8bb26ae74
Merge pull request #12294 from samcake/pastel
...
Improve startup time by optimizing shader bookkeeping
2018-02-02 16:37:44 -08:00
Elisa Lupin-Jimenez
e2bf8ad231
reverted to S3 for model URL
2018-02-02 15:36:28 -08:00
Stephen Birarda
eb9d100fc8
reset count on conn refusal, soft reset DH in Interface on limit reached
2018-02-02 13:47:48 -08:00
Stephen Birarda
e16a3859c2
reset silent check in packet check on domain connection reset
2018-02-02 13:47:48 -08:00
Brad Davis
e3e45e16c1
Disable LOD adjustment on android
2018-02-02 13:46:08 -08:00
Dante Ruiz
d593e7107c
fix merge conflict
2018-02-02 13:29:31 -08:00
Atlante45
8ebb3e52d8
Misc bug fixes
2018-02-02 13:10:49 -08:00
Elisa Lupin-Jimenez
f71d9e4d6a
snapshot referenced locally, won't work on OS
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
62437dcc22
drag and drop works
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
2ff47fa454
images auto-add to asset server, started asset browser add link
2018-02-02 10:27:42 -08:00
Seth Alves
861497e907
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-02-02 08:56:18 -08:00
Seth Alves
14d5029f4d
only update cauterization of child entities when something relevant changes
2018-02-02 08:56:11 -08:00
Olivier Prat
1f4671ba17
Cleaned up orthographic shadow culling functor
2018-02-02 11:09:28 +01:00
John Conklin II
cbdbf51ccd
Merge pull request #12317 from hyperlogic/feature/remove-ik-hips-offset
...
Removal of hips offset shifting from AnimInverseKinematics node
2018-02-01 15:30:08 -08:00
humbletim
06afaa7470
BufferView <-> QVariant/QScriptValue conversion
...
update MeshProxy/SimpleMeshProxy and ScriptableModel
ModelScriptingInterface / scriptable::ModelProvider
integration
update to RC-63
initial graphics-scripting refactoring
graphics-scripting baseline commit
wip commit
Geometry -> MeshPart
remove SimpleMeshProxy
collapse graphics-utils -> graphics-scripting
scriptable::Model => scriptable::ScriptableModel
2018-02-01 16:30:29 -05:00
Seth Alves
f7027b52e1
Merge pull request #12311 from ElderOrb/FB11511
...
FB11511 - position of log windows should be persistent between invocations of interface
2018-02-01 12:11:30 -08:00
Seth Alves
bdf6736a54
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-02-01 12:04:56 -08:00
Liv
6363ded74b
Merge pull request #12280 from misslivirose/feat/expose-identity-verification
...
Expose functionality to enable entity scripts to check ownership verification on avatar entities
2018-02-01 10:07:58 -08:00
Seth Alves
482be7ba4e
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-02-01 06:36:04 -08:00
Sam Gateau
a650c5bbc6
Move a define to resume watchdog a bit further
2018-01-31 23:31:31 -08:00
Anthony J. Thibault
b23f98b311
Removal of hips offset shifting from AnimInverseKinematics node
...
With the addition of the hips IK target, the hips offset shifting code is no longer necessary.
This PR should not effect any behavior, but it removes this unused code from the animation system.
2018-01-31 17:56:33 -08:00
vladest
bca903a6df
Fix build
2018-01-31 23:31:18 +01:00
samcake
0885b00ab8
Merge branch 'master' of https://github.com/highfidelity/hifi into pastel
2018-01-31 14:18:38 -08:00
Alexander Ivash
1ed7d164c4
FB11511 - position of log windows should be persistent between invocations of interface
2018-02-01 01:15:03 +03:00
vladest
2a5b3d97fb
AddressBar trigger implemented. Fixed warnings on non existing context properties. Fixed warnings about non notifyable property
2018-01-31 23:05:38 +01:00
Seth Alves
a49097789a
Revert "AddressBar trigger implemented. Fixed warnings on non existing contex…"
2018-01-31 13:32:19 -08:00
Seth Alves
acc5973813
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-31 12:22:50 -08:00
Seth Alves
0df4ae02fc
Merge pull request #12126 from vladest/addressbar_close_fix
...
AddressBar trigger implemented. Fixed warnings on non existing contex…
2018-01-31 11:26:05 -08:00
Seth Alves
50e6864988
Merge pull request #12138 from Triplelexx/21669_prompt_keyboard
...
WL#21669: Allow better keyboard navigation of prompt windows such as Window.prompt()
2018-01-31 11:19:49 -08:00
Seth Alves
64a46bf5df
merge from upstream
2018-01-31 10:43:41 -08:00
Bradley Austin Davis
b97c938544
Merge pull request #12216 from thoys/feat/js-script-console-auto-complete
...
JS scripting console auto-complete
2018-01-31 10:39:51 -08:00
samcake
062bfbd7b6
Merging with master
2018-01-30 18:33:34 -08:00
Atlante45
bc819c698e
Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back
2018-01-30 16:09:30 -08:00
Sam Gateau
9ea6c78ac2
fix stupid copy paste
2018-01-30 15:31:34 -08:00
John Conklin II
215d03c4ce
Merge pull request #12269 from sethalves/backtrace-for-rc-63
...
Backtrace for rc 63
2018-01-30 15:13:01 -08:00
John Conklin II
0b03632437
Merge pull request #12289 from hyperlogic/bug-fix/mac-os-shader-compile-too-slow-rc63
...
RC63: 8x shader compilation optimization and watchdog disable
2018-01-30 13:26:49 -08:00
samcake
2dcedf9f39
cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation
2018-01-30 12:52:05 -08:00
Atlante45
019a2d346c
Fix spaces
2018-01-30 12:04:01 -08:00
Atlante45
db08f1dda6
Move backtrace to interface
2018-01-30 11:39:48 -08:00
Anthony Thibault
1e8a5485c1
8x shader compilation optimization and watchdog disable
...
addPlumberPipeline in RenderPipelines.cpp would recompile
a single program 7 more times then necessary. This was
causing startup times on Mac OS X to trigger the deadlock
watchdog.
Even with this fix, compiling shaders is still too slow,
As a workaround, we disable the watchdog thread during
rendering pipeline setup.
2018-01-30 10:27:06 -08:00
Gabriel Calero
a5a36b4b8f
Don't show help on android. Hide menu bar
2018-01-30 14:48:37 -03:00
Gabriel Calero
07a542e35d
Add bottom bar and address dialog (Android)
2018-01-30 14:48:37 -03:00
Seth Alves
7d1eb5fef8
Merge branch 'RC63' of github.com:highfidelity/hifi into backtrace-for-rc-63
2018-01-30 09:13:02 -08:00
Liv Erickson
8b7c989508
move emit signals to wallet interface
2018-01-29 16:34:44 -08:00
Liv Erickson
ce8159340b
fix vs autoformatting
2018-01-29 15:51:09 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
...
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
Dante Ruiz
264aa7f4d2
Merge pull request #12191 from druiz17/entity-attachment-bookmark
...
Bookmark avatar entities
2018-01-29 12:55:35 -08:00
Liv Erickson
634bc83ed5
fix elses
2018-01-29 12:54:52 -08:00
Liv Erickson
f8f76d6757
changing back to avatar only and making some changes to avoid multiple calls to dependency manager
2018-01-29 12:46:00 -08:00
Seth Alves
98e0e663e7
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-29 12:36:37 -08:00
John Conklin II
e01bbcf10b
Merge pull request #12264 from sethalves/warn-for-head-position-nan
...
print warnings if head position contains not-a-number
2018-01-29 12:25:23 -08:00
samcake
1fd4c5c1a4
Integrating the tag flags to the render item key and adding configration of the render pipelien with the Tag information
2018-01-29 12:20:51 -08:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request
...
Leopoly_Phase1_003_Asset-Request
2018-01-29 11:40:41 -08:00
Liv Erickson
6a971e1362
remove restriction to be avatar only
2018-01-29 11:27:30 -08:00
Dante Ruiz
a637bac2fe
remove debug statement
2018-01-29 11:26:28 -08:00
Dante Ruiz
a670a0b9a2
Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark
2018-01-29 11:25:26 -08:00
Liv Erickson
a10f7932bd
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/expose-identity-verification
2018-01-29 11:07:38 -08:00
Liv Erickson
0e3a01f1e8
it's working! removed my null pointer and just get it from the dependency manager when required
2018-01-29 10:20:16 -08:00
Andrew Meadows
c2817fc091
HMD low LOD threshold changed: 42 --> 34
2018-01-29 10:18:08 -08:00
Andrew Meadows
6acec39e92
HMD low LOD threshold changed: 45 --> 42
2018-01-29 10:05:23 -08:00
samcake
8dfa3aace3
cleaning en route
2018-01-26 17:34:37 -08:00
Liv Erickson
20635acf27
moving logic to wallet, crashes currently
2018-01-26 17:13:39 -08:00
humbletim
e2afcac534
include .extraInfo as part of RayPick API constructors
2018-01-26 18:34:13 -05:00
Seth Alves
b7303414f2
unmangle merges
2018-01-26 11:57:30 -08:00
Seth Alves
19409cc6ce
fix merge/cherry-pick error
2018-01-26 10:45:18 -08:00
Seth Alves
3be42fe79a
Merge branch 'master' of github.com:highfidelity/hifi into warn-for-head-position-nan
2018-01-26 10:36:26 -08:00
Seth Alves
17ec79f182
add breaks in case statements that used to have returns
2018-01-26 10:36:16 -08:00
Seth Alves
b8f3d8140d
add breaks in case statements that used to have returns
2018-01-26 10:34:43 -08:00
Seth Alves
2962c8979c
print warnings if head position contains not-a-number
2018-01-26 09:49:21 -08:00
Seth Alves
dbe9fd290e
comment out code that would set annotations after StartHandler is called
2018-01-26 09:23:29 -08:00
Seth Alves
c550620cb4
backtrace for rc-63
2018-01-26 09:23:24 -08:00
Atlante45
df62ba88cb
Fix rebase error
2018-01-26 09:22:37 -08:00
Seth Alves
9eb10c09da
oops
2018-01-26 09:22:33 -08:00
Seth Alves
e32089d3dd
only start crash hanlder if UserActivityLogger::isEnabled() is true
2018-01-26 09:22:22 -08:00
Atlante45
39f26e35f0
backtrace for rc-63
2018-01-26 09:22:14 -08:00
Seth Alves
6c04431636
call startCrashhandler from interface
2018-01-26 09:20:29 -08:00
Seth Alves
47f44eb21f
extirpate bugsplat
2018-01-26 09:20:23 -08:00
Thijs Wenker
08b712281f
Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete
2018-01-26 18:10:47 +01:00
Olivier Prat
1aa41918d0
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-01-26 15:01:30 +01:00
Sam Gateau
51dac04374
Introducing the tag in lieu of the vsisiblity mask
2018-01-26 02:59:43 -08:00
Sam Gateau
23b99f04cd
Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch
2018-01-25 18:33:37 -08:00
samcake
2f4e61888f
Making it work maybe
2018-01-25 16:57:35 -08:00
Seth Alves
b6f7d2eb89
print warnings if head position contains not-a-number
2018-01-25 15:15:59 -08:00
Liv Erickson
3a6f184278
make clear function is for avatar entities only, add error handling in non-client entity cases
2018-01-25 15:13:14 -08:00
Liv Erickson
7e5684c439
use signals
2018-01-25 15:04:12 -08:00
Brad Davis
361b767586
Merge branch 'fix/render_config' into android
2018-01-25 14:50:41 -08:00
Thijs Wenker
45487a1e45
Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete
...
# Conflicts:
# interface/CMakeLists.txt
2018-01-25 22:51:35 +01:00
Thijs Wenker
179c21acf4
jsdoc info on selected auto-complete entry
2018-01-25 22:46:30 +01:00
Brad Davis
ab4e2d99f1
Don't try to set the current directory to a QRC path
2018-01-25 13:04:54 -08:00
Brad Davis
867bb99b51
Fix help screen URL
2018-01-25 13:04:08 -08:00
Brad Davis
ac94327ec7
Fix loading of the context overlay information icon
2018-01-25 12:44:55 -08:00
Liv Erickson
7ee5608992
initial first pass of exposing headless verification
2018-01-25 12:02:26 -08:00
Andrew Meadows
289356dfe7
Merge pull request #12227 from ZappoMan/sendDataDescription
...
some settings cleanup
2018-01-25 11:30:14 -08:00
ZappoMan
cb01bd14b9
Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription
2018-01-25 10:39:43 -08:00
John Conklin II
e081808ace
Merge pull request #12235 from luiscuenca/assetBrowserFix
...
RC63 Fix Edit/Asset Browser in HMD mode
2018-01-25 09:38:23 -08:00
Olivier Prat
5af4337b0e
Merged with master
2018-01-25 10:11:53 +01:00
Olivier Prat
f3aac2a7b5
Merged with samcake/black
2018-01-25 09:27:48 +01:00
samcake
ae6a95ec0d
fixing my bugs on vissibility
2018-01-24 18:07:35 -08:00
Zach Fox
94e1c425ab
Fix MacOS Security Pic visibility; fix incorrect button state when changing pic
2018-01-24 17:03:16 -08:00
John Conklin II
1529fea983
Revert "Display both lasers on tablet and Web surfaces"
...
(cherry picked from commit 455090d2b9
)
2018-01-24 14:51:42 -08:00
Andrew Meadows
a0e07a2c4b
Merge pull request #12232 from luiscuenca/showHelp
...
Fix Interface first launch should show help
2018-01-24 12:11:34 -08:00
Dante Ruiz
2cbcc28bd4
only call init animGraph once
2018-01-24 10:44:04 -08:00
samcake
38242072e5
Merge branch 'cauterize-head-av-entities-1' of https://github.com/sethalves/hifi into seth-branch
2018-01-23 16:30:54 -08:00
Seth Alves
1cbc2e31cf
merge from upstream
2018-01-23 15:21:03 -08:00
Dante Ruiz
071f7d54d9
Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update
2018-01-23 14:44:26 -08:00
Dante Ruiz
6a03557801
don't override sensorToWorldMatrix
2018-01-23 14:44:10 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
Brad Davis
5bf2bda96d
Merge branch 'android' into android_new
2018-01-23 08:17:46 -08:00
luiscuenca
3c12ae8925
Fix Edit/Asset Browser in HMD mode
2018-01-22 20:52:18 -07:00
luiscuenca
6d6950deca
Fix Interface first launch should show help
2018-01-22 16:25:58 -07:00
Brad Davis
6a91d549ce
Fix stylus overlay
2018-01-22 15:08:26 -08:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
Thijs Wenker
e8955fcd32
Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete
2018-01-22 23:37:24 +01:00
Sam Gondelman
bdef05a326
Merge pull request #12221 from highfidelity/revert-12203-21703
...
Revert "Display both lasers on tablet and Web surfaces"
2018-01-22 12:27:00 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
John Conklin II
22ee57db74
Merge pull request #12214 from 1st-BrainStormer/master
...
Fix lockup when no midi devices present.
2018-01-22 11:25:46 -08:00
Thijs Wenker
f4e6606c8d
fix MyAvatar JS API typo
2018-01-22 19:01:13 +01:00
Seth Alves
f6b4cf4c60
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-22 07:13:41 -08:00
Sam Gateau
d38d13cbb9
Trying to address the overlays to not be visisble in 2nd camera
2018-01-21 23:47:45 -08:00
ZappoMan
4ad5d34a10
more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel
2018-01-20 17:20:42 -08:00
Bruce Brown
f7caba5295
de-bounce Midi::USBchanged signal.
...
Debounced USBchanged signal to prevent pauses.
2018-01-20 11:17:47 -08:00
ZappoMan
ab9041bcab
remove LOAD DEFAULT SCRIPTS from General Preferences, since it already exists on Running Scripts
2018-01-20 00:14:44 -08:00
ZappoMan
027a1e69f4
some settings cleanup, adding description to Send Data
2018-01-20 00:08:06 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces"
2018-01-19 15:15:52 -08:00
John Conklin II
db5bf68431
Merge pull request #12203 from ctrlaltdavid/21703
...
Display both lasers on tablet and Web surfaces
2018-01-19 15:15:44 -08:00
Brad Davis
3e7872637d
Merge branch 'android' into android_new
2018-01-19 14:40:01 -08:00
Brad Davis
d53b8b38ac
Merge remote-tracking branch 'upstream/master' into android
2018-01-19 14:35:20 -08:00
Brad Davis
686393d62f
Load built-in resources earlier
2018-01-19 14:35:04 -08:00
Seth Alves
9be2c67f00
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 11:46:34 -08:00
Zach Fox
9d6e62d6bf
Merge pull request #12163 from ElderOrb/FB11109
...
FB11109 Preview disabled image swap (Commerce only)
2018-01-19 11:40:05 -08:00
Dante Ruiz
c71fa110db
update file dates and remove debug state
2018-01-19 11:31:13 -08:00
Dante Ruiz
139266fe80
remove unneeded code
2018-01-19 11:24:06 -08:00
Ryan Downe Karpf
f1b18ccc00
Merge pull request #12184 from ctrlaltdavid/21700
...
Add Window browseChanged signal as replacement for openFileChanged
2018-01-19 10:45:27 -08:00
Thijs Wenker
a31fe7546a
- remove debug
...
- fix API export JSON filename
- fix warnings
2018-01-19 19:45:25 +01:00
Brad Davis
3dba928b72
Merge remote-tracking branch 'upstream/android' into android_new
2018-01-19 10:36:46 -08:00
Thijs Wenker
0f7f58417b
JS scripting console auto-complete
2018-01-19 19:11:12 +01:00
Seth Alves
bce9b5f459
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 09:53:54 -08:00
Seth Alves
6aa389cad0
trying to now show overlays in mirrors
2018-01-19 09:53:41 -08:00
David Rowe
fb684909ce
Merge branch 'master' into 21703
2018-01-19 17:25:12 +13:00
David Rowe
e0e6fc711b
Replace Pointers API function setNonHoverItems() with setDoesHover()
2018-01-19 16:05:09 +13:00
humbletim
dfb1619dc6
CR feedback; using namespace AssetUtils => inline AssetUtils::
2018-01-18 21:49:53 -05:00
Brad Davis
bdfa1273ba
Merge remote-tracking branch 'upstream/master' into android
2018-01-18 17:33:10 -08:00
David Kelly
2e4fc5e58c
Merge pull request #12207 from davidkelly/dk/placesInHfcTransferHistory
...
nearby hfc transfers should send the location
2018-01-18 16:46:34 -08:00
David Kelly
844ec6a863
eliminate dash in history, replace with 0 HFC
2018-01-18 16:02:40 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702
...
Add Window.protocolSignature() as a replacement for location.protocolVersion()
2018-01-18 15:20:03 -08:00
Brad Hefta-Gaub
f3dfad6c59
Merge pull request #12155 from ctrlaltdavid/21689
...
Remove unused "anchor" Overlays property
2018-01-18 15:04:41 -08:00
Sam Gateau
aec99db4fc
Merge pull request #12157 from AndrewMeadows/lod-debug-ui
...
add scripted/qml debug UI for render LOD
2018-01-18 15:00:50 -08:00
Brad Hefta-Gaub
c9cedcb2c0
Merge pull request #12183 from SamGondelman/pointerCrash
...
Destroy PointerManager before PickManager
2018-01-18 14:58:20 -08:00
David Kelly
21cc6ee8dd
fix marketplace txn display (memo only)
2018-01-18 14:28:25 -08:00
Seth Alves
31c007d167
more backwards logic, added withViewVisibilityMask call in ItemKey
2018-01-18 14:15:30 -08:00
Seth Alves
7c32d3c536
flip logic back around
2018-01-18 13:49:17 -08:00
David Kelly
2b7576cef5
Merge branch 'master' of github.com:highfidelity/hifi into dk/placesInHfcTransferHistory
2018-01-18 13:00:07 -08:00
David Kelly
9a523ead31
fix link
2018-01-18 12:44:45 -08:00
Alexander Ivash
a74b093b60
FB11109 Preview disabled image swap (Commerce only)
2018-01-18 23:26:43 +03:00
David Rowe
8c2427dd58
Rename Window.protocolVersion() to Window.protocolSignature()
2018-01-19 09:06:16 +13:00
David Kelly
2cdbc1159e
nearby hfc transfers should send the location too
2018-01-18 11:15:32 -08:00
Seth Alves
fb974b0b9c
attempt to straighten out use of view-visibility masks
2018-01-18 10:09:23 -08:00
Brad Davis
d3c4b0ef45
Merge remote-tracking branch 'gcalero/android_virtual_touchpad' into android_new
2018-01-18 10:04:03 -08:00
Anthony J. Thibault
c5efcf5d6a
Bug fix for cocked head after playing an input recording.
...
I thought this was the cause of the Manuscript case 11454 but apparently not.
2018-01-18 09:21:15 -08:00
Andrew Meadows
2c43138e14
slightly faster auto LOD adjust
2018-01-18 08:53:45 -08:00
Andrew Meadows
80c43bd0f7
fix typo in variable name
2018-01-18 08:53:45 -08:00
Andrew Meadows
9a1a10b4e1
remove cruft and use more correct names
2018-01-18 08:53:45 -08:00
Andrew Meadows
82cab5e4a1
add scripted/qml debug UI for render LOD
2018-01-18 08:53:45 -08:00
Seth Alves
d897b1c1eb
Merge branch 'visible-perview' of github.com:samcake/hifi into cauterize-head-av-entities-1
2018-01-18 07:02:20 -08:00
Seth Alves
76ef3d7c7d
pull from upstream
2018-01-18 07:01:50 -08:00
Sam Gateau
7a9740d258
visible-perview
2018-01-18 02:18:46 -08:00
Brad Davis
cbb2d9d854
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 17:51:39 -08:00
David Kelly
c661bec8fd
whitespace
2018-01-17 17:15:14 -08:00
David Rowe
ee2936d133
Add Pointers API function that disables hover events for nominated items
2018-01-18 14:07:07 +13:00
David Kelly
1dde25e38f
Don't make links in txn history for highfidelity and marketplace
2018-01-17 16:51:38 -08:00
Zach Fox
5ce768f402
Merge pull request #12151 from zfox23/commerce_sendMoney1
...
Commerce: P2P Transfer Iteration 1
2018-01-17 16:41:56 -08:00
Dante Ruiz
eadd3b48bd
bookmark avatar-entities-done
2018-01-17 15:42:07 -08:00
Zach Fox
16d51986a9
Make the call to receiveAt more robust
2018-01-17 15:11:58 -08:00
Dante Ruiz
8f22c719b3
Merge pull request #12099 from sethalves/run
...
allow avatar walk-speed to be set from javascript
2018-01-17 13:53:13 -08:00
Seth Alves
7af90d5429
Merge pull request #12171 from mnafees/21671
...
CR for Job #21671 - Window.copyToClipboard() doesn't work in .js files
2018-01-17 13:42:47 -08:00
Seth Alves
33c586de60
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor
...
Remove dangerous "Use Anim Pre and Post Rotations" menu item
2018-01-17 13:41:51 -08:00
Zach Fox
1d747bc0e4
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-17 11:56:00 -08:00
Bradley Austin Davis
9f6c2c3cdd
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 11:44:00 -08:00
Dante Ruiz
3ba0eaa13d
fix typo
2018-01-17 11:05:55 -08:00
Dante Ruiz
ebb09f4271
Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark
2018-01-17 11:04:46 -08:00
Dante Ruiz
3abb3d6fcc
trying to add offset
2018-01-17 11:04:32 -08:00
David Back
92c0fd4877
Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS
...
Merge Account & GlobalServices follow-up
2018-01-17 10:50:54 -08:00
Gabriel Calero
970ca5e08f
Add virtual pad for android
2018-01-17 15:00:43 -03:00
Seth Alves
1e847cf32e
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-17 08:08:13 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities
...
Soft Entities
2018-01-17 08:02:37 -08:00
Seth Alves
d3084dc0df
defang
2018-01-17 07:11:27 -08:00
Seth Alves
bfccb52b7a
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-17 07:02:14 -08:00
Brad Davis
6a06bf405a
Merge remote-tracking branch 'upstream/master' into android
2018-01-16 18:24:44 -08:00
Sam Gateau
d4571bd86a
Merge pull request #12181 from humbletim/rename-model-graphics
...
Rename libraries/model -> libraries/graphics
2018-01-16 18:12:25 -08:00
Anthony J. Thibault
51ea2632c0
Remove Avatar UseAnimPreAndPostRotations option.
...
This should always be true and can lead to hard to diagnose bugs if it is ever set to false.
2018-01-16 17:27:19 -08:00
Dante Ruiz
92a259fd63
fix setting correct joint index
2018-01-16 16:41:06 -08:00
Zach Fox
e700ff91d0
Remove warning
2018-01-16 15:58:17 -08:00
Dante Ruiz
7707e68234
bookmarks add back avatar-entities
2018-01-16 15:37:03 -08:00
Zach Fox
8cc427a374
Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1
2018-01-16 15:07:53 -08:00
David Rowe
2883e24285
Add Window.protocolVersion() as a replacement for location's
2018-01-17 12:00:35 +13:00
David Kelly
929760c226
fix time display
2018-01-16 14:52:26 -08:00
Bradley Austin Davis
b4223215ef
Use old style resources on OSX for now
2018-01-16 14:44:05 -08:00
Seth Alves
511f94a4fc
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-16 14:01:54 -08:00
Zach Fox
d64b35729f
Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1
2018-01-16 13:44:29 -08:00
David Rowe
85bda1da8e
Add Window browseChanged signal as replacement for openFileChanged
2018-01-17 09:57:20 +13:00
David Kelly
d8f8f9ff1a
First cut at alan's new design
2018-01-16 11:19:10 -08:00
Clément Brisset
1949471dad
Merge pull request #12182 from highfidelity/stable
...
Merge stable (RC62) to master
2018-01-16 11:01:07 -08:00
SamGondelman
c3eb4b5ecd
destroy pointermanager before pickmanager
2018-01-16 10:31:42 -08:00
Mohammed Nafees
885801c5ca
Fix copying to clipboard from JS scripts
2018-01-16 13:17:47 -05:00
humbletim
b91d536dd0
rename model:: -> graphics::
2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
2018-01-16 12:44:44 -05:00
Seth Alves
12db51728e
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-16 07:50:55 -08:00
Dante Ruiz
69389116f5
add menu option for AvatarEntitiesBookmarks
2018-01-15 16:47:48 -08:00
MiladNazeri
c7cdf6b8f6
Merge pull request #12145 from ctrlaltdavid/21684
...
Update Window JSDoc per recent API changes
2018-01-15 14:50:40 -08:00
Seth Alves
06dd680dc9
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-15 13:48:10 -08:00
Brad Davis
d10d7026c5
Force Qt to use ANGLE when in GLES mode on Windows
2018-01-15 13:42:41 -08:00
Dante Ruiz
645f608814
fixing merge conflict
2018-01-15 10:45:51 -08:00
John Conklin II
c3648fb04c
Merge pull request #12168 from druiz17/RC62
...
fix Asset browser for tablet (RC62)
2018-01-15 10:16:56 -08:00
Zach Fox
f7ed8c10fa
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-15 10:13:07 -08:00
Brad Davis
58530c595a
Pre-merge cleanup
2018-01-14 19:48:12 -08:00
Seth Alves
a7d658c857
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-14 12:34:31 -08:00
Brad Davis
55bfdc105b
Switch android to GLAD
2018-01-14 10:22:18 -08:00
Brad Davis
acb95d1355
GLAD polish
2018-01-14 00:10:05 -08:00
Brad Davis
24b83aa0f1
Merge remote-tracking branch 'sam/android-gles' into windows_gles
2018-01-13 11:36:31 -08:00
Brad Davis
17899d5e07
Don't create share context for web while running nsight
2018-01-13 11:32:23 -08:00
Sam Gateau
df0660f823
Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles
2018-01-13 01:00:41 -08:00
Sam Gateau
331a8f3094
fixing the stencil not clearing correctly and shaders not compiled correctly in main thread
2018-01-13 01:00:10 -08:00
Brad Davis
ab7aa52a10
GLES emulaton on windows
2018-01-12 19:17:35 -08:00
Dante Ruiz
8e4bd2d662
fix asset browser for tablet
2018-01-12 17:11:02 -08:00
Dante Ruiz
a48304b104
fix Asset browser for tablet
2018-01-12 17:06:07 -08:00
Zach Fox
e627925bd3
Fix 'Browse Avatars' button from Avatar Settings
2018-01-12 15:14:42 -08:00
David Kelly
6cedc016c4
Adding sender/recipient to transaction history for hfc transfers
2018-01-12 16:08:52 -07:00
David Kelly
579a4d85b3
Merge branch 'commerce_sendMoney1' of https://github.com/zfox23/hifi into dk/senderAndRecipientInTxnHistory
2018-01-12 14:37:46 -07:00
Zach Fox
6920e57613
Fix 'Browse Avatars' button from Avatar Settings
2018-01-12 13:31:58 -08:00
Dante Ruiz
5b82c7bc41
fix merge conflict
2018-01-12 11:00:19 -08:00
Brad Davis
7579451c24
Merge remote-tracking branch 'upstream/master' into android
2018-01-11 23:31:45 -08:00
Brad Davis
22d133c71f
Allow GLES client on desktop builds
2018-01-11 23:31:34 -08:00
Seth Alves
e7a3d98ae5
don't draw head-descendent entities when in 1st-person camera mode
2018-01-11 19:34:54 -08:00
Dante Ruiz
96a97b5938
added model transform override
2018-01-11 16:41:45 -08:00
David Rowe
5dca387055
Remove old, unused overlay panel code
2018-01-12 12:47:22 +13:00
David Rowe
9b0fb19cfa
Remove unused "anchor" Overlays property
2018-01-12 12:16:58 +13:00
howard-stearns
2987d21f66
remove some more
2018-01-11 13:15:34 -08:00
Zach Fox
81ab5ac81c
hfc_key -> public_key
2018-01-11 12:50:25 -08:00
Zach Fox
d25ef074e1
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-11 12:35:18 -08:00
howard-stearns
c39771d995
do not delete wallet file when things go wrong, and remove obsolete
...
reset machinery
2018-01-11 11:50:23 -08:00
Seth Alves
c09f644612
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-11 09:09:11 -08:00
Sam Gateau
9bc02ec564
simple changes to try debugging the stereo rendering
2018-01-10 21:01:26 -08:00
David Rowe
a543d90090
Miscellaneous fixes
2018-01-11 15:53:45 +13:00
David Rowe
7ba42f0e76
Update JSDoc per recent changes in Window API
2018-01-11 15:52:56 +13:00
Seth Alves
568c27d6e0
Merge pull request #12039 from luiscuenca/currentAPI
...
Fix and improve currentAPI.js
2018-01-10 17:55:08 -08:00
Seth Alves
aefd294bf2
Merge pull request #12107 from hyperlogic/bug-fix/better-third-person-camera
...
Improve stability for HMD third person avatars
2018-01-10 17:46:47 -08:00
Brad Davis
560fd38547
Merge remote-tracking branch 'upstream/master' into android
2018-01-10 17:31:50 -08:00
Andrew Meadows
b3fcca8446
Merge pull request #12132 from hyperlogic/bug-fix/prevent-hands-from-entering-body
...
Bug fix to prevent wrists entering the avatar's torso.
2018-01-10 17:22:50 -08:00
Brad Davis
97593bc4d8
Fixing compiled resource access
2018-01-10 17:18:12 -08:00
MiladNazeri
301731554f
Merge pull request #12102 from cain-kilgore/21664
...
WL 21664 - Window.innerHeight should not include the menu bar
2018-01-10 17:10:14 -08:00
Zach Fox
939012a2d0
Hook up the endpoints!
2018-01-10 17:10:05 -08:00
Zach Fox
c15b1669b1
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-10 15:53:23 -08:00
Triplelexx
24f1fc3546
fix Ui keyboard navigation
...
various fixes to allow some support for keyboard navigation in message boxes and dialogs
2018-01-10 22:30:43 +00:00
Seth Alves
ddc730f49f
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-10 13:49:07 -08:00
Brad Davis
2c35242af1
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-10 13:40:12 -08:00
Brad Davis
7a7aee770c
Switching to binary resources
2018-01-10 13:39:56 -08:00
MiladNazeri
b73106fa7e
Merge pull request #12120 from cain-kilgore/21666
...
WL 21666 - Window.domainChanged() isn't emitted if domain isn't running
2018-01-10 12:30:21 -08:00
Cain Kilgore
b26e31a362
Copy paste? Never!
2018-01-10 20:27:19 +00:00
MiladNazeri
2220b976dc
Merge pull request #12130 from cain-kilgore/21665
...
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
2018-01-10 12:06:58 -08:00
Anthony J. Thibault
250e4032b0
Bug fix to prevent wrists entering the avatar's torso.
...
This was inadvertently disabled in PR #11978 .
(cherry picked from commit ae997928c1
)
2018-01-10 12:04:50 -08:00
MiladNazeri
bf61d8c7b3
Merge pull request #12115 from ctrlaltdavid/deprecations
...
Update JSDoc with some deprecations
2018-01-10 12:04:21 -08:00
Anthony J. Thibault
ae997928c1
Bug fix to prevent wrists entering the avatar's torso.
...
This was inadvertently disabled in PR #11978 .
2018-01-10 11:51:44 -08:00
Anthony J. Thibault
220b7f5e55
Merge branch 'master' into bug-fix/better-third-person-camera
2018-01-10 10:14:09 -08:00
Dante Ruiz
d0bff29471
fixing merge conflict
2018-01-10 10:11:53 -08:00
Zach Fox
e5abdc77d9
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-10 10:02:56 -08:00
Andrew Meadows
7060cd9a90
Merge pull request #12122 from druiz17/fix-double-set-tablet-root
...
don't call setQmlTabletRoot twice
2018-01-10 09:53:09 -08:00
Sam Gateau
d4dc1e352f
Merge pull request #12124 from AndrewMeadows/no-misc-stats
...
more context for update performance stats
2018-01-10 09:10:26 -08:00
Sam Gateau
8c80247925
Merge pull request #12123 from SamGondelman/meta
...
Model meta render item is only withTypeShape if visual geometry request fails
2018-01-10 09:09:19 -08:00
Seth Alves
3816c732c0
Merge branch 'run' of github.com:sethalves/hifi into run
2018-01-10 08:11:55 -08:00
Seth Alves
8cf94547e4
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-10 08:11:46 -08:00
Cain Kilgore
330b266ca8
Merge branch 'master' of https://github.com/highfidelity/hifi into 21665
2018-01-10 11:33:06 +00:00
Cain Kilgore
38afc5a25b
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
2018-01-10 11:31:46 +00:00
Brad Davis
b1e95681a9
Cleanup android
2018-01-09 23:30:31 -08:00
Brad Davis
fb59a0a56f
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-09 20:02:55 -08:00
Brad Davis
105dffebaf
Fixing UI
2018-01-09 18:36:42 -08:00
Zach Fox
928e3d2ef7
Merge pull request #12108 from zfox23/commerce_pagination
...
Commerce: Support pagination at History endpoint; improve Purchases scrolling
2018-01-09 15:57:34 -08:00
Dante Ruiz
c4253f3b3b
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-09 15:31:38 -08:00
vladest
075bcba49f
AddressBar trigger implemented. Fixed warnings on non existing context properties. Fixed warnings about non notifyable property
2018-01-09 23:48:40 +01:00
Zach Fox
edf25c3e4e
Remove code duplication...
2018-01-09 14:14:54 -08:00
Zach Fox
a6259a5ef5
Initial progress
2018-01-09 13:39:28 -08:00
Andrew Meadows
8c6edc749a
provide more context for update perf stats
2018-01-09 12:59:32 -08:00
SamGondelman
7c56a9ffb2
model meta is only withTypeShape if visual geometry request fails
2018-01-09 12:43:43 -08:00
Zach Fox
d31dec7acb
Fix unix build errors
2018-01-09 12:41:56 -08:00
John Conklin II
b1790cccbe
Merge pull request #12113 from druiz17/fix-double-set-tablet-root
...
Don't call setQmlTabletRoot twice for Web3dOverlays RC62
2018-01-09 12:25:00 -08:00
Brad Davis
d6dd29b952
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-09 11:43:03 -08:00
Brad Davis
bd5af2b493
Working on android avatar rendering
2018-01-09 11:40:32 -08:00
Zach Fox
360a7cc4c6
CR feedback
2018-01-09 11:08:18 -08:00
Anthony J. Thibault
e28f13c1db
Merge branch 'master' into bug-fix/better-third-person-camera
2018-01-09 10:34:04 -08:00
Cain Kilgore
0e3913baff
Removed Window.menuHeight
2018-01-09 09:07:26 +00:00
Cain Kilgore
773461bd30
Merge branch 'master' of https://github.com/highfidelity/hifi into 21666
2018-01-09 08:33:44 +00:00
Cain Kilgore
46de7ed83b
WL 21666 - Window.domainChanged() isn't emitted if domain isn't running
2018-01-09 08:32:59 +00:00
Sam Gateau
3fd319abec
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-01-08 21:11:17 -08:00
luiscuenca
9a81410762
refactor
2018-01-08 20:51:15 -07:00
luiscuenca
319913e6af
Fix toolbar appears on HMD mode
2018-01-08 20:37:07 -07:00
David Back
13c34b2d33
add AccountServices context
2018-01-08 17:37:48 -08:00
David Rowe
3d9d2a1859
Filed overlay property has been removed
2018-01-09 14:35:02 +13:00
David Back
43cd5586f3
nuke AccountScriptingInterface, rename GlobalServicesScriptingInterface to AccountServicesScriptingInterface
2018-01-08 17:25:58 -08:00
Seth Alves
d0ddbc0092
fix warning
2018-01-08 16:52:07 -08:00
Dante Ruiz
4cf40554c0
don't call setQmlTabletRoot twice
2018-01-08 16:06:31 -08:00
Seth Alves
8ed72dd276
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-08 15:53:21 -08:00
David Rowe
8016ae1bf3
Fix typo
2018-01-09 12:47:12 +13:00
David Rowe
ceb2d38103
Deprecate Overlays.getOverlayObject()
2018-01-09 12:45:12 +13:00
Seth Alves
e0bbf9ee41
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-08 15:28:02 -08:00
Seth Alves
ad389e5072
make avatar walk-speed adjustable from js. add a tablet button to control walking vs running
2018-01-08 15:27:41 -08:00
Brad Davis
a2c2e7d9ff
Fixes to load cubemap
2018-01-08 14:43:54 -08:00
Anthony Thibault
f4c38b91b3
Merge pull request #12071 from luiscuenca/handTouch
...
Touch feeling for near grab
2018-01-08 12:50:30 -08:00
Gabriel Calero
7fbd23f36b
Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr
2018-01-08 17:38:28 -03:00
Gabriel Calero
6050737e7c
Resolving comments in PR
2018-01-08 17:36:08 -03:00
Seth Alves
1c94c9c11d
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-08 12:27:42 -08:00
Seth Alves
f1c03b2d40
adjust RENDER_HEAD_CUTOFF_DISTANCE so that I don't see my head when I run
2018-01-08 12:27:35 -08:00
Zach Fox
dcfceab078
Remove all work done on paginating purchases
2018-01-08 12:03:56 -08:00
MiladNazeri
56d4429a8b
Merge pull request #12020 from ctrlaltdavid/21646
...
Window JSDoc
2018-01-08 11:53:34 -08:00
Zach Fox
2231bf2bdd
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination
2018-01-08 11:45:20 -08:00
Zach Fox
cdd62c7119
I don't think auto-refresh and pagination of inventory is possible
2018-01-08 11:29:41 -08:00
Anthony J. Thibault
61edd83987
Improve stability for HMD third person avatars
...
Previously there was a hack where the sensor to world matrix was NOT updated in HMD mode if the camera was third person.
The reason the hack existed was to make third person camera less nauseating for users.
However this had a major drawbacks.
It led to avatar hip spasms when the user turned around in the tracked volume, while in third person camera.
To fix this issue properly, the hack which prevented updating the sensor to world matrix was removed, and now the third person camera is now computed in sensor space relative to the hmd.
2018-01-08 11:26:29 -08:00
David Rowe
7a971b2d26
Fix typo
2018-01-09 08:17:15 +13:00
John Conklin II
d660bbf6e5
Merge pull request #12101 from hyperlogic/bug-fix/avatar-sit
...
Bug fix for sit script.
2018-01-08 09:59:17 -08:00
Bradley Austin Davis
68cd768a65
Merge branch 'android' into android_render_pr
2018-01-08 12:49:52 -05:00
Seth Alves
f6fed444b0
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-08 07:49:09 -08:00
Sam Gateau
a9f1e4102b
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-01-07 22:19:38 -08:00
Howard Stearns
724db93389
Merge pull request #12002 from howard-stearns/consistent-goToUser
...
Consistent go to user
2018-01-07 11:07:39 -08:00
luiscuenca
8a7c68829d
Optimizations, cleanings and globals
2018-01-07 11:56:30 -07:00
Cain Kilgore
47038e4349
WL 21664 - Window.innerHeight should not include the menu bar
2018-01-07 08:31:36 +00:00
Seth Alves
fdead46642
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-06 08:07:28 -08:00
David Rowe
673bc7de38
Update Window JSDoc
2018-01-06 16:05:55 +13:00
Anthony J. Thibault
243dcb88ee
Bug fix for sit script.
2018-01-05 16:20:44 -08:00
Zach Fox
0c38a5598f
Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection
...
Fix bugs related to inspecting entities with hand controllers
2018-01-05 15:50:00 -08:00
luiscuenca
4f6a804fd1
Fix magic numbers
2018-01-05 16:27:48 -07:00
Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661
...
Laser auto-on with tablet and Web overlays
2018-01-05 14:08:01 -08:00
Brad Hefta-Gaub
aebd098e6e
Merge pull request #12072 from Triplelexx/21654_assetbrowser_sorting
...
WL#21654: Make the Asset Browser Sort Case Insensitive
2018-01-05 13:34:39 -08:00
Seth Alves
3cd0ec3336
default run speed is faster, advanced movement on by default
2018-01-05 13:20:41 -08:00
samcake
abc029fd41
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-01-05 12:28:12 -08:00
Sam Gateau
91eb718074
Merge pull request #12091 from SamGondelman/overlayFix
...
Update model render items on texture load and fix no haze issue
2018-01-05 12:26:56 -08:00
samcake
50c97ede2b
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-01-05 11:55:43 -08:00
David Back
b165eac6a0
Merge branch 'master' into mergeAccountGlobalServices
2018-01-05 10:54:59 -08:00
Melissa Brown
eb83c68d46
Merge pull request #12094 from ctrlaltdavid/resolution-removed
...
Delete web3d overlay "resolution" property JSDoc
2018-01-05 10:38:07 -08:00
Andrew Meadows
c33c637f07
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs
...
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
2018-01-05 09:07:54 -08:00
Ryan Downe Karpf
a3245aec57
Merge pull request #12079 from RebeccaStankus/log-filtering
...
Log filtering
2018-01-05 08:40:41 -08:00
Seth Alves
fd8b521c50
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix
...
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963 )
2018-01-05 08:15:48 -08:00
David Rowe
5463f1ae6b
Merge branch 'master' into 21646
2018-01-05 16:58:58 +13:00
David Rowe
d6a0457ee5
Delete web3d overlay "resolution" property JSDoc
2018-01-05 16:48:37 +13:00
Lexx
85b54f82d8
revert sorting change mistake
2018-01-05 01:58:23 +00:00
NissimHadar
43bc8bb948
Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor
...
defang accidental disable of MyAvatar's default motor
2018-01-04 17:44:22 -08:00
Zach Fox
0388c183ab
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination
2018-01-04 16:42:12 -08:00
SamGondelman
eb0d09360a
Merge remote-tracking branch 'upstream/master' into overlayFix
2018-01-04 15:47:20 -08:00
Zach Fox
ea29d8bde0
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixHandControllerInspection
2018-01-04 15:41:27 -08:00
Zach Fox
4232bc0200
Bump per_page to 100
2018-01-04 14:42:05 -08:00
Dante Ruiz
b526842a46
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-04 14:23:10 -08:00
Zach Fox
14447c26a0
Prevent visual data loss
2018-01-04 13:47:31 -08:00
David Back
81f3590954
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
2018-01-04 13:17:07 -08:00
SamGondelman
6a19b0e0b6
update render items on texture load
2018-01-04 13:10:46 -08:00
RebeccaStankus
9ba324b85f
"Clear Filter" button instead of "Show All"
2018-01-04 12:51:11 -08:00
RebeccaStankus
3e8063f80a
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-04 12:48:09 -08:00
Gabriel Calero
8cac98545a
Fixes for Android
2018-01-04 17:36:10 -03:00
Zach Fox
10d494b51d
Pagination for Recent Activity
2018-01-04 12:32:30 -08:00
Clément Brisset
efbff56f26
Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener
...
Remove legacy jurisdiction code
2018-01-04 11:52:38 -08:00
RebeccaStankus
f52a6d8eae
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-04 10:49:32 -08:00
luiscuenca
ef0164c272
Fix tabs
2018-01-04 11:43:51 -07:00
luiscuenca
28d9409bf0
Fix default hand poses
2018-01-04 11:37:37 -07:00
David Rowe
7236ac17e2
Merge branch 'master' into 21661
2018-01-04 15:21:00 +13:00
David Rowe
138092ac37
Remove "Prefer Avatar Finger Over Stylus" setting
2018-01-04 15:12:34 +13:00
Zach Fox
ff4f582c7d
Thanks Howard
2018-01-03 17:23:35 -08:00
David Back
6c8987d75f
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
2018-01-03 14:44:52 -08:00
Cristian Luis Duarte
da28e0a8cb
Implement generateAssetsFileList in build.gradle (same work as assets file generation by androiddeployqt) + Copy assets at startup
2018-01-03 16:42:18 -03:00
Gabriel Calero
fc62b2d34a
Fix ktx_cache path for android. Load the least js scripts for android
2018-01-03 16:42:18 -03:00
Gabriel Calero
ef8ba1cad0
Include config.h in ResourceImageItem.cpp. Minor fixes
2018-01-03 16:40:14 -03:00
Gabriel Calero
78f2a8c566
Copy scripts from android assets at startup
2018-01-03 16:40:14 -03:00
Gabriel Calero
468fc89c3e
Use forward pipeline for android
2018-01-03 16:38:23 -03:00
Gabriel Calero
76b38bebad
Make Interface run in Android
2018-01-03 16:36:11 -03:00
RebeccaStankus
89138c9bd8
More filter choices, search will clear
2018-01-03 11:35:46 -08:00
Dante Ruiz
674e8e1ac2
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-03 08:47:40 -08:00
humbletim
4021455058
placeholder PickResult.extraInfo documentation
2018-01-03 04:20:12 -05:00
David Rowe
901af8896f
Add "Prefer Stylus Over Laser" setting
2018-01-03 17:54:43 +13:00
David Rowe
6e43497e14
Merge tag 'RELEASE-7602' into 21661
...
Jenkins Git plugin tagging with RELEASE-7602
2018-01-03 16:46:10 +13:00
RebeccaStankus
dd48972e44
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-02 14:06:41 -08:00
RebeccaStankus
0b452a23dc
forgot to add hifi.entities to filter selections
2018-01-02 14:04:30 -08:00
RebeccaStankus
bf59697aa5
better dropdown
2018-01-02 13:56:49 -08:00
Dante Ruiz
6fa3446c57
joints are being relayed to children
2018-01-02 13:54:13 -08:00
David Rowe
7013f64714
Remove erroneous "filed" Overlay property
2018-01-03 10:37:37 +13:00
RebeccaStankus
d08e97f9cc
more filter options
2018-01-02 13:28:39 -08:00
RebeccaStankus
fe69498976
initial changes...ready for feedback
2018-01-02 13:04:52 -08:00