Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-29 19:46:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65210 commits 6 branches 1 tag 1.1 GiB
Commit graph

26820 commits

Author SHA1 Message Date
samcake
c70b655fbc A bit more explanations to the Task Flow class 2018-02-15 11:55:16 -08:00
Nissim Hadar
ff43e4c2ad Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	scripts/system/html/js/entityProperties.js
 2018-02-15 11:53:11 -08:00
Nissim Hadar
df7a8389b3 Fixed possible crash. 2018-02-15 11:51:06 -08:00
Nissim Hadar
777862f253 can cast shadow flag now works correctly (UI/JS aspects). 2018-02-15 11:50:38 -08:00
Anthony J. Thibault
f07b1fa4c5 Revert "FBX node IDs aren't alphanumerically ordered per logical structure" 
This reverts commit a7ec4501e6.

Because remainingModels is a QSet, the order is not guaranteed.
Therefore the same code iterating over the same items will sometimes have a different ordering.
See docs for QSet, http://doc.qt.io/qt-5/qset.html
This was bug was causing scrambled avatars, because both the transmitter and receiver of the AvatarData packets
make the strong assumption that the joint orders are same.  When they are not the avatar's appear scrambled.
 2018-02-15 11:32:29 -08:00
samcake
b21b98c810 Add a way to early abort a task from a Job, apply that to the highlight effect to shave unecessary work 2018-02-15 11:24:20 -08:00
humbletim
145a0df082 interim checkin 2018-02-15 14:14:07 -05:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals 2018-02-15 11:02:49 -08:00
Alexander Ivash
beb595266d fix 4x 'fromQml' slots execution 
note: per discussion with Austion & Seth, TabletRoot should be the only entity sending 'sendToScript' signals to C++
 2018-02-15 21:45:35 +03:00
Ryan Huffman
145a8b385b Move HTTP_RESPONSE_CHUNK_SIZE into lambda for http response 2018-02-15 10:22:35 -08:00
Ryan Huffman
2cfa91be06 Add memory include to HTTPConnection 2018-02-15 10:22:35 -08:00
Ryan Huffman
8a69c69bec CR 2018-02-15 10:22:35 -08:00
Ryan Huffman
8b07e7e28f Add backup DS APIs 
Add backup apis
 2018-02-15 10:22:35 -08:00
Ryan Huffman
e63b692d80 Add BackupHandler for entity file backups 2018-02-15 10:22:35 -08:00
Atlante45
272f95efa2 Specify wich packet can ignore verification at DS level 2018-02-15 10:09:21 -08:00
Ryan Huffman
0bbbff95cd Fix replacement octree data not working 2018-02-15 10:09:21 -08:00
Ryan Huffman
2a667fcd60 Cleanup entity -> ds persist 2018-02-15 10:09:21 -08:00
Ryan Huffman
1b7b4eee50 Fix entity data not being gzipped when adding id+version 2018-02-15 10:09:20 -08:00
Ryan Huffman
ff5be2d690 Fix entity data ID sometimes being reset 2018-02-15 10:09:20 -08:00
Ryan Huffman
cb9327e030 Add entity file sync and domain content backups 2018-02-15 10:09:20 -08:00
Clément Brisset
c62f68264f
Merge pull request #12295 from birarda/feat/content-split-from-settings 
initial separation of DS into domain settings and content settings
 2018-02-15 10:04:36 -08:00
Nissim Hadar
7e99570824 Fixed Ubuntu warnings. 2018-02-15 07:54:55 -08:00
Nissim Hadar
adb02d69f9 WIP -adding canCastShadow flag. 2018-02-14 21:45:56 -08:00
Nissim Hadar
26e7a85a95 Fixed possible crash. 2018-02-14 21:15:29 -08:00
Nissim Hadar
a679b6f828 Fixed possible crash. 2018-02-14 18:55:04 -08:00
samcake
246ac25d0a Introducing a way to abort a task from one of its job, using it to skip highlight tasks if nothing to highlight 2018-02-14 17:36:46 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -08:00
Nissim Hadar
054b2bf3e2 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	scripts/system/html/js/entityProperties.js
 2018-02-14 17:10:07 -08:00
SamGondelman
324eefc914 remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
David Back
e4263100b4 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarInRange 2018-02-14 16:40:11 -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
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
Stephen Birarda
6240181474 initial separation of content settings and domain settings 2018-02-14 12:09:56 -08:00
Nissim Hadar
a92765a83a Adding can cast shadow property. 2018-02-14 12:01:30 -08:00
John Conklin II
63f752e76f
Merge pull request #12366 from sethalves/fix-children-of-animated-entity-joints 
fix -- get children of animated entity joints to follow along, again
 2018-02-14 11:12:45 -08:00
Brad Davis
8853bd6388 Fix spectator camera crash 2018-02-14 11:11:28 -08:00
samcake
6357f36a97 Fixing names 2018-02-14 10:39:14 -08:00
ZappoMan
e71811bef2 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-14 09:03:32 -08:00
Nissim Hadar
1632ab9782 Changed flag to "cast shadow" instead of "don't cast shadow". 2018-02-13 18:27:36 -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
Anthony J. Thibault
d2c199104e Avatars use Dual Quaternion Skinning and Model Entities do not. 2018-02-13 17:47:49 -08:00
Stephen Birarda
6ba2f4b279
Merge pull request #12286 from Atlante45/feat/asset-server-backup 
Add asset server backups capabilities to the Domain Server
 2018-02-13 17:40:11 -07:00
Nissim Hadar
23a29b8d4b Added don't castr shadow flag to entity and shape classes. 2018-02-13 16:16:04 -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
SamGondelman
38290064c1 replace materials by name, hide material mode for now 2018-02-13 13:24:08 -08:00
samcake
a98f55298b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2018-02-13 13:06:58 -08:00
samcake
f64e5f2444 Introducing the cull group 2018-02-13 13:06:26 -08:00
Clément Brisset
593113c102
Merge pull request #12387 from Atlante45/new-master 
Merge stable back into master
 2018-02-13 12:59:59 -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
Andrew Meadows
20c2a4470e merge 'findByID' into 'workload-001' 2018-02-13 11:47:02 -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
Anthony J. Thibault
7f5f48bca9 Models can now switch between dual quats and matrix palette skinning. 
but not dynamically, because we still only compile one version of the shader.
 2018-02-13 11:37:14 -08:00
Andrew Meadows
38bc312004 faster and const EntityTree::findByID() 2018-02-13 11:25:34 -08:00
Gabriel Calero
99f6c80b2a Temporary remove ToneMappingDeferred 2018-02-13 10:00:31 -08:00
Dante Ruiz
ddcee05b14 added control button for controller API 2018-02-13 09:41:00 -08:00
Sam Gateau
040710807d
Merge pull request #12346 from Zvork/scripts 
Fix transition (ex-fade) debugging scripts
 2018-02-13 09:08:35 -08:00
Andrew Meadows
01fb8f3369 remove cruft 2018-02-13 08:58:24 -08:00
Andrew Meadows
95b34cf112 remove cruft and extra whitespace 2018-02-13 08:58:24 -08:00
Andrew Meadows
f1495d27f6 try task link dependency rather than include 2018-02-13 08:58:24 -08:00
Andrew Meadows
a1c540fc85 instantiate trace_workload logging category 2018-02-13 08:57:20 -08:00
Andrew Meadows
2b1b75450d fix assert 2018-02-13 08:57:20 -08:00
Andrew Meadows
d59c3898dc add 'workload' logging profile 2018-02-13 08:57:20 -08:00
Andrew Meadows
cfb64ad693 add LoggingCategory data member to JobContext 2018-02-13 08:57:20 -08:00
Andrew Meadows
724e2f7e66 add CMakeLists.txt for new 'task' library 2018-02-13 08:56:11 -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
955af21aba use explicit cast to avoid windows warning 2018-02-13 08:54:44 -08:00
Andrew Meadows
a8ad846f2b cleanup 2018-02-13 08:54:44 -08:00
Andrew Meadows
be38a4bc71 creating workload lib 2018-02-13 08:54:44 -08:00
Anthony J. Thibault
cf5452313a WIP check in of making the use of dq or mat dynamic per model 2018-02-12 18:44:24 -08:00
Nissim Hadar
34aab4a9c8 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities-renderer/src/RenderableZoneEntityItem.cpp
 2018-02-12 17:50:39 -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
Atlante45
94973fa1d0 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-02-12 15:21:01 -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
ad40961864 fix tangents (I think), update material rendering when transform changes 2018-02-12 13:46:27 -08:00
Atlante45
e15ab2ca6c CR 2018-02-12 13:32:48 -08:00
Nissim Hadar
4acd0a34f5 Seems OK. Before adding flag to entity. 2018-02-12 12:55:14 -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
Brad Davis
bac80292a7 Merge remote-tracking branch 'gcalero/android_audio_fixes' into android 2018-02-12 12:13:34 -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
samcake
bc51f3643d Adding a check for item existence before calling the update on the render::Item 2018-02-12 10:21:50 -08:00
Gabriel Calero
a2f6548d1d Make slot declarations non-conditional 2018-02-12 13:45:56 -03:00
David Back
dc92250b1a change var names 2018-02-09 17:37:53 -08:00
David Back
ff0b632978 get avatars in range 2018-02-09 17:37:30 -08:00
Sam Gateau
f3918ad216
Merge pull request #12367 from AndrewMeadows/fix-shared-unit-tests 
Fix shared unit tests
 2018-02-09 17:18:35 -08:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
samcake
522c577e73 FIxing the bad ambient lighting on scattering surfaces 2018-02-09 14:08:55 -08:00
Dante Ruiz
fccb4297f7
Merge pull request #12379 from samcake/pastel 
fixing the scattering bad ambient lighting
 2018-02-09 13:55:42 -08:00
ZappoMan
0ed3a18118 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-09 13:24:31 -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
02e9bd4fbc
Merge pull request #12348 from druiz17/fix-lasers-going-to-origin 
Fix lasers going to origin when trying to far grab.
 2018-02-09 11:48:00 -08:00
Atlante45
87f77b6257 Asset Server Backup 2018-02-09 11:32:42 -08:00
samcake
e64c029424 fixing the scattering bad ambient lighting 2018-02-09 11:32:29 -08:00
NissimHadar
7ee5245aeb Added shadow caster flag to filter. 2018-02-09 10:45:29 -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
Bradley Austin Davis
dbc4b1533d Fixing build warnings in minipromises 2018-02-09 10:12:32 -08:00
samcake
4419dfe622 Addressing review comments 2018-02-09 10:02:16 -08:00
Sam Gateau
047d24fe5e
Merge pull request #12340 from jherico/fix/shader_length 
Fix overlimit shader char strings
 2018-02-09 09:31:15 -08:00
humbletim
a08770c816 cleanup 2018-02-09 02:29:20 -05:00
Sam Gateau
0e25b7bd35 Fixing the normal map computation 2018-02-08 23:27:12 -08:00
Sam Gateau
f20e1a727e Removing the specular pipeline since we now take care of it with the base shader, remove unused shader include files adding the tone map pass 2018-02-08 23:07:39 -08:00
samcake
b66da1897d improving the forward rendering pass, removing the specular variation and making it defautl 2018-02-08 17:59:07 -08:00
Seth Alves
6471780e21 allow overlay children to follow avatar from one domain to another 2018-02-08 17:43:08 -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
David Back
f137fadc98 fix uint warnings 2018-02-08 16:56:13 -08:00
NissimHadar
950a62f3f8 Global graphics flag default to on. 
Added cast shadows flag to zone/keylight.
Exit the RenderShadowMap job if current keylight doesn't cast shadows.
 2018-02-08 15:52:20 -08:00
David Back
f929fa3bcb filename space fix 2018-02-08 14:50:30 -08:00
David Back
6a23eea6ee adjust shininess value 2018-02-08 14:15:47 -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
samcake
caacd3e5cf Trying to fix the forwaard rendering 2018-02-07 18:46:47 -08:00
David Back
880ef17c75 Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials 2018-02-07 18:11:15 -08:00
David Back
784b265a86 better texture option parsing 2018-02-07 18:11:00 -08:00
Andrew Meadows
572edab79f remove dupe const 2018-02-07 16:48:31 -08:00
Seth Alves
31c2b8fea9 oops 2018-02-07 16:31:38 -08:00
Seth Alves
b6ac348428 get children of animated entity joints to follow along, again 2018-02-07 16:30:07 -08:00
Bradley Austin Davis
fcb59a4ee6 Fixing android 2018-02-07 11:06:30 -08:00
Andrew Meadows
57aef54237 pull master into AndrewMeadows/quickfix-tractor 2018-02-07 10:46:15 -08:00
Dante Ruiz
a03cfb835d Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update 2018-02-07 10:39:23 -08:00
Bradley Austin Davis
fd007e845d Squashed scribe changes 2018-02-07 10:29:29 -08:00
David Back
d44ce78efc Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials 2018-02-07 10:10:05 -08:00
Bradley Austin Davis
ae092f6c0b Merge remote-tracking branch 'upstream/master' into fix/shader_length 2018-02-07 09:48:23 -08:00
NissimHadar
d01f9cd1fb Fixing git crap. 2018-02-06 23:51:08 -08:00
David Back
26a56f0173 Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials 2018-02-06 16:12:30 -08:00
Bradley Austin Davis
0455fb37b6 Merge remote-tracking branch 'upstream/master' into fix/shader_length 2018-02-06 15:55:01 -08:00
Andrew Meadows
672520f3bf quickfix for velocity spike for Tractor action 2018-02-06 12:06:27 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
John Conklin II
0e3bcda859
Merge pull request #12336 from sethalves/bump-av-protocol-more 
try harder to bump avatar-mixer protocol version
 2018-02-06 09:12:03 -08:00
Olivier Prat
d248e1ed79 Merge branch 'master' of http://github.com/highfidelity/hifi into scripts 2018-02-06 18:00:38 +01:00
Seth Alves
d8ad3192fe
Merge pull request #12332 from sethalves/fix-tractor-action-initial-crazy 
Fix tractor action initial crazy
 2018-02-06 08:59:25 -08:00
Seth Alves
213dd61502
Merge pull request #12341 from sethalves/fix-polyvox-visible 
make polyvox entities visible again
 2018-02-06 08:59:01 -08:00
Olivier Prat
733d36df47 Fixed save / load of fade effect configurations 2018-02-06 17:57:04 +01:00
Olivier Prat
179aca2bf9 Shadow task now uses LOD culling from main view task 2018-02-06 11:47:39 +01:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Seth Alves
33ca1fd344 make polyvox entities visible again 2018-02-05 14:58:34 -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
Bradley Austin Davis
b658d4add2
Merge pull request #12338 from vladest/fix_build_gcc7 
Add include with std::function
 2018-02-05 13:34:48 -08:00
vladest
0715a7cae5 Add include with std::function 2018-02-05 21:02:44 +01:00
Seth Alves
14d8259a5e try harder to bump avatar-mixer protocol version 2018-02-05 11:54:48 -08:00
Stephen Birarda
52e63db70b
Merge pull request #12249 from birarda/bug/god-voice 
refuse to handle positional audio streams with NaN position
 2018-02-05 12:50:56 -07: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
Anthony Thibault
819af96fcc
Merge pull request #12331 from ctrlaltdavid/21732 
Fix scaling of avatar submeshes attached to joints
 2018-02-05 10:19:18 -08:00
Olivier Prat
92279b5939 Merged with master 2018-02-05 18:24:05 +01:00
Olivier Prat
445ffbd82f Added tag bits to shadow octree query 2018-02-05 16:35:55 +01: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
d842e532ee Remove Window.customPrompt() from JavaScript API 2018-02-04 14:02:30 +13:00
Olivier Prat
2940a67b3e Merged with master 2018-02-03 16:55:25 +01:00
Seth Alves
639f7a52d8 remove unneeded/repeated line 2018-02-02 18:24:38 -08:00
Seth Alves
a6978a6dec Merge branch 'make-your-branch' of github.com:AndrewMeadows/hifi into fix-tractor-action-initial-crazy 2018-02-02 18:15:59 -08:00
ZappoMan
71a8e96d5a fix several CR requests 2018-02-02 18:14:12 -08:00
David Rowe
9818674549 Fix scaling of avatar submeshes attached to joints 2018-02-03 15:06:47 +13:00
SamGondelman
4d4294dd6a Merge remote-tracking branch 'upstream/master' into decals 2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8 wip finish adding material entity 2018-02-02 16:49:33 -08:00
Andrew Meadows
83ab994181 avoid initial bad measure of tractor target's velocity 2018-02-02 16:42:51 -08: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
ZappoMan
8a9153a461 Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters 2018-02-02 16:08:05 -08:00
Andrew Meadows
a5e968867e
Merge pull request #12302 from druiz17/fix-another-bootstrapping 
Fix another bootstrapping and rename entityItem _dirtyFlags
 2018-02-02 15:14:38 -08:00
John Conklin II
9f4820df3b
Merge pull request #12255 from Zvork/trnormalmap 
Normal map support on translucent objects
 2018-02-02 14:19:50 -08:00
Brad Davis
08e52e5ef3 Fix additional highp 2018-02-02 14:15:21 -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
dca3061107 Fix material key on Android 2018-02-02 13:45:24 -08:00
Brad Davis
d087530423 Add nvtt to android build 2018-02-02 13:42:26 -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
Stephen Birarda
ffd10b79bf refuse to handle positional audio streams with NaN position 2018-02-02 11:21:50 -08:00
Elisa Lupin-Jimenez
9f8e2017ce can add image directly from asset server 2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
d390e20139 removed extraneous commenting and image class 2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
42151b8fd4 creating new image entity opens image property options 2018-02-02 10:14:27 -08:00
Elisa Lupin-Jimenez
ceb621a521 reverted protocol change for images 2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
576d683d3b initial changes to incorporate snap model 2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
dc5f29aa58 entity item properties hooked up for image 2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
c9c55af661 setting up properties page (not complete) 2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
6f76650789 updated with master 2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
3d000d3d01 changed packet number 2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
72d8f90ec1 not sure why entities don't render with these changes 2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
fc0e87d5ea more infrastructure links 2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
fdca8ab93e added image button to edit.js, working on connecting to cpp 2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
3a7290c3ed starting 2d image entity type 2018-02-02 10:08:39 -08:00
Olivier Prat
03daba9bac Removed duplicate shader include 2018-02-02 18:18:24 +01:00
Olivier Prat
8a011036ef Removed warnings on mac and ubuntu 2018-02-02 18:07:35 +01: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
e9747e9d85 Small optimisations in shadow shader 2018-02-02 15:06:22 +01:00
Olivier Prat
ac92b3c130 Merge branch 'master' of http://github.com/highfidelity/hifi into scribe 2018-02-02 14:01:59 +01:00
Olivier Prat
234cb1e3e6 Added anti frustum test to remove lower cascade objects from higher shadow cascades 2018-02-02 12:15:43 +01:00
Olivier Prat
1f4671ba17 Cleaned up orthographic shadow culling functor 2018-02-02 11:09:28 +01:00