Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-07 22:40:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69178 commits 25 branches 28 tags 1.2 GiB
Commit graph

28560 commits

Author SHA1 Message Date
samcake
44a8d880fa Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-24 14:31:53 -07:00
John Conklin II
36d2baab60
Merge pull request #13214 from SamGondelman/primCrash 
Fix crash in GL45Backend::do_drawIndexedInstanced
 2018-05-24 13:33:06 -07:00
John Conklin II
04bf8f851f
Merge pull request #13219 from samcake/one 
Bringing Evolution to the Job Engine Task library developed in the workload project to master
 2018-05-24 13:30:16 -07:00
Brad Davis
7e16325805 Unit testing cached and uncached shader loading 2018-05-24 12:42:34 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
Stephen Birarda
2cb7c9cc62 add a BUILD_TYPE to BuildInfo, fix conditional 2018-05-24 12:04:32 -07:00
Stephen Birarda
45b8c1248c disable version checking for nightly builds 2018-05-24 12:03:33 -07:00
Andrew Meadows
885c7bc97d bump protocol for extra byte in collisionMask 2018-05-24 11:28:52 -07:00
Andrew Meadows
d42375e4fe finish uint8_t to uint16_t conversion 2018-05-24 11:28:52 -07:00
Andrew Meadows
31dd59d212 double bits in collision groups 2018-05-24 11:28:52 -07:00
Sam Gateau
b8b337dbe4 There and back again... 2018-05-24 01:18:36 -07:00
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