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

28799 commits

Author SHA1 Message Date
Sam Gateau
13d02011f3 There and back again... 2018-05-24 00:53:29 -07:00
Sam Gateau
f66e13b2ec Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-23 21:43:36 -07:00
samcake
c29b93b986 Merging with latest master and bringin low hanging fruits from Andrews pr 2018-05-23 17:49:10 -07:00
samcake
40370f860a Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-05-23 17:26:08 -07:00
samcake
c66b592b3a MOVe the feedINput functions at the right spot 2018-05-23 17:04:00 -07:00
SamGondelman
e6741a363e add local-only isVisibleInSecondaryCamera flag to entities 2018-05-23 16:35:21 -07:00
samcake
7ed39f4052 Adjusting the syntax to have linux compiling maybe 2018-05-23 16:16:57 -07:00
samcake
cf58f31f3e Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine' 2018-05-23 15:08:48 -07:00
Andrew Meadows
d50da2babc Merge 'master' into 'workload' 2018-05-23 14:51:05 -07:00
John Conklin II
3e665fb616
Merge pull request #13179 from dback2/cloneables 
Server-Managed Cloneables + Cloneable Properties
 2018-05-23 12:40:27 -07:00
samcake
55945b5454 Remove deprecated and commented code 2018-05-23 12:36:20 -07:00
samcake
b06356b0fd Remove deprecated and commented code 2018-05-23 11:58:25 -07:00
samcake
5bede45c85 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-23 11:26:07 -07:00
Ryan Huffman
59ca2f9977 Fix ResourceManager not properly shutting down thread 2018-05-23 10:51:12 -07:00
Ryan Huffman
8e1c7531dc Add option to oven.exe to disable texture baking 2018-05-23 10:42:14 -07:00
David Rowe
ebeee51581 Update image links 2018-05-23 17:20:24 +12:00
samcake
184d50b018 Well 2018-05-22 17:55:26 -07:00
samcake
4985207b45 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-22 17:40:54 -07:00
Liv Erickson
56493346c1 fix permissions check 2018-05-22 15:41:48 -07:00
John Conklin II
52a05680e7
Merge pull request #12895 from vladest/menu-updates 
Menu Cleanup and Reorganization
 2018-05-22 13:21:08 -07:00
Liv Erickson
0ebd13b3e6 cannot edit origin from client / fix ICE issue 2018-05-22 13:17:23 -07:00
SamGondelman
9dfc61a452 possible fix for gl crash 2018-05-22 12:51:32 -07:00
David Rowe
6a75e7acb6 Fix canCastShadow property JSDoc 2018-05-23 07:11:23 +12:00
Liv Erickson
7efcc135e4 reorder flags 2018-05-22 11:03:41 -07:00
Liv Erickson
e273a0c1a6 fix define properties 2018-05-22 09:10:50 -07:00
samcake
072d0f262c FIxing the problem of shadows not repecting the cull group 2018-05-21 18:07:04 -07:00
Liv Erickson
27c2bb9046 add properties group where missing 2018-05-21 17:39:08 -07:00
Liv Erickson
a1e7f648bc add debug properties 2018-05-21 17:14:36 -07:00
Liv Erickson
e76829bb1d change to DEFINE_PROPERTY_REF 2018-05-21 16:51:23 -07:00
Liv Erickson
604b3cac1c check for null entities in grab, add conversion for old userdata cloneable 2018-05-21 16:19:43 -07:00
samcake
f536f7b6c9 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-21 15:52:51 -07:00
samcake
2dc28a504c Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-21 15:52:42 -07:00
Sam Gateau
87989268bf
Merge pull request #13182 from jherico/feature/batch_pooling 
Use pooled gpu batches
 2018-05-21 15:47:55 -07:00
Sam Gateau
a1c948c0f0
Merge pull request #13127 from SimonWalton-HiFi/half-baked-model 
Incorrectly baked model crashes Interface
 2018-05-21 15:30:42 -07:00
SamGondelman
45289dea09 on mac, render unsupported bptc textures (skyboxes) as uncompressed 2018-05-21 14:27:18 -07:00
Brad Davis
9c26b2c1d3 Use pooled gpu batches 2018-05-21 13:53:44 -07:00
David Rowe
fa54461788 Update some recent JSDoc additions 2018-05-22 08:52:39 +12:00
Simon Walton
c205a856a7 Split canned FBX header in two; only check first part on read 2018-05-21 13:29:08 -07:00
John Conklin II
61eccabb56
Merge pull request #13208 from jherico/fix/texture_warnings 
Fixing populated / allocated tracking for textures
 2018-05-21 13:27:56 -07:00
Brad Davis
6daffba18e Fixing populated / allocated tracking for textures 2018-05-21 11:51:05 -07:00
John Conklin II
168edb1cde
Merge pull request #13192 from druiz17/fix-spaming-set-host 
fix case sensitive comparison in AddressManager::setHost
 2018-05-21 11:16:18 -07:00
samcake
b4807becb6 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-21 10:41:25 -07:00
samcake
03271d6818 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-21 10:38:44 -07:00
Dante Ruiz
249d22b4b4 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-21 10:31:24 -07:00
Sam Gateau
3d4964559d
Merge pull request #13202 from jherico/fix/texture_warnings 
Fix logspam from texture transfer code
 2018-05-21 10:20:40 -07:00
John Conklin II
88163424f0
Merge pull request #13164 from SimonWalton-HiFi/entities-relaying 
Move down OctreeQueryNode::_viewMutex to OctreeQuery
 2018-05-21 10:14:41 -07:00
Sam Gondelman
45beb686a0
Merge pull request #13204 from SamGondelman/hudCrash 
Protect against null hudTexture
 2018-05-21 09:31:08 -07:00
Sam Gateau
e1690a28e1 Merging with master 2018-05-20 23:04:11 -07:00
Thijs Wenker
7f4e9a0089 style 2018-05-21 06:17:08 +02:00
Thijs Wenker
f4df75d016 CR feedback 2018-05-21 06:04:05 +02:00
Livi Erickson
70bbac5c83 update with lastEditedCheck 2018-05-20 18:49:41 -07:00
Livi Erickson
9f7b383757 address CR feedback 2018-05-20 18:22:17 -07:00
David Rowe
e44e7ca35f Fix up Resource and resource cache APIs' JSDoc 2018-05-21 11:57:16 +12:00
Livi Erickson
9c0084209b fix style error, start lifetime properly for cloned entities 2018-05-20 16:41:14 -07:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
luiscuenca
1130f9998d Minor fix allows import GLTF from Substance Painter 2018-05-19 10:42:55 -07:00
Liv Erickson
6c8d68afc6 add extra cleanup in delete messages and simulation, as a fall back 2018-05-18 18:18:42 -07:00
Simon Walton
e4130dbf39 Merge remote-tracking branch 'upstream/master' into half-baked-model 2018-05-18 17:48:52 -07:00
samcake
3aaa01788c Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-18 17:42:30 -07:00
samcake
36a08fdd84 Friday night end of the day, last compilation.... almost 2018-05-18 17:41:28 -07:00
Liv Erickson
29b11b9101 some fixes to server cloneables 2018-05-18 17:12:41 -07:00
Dante Ruiz
3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-18 16:42:31 -07:00
Sam Gateau
8ae253019c
Merge pull request #13201 from samcake/brown 
Fix Flickery Procedural Shader
 2018-05-18 16:11:21 -07:00
Sam Gateau
026cae09f7
Merge pull request #13200 from Cristo86/gles_ishazeenabled_error_fix 
Fix isHazeEnabled() checks with 0.0 to fix GLES compiler error
 2018-05-18 15:44:24 -07:00
SamGondelman
484bda0f3c check for null texture 2018-05-18 15:34:07 -07:00
Sam Gateau
07f1ab8c98
Merge pull request #13194 from SamGondelman/resolution 
Fix Scale Resolution option
 2018-05-18 15:23:01 -07:00
Brad Davis
fb101cf036 Fix logspam from texture transfer code 2018-05-18 14:51:26 -07:00
samcake
0e66ca1dfd Fixing the procedural shader flickering key lighting, this is due to the LightingMOdel binding slot not assigned 2018-05-18 13:25:08 -07:00
SamGondelman
12b91a2ab7 compress skyboxes 2018-05-18 13:18:43 -07:00
Cristian Luis Duarte
c7edf72f71 Check isHazeEnabled() vs 0.0 to compile on GLES 2018-05-18 15:59:24 -03:00
Andrew Meadows
84a2e5e443 fix yeild behavior for owned things outside of R1 2018-05-18 11:23:56 -07:00
Simon Walton
7f2a90cdb9 Address couple of reviewer issues 2018-05-18 11:20:45 -07:00
Dante Ruiz
027d1ed50b making requested changes 2018-05-18 11:07:11 -07:00
Liv Erickson
de05388ebf Merge branch 'master' of github.com:highfidelity/hifi into clone-server 2018-05-18 10:42:26 -07:00
Andrew Meadows
c8b8d0f1c4 remove commented out cruft 2018-05-18 10:31:08 -07:00
Simon Walton
545ada0abb Connect signal to keyGen thread for it to quit when owner destructed 2018-05-18 10:28:52 -07:00
Andrew Meadows
063c2564d1 only clear bid state when ownership actually changed 2018-05-18 10:28:45 -07:00
Andrew Meadows
a9c193b672 merge 'workload-014' into 'workload' 2018-05-18 10:12:04 -07:00
Brad Davis
3356486f27 Fix populated texture size tracking 2018-05-18 09:23:54 -07:00
Brad Davis
91f1d93d4e Fix flicker while transferring texture data 2018-05-18 09:23:54 -07:00
Brad Davis
ae07036f20 Add ideal resource texture memory stat 2018-05-18 09:23:53 -07:00
Brad Davis
fb81cf927a Faster texture transfers 2018-05-18 09:21:02 -07:00
Liv
40ff3f966f
Merge pull request #13165 from ctrlaltdavid/21872-b 
JSDoc stubs for various APIs
 2018-05-18 09:11:55 -07:00
Andrew Meadows
a23126a6b2 Merge 'master' into 'workload' 2018-05-18 07:38:02 -07:00
samcake
aa18aaa7b1 Maybe 2018-05-17 18:06:46 -07:00
Andrew Meadows
00e360aff0 reduce sim ownership priority when releasing grab 2018-05-17 17:25:07 -07:00
Andrew Meadows
926014b43f entity-server always promotes VOLUNTEER to RECRUIT 2018-05-17 17:24:24 -07:00
SamGondelman
c57c15f22c fix resolution option 2018-05-17 16:58:35 -07:00
Dante Ruiz
48404d811c fix case sensitive comparison 2018-05-17 16:34:52 -07:00
David Back
4e14eb37e3 update comment 2018-05-17 16:34:19 -07:00
David Back
30855f94eb set last edited to 0 to ensure server update 2018-05-17 16:02:58 -07:00
Sam Gondelman
74840d2130
Merge pull request #12935 from gcalero/android_new_login 
Android new login
 2018-05-17 15:53:25 -07:00
David Back
26b6b851f5 Merge branch 'cloneables' of github.com:dback2/hifi into cloneables 2018-05-17 14:50:39 -07:00
David Back
b8ce07744d initialize prop defaults, no bool returns 2018-05-17 14:50:14 -07:00
samcake
0cf87748cd Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-17 14:20:44 -07:00
Simon Walton
fe92cf0c47 Move fix up a level to bit a little more general 2018-05-17 13:34:38 -07:00
David Rowe
33ba559bb4 Show all OverlayWebWindows properties and functions together 2018-05-18 08:02:02 +12:00
David Rowe
2669a39e0f Deprecate Agent API items that shouldn't be exposed in the API 2018-05-18 07:32:25 +12:00
Clement
da08d747dc Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-05-17 12:10:08 -07:00
Liv Erickson
ec8aa71dc4 Add JSDoc header to new clone function in Entity API 2018-05-17 11:25:20 -07:00
David Back
42d8492427 no clock skew 2018-05-17 11:17:04 -07:00
David Back
3730cbe36c reconstruct cloneIDs lists on start, read/write locks on clone ID functions, fix removing last cloneable 2018-05-17 10:28:48 -07:00
Simon Walton
86a8672c5a Initialize Qt/openssl before RSA keygen to prevent collision 2018-05-17 10:17:22 -07:00
David Back
900b373c96 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-17 09:04:28 -07:00
Gabriel Calero
8741c5e6a4 Make haptic pulse duration configurable in VirtualPadDevice 2018-05-17 11:37:13 -03:00
David Rowe
6db4dd8673 Merge branch 'master' into 21872-b 
# Conflicts:
#	interface/src/ui/Snapshot.h
 2018-05-17 20:11:14 +12:00
David Rowe
145d73aa76 OverlayWebWindow JSDoc fixes 2018-05-17 19:18:00 +12:00
samcake
735db27919 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-16 17:18:23 -07:00
John Conklin II
4ce4afe0b1
Merge pull request #13180 from Cristo86/android_no_joystick_fix 
Fix Joystick/Control not showing up in Samsung after typing address (Android)
 2018-05-16 15:41:24 -07:00
Andrew Meadows
2cf6e9007b remove unsused data member 2018-05-16 13:57:51 -07:00
samcake
adc8a07d3c Merge branch 'RC67.2' of https://github.com/highfidelity/hifi into rc67.2-taaOn 2018-05-16 13:14:14 -07:00
samcake
21e069c90c Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa 2018-05-16 13:09:55 -07:00
David Back
6484c866f3 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-16 11:35:34 -07:00
Sam Gateau
523d57d948
Merge pull request #13162 from AndrewMeadows/avatar-collisions 
avatars collide again
 2018-05-16 09:25:05 -07:00
Cristian Luis Duarte
b5e8adfc39 Use availableSize() to get screen size instead of size() as it returns a wrong screen size on some Samsung devices (misplacing controls that are relative to screen size) 2018-05-16 12:53:39 -03:00
Gabriel Calero
5afc9c6df3 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-16 12:45:17 -03:00
vladest
72838f6d34 Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons 2018-05-16 17:06:31 +02:00
vladest
5127cb0ea6 Merge branch 'master' into menu-updates 2018-05-16 14:37:00 +02:00
David Back
1e2d2819d5 tweaks 2018-05-15 17:36:39 -07:00
David Back
f8fc7bedd7 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-15 17:31:43 -07:00
David Back
f74e219029 rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete 2018-05-15 17:24:14 -07:00
samcake
179801dab6 FIxing the transparent ambient lighting bug 2018-05-15 17:22:28 -07:00
John Conklin II
aca261af3e
Merge pull request #12939 from Cristo86/android_places_goto 
Android Search & Go To
 2018-05-15 16:43:38 -07:00
Wayne Chen
92e9a8e064 fixing typo in documentation. 2018-05-15 16:32:01 -07:00
David Rowe
f571e90ef5 Merge branch 'master' into 21872-b 2018-05-16 10:20:53 +12:00
David Rowe
f629022b8c AvatarList API JSDoc stubs 2018-05-16 10:16:13 +12:00
David Rowe
fdeb0e3305 Avatar API JSDoc stubs 2018-05-16 09:20:54 +12:00
SamGondelman
6b268191c8 local compression, patched etc2comp 2018-05-15 14:05:21 -07:00
John Conklin II
a6cda2166a
Merge pull request #13158 from highfidelity/stable 
RC67.1 stable mergeback to master
 2018-05-15 14:01:06 -07:00
John Conklin II
ce1231910c
Merge pull request #13140 from Cristo86/android_avatar_name 
@SamGondelman We just do a quick 5-10 minute Windows check, just to make sure Windows/Mac weren't broken by the change.
 2018-05-15 13:22:15 -07:00
vladest
7ea6181520 Merge branch 'master' into menu-updates 2018-05-15 21:54:45 +02:00
Gabriel Calero
306b8cc68a Set HomeActivity transparent to avoid texture corruption (black and white) 2018-05-15 15:14:17 -03:00
Andrew Meadows
c7c4324b3c Merge 'master' into 'workload' 2018-05-15 10:22:50 -07:00
David Back
623410a0aa Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-15 09:53:24 -07:00
Wayne Chen
f82e597ac7 Updating documentation for getChildrenIDs + fixing issue #1934 2018-05-15 09:34:07 -07:00
Thijs Wenker
bfe210da75 Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes 2018-05-15 16:48:51 +02:00
Olivier Prat
d10b5a16f2 Turned off jitter with FXAA 2018-05-15 15:09:02 +02:00
Olivier Prat
bed7752a1a Fixed bug with highlighting and TAA 2018-05-15 12:27:04 +02:00
David Rowe
1ca6bd2f0b location getter/setter JSDoc 2018-05-15 17:37:45 +12:00
David Rowe
8e9799b80f Pointers API JSDoc fix up 2018-05-15 16:36:42 +12:00
Wayne Chen
bd6905b3d2 Adding possible solution to issue#1934. 2018-05-14 18:25:39 -07:00
David Rowe
36752ee701 PickType API JSDoc fix up 2018-05-15 11:23:29 +12:00
David Rowe
8ea3a733ca Resource API JSDoc stub 2018-05-15 10:32:36 +12:00
Simon Walton
454978a9c2 Add more locking of _conicalViews vector 2018-05-14 15:15:58 -07:00
David Rowe
a1de44310f tabletInterface API JSDoc 2018-05-15 10:02:38 +12:00
Anthony J. Thibault
ec638d9d91 Avatar can now look straight down without spinning 180. 
Also, come code clean up and removal of unnecessary Y_180 flips.
 2018-05-14 13:48:04 -07:00
John Conklin II
c57b0a957d
Merge pull request #13138 from AndrewMeadows/avoid-div-by-zero 
avoid div by zero when measuring RigidBody effective acceleration
 2018-05-14 13:41:08 -07:00
Sam Gateau
aa75af5ca4
Merge pull request #12814 from Zvork/shadow 
Shadow bug fix : incorrect shadow map far plane when casting shadow on non-'shadow casters'
 2018-05-14 13:00:15 -07:00
Anthony J. Thibault
274ac98bd6 Merge branch 'master' into nativeCGCode 2018-05-14 09:12:08 -07:00
David Rowe
c97d7c9d73 Expand and fix ToolbarProxy and ToolbarButtonProxy JSDoc stubs 2018-05-14 10:43:38 +12:00
David Rowe
71355840b9 Expand OverlayWindow and OverlayWebWindow JSDoc stubs 2018-05-14 09:57:35 +12:00
David Rowe
cad5b3fb15 Expand AudioEffectOptions JSDoc stubs 2018-05-14 09:28:50 +12:00
David Rowe
9fdce4df65 OverlayWindow and OverlayWebWindow API JSDoc stubs 2018-05-13 16:38:38 +12:00
David Rowe
7cef329939 Render API JSDoc stubs 2018-05-13 11:53:57 +12:00
David Rowe
46ebb0457e Toolbars API JSDoc stubs 2018-05-13 10:56:21 +12:00
David Rowe
fb1f7fea90 Steam API JSDoc stubs 2018-05-13 10:32:46 +12:00
vladest
0a67fc3b36 Merge conflicts 2018-05-12 11:24:35 +02:00
David Rowe
b445371ad8 Resources API JSDoc stubs 2018-05-12 16:24:34 +12:00
David Rowe
11f984f05b OffscreenFlags API JSDoc stubs 2018-05-12 15:08:41 +12:00
David Rowe
841161068c Midi API JSDoc stubs 2018-05-12 15:01:52 +12:00
David Rowe
6e1a091447 Mat4 API JSDoc stubs 2018-05-12 14:44:38 +12:00
David Back
3031bb05be Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-11 17:54:20 -07:00
David Back
a57c280813 convertToCloneProperties 2018-05-11 17:54:08 -07:00
David Rowe
a2bb9de441 Graphics API JSDoc stubs 2018-05-12 12:53:43 +12:00
Cristian Luis Duarte
9e9e1092d6 Add Opaques tasks into RenderForwardTask 2018-05-11 21:37:28 -03:00
Simon Walton
9bb966dd1d Push down OctreeQueryNode lock to OctreeQuery and use for conical views 
Possibly related to
https://highfidelity.manuscript.com/f/cases/14165/entity-server-doesn-t-always-relay-added-entities-to-clients
 2018-05-11 17:12:53 -07:00
Andrew Meadows
6de175e794 avatars collide again 2018-05-11 17:01:48 -07:00
David Rowe
6d000f3362 JSDoc parameter for AudioEffectOptions constructor 2018-05-12 11:41:42 +12:00
Cristian Luis Duarte
f97155b6cd Revert virtualpad code. It works on Pixel XL 2018-05-11 20:34:43 -03:00
MiladNazeri
ea26512793
Merge pull request #13147 from ctrlaltdavid/21872-a 
Fix JSDoc function definitions specifying properties instead of params
 2018-05-11 16:20:06 -07:00
David Rowe
cf9053c873 Merge branch 'master' into 21872-b 2018-05-12 10:50:31 +12:00
Gabriel Calero
0f8c666647 Trying to fix virtualpad textures corruption 2018-05-11 19:50:00 -03:00
Seth Alves
ca56449c1d
Merge pull request #13159 from sethalves/fix-action-assert 
don't assert when unserializing a 'spring' action
 2018-05-11 15:15:51 -07:00
Cristian Luis Duarte
e3d7d65186 Merge remote-tracking branch 'origin/master' into android_avatar_name 2018-05-11 18:48:34 -03:00
SamGondelman
b7395771f9 Merge remote-tracking branch 'upstream/master' into etc2comp 2018-05-11 14:46:35 -07:00
Gabriel Calero
9b5da09dc7 Fix connection issue syncing two AccountManagers 2018-05-11 18:08:56 -03:00
Seth Alves
85a6e2555f don't assert when unserializing a 'spring' action 2018-05-11 13:55:29 -07:00
Stephen Birarda
4f7ce7345d
Merge pull request #13045 from SimonWalton-HiFi/domain-checkins-tweak 
Reset pending domain check-in count more frequently
 2018-05-11 13:31:03 -07:00
David Back
65bda27ae3 Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-11 13:03:27 -07:00
samcake
cc582cf2ce Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-11 12:34:55 -07:00
John Conklin II
5cd225e4de
Merge pull request #12947 from jherico/feature/splash2 
Additional work on splash screen
 2018-05-11 11:26:37 -07:00
SamGondelman
eede3ff1ba Merge remote-tracking branch 'upstream/master' into etc2comp 2018-05-11 11:23:33 -07:00
Zach Fox
a6dd95e31b
Merge pull request #13146 from sethalves/fix-logging-less-when-verbose 
don't enable so much logging when 'verbose logging' is turned on
 2018-05-11 10:44:48 -07:00
Gabriel Calero
e838a85a47 Merge remote-tracking branch 'upstream/master' into android_places_goto 2018-05-11 09:13:41 -03:00
Olivier Prat
ff88911f93 Protected procedural skyboxes from NaNs and negative values returned by procedural shader 2018-05-11 12:26:03 +02:00
David Rowe
496154fdbe File API JSDoc stubs 2018-05-11 21:07:12 +12:00
Olivier Prat
9e462e777c Fixed compilation error with transparent procedurals 2018-05-11 11:01:24 +02:00
David Rowe
fb175d7110 AudioEffectOptions API JSDoc stubs 2018-05-11 20:36:10 +12:00
David Rowe
3891ebe703 Agent API JSDoc stubs 2018-05-11 20:20:07 +12:00
SamGondelman
de4a2ca3b2 update procedural skybox on user data change 2018-05-10 18:44:53 -07:00
samcake
02be965271 more stuff fixed 2018-05-10 18:10:01 -07:00
John Conklin II
4129664368
Merge pull request #13145 from highfidelity/stable 
Merge RC67 stable into master
 2018-05-10 17:07:20 -07:00
Seth Alves
826c427e2a trying to sort-out audio-stream logging 2018-05-10 15:42:59 -07:00
Olivier Prat
ec439086a2 Extended to other shaders 
(cherry picked from commit 328f1dec9b)
 2018-05-10 15:41:34 -07:00
Olivier Prat
29355ba8fb Fixed procedural shaders 
(cherry picked from commit eab7dd6006)
 2018-05-10 15:41:04 -07:00
David Rowe
fab85c3f6d Fix JSDoc function definitions specifying properties instead of params 2018-05-11 09:52:48 +12:00
John Conklin II
bc9e403ab9
Merge pull request #13005 from SimonWalton-HiFi/hmac-auth2 
Use HMAC authentication for network packets - 2nd attempt
 2018-05-10 14:38:18 -07:00
Gabriel Calero
a1a48d9b9e Merge remote-tracking branch 'upstream/master' into android_places_goto 2018-05-10 18:24:26 -03:00
Cristian Luis Duarte
f30908fb26 Android - Remove delay starting Home + Change default joystick flag 2018-05-10 18:21:33 -03:00
Sam Gateau
fd9669b42d
Merge pull request #13125 from jherico/feature/testing 
Working on improved unit testing, adding texture transfer testing
 2018-05-10 12:29:43 -07:00
vladest
62aa2df836 Merge branch 'master' into menu-updates 2018-05-10 10:36:38 +02:00
David Back
5aab88be06 assert 2018-05-09 19:10:56 -07:00
Sam Gateau
70bafed463 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-09 18:41:32 -07:00
David Back
7738a2bcdd Merge branch 'master' of https://github.com/highfidelity/hifi into cloneables 2018-05-09 18:12:46 -07:00
David Back
dea588ae4a remove prints 2018-05-09 18:12:04 -07:00
David Back
3241c18271 first pass cloneables WIP 2018-05-09 18:10:40 -07:00
Seth Alves
4410402c7d
Merge pull request #13114 from sethalves/more-logging-suppression 
more suppression of logging
 2018-05-09 17:36:12 -07:00
samcake
652c754373 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-09 15:16:48 -07:00
John Conklin II
75164201d1
Merge pull request #13117 from SamGondelman/android 
Test highp floats for Android
 2018-05-09 14:36:51 -07:00
SamGondelman
437fa25f6e Merge remote-tracking branch 'upstream/master' into etc2comp 2018-05-09 14:30:53 -07:00
SamGondelman
7418fe782c local compression on android 2018-05-09 14:30:33 -07:00
Simon Walton
9b6225db40 Bump default packet version 20 -> 21 2018-05-09 14:29:10 -07:00
MiladNazeri
bc03fb398f
Merge pull request #13102 from ctrlaltdavid/21856-h 
Fix JSDoc for Users.requestUsernameFromID
 2018-05-09 13:35:06 -07:00
Brad Davis
7fbad47351 Working on texture test 2018-05-09 13:20:48 -07:00
Brad Davis
1d403b4d67 Add texture transfer testing 2018-05-09 13:20:47 -07:00
Cristian Luis Duarte
936a319e62 Android - First version of showing up avatars names upon touch. Brought back (transparent) overlays into render forward task. 2018-05-09 17:15:57 -03:00
Seth Alves
7466d08f1f more suppression of logging 2018-05-09 13:01:49 -07:00
Andrew Meadows
b8d34f4b8f more correct variable name 2018-05-09 12:13:27 -07:00
Andrew Meadows
f454dac709 avoid div by zero when measuring acceleration 2018-05-09 12:04:44 -07:00
John Conklin II
b9656e5c72
Merge pull request #13130 from samcake/blue 
Fix size calculation of compressed textures #13120
 2018-05-09 11:45:10 -07:00
samcake
70a570d958 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-09 11:31:59 -07:00
Seth Alves
db03265a6b when in serverless mode, short-circuit simulation ownership bids 2018-05-09 10:53:46 -07:00
Gabriel Calero
1cc0a52597 Fix the joystick texture corruption 2018-05-09 11:20:47 -03:00
amantley
8000bcd272 cleaned up cg code ie computeNewHipsRotation 2018-05-08 18:12:53 -07:00
Simon Walton
0349847857 Add comment re threading issues 2018-05-08 17:46:25 -07:00
SamGondelman
07600f2a81 add etc2comp dependency on desktop and android 2018-05-08 17:30:48 -07:00
Simon Walton
df6609c1f5 Remove debugging #define 2018-05-08 16:26:19 -07:00
Simon Walton
8716e9591e Fixes for gcc compilation 
Maybe even clang also.
 2018-05-08 16:12:01 -07:00
samcake
44e7541888 Fixing the size evaluation for compressed texture and gpu::Element Type enum 2018-05-08 15:57:27 -07:00
NissimHadar
7f9f9d769a Corrected bug causing Interface not to exit at end of test. 2018-05-08 15:51:52 -07:00
Simon Walton
bcc4136462 Merge branch 'master' into half-baked-model 2018-05-08 15:51:25 -07:00
Simon Walton
82e43aea11 Baking - if mesh extraction or compression fails don't change node 
Needed to prevent a null (would-be Draco mesh) node being added.
 2018-05-08 13:59:38 -07:00
samcake
728577dfd8 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-08 11:46:01 -07:00
NissimHadar
0206de01f5 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-08 09:18:27 -07:00
Simon Walton
37ead11cf9 Modify FBX reader to allow for multiple empty node 
Some baked files can have spurious empty nodes in
them; this was causing chunks of the FBX file to be
missed. Also more tweaks for FBX to JSON conversion.
https://highfidelity.manuscript.com/f/cases/14329/
 2018-05-07 18:18:16 -07:00
amantley
3a10cacec0 1.added the swing twist code to update the follow rotation in MyAvatar.cpp 
2.added step.js and cg_lean.js to the developer folder
3.added menu item for toggling the hips following between head and hips
4.added new function to return true if the root of MyAvatar is translating
to be under the head.  Used to smooth the path of the hips
5.added computeCounterBalance to MyAvatar.h and cpp
6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp
7.added head yaw into the calculation of the hip rotation for the center
of gravity.  This is already was happening in the deriveBodyFromHMD code
that is default
8.Changed Constants in Avatar constants for the base of support
9.fixed the over rotation of the shoulders
10.fixed scaling problem in cg computation
11.added room for going up on the toes without stretching
 2018-05-07 17:41:35 -07:00
NissimHadar
c3ef6aab1c Don't save test scripts 2018-05-07 12:51:41 -07:00
Gabriel Calero
9b63b76b68 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-07 16:06:02 -03:00
Gabriel Calero
66b975192d Merge remote-tracking branch 'cristo86/android_places_goto' into android_new_login 2018-05-07 15:56:43 -03:00
SamGondelman
c2004debd5 test using highp floats everywhere for android 2018-05-07 11:41:19 -07:00
NissimHadar
481eddb2a3 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-07 08:24:03 -07:00
vladest
1794113f37 Check global switch as well 2018-05-06 12:51:59 +02:00
vladest
ac413c8854 Tablet opening notification sound settings added 2018-05-06 09:41:10 +02:00
Seth Alves
677c99abd4 use memcpy on _usageType as well 2018-05-05 20:50:54 -07:00
Seth Alves
6a55e67ce9 avoid misaligned pointer deref 2018-05-05 16:39:03 -07:00
Sam Gateau
9b65e0771b Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-05 12:17:20 -07:00
Stephen Birarda
66122830c4
Merge pull request #13108 from Atlante45/fix/includes 
Fix non self-sufficient headers
 2018-05-04 19:05:26 -07:00
Clement
5a3773ba72 Fix compile error on linux/windows 2018-05-04 18:18:46 -07:00
samcake
6424b91e86 Templatizing the timeProfiler for the task 2018-05-04 17:58:21 -07:00
Simon Walton
94f4803d52 Add debug code to dump before/after FBXNode to file 
Also fix trailing comma issue in json since gvim complains
bitterly.
 2018-05-04 17:28:18 -07:00
Brad Davis
72526781d9 Additional work on splash screen 2018-05-04 16:40:05 -07:00
Sam Gateau
6f6f591985
Merge pull request #12996 from jherico/fix/fb14099 
Fix debug assert in manipulating thread local data to store GL surfaces
 2018-05-04 16:31:09 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking 
Add support for client texture selection
 2018-05-04 16:14:43 -07:00
Anthony J. Thibault
8480bb962b Fix for crash deep in QML after useFullAvatarURL 
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
 2018-05-04 16:08:44 -07:00
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist 
Multifrustum queries punchlist
 2018-05-04 15:50:44 -07:00
John Conklin II
7699a19267
Merge pull request #12992 from Zvork/procedural 
Fixed procedural shaders
 2018-05-04 15:35:57 -07:00
Simon Walton
00d2f9494b Change HMACAuth::calculateHash to just call existing methods 2018-05-04 15:07:20 -07:00
Clement
b04c5bd0db CR 2018-05-04 14:43:16 -07:00
Gabriel Calero
1330132a32 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-04 18:35:51 -03:00
NissimHadar
2311fa33fb Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-04 14:13:43 -07:00
Simon Walton
e22bc7eff2 Add FBXNode to JSON stream class 2018-05-04 14:10:22 -07:00
Gabriel Calero
868b58e66d Un-expose Application from javascript. Restore displayplugin deactivation when goes to background 2018-05-04 18:01:01 -03:00
David Rowe
a35517d985 Fix JSDoc for Users.requestUsernameFromID 2018-05-05 07:05:10 +12:00
John Conklin II
c7bc479c60
Merge pull request #13094 from hyperlogic/bug-fix/case-14639 
Fix for crash deep in QML after useFullAvatarURL
 2018-05-04 11:33:28 -07:00
Ryan Huffman
e1d218bb57 Bump asset packet version for texture meta 2018-05-04 11:25:11 -07:00
Ryan Huffman
fc3fd75100 Fix TextureMeta::deserialize not handling json parse errors 2018-05-04 11:13:24 -07:00
Ryan Huffman
ac0fe62086 Make ModelBaker ktx extension check case-insensitive 2018-05-04 10:53:10 -07:00
Stephen Birarda
a922471b9a
Merge pull request #13018 from huffman/fix/logging-size-limit 
Fix old log files not being cleaned up
 2018-05-04 10:46:13 -07:00
Stephen Birarda
8ded6c76ec
Merge pull request #13069 from ctrlaltdavid/21729-a 
Remove deprecated location.domainId from API
 2018-05-04 10:35:41 -07:00
John Conklin II
32086def18
Merge pull request #13091 from samcake/blue 
Master: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
 2018-05-04 10:25:57 -07:00
Stephen Birarda
8c6d83ad67
Merge pull request #13023 from SimonWalton-HiFi/connection-stats-dump 
Add a utility function to dump ConnectionStats
 2018-05-04 10:19:25 -07:00
samcake
dd4777bef3 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-04 09:49:52 -07:00
Ken Cooke
b657c28a9b
Merge pull request #13099 from kencooke/glm-asan-warnings 
Fix asan warnings
 2018-05-04 09:24:51 -07:00
Ken Cooke
73ce02ce75 Fix asan warnings in byte-unpacking functions 2018-05-04 07:56:44 -07:00
Sam Gateau
61c855a97b Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-03 20:15:07 -07:00
Clement
487a63025f Fix warning 2018-05-03 18:19:52 -07:00
Clement
d7e9fdc6a4 Bump Avatar Query packet version 2018-05-03 18:19:29 -07:00
Clement
27c471ee97 Move all wire frustums to conical frustums 2018-05-03 18:19:29 -07:00
Clement
3283c5eaec Fix inverted comparaison 2018-05-03 18:19:29 -07:00
Clement
b4ea32bbb6 Correctly compute conical frustum for irregular ones 2018-05-03 18:19:29 -07:00
Clement
67c119cd2e Send Entity Query via conical frustums 2018-05-03 18:19:29 -07:00
Clement
e400eb4ed2 Rename ViewFrustum packets to AvatarQuery 2018-05-03 18:19:29 -07:00
Clement
d774dc2060 WIP Only use conical frustums on the server 2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av 
Add support for multifrustum avatar queries
 2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam 
Add support for multifrustum entity queries
 2018-05-03 18:13:51 -07:00
samcake
6d251c4cd3 Bringing the work and refinment done in workload branch to master branch 2018-05-03 17:46:50 -07:00
Simon Walton
a17359d2df Ensure a minimum of one joint-verts sets to prevent crash 
A baked FBX that has no joints will cause a crash without
this.
 2018-05-03 17:26:25 -07:00
Clement
7fe16f82fb Move variables to Agent.cpp 2018-05-03 17:08:17 -07:00
Stephen Birarda
48aeebdd50
Merge pull request #13007 from Atlante45/fix/crashes-hotfix 
Keep CrashpadClient around for application lifetime
 2018-05-03 16:48:29 -07:00
NissimHadar
e07039266d Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-03 16:44:57 -07:00
Andrew Meadows
b1fcb43246 send ownership removal packet when dynamic object leaves bullet 2018-05-03 16:23:13 -07:00
Andrew Meadows
3d16c9014f remove unowned 'dynamic' objects from kinematic integration 2018-05-03 16:22:36 -07:00
John Conklin II
7d424edd9b
Merge pull request #13092 from Atlante45/fix/asan-warning 
Fix uninitialized boolean (asan warning)
 2018-05-03 15:46:37 -07:00
NissimHadar
3b566332c6 Shutdown interface when test script finishes. 2018-05-03 14:34:12 -07:00
NissimHadar
3a5425122b Shutdown interface when test script finishes. 2018-05-03 14:31:01 -07:00
MiladNazeri
6efb710222
Merge pull request #13076 from ctrlaltdavid/21856-g 
JSDoc fixes
 2018-05-03 14:06:23 -07:00
Anthony J. Thibault
fc9bd7f905 Fix for crash deep in QML after useFullAvatarURL 
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
 2018-05-03 14:06:06 -07:00
Gabriel Calero
a767540b76 Fix connection issue syncing two AccountManagers 2018-05-03 17:53:18 -03:00
samcake
767e6b15f3 Fixing the local lighting on translucents bug 2018-05-03 11:42:06 -07:00
Clement
cefb8457ea Fix uninitialized boolean 2018-05-03 11:17:31 -07:00
samcake
60a49c3f7c applying the local lights on translucent fix 2018-05-03 10:37:29 -07:00
Ken Cooke
028ea11405
Merge pull request #13080 from kencooke/audio-asan-warnings 
Fix asan warnings
 2018-05-03 10:32:59 -07:00
David Rowe
e95c38d939 Merge branch 'master' into 21856-g 
# Conflicts:
#	libraries/model-networking/src/model-networking/TextureCache.h
 2018-05-03 21:03:14 +12:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d 
List which contexts each namespace and class is available in
 2018-05-03 01:29:14 -07:00
Ken Cooke
3e77d946ea Silence warnings of unused functions 2018-05-02 17:48:04 -07:00
samcake
1dc6988f41 Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-05-02 17:36:26 -07:00
Andrew Meadows
99a75c5a87 Merge 'master' into 'workload' 2018-05-02 17:28:36 -07:00
Sam Gateau
361fe75dc3
Merge pull request #13078 from jherico/fix/14638 
Make resource swapchains immutable
 2018-05-02 17:21:45 -07:00
Ken Cooke
3071b410bf Remove obsolete 32-bit optimizations 2018-05-02 15:42:53 -07:00
Ken Cooke
5f394fb254 Remove workaround for VS2013 bug 2018-05-02 15:31:40 -07:00
Ken Cooke
e549f7b085 Fix VS2017 performance loss 2018-05-02 14:48:08 -07:00
John Conklin II
f43b9ee7e8
Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw 
Added items to the developer menu for debugging physics
 2018-05-02 14:25:09 -07:00
Ryan Huffman
529869e80c Make NetworkTexture extension comparisons case-insensitive 2018-05-02 13:41:52 -07:00
Ryan Huffman
697fde4a1a Cleanup meta texture related changes 2018-05-02 13:31:32 -07:00
Gabriel Calero
4dce62cc2e Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 16:27:41 -03:00
John Conklin II
7a5fce4315
Merge pull request #12991 from luiscuenca/avatarScript 
Avatar Scripts
 2018-05-02 12:23:13 -07:00
luiscuenca
689fbd2da0 added requested changes 2018-05-02 11:09:17 -07:00
Anthony J. Thibault
4fa9af5534 Added items to the developer menu for debugging physics 
Hooked up Bullet's internal debug draw functionality to our client.
Under the Developer > Physics Menu there are five new items:

  * Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes.
  * Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes.
  * Show Bullet Contact Points - will draw all contact points where two or more objects are colliding.
  * Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together.
  * Show Bullet Constraint Limits - will render the joint limits for each constraint.
 2018-05-02 10:51:00 -07:00
Gabriel Calero
c15ef56d90 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-05-02 14:38:10 -03:00
Bradley Austin Davis
64d442b281 Change type used for swap chain count 2018-05-02 10:32:44 -07:00
Bradley Austin Davis
80f87f7a62 Make resource swapchains immutable, fix for 14638 2018-05-02 10:32:34 -07:00
Bradley Austin Davis
233c60a506 Change type used for swap chain count 2018-05-02 10:29:55 -07:00
Bradley Austin Davis
7bad849e67 Make resource swapchains immutable, fix for 14638 2018-05-02 10:29:40 -07:00
John Conklin II
83d370f1af
Merge pull request #12872 from huffman/fix/vertex-colors-fbx 
Fix FBX vertex colors not being read correctly
 2018-05-02 10:22:01 -07:00
Ryan Huffman
b29984ab2c Remove max log age for rolling interface log 2018-05-02 10:01:15 -07:00
Ken Cooke
05c534991e Fix ASAN warnings 2018-05-02 09:39:42 -07:00
Andrew Meadows
af85642ad4 editorial pass on simulation ownership overview 2018-05-02 09:10:10 -07:00
Sam Gateau
22e5465767
Merge pull request #13013 from AndrewMeadows/avoid-update-flood 
fix bug: interface sends too many updates on settle
 2018-05-02 08:52:58 -07:00
Ken Cooke
a4105f1081
Merge pull request #13052 from kitely/fix-gcc-warnings 
Eliminated warnings in gcc
 2018-05-02 06:43:32 -07:00
Oren Hurvitz
26ffb3213c Changed "[[gnu::fallthrough]]" to "// FALLTHRU" 2018-05-02 07:06:47 +01:00
David Rowe
3febdcb141 Miscellaneous JSDoc tidying 2018-05-02 16:15:35 +12:00
David Rowe
48632be3c2 Fix up cache APIs' JSDoc 2018-05-02 16:12:48 +12:00
Clement
83a438eb22 Set avatar view packets on their own timer 2018-05-01 18:10:55 -07:00
Clement
2ad948c462 Bump ViewFrustum packet version 2018-05-01 18:03:21 -07:00
Clement
538f24162f Define ViewFrustums type alias 2018-05-01 18:03:21 -07:00
Clement
21213e81f4 Multiview support for priority queue 2018-05-01 18:03:21 -07:00
Clement
d47ddbd6e4 CR 2018-05-01 18:02:29 -07:00
Clement
30d14dcd45 Push packet version 2018-05-01 18:02:29 -07:00
Atlante45
7a710093ac Fix build error 2018-05-01 18:02:29 -07:00
Clement
3862a02cee DRY traversal scan callbacks 2018-05-01 18:02:29 -07:00
Clement
98cf48694e Expose secondary camera to game logic 2018-05-01 18:02:29 -07:00
Clement
49fad3d868 EntityServer traversal aware of all ViewFrustums 2018-05-01 18:02:29 -07:00
Stephen Birarda
12f7dd93dc
Merge pull request #13068 from birarda/67-to-master 
merge RC67 back to master
 2018-05-01 17:24:46 -07:00
Stephen Birarda
0838381e4c
Merge pull request #13070 from SimonWalton-HiFi/getdomainlocalid-assert 
Prevent call of getDomainLocalID() by domain server itself more robustly
 2018-05-01 15:45:37 -07:00
Simon Walton
bbcb07d9ab Brute force it with isDomainServer() 2018-05-01 15:07:44 -07:00
Simon Walton
0627099667 In packetSourceAndHashMatchAndTrackBandwidth() check LocalID after check for DS source 
Makes check more robust in case domain server itself reaches this point,
since LimitedNodeList::getDomainLocalID() debug-asserts.
 2018-05-01 14:33:48 -07:00
David Rowe
0653f49efe Remove deprecated location.domainId from API 
location.domainID is available, instead.
 2018-05-02 09:31:24 +12:00
Stephen Birarda
f5441c05b3 Merge branch 'master' of github.com:highfidelity/hifi into 67-to-master 2018-05-01 14:18:24 -07:00
Stephen Birarda
cad63ad107 Revert "Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"" 
This reverts commit acb21cc96a.
 2018-05-01 14:15:12 -07:00
Ryan Huffman
24ac342c6b Add support for client texture selection 2018-05-01 14:11:31 -07:00
Andrew Meadows
003ea5ae36 remove unused crufty debug variable 2018-05-01 13:15:37 -07:00
Andrew Meadows
26db9ec09e yield ownership outside workload R1 2018-05-01 13:15:37 -07:00
David Rowe
1aa28b7f54 Merge remote-tracking branch 'upstream/master' into 21856-d 
# Conflicts:
#	interface/src/LODManager.h
 2018-05-02 07:50:55 +12:00
John Conklin II
250aa3ab43
Merge pull request #13027 from jherico/fix/web_crash2 
Some fixes for QML surfaces
 2018-05-01 12:39:46 -07:00
samcake
b3408ae4c0 Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload 2018-05-01 11:39:54 -07:00
John Conklin II
c3e531dda1
Merge pull request #13062 from sethalves/fix-physics-crash-on-exit 
fix physics related crash-on-exit
 2018-05-01 11:04:50 -07:00
Stephen Birarda
24dc1c930e Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67 2018-05-01 10:54:35 -07:00
Seth Alves
f1e1c6a348 fix physics related crash-on-exit 2018-05-01 09:15:44 -07:00
David Rowe
2482da3c25 Miscellaneous JSDoc fixes noticed in passing 2018-05-01 21:55:45 +12:00
David Rowe
a1fc1c4810 Add JSDoc for Entity preload and unload signals 2018-05-01 21:55:14 +12:00
luiscuenca
50ca09b3b4 minor fixes 2018-04-30 16:26:04 -07:00
Clement
f3fe1f3e58 Force crash helpers not inlined 2018-04-30 15:54:08 -07:00
Ryan Huffman
73cea112ee Update FilePersistThread to use std::chrono instead of usecTimestampNow 2018-04-30 14:13:59 -07:00
Simon Walton
cfc5892d63 Only clear check-in count on Domain Query related responses 2018-04-30 13:41:56 -07:00
Stephen Birarda
ed47cd8458 add a missing unsafe_erase for local node ID map 2018-04-30 12:35:48 -07:00
luiscuenca
2de982a5a2 Added script types and better script reload 2018-04-30 12:04:35 -07:00
John Conklin II
bc7b0ca0a9
Merge pull request #13029 from birarda/bug/revert-12969-in-67 
Fix missed revert of PR 12969 for RC67
 2018-04-30 11:11:38 -07:00
MiladNazeri
a2e2b2cb8c
Merge pull request #13047 from ctrlaltdavid/21856-b 
Fix JSDoc for Entities.findEntitiesByName
 2018-04-30 11:00:35 -07:00
John Conklin II
ed39b4f63e
Merge pull request #13014 from druiz17/fix-localhost-port 
hide default port from addresses, fix localhost scheme
 2018-04-30 10:10:06 -07:00
Thijs Wenker
9e086dda3c Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes 2018-04-30 17:32:49 +02:00
Oren Hurvitz
69b97b423f Added a missing 'break' in AnimExpression::evalUnaryMinus() 2018-04-30 15:42:45 +03:00
Oren Hurvitz
a226790295 Eliminated warnings in gcc 
Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.
 2018-04-30 15:05:27 +03:00
David Rowe
2cc3ed6287 List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12:00
David Rowe
8d71d72258 Fix JSDoc for Entities.findEntitiesByName 2018-04-28 13:16:26 +12:00
Brad Davis
8e42bb8c87 Restore the stop functionality for a browser view when it's being destroyed 2018-04-27 17:35:38 -07:00
Ken Cooke
1e25d48941
Merge pull request #13044 from roxanneskelly/roxie-arm64-fixes 
Two fixes for arm64 on linux
 2018-04-27 17:15:03 -07:00
Simon Walton
bfbded7bec Reset pending domain checkins in more locations 2018-04-27 16:57:24 -07:00
Roxanne Skelly
ac8b3e4f5e Two fixes for arm64 on linux 
1) size_t is not defined by default in gcc, so stddef.h needed to be added
to AudioDynamics.h to handle some size_t usage.
2) gcc defaults char to unsigned, where windows defaults to signed.  OctalCode.cpp
was assuming signed
 2018-04-27 23:21:54 +00:00
John Conklin II
37f4a2d3a8
Merge pull request #12986 from hyperlogic/bug-fix/debug-rendering-over-background 
Debug Draw rendering now is visible on background skybox
 2018-04-27 15:56:44 -07:00
samcake
023941a133 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-27 15:19:23 -07:00
Brad Davis
575520fe30 Ensure we actually delete the QML scenegraph! 2018-04-27 15:08:10 -07:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging 
Quiet logging
 2018-04-27 14:59:38 -07:00
John Conklin II
1f4a9b6bcc
Merge pull request #12950 from SimonWalton-HiFi/batch-compile-shaders2 
Batch compile more shaders
 2018-04-27 14:55:57 -07:00
Stephen Birarda
5324ea6d5d
Merge pull request #13038 from highfidelity/stable 
Merge stable to RC66.2
 2018-04-27 14:42:28 -07:00
samcake
3812b8da60 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-27 13:16:35 -07:00
John Conklin II
ddedfce8a3
Merge pull request #12932 from ZappoMan/fixBug349 
fix bug 349
 2018-04-27 12:48:17 -07:00
John Conklin II
73b175a1f2
Merge pull request #12934 from misslivirose/fix/import-whitespace 
trim before importing from clipboard
 2018-04-27 12:44:35 -07:00
Bradley Austin Davis
acb21cc96a Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently" 2018-04-27 10:50:47 -07:00
Zach Fox
c163ae63b8 Allow gifting of Pending items; remove PoP verification rescheduling on Pending items 2018-04-27 10:28:59 -07:00
Zach Fox
0f36fb113d Allow gifting of Pending items; remove PoP verification rescheduling on Pending items 2018-04-27 10:20:55 -07:00
samcake
593c452671 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-27 09:33:06 -07:00
Brad Davis
e892694bf5 Don't modify URL on web entity on QML shutdown, remove tablet related code from web entity 2018-04-27 08:13:35 -07:00
Brad Davis
1b612d373f Explicitly delete QML context before releasing engine 2018-04-27 08:11:11 -07:00
Brad Davis
6640313256 Fix memory leak in QML surfaces 2018-04-27 08:10:22 -07:00
Brad Davis
4db83230ce Fix bad virtual cast on qml surface destruction 2018-04-27 08:09:31 -07:00
Brad Davis
2662dc9b4e Suppress tracing log spam when tracing is not active 2018-04-27 08:03:48 -07:00
Sam Gateau
b4682b31df Getting the variant list out to js right 2018-04-26 23:53:11 -07:00
samcake
3ab0458d3a Trying to expose an array to js 2018-04-26 17:45:48 -07:00
Simon Walton
1448f3959e Add a utility function to dump ConnectionStats 2018-04-26 17:11:17 -07:00
Ryan Huffman
496b638a88 Fix log file directory not being capped at 50MB 2018-04-26 15:48:55 -07:00
Thijs Wenker
20b9e44844 Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes 2018-04-26 22:37:15 +02:00
MiladNazeri
098b432fd9
Merge pull request #13011 from ctrlaltdavid/21856-a 
Docs to JSDoc review updates
 2018-04-26 13:29:48 -07:00
Stephen Birarda
c8d7dc9b91 hide default port from addresses, fix localhost scheme 2018-04-26 13:29:26 -07:00
Stephen Birarda
97d793f867 hide default port from addresses, fix localhost scheme 2018-04-26 13:25:56 -07:00
samcake
ba29ebaeb0 Moving the view controller up into workload and exposing timings 2018-04-26 13:08:26 -07:00
Andrew Meadows
03e03727db fix bug: interface sends too many updates on settle 2018-04-26 12:55:28 -07:00
Stephen Birarda
bc4ce12e64
Merge pull request #13008 from huffman/fix/download-correct-installer 
Fix update installer URLs and add installer info to user activity data
 2018-04-26 11:32:22 -07:00
Stephen Birarda
9f25103b09
Merge pull request #12972 from sethalves/fix-linux-clang-build 
fix linux clang build
 2018-04-26 10:46:51 -07:00
Ryan Huffman
4c8b8d8442 Improve installer campaign+type for updates and user activity data 2018-04-26 08:32:18 -07:00
David Rowe
08dc9b133f Docs to JSDoc review 2018-04-26 21:10:28 +12:00
luiscuenca
e0770f06b1 Add scripts to Model Packager 2018-04-25 19:35:26 -07:00
Thijs Wenker
8b7a07577c Merge branch 'master' of git@github.com:highfidelity/hifi.git into feat/hasScriptedBlendshapes 2018-04-26 03:09:44 +02:00
samcake
6d755a2127 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 17:36:02 -07:00
Simon Walton
9ef56c44a3 Merge PR12964 to not use verification if not keyed 
https://github.com/highfidelity/hifi/pull/12964
 2018-04-25 17:08:08 -07:00
samcake
17f8e789fc less warning maybe ? 2018-04-25 15:53:50 -07:00
Clément Brisset
2be40d487e
Merge pull request #13002 from birarda/sixty-six-one-mergeback 
merge RC66.1 back to master
 2018-04-25 15:47:56 -07:00
samcake
5db3eee4ad Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 15:21:43 -07:00
Simon Walton
66bd424ae4 Bump default packet version for new HMAC 2018-04-25 14:51:11 -07:00
Simon Walton
4fa11f116f Add & use HMACAuth method that calculates hash atomically 
To avoid issues with race conditions involving separate
addData() and result() calls use a method that does
both in the lock.
 2018-04-25 14:41:16 -07:00
Liv Erickson
afea186784 fix for both functions 2018-04-25 14:39:04 -07:00
Stephen Birarda
956cc411d5 Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback 2018-04-25 14:33:23 -07:00
John Conklin II
cb7b03652b
Merge pull request #12796 from MiladNazeri/feature/add-findByName 
added Entities.findbyName
 2018-04-25 14:00:10 -07:00
Liv Erickson
1860e66bd2 Merge branch 'master' of github.com:highfidelity/hifi into fix/import-whitespace 2018-04-25 13:52:55 -07:00
Brad Davis
44816941fc Fix debug assert in manipulating thread local data to store GL surfaces 2018-04-25 13:51:27 -07:00
MiladNazeri
0f87e53902
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate 
Docs/docs to js docs update
 2018-04-25 12:26:19 -07:00
samcake
32e83c256a Adjusting the task::Engine run signature to appease gcc gods and other warnings 2018-04-25 12:23:30 -07:00
John Conklin II
f04200a620
Merge pull request #12976 from ctrlaltdavid/21856 
Docs to JSDoc
 2018-04-25 11:36:34 -07:00
John Conklin II
748c8cdc58
Merge pull request #12861 from Zvork/taapre 
Bloom and Temporal Anti-Aliasing improvements
 2018-04-25 11:16:56 -07:00
Simon Walton
e25e15d6b3 Merge branch 'hmac-better-locking' into hmac-auth2 2018-04-25 10:38:07 -07:00
Simon Walton
3233cc43ac Revert "Merge pull request #12981 from birarda/bug/revert-hmac" 
This reverts commit 91b93db0c5, reversing
changes made to 6062f21da1.
 2018-04-25 10:30:50 -07:00
John Conklin II
91b93db0c5
Merge pull request #12981 from birarda/bug/revert-hmac 
revert HMAC packet verification for now
 2018-04-25 10:07:36 -07:00
samcake
5b5cad38e8 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-25 10:03:42 -07:00
Olivier Prat
328f1dec9b Extended to other shaders 2018-04-25 18:56:18 +02:00
Thijs Wenker
98148aa396 Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes 2018-04-25 18:53:31 +02:00
Bradley Austin Davis
ea0ef20416
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently" 2018-04-25 09:43:20 -07:00
Olivier Prat
e37b18336a Improved anti-aliasing on text 2018-04-25 12:08:08 +02:00
Olivier Prat
eab7dd6006 Fixed procedural shaders 2018-04-25 10:25:34 +02:00
Olivier Prat
f332849d9a Merge branch 'master' of http://github.com/highfidelity/hifi into taapre 2018-04-25 09:19:21 +02:00
milad nazeri
4c736b2d62 Fixed defaults 2018-04-24 21:38:48 -07:00
David Rowe
cae9447ac5 Doc review 2018-04-25 15:09:47 +12:00
luiscuenca
165c3214a7 Avatar Scripts 2018-04-24 18:43:53 -07:00
Simon Walton
21a9525a73 Version of HMACAuth with exposed lock 
Client is responsible for locking between adding and
retrieving. Fixes a likely race.
 2018-04-24 17:52:12 -07:00
Liv Erickson
10694e2256 Merge branch 'master' of github.com:highfidelity/hifi into fix/import-whitespace 2018-04-24 17:15:45 -07:00
John Conklin II
6062f21da1
Merge pull request #12961 from Atlante45/fix/es-deadlock 
Enforce correct lock order between EntityTree and EntitySimulation
 2018-04-24 15:40:32 -07:00
Anthony J. Thibault
2136134ed0 Debug Draw rendering now is visible on background skybox 2018-04-24 14:28:08 -07:00
John Conklin II
ce14dfb9a4
Merge pull request #12974 from AndrewMeadows/dont-feed-bullet-garbage 
don't try to build convex hulls with nan data
 2018-04-24 14:11:25 -07:00
Atlante45
d82333534c Ensure the tree lock is always taken before the simulation lock 2018-04-24 13:46:05 -07:00
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data 
Get the correct device name connect to OpenVr
 2018-04-24 13:29:41 -07:00
Brad Hefta-Gaub
e6f15c720f
Merge pull request #12973 from birarda/bug/no-node-stats 
66.1: fix connection to start stats sending for assignments
 2018-04-24 13:23:39 -07:00
milad nazeri
23d07fa292 fixed spacing issue 2018-04-24 13:14:55 -07:00
samcake
adfc935fdb Merge with master 2018-04-24 13:04:16 -07:00
John Conklin II
47c983a004
Merge pull request #12978 from AndrewMeadows/fix-crash-createConvexHull-RC66.1 
RC66.1: don't try to build convex hulls with nan data
 2018-04-24 13:03:13 -07:00
Stephen Birarda
63491588cb Revert "Merge pull request #12690 from SimonWalton-HiFi/hmac-auth" 
This reverts commit 7378c87ade, reversing
changes made to 92bf99f436.
 2018-04-24 12:44:51 -07:00
Brad Hefta-Gaub
c6f4e118ce
Merge pull request #12953 from huffman/hotfix/node-list-connections 
Hotfix, avatars disappear on quick reconnect
 2018-04-24 12:38:21 -07:00
samcake
33bbbcef83 Merging with master 2018-04-24 11:49:34 -07:00
samcake
382161659e Merge branch 'master' of https://github.com/highfidelity/hifi into taa-zvork 2018-04-24 11:37:00 -07:00
Sam Gateau
b342b16857 Fixing the crash on mac 2018-04-24 11:25:40 -07:00
Sam Gateau
2cae294ab4
Merge pull request #12904 from AndrewMeadows/lhf-needsToCallUpdate 
LHF optimiaztion: only call ModelEntityItem::update() on instances that actually need it
 2018-04-24 11:22:48 -07:00
Thijs Wenker
b0187ecfd3 add MyAvatar.hasAudioEnabledFaceMovement API property which is enabled by default 2018-04-24 19:24:23 +02:00
Sam Gateau
da154d3e00
Merge pull request #12969 from jherico/fix/web_crash 
Attempt to shutdown web surfaces more consistently
 2018-04-24 10:15:25 -07:00
Brad Davis
4228b4269f Fixing PR build 2018-04-24 10:06:28 -07:00
Brad Davis
a144de54e7 Attempt to shutdown web surfaces more consistently 2018-04-24 10:06:20 -07:00
milad nazeri
1121fe8da0 fix tabs 2018-04-23 21:47:53 -07:00
Brad Davis
ecaf162afb Fixing PR build 2018-04-23 20:41:36 -07:00
samcake
f686ef1f25 Exposing more uniforms to ui for refining the controller 2018-04-23 18:02:09 -07:00
Andrew Meadows
95d07345d4 don't try to build convex hulls with nan data 2018-04-23 17:00:38 -07:00
David Rowe
98f43b6a70 Interim JSDoc for MyAvatar - stubs for remainder 2018-04-24 10:47:33 +12:00
Thijs Wenker
3764ee4a06 Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes 2018-04-24 00:36:28 +02:00
Andrew Meadows
ae186d46c6 don't try to build convex hulls with nan data 2018-04-23 14:46:23 -07:00
Brad Davis
861200db27 Attempt to shutdown web surfaces more consistently 2018-04-23 14:32:38 -07:00
John Conklin II
91197cadcf
Merge pull request #12967 from SimonWalton-HiFi/hmac-shortid-merge-fix 
Fix for null sourceNode use
 2018-04-23 14:11:06 -07:00
David Rowe
719062dd9f Interim JSDoc for MyAvatar - first pass 2018-04-24 09:10:59 +12:00
John Conklin II
70689dd297
Merge pull request #12968 from birarda/bug/wrong-domain-local-id 
fix setting of domain local ID from domain list
 2018-04-23 13:50:21 -07:00
John Conklin II
5a3f44fa15
Merge pull request #12965 from NissimHadar/bug12979 
Fix for bug #12979: Setting colors [0, 0, 254] from js api ends up as black color
 2018-04-23 13:49:41 -07:00
Sam Gateau
d3fccc4104
Merge pull request #12881 from SamGondelman/scaleAssert 
Minimum entity dimension (1mm)
 2018-04-23 13:40:53 -07:00
Stephen Birarda
a6509f5ea7 fix connection to start stats sending for assignments 2018-04-23 13:25:18 -07:00
Seth Alves
6d8f769cf8 fix linux clang build 2018-04-23 13:18:36 -07:00
John Conklin II
b3dbf7a025
Merge pull request #12943 from vladest/fix_spinbox 
Fix SpinBox.
 2018-04-23 13:02:01 -07:00
Stephen Birarda
779386fbc4 fix setting of domain local ID from domain list 2018-04-23 12:29:02 -07:00
Simon Walton
f849d6f937 Change packetSourceAndHashMatchAndTrackBandwidth logging in same manner 2018-04-23 12:26:02 -07:00
Andrew Meadows
577f9a03e6 fix bug: animation reset on 'hold' 2018-04-23 12:08:40 -07:00
Andrew Meadows
748af5a65f worry about multi-threads when updating animation props 2018-04-23 12:08:40 -07:00
Andrew Meadows
8e51d66092 fix bug: animation should reset on start running 2018-04-23 12:08:40 -07:00
Andrew Meadows
b48e9495a5 rollback change to MaterialEntityItem, we'll fix later 2018-04-23 12:08:40 -07:00
Andrew Meadows
75508385cf more correct needsToCallUpdate() implementations 2018-04-23 12:08:40 -07:00
Andrew Meadows
e36dbab838 remove unused data member 2018-04-23 12:08:40 -07:00
NissimHadar
ea6585a0b9 Corrected tosRGBFloat() computation. 2018-04-23 11:53:35 -07:00
Gabriel Calero
001cd5e937 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-23 14:25:26 -03:00
samcake
35bbc6e61f Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-23 10:20:22 -07:00
Sam Gateau
d1e2e9ce71
Merge pull request #12921 from SamGondelman/precisionq 
Fix AMD shader compilation
 2018-04-23 10:17:35 -07:00
samcake
990ee83f04 Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-23 10:07:58 -07:00
Sam Gateau
7842ee8eac
Merge pull request #12962 from SamGondelman/menu 
Android: Hide menu and fix shader compilation
 2018-04-23 09:51:20 -07:00
Sam Gateau
97934fe563 Adjusting the regulators and moving task to use chrono nad interesting tests 2018-04-23 00:07:00 -07:00
milad nazeri
4ac06fe99f Updating previous jsdocs 2018-04-22 22:22:33 -07:00
David Rowe
941e9360dd JSDoc fixes 2018-04-23 16:09:56 +12:00
Sam Gateau
99a0e42b5d Merge branch 'master' of https://github.com/highfidelity/hifi into workload 2018-04-22 20:26:49 -07:00
David Rowe
d65f66a73d Interim JSDoc for Recording 2018-04-23 14:13:29 +12:00
David Rowe
6a2b7244eb Interim JSDoc for Tablet 2018-04-23 11:06:17 +12:00
David Rowe
eeb511c359 Reticle JSDoc fix 2018-04-23 10:20:04 +12:00