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

24038 commits

Author SHA1 Message Date
humbletim
e4a2a589a5 CR fedback and cleanup 2018-02-22 07:56:09 -05:00
humbletim
caab532d80 remove dupe line 2018-02-22 06:00:03 -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
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items 
Remove some deprecated JavaScript API items
 2018-02-21 16:31:16 -08:00
Liv Erickson
aba1cae36d get rid of magic number 2018-02-21 16:19:50 -08:00
SamGondelman
4b1217f1f6 move all entity items to main thread 2018-02-21 15:54:07 -08:00
Liv Erickson
990e848de6 fix typo that was breaking popup dialog 2018-02-21 15:54:00 -08:00
Liv Erickson
68f0c0391a Initial fix - need a little style fixing 2018-02-21 15:44: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
Nissim Hadar
b519ebd6f1 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-21 12:36:56 -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
Zach Fox
b548567f5a Apps protection 2018-02-21 11:17:47 -08:00
Zach Fox
1fbc16aae2 Fix noPermissionGlyph margin 2018-02-21 10:52:17 -08:00
SamGondelman
4dde178b93 fix new material UI 2018-02-21 10:33:15 -08:00
ZappoMan
47a98d9d0f relax the deadlock time to 2 minutes 2018-02-21 10:12:04 -08:00
Seth Alves
220d9abbfc
Merge pull request #12435 from vladest/fix_flickable_tablethome 
Make sure Flickable for GridView for TabletHome will not flick
 2018-02-21 09:21:45 -08:00
Nissim Hadar
af484d0af6 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-20 23:48:12 -08:00
Nissim Hadar
6f84e4c977 Moved shadows and ambient occlusion to menu checkboxes. 2018-02-20 23:45:07 -08:00
Liv Erickson
5cd184ddc3 change default add to world shape for asset browser 2018-02-20 17:55:30 -08:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
Zach Fox
f08c66e3ac Remove debug code 2018-02-20 14:16:55 -08:00
Zach Fox
fd6f4b569f Fix active focus issue 2018-02-20 13:19:31 -08:00
Zach Fox
eb29bdf5d2 Don't allow tabs or newlines 2018-02-20 13:06:10 -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
Zach Fox
9bde9f5a4f Fix height of Optional Message in Send Money 2018-02-20 12:36:11 -08:00
Zach Fox
11f897beb0 Initial app support 2018-02-20 10:39:36 -08:00
John Conklin II
aa67a98d02
Merge pull request #12426 from ElderOrb/FB11508 
fix for toolbar slowly drifting on switching between HMD/Desktop modes
 2018-02-20 09:30:01 -08:00
humbletim
5791ca4c51 interim checkin 2018-02-20 12:22:04 -05: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
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals 
Material Entities
 2018-02-19 10:58:02 -08:00
Brad Hefta-Gaub
0ef2794c35
Merge pull request #12395 from druiz17/fix-qml-tablet-apps 
Prevent adding the same tablet url to the tabletApps list
 2018-02-18 19:10:24 -08:00
Cain Kilgore
47ed45b5e9
Fixed extra " in backup_instructions.html 2018-02-17 18:14:44 +00:00
vladest
e5f953c103 Make sure Flickable for GridView for TabletHome will not flick 2018-02-17 16:52:32 +01:00
Stephen Birarda
769d5677b1 Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-16 17:41:14 -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
Nissim Hadar
194c7f4101 WIP - for review. 2018-02-16 09:28:15 -08:00
Alexander Ivash
2eb8ebcdbc FB11508 - toolbar slowly sides downward 2018-02-16 20:22:16 +03: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
Zach Fox
c4e9c76258 Small UIT tweaks 2018-02-15 16:03:49 -08:00
SamGondelman
b189433855 merge 2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74 CR 2018-02-15 15:48:41 -08:00
Dante Ruiz
a194c8bc03 Merge branch 'master' of github.com:highfidelity/hifi into fix-qml-tablet-apps 2018-02-15 15:46:16 -08:00
Zach Fox
811ecf9db8 Fix 2018-02-15 14:44:33 -08:00
Zach Fox
8072372822 Lots of changes 2018-02-15 13:27:13 -08:00
Zach Fox
b8fb08dc74 Avatar support 2018-02-15 11:24:22 -08:00
humbletim
145a0df082 interim checkin 2018-02-15 14:14:07 -05:00
Zach Fox
3c620282b1
Merge pull request #12393 from zfox23/fixAvailabilityMouseArea 
PAL: Prevent opening of Availability from WebView
 2018-02-15 11:10:05 -08: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
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
Seth Alves
93d8a6f00d
Merge pull request #12402 from druiz17/fix-tablet-create-rotation 
Fix tablet rotation when going into and out of create mode
 2018-02-14 16:10:10 -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
Seth Alves
d1c0f0a40f
Merge pull request #12390 from druiz17/add-control-mapping 
add control button mapping for controller API
 2018-02-14 15:02:28 -08:00
Alexander Ivash
611c67bf2f FB12297 - HMD: Disabled preview mode only occurs during step 2 of the wallet setup wizard 2018-02-15 02:00:51 +03:00
John Conklin II
9ba29028e3
Merge pull request #12398 from jherico/fix/spectator_cam 
Fix spectator camera crash
 2018-02-14 13:15:42 -08:00
John Conklin II
6187731fdc
Merge pull request #12291 from 1P-Cusack/FogBugz/Case_10865 
[Case 10865] Make Asset Browser multi-select work with Ctrl/Cmd/Shift+Click
 2018-02-14 11:14:26 -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
Dante Ruiz
2a8101a944 Merge branch 'master' of github.com:highfidelity/hifi 2018-02-14 09:35:53 -08:00
Zach Fox
2f0c9e1acb
Merge pull request #12394 from zfox23/commerce_fixRecentActivityWrap 
Commerce: Fix wrap mode for very long P2P memos
 2018-02-14 09:14:21 -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
Zach Fox
a477a3da70 Done with My Purchases flow for now 2018-02-13 15:04:31 -08:00
Zach Fox
69a06bf1b7 Wrong fonts file 2018-02-13 14:42:03 -08:00
Dante Ruiz
119a7554ee Prevent add the same tablet url app to the tabletApps list 2018-02-13 14:33:15 -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
Zach Fox
3e41229e8c Commerce: Fix wrap mode for very long P2P memos 2018-02-13 13:30:17 -08:00
Zach Fox
8cd00c49d6 PAL: Prevent opening of Availability from WebView 2018-02-13 13:21:40 -08:00
Andrew Meadows
b111e82763
Merge pull request #12365 from AndrewMeadows/workload-001 
moving Job/Task framework out of 'render' library and into its own 'task' library
 2018-02-13 12:26:32 -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
cf3d8e4463 remove cached file 2018-02-13 11:07:15 -08:00
Dante Ruiz
45f09dde96 address tony's requests 2018-02-13 10:32:15 -08:00
Dante Ruiz
ddcee05b14 added control button for controller API 2018-02-13 09:41:00 -08:00
Andrew Meadows
8231a56b22 pull task out of render and into its own lib 2018-02-13 08:56:11 -08:00
Andrew Meadows
be38a4bc71 creating workload lib 2018-02-13 08:54:44 -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
Zach Fox
f4e2b48dbb Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-12 11:02:22 -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
Zach Fox
ffea8104fc Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1 2018-02-09 15:59:38 -08:00
Zach Fox
abdd50fb45 it's a start 2018-02-09 15:56:28 -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
David Back
7bcfd0cf8d
Merge pull request #12114 from dback2/polymaterials 
Additional mtl spec support & fixes for Poly & more
 2018-02-09 13:18:14 -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
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
Zach Fox
3a7e626463 Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign 
Commerce: Inspection Certificate Redesign
 2018-02-08 10:41:04 -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
David Back
880ef17c75 Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials 2018-02-07 18:11:15 -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
8d35bcb3e5
Merge pull request #12347 from AndrewMeadows/quickfix-tractor 
remove initial glitch in Tractor (grab) action
 2018-02-07 14:22:12 -08:00
Seth Alves
84ed23f547
Merge pull request #12292 from ElderOrb/FB11855 
FB11855 - Change bubble icon on tablet
 2018-02-07 14:03:16 -08:00
Zach Fox
2270dcd79d Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign 
Commerce: Inspection Certificate Redesign
 2018-02-07 13:52:20 -08:00
Seth Alves
84f4453990 undo part of #12312 2018-02-07 13:32:30 -08:00
Zach Fox
3c34d13ec6
Revert "Commerce: Inspection Certificate Redesign" 2018-02-07 13:22:09 -08:00
Seth Alves
3e516cd2dd Merge branch 'quickfix-tractor' of github.com:AndrewMeadows/hifi into test-12347 2018-02-07 10:48:19 -08:00