Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-08 02:03:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67294 commits 25 branches 0 tags 1.1 GiB
Commit graph

20585 commits

Author SHA1 Message Date
vladest
2a9bbfa808 Wrap text in query dialogs. Add right margins for input field and buttons 2018-03-04 13:19:56 +01:00
Seth Alves
606face7c0 gather together the url scheme constants, name them consistently 2018-03-02 20:39:38 -08:00
Seth Alves
fdb53b6543 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-02 19:27:53 -08:00
Seth Alves
7a61119d11 remove unneeded call to clearDomainOctreeDetails 2018-03-02 19:27:45 -08:00
NissimHadar
8536b44c61 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 16:09:06 -08:00
John Conklin II
8f403ebc23
Merge pull request #12543 from zfox23/improveFontLoading 
Improve font loading via QRC instead of file path
 2018-03-02 14:22:17 -08:00
Seth Alves
746769cbe9 don't crash 2018-03-02 13:52:18 -08:00
Seth Alves
507dfa5ec3 more code review response 2018-03-02 11:35:34 -08:00
Seth Alves
bdd926f89e cleanups 2018-03-02 10:38:35 -08:00
Seth Alves
45157a16f2 merge from upstream 2018-03-02 09:57:27 -08:00
Seth Alves
82bfd25d8b fix placename in title-bar, fix domain-spawning-point 2018-03-02 09:54:54 -08:00
NissimHadar
000b08f7c0 Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork 2018-03-02 08:07:01 -08:00
David Rowe
287ea8eff2 Fix Window.setFocus() unsetting focus if Interface has focus 2018-03-02 15:40:49 +13:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev 
Android Master
 2018-03-01 17:22:34 -08:00
SamGondelman
e3b65a9201 Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-03-01 16:39:31 -08:00
Dante Ruiz
1f4aed31f1 adding hyperlink 2018-03-01 16:16:47 -08:00
David Rowe
b50044fb2b Remove deprecated Window.openFileChanged() signal from API 2018-03-02 13:15:27 +13:00
NissimHadar
0f2cf8ea85 Re-implemented shadow controls. 2018-03-01 14:24:20 -08:00
Seth Alves
9ee65ab474 don't use clipboard when loading serverless domains 2018-03-01 13:31:43 -08:00
Seth Alves
2d374583b4 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-01 11:07:50 -08:00
Seth Alves
33065fb51c more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port 2018-03-01 11:07:37 -08:00
Zach Fox
877fa52034 Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading 2018-03-01 10:14:23 -08:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update 
Image entity has correct orientation and is collisionless
 2018-03-01 09:57:08 -08:00
Zach Fox
67034274fa Improve font loading by using QRC instead of relative paths 2018-02-28 17:59:37 -08:00
Cristian Luis Duarte
9acb83632c Android - Make joystick move up when showing the bottom bar 2018-02-28 18:52:13 -03:00
Cristian Luis Duarte
55d52f92df Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows) 2018-02-28 15:55:50 -03:00
samcake
9e5ed7b905 Add more timing stats in explanded mode 2018-02-28 10:48:35 -08:00
David Rowe
a782b6779a Merge branch 'master' into 21709 
# Conflicts:
#	interface/src/ui/overlays/Overlays.h
#	interface/src/ui/overlays/Shape3DOverlay.cpp
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/EntityScriptingInterface.h
 2018-02-28 12:42:05 +13:00
samcake
e290f2fc3c Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-02-27 14:54:11 -08:00
Seth Alves
a44ddbbc26 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-27 14:09:05 -08:00
Brad Davis
136ced98c3 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-27 13:44:00 -08:00
John Conklin II
b4000c04bc
Merge pull request #12432 from highfidelity/feat/content-settings 
Add content archives to domain server web interface
 2018-02-27 13:30:53 -08:00
SamGondelman
cc53b338db Merge remote-tracking branch 'upstream/master' into scriptableMaterials 2018-02-27 13:30:03 -08:00
Howard Stearns
0e4f3460b3
Merge pull request #12497 from howard-stearns/end-seeding 
End seeding
 2018-02-27 13:18:13 -08:00
SamGondelman
0fca56eef0 Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" 
This reverts commit 3201d2ba21, reversing
changes made to c0f20900a0.
 2018-02-27 11:33:05 -08:00
Stephen Birarda
9cc348ef27 Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-27 09:59:37 -08:00
Zach Fox
9170244312 Make WindowScriptingInterface available to tablet 2018-02-27 09:36:02 -08:00
Seth Alves
636c271dc3 merge from upstream 2018-02-27 09:21:08 -08:00
samcake
efba6bb524 Adding a counter for the other parts of the gameloop 2018-02-27 09:11:14 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting 
Leopoly_Phase1_010 Graphics Scripting
 2018-02-27 07:53:25 -08:00
Olivier Prat
2d71d7da9f Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-02-27 09:11:43 +01:00
John Conklin II
25144f0fec
Merge pull request #12456 from Atlante45/fix/min-spec-crash 
Fix crash when passing --checkMinSpec flag
 2018-02-26 17:35:46 -08:00
David Rowe
1fb02d15d7 Entities actions JSDoc 2018-02-27 14:12:20 +13:00
Stephen Birarda
aa7bd2066a Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-26 17:02:00 -08:00
Seth Alves
642e7b7c37
Merge pull request #24 from druiz17/serverless-domains 
Some bug fixes
 2018-02-26 15:25:59 -08:00
Elisa Lupin-Jimenez
b56c78d36c image has correct orientation and is collisionless 2018-02-26 14:44:46 -08:00
Dante Ruiz
a23c425f5e actions and serverless status fixes 2018-02-26 14:24:51 -08:00
Seth Alves
666fa77be2 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-26 13:53:20 -08:00
Brad Davis
b9387f2a21 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-26 13:18:14 -08:00
SamGondelman
6fe2d46d7c merge 2018-02-26 12:40:14 -08:00
John Conklin II
6316f33282
Merge pull request #12485 from dback2/avatarMotors 
Add dynamic mode for scripted avatar motor
 2018-02-26 11:03:30 -08:00
howard-stearns
a5cedde3c8 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-26 10:33:03 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork 
Shadow control for zones, models and shapes
 2018-02-26 10:13:40 -08:00
Brad Davis
3e552e5739 Fix warnings 2018-02-26 09:53:35 -08:00
NissimHadar
c0f20900a0
Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix 
Corrected edge case of creating a snapshot with "" as the filename.
 2018-02-26 09:39:16 -08:00
howard-stearns
30a6cca4b3 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-26 09:26:09 -08:00
Seth Alves
f08864f17b Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-26 09:01:41 -08:00
Zach Fox
b5c42bfeca
Merge pull request #12480 from zfox23/commerce_extendedCerts_apps 
Commerce: Extended Certificates - Apps!
 2018-02-26 08:24:53 -08:00
humbletim
f824edd04e * remove Model_temporary_hack 
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
 2018-02-26 04:58:22 -05:00
howard-stearns
5e78de61ee remove debugging 2018-02-25 15:24:08 -08:00
howard-stearns
300f611c47 working, with soft reset 2018-02-25 14:06:06 -08:00
howard-stearns
3d0e3a3901 Merge branch 'master' of https://github.com/highfidelity/hifi into end-seeding 2018-02-24 13:34:00 -08:00
Seth Alves
9e156deaab
Merge pull request #12494 from druiz17/one-menu 
Remove the avatarEntitiesBookmark menu option
 2018-02-23 19:02:25 -08:00
SamGondelman
b56f755034 material reflection 2018-02-23 17:58:46 -08:00
Brad Hefta-Gaub
3d54f4d246
Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdog 
Relax deadlock watchdog
 2018-02-23 17:09:30 -08:00
howard-stearns
726c1ed816 receiveAt with new key 2018-02-23 17:05:46 -08:00
Seth Alves
f946ce48d6 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-02-23 16:46:55 -08:00
Seth Alves
5632f9d8fd clean up debug prints. put filename in window title-bar when connected to a serverless domain 2018-02-23 16:46:42 -08:00
Atlante45
800d15b405 Make sure settings timer is running 2018-02-23 16:23:50 -08:00
howard-stearns
29a2fa6ca5 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-23 16:19:54 -08:00
Sam Gondelman
e10af9b83d
Merge pull request #12462 from SamGondelman/entityDelete 
Fix EntityItems not getting destroyed
 2018-02-23 16:17:52 -08:00
howard-stearns
f66e688f41 Merge branch 'master' of github.com:highfidelity/hifi into end-seeding 2018-02-23 16:12:41 -08:00
howard-stearns
53614a1d9f almost working 2018-02-23 16:12:01 -08:00
Seth Alves
77febe0aab save avatar-entities which are created while using a serverless domain 2018-02-23 16:03:08 -08:00
David Back
283b5724ba CR changes 2018-02-23 15:02:51 -08:00
David Back
da391564a8 CR changes 2018-02-23 15:01:29 -08:00
David Back
a418129bea simplify to just changing timescales 2018-02-23 15:00:23 -08:00
Dante Ruiz
07b0431215 fix merge conflict 2018-02-23 14:00:36 -08:00
Seth Alves
1e49dc5ca2 try using app-local-data path for /~/ 2018-02-23 13:58:23 -08:00
Brad Davis
0550138609 Merge remote-tracking branch 'upstream/master' into android_dev 2018-02-23 12:48:10 -08:00
Dante Ruiz
d0ec84b6c8 remove menu option for booking marking avatar entities 2018-02-23 10:45:59 -08:00
Zach Fox
5ee28297f3 Don't use eventLoop, since that will block the UI 2018-02-23 10:19:00 -08:00
Seth Alves
99893d81e2 merge from upstream 2018-02-23 09:14:48 -08:00
Olivier Prat
c935111c43 Some slight cleanup in Application_render 2018-02-23 18:13:08 +01:00
Olivier Prat
b1b62087e5 Forgot to reactivate deadlock detection 2018-02-23 18:08:21 +01:00
Olivier Prat
ee253143ff Merge branch 'master' of http://github.com/highfidelity/hifi into taa 2018-02-23 14:53:14 +01:00
humbletim
6ea4b660b7 CR feedback; remove ok bool pointer and all metadata; cleanup 2018-02-23 07:47:39 -05:00
Olivier Prat
4636f43728 Simplified camera view history and TAA is now working in all circumstances. 2018-02-23 10:19:05 +01:00
David Rowe
440c0aa0d9 Overlays JSDoc improvements 2018-02-23 19:27:54 +13:00
Atlante45
c106fee659 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration 2018-02-22 19:45:43 -08:00
Bradley Austin Davis
12d1885dff
Merge pull request #12428 from gcalero/android_ui_fixes 
Android ui fixes
 2018-02-22 18:28:18 -08:00
Brad Davis
aeb29db37d Merge remote-tracking branch 'upstream/stable' into android_stable 2018-02-22 17:35:00 -08:00
ZappoMan
9f68accb30 add menu for testing unresponsive interface 2018-02-22 17:34:00 -08:00
David Back
083e461eb0 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors 2018-02-22 17:20:49 -08:00
David Back
902672f85e add dynamic mode for scripted avatar motor 2018-02-22 17:20:36 -08:00
Atlante45
277e556b48 Create a standard function to init Hifi Apps 2018-02-22 17:06:09 -08:00
howard-stearns
1aaae94cc1 checkpoint 2018-02-22 17:04:27 -08:00
Atlante45
80c0f2a21e Fix crash when passing --checkMinSpec flag 
That flag caused a DLL to be loaded before Application was
	instanced.
	This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
	the previous registration pointing the startup function in
	the main executable to be overridden with the address of the
	function in the DLL (Since they both link the same static
	library)
	This leads to the correct function running in the wrong address
	space (the DLLs), hence not initializing some global variables
	correctly.
 2018-02-22 16:29:38 -08:00
Zach Fox
33f73fef0d YAY! 2018-02-22 16:26:35 -08:00
Zach Fox
10fa3fa346 It's working! 2018-02-22 16:09:01 -08:00
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