Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 01:00:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
54103 commits 75 branches 59 tags 1.2 GiB
Commit graph

22201 commits

Author SHA1 Message Date
Ryan Huffman
b20fcbfcdb Add a way to write data to a storage object 2017-04-26 10:45:50 -07:00
Ryan Huffman
ccd9c4697b Add extended ktx header/high-mip request handling to NetworkTexture 2017-04-26 10:45:50 -07:00
Ryan Huffman
1fec531c68 Add basic mip writing to gpu::Texture 2017-04-26 10:45:50 -07:00
Ryan Huffman
00cbfa0f70 Add start of progressive ktx-loading 2017-04-26 10:45:50 -07:00
Ryan Huffman
105d17e85e Add byte range support to HTTPResourceRequest 2017-04-26 10:45:14 -07:00
Dante Ruiz
d8e6e8e7d0 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-26 16:53:02 +01:00
Dante Ruiz
79d827c6be added requested features 2017-04-26 16:52:51 +01:00
David Rowe
1b635d8c5e Replace FIXMEs with proper code 2017-04-26 13:29:51 +12:00
David Rowe
4a5f84f4b9 Merge branch 'master' into 21249 
# Conflicts:
#	libraries/audio-client/src/AudioClient.cpp
 2017-04-26 13:24:18 +12:00
ZappoMan
65801cbb4d Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 18:21:17 -07:00
ZappoMan
5164aa4056 hacking 2017-04-25 18:21:09 -07:00
Seth Alves
dc70e96b0f Merge pull request #10284 from birarda/bug/input-received-signal 
fix emission of inputReceived in AudioClient
 2017-04-25 17:38:04 -07:00
ZappoMan
90cdeb9582 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-25 16:09:59 -07:00
Atlante45
33f58f99d1 CR 2017-04-25 16:09:31 -07:00
Dante Ruiz
5a9cf554e7 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-25 23:57:48 +01:00
Atlante45
9dbae4b54e CR 2017-04-25 15:56:23 -07:00
Atlante45
56f656f92a Disable compression during runtime 2017-04-25 15:56:23 -07:00
Atlante45
1cc86b7203 Fix build error 2017-04-25 15:56:23 -07:00
Atlante45
1820207259 Fix processTextureAlpha 2017-04-25 15:56:23 -07:00
Atlante45
d6ab35ba1a Logging cleanup 2017-04-25 15:56:23 -07:00
Atlante45
b98cd7355e Code cleanup 2017-04-25 15:56:23 -07:00
Atlante45
77d8bf20a7 Fix warnings 2017-04-25 15:56:23 -07:00
Atlante45
fae49668b4 Disable CubeMap and NormalMap compression 2017-04-25 15:56:23 -07:00
Atlante45
145af2b911 Fix ImageReader for images with a wrong extension 2017-04-25 15:56:23 -07:00
Atlante45
fc1b920341 Add ability to disable texture compression 2017-04-25 15:56:23 -07:00
Atlante45
ad16a935e9 Texture::create returns shared pointer 2017-04-25 15:56:23 -07:00
Atlante45
63e564c178 Add source hash to KTX metadata 2017-04-25 15:56:23 -07:00
Atlante45
d9a7615cc8 Add compression support for skyboxes 2017-04-25 15:56:23 -07:00
Stephen Birarda
d72e5e5b24 add handling for install_name_tool calls on OS X 2017-04-25 15:56:23 -07:00
Stephen Birarda
3a217f75f4 force release for NVTT on Win32 2017-04-25 15:56:23 -07:00
Stephen Birarda
5c12180b58 use pre-built NVTT on windows 2017-04-25 15:56:23 -07:00
Atlante45
ae73cf4038 Add support for Grayscale and NormalMap textures 2017-04-25 15:56:23 -07:00
Stephen Birarda
27c6011e6e change nvtt external to ignore release type 2017-04-25 15:56:23 -07:00
Stephen Birarda
ee62e7dcb8 update nvtt external to build from source 2017-04-25 15:56:22 -07:00
Atlante45
69a27d516f Fix roughness 2017-04-25 15:56:22 -07:00
Atlante45
5ceb30b69c Make sure mips are copied to memory 2017-04-25 15:56:22 -07:00
Atlante45
a450f52427 Start to setup image library 2017-04-25 15:56:22 -07:00
Atlante45
2e1355618f Use NVTT to mipmap color textures 2017-04-25 15:56:22 -07:00
Atlante45
0428b22b63 Add nvtt external 2017-04-25 15:56:22 -07:00
Stephen Birarda
da1d93b86c fix emission of inputReceived in AudioClient 2017-04-25 15:41:37 -07:00
David Rowe
7c2e1aa846 Tidy FIXME 2017-04-26 10:16:35 +12:00
Andrew Meadows
157dc1475b Merge pull request #10281 from birarda/bug/session-refresh-login 
force DS to use new node ID if connect is re-sent
 2017-04-25 15:02:57 -07:00
Sam Gateau
59ed51c702 Merge pull request #10280 from samcake/white 
Fixing the crash on mac at start up
 2017-04-25 14:32:23 -07:00
Stephen Birarda
c00dfcc7d7 send the domain disconnect packet before UUID is cleared 2017-04-25 14:32:21 -07:00
Brad Hefta-Gaub
1962a49f3b Merge pull request #10225 from sethalves/bullet-constraints-1 
Bullet constraints + far-grab bootstrap fix
 2017-04-25 13:36:47 -07:00
samcake
fe7cec1734 Testing on windows running 4.1 backend, all good 2017-04-25 12:04:12 -07:00
samcake
dff3a3bb34 fixing the mac crash 2017-04-25 11:34:01 -07:00
Dante Ruiz
8c020a0ec2 saving work 2017-04-25 18:01:19 +01:00
David Rowe
d682924b00 Temporary fix for recording audio 2017-04-25 21:08:10 +12:00
David Rowe
4c30c0d722 Make UserActivityLogger available to AC scripts 2017-04-25 13:42:12 +12:00
David Rowe
c05954ee4b Add logAction() method to UserActivityLogger JavaScript API 2017-04-25 13:40:57 +12:00
ZappoMan
d179135a87 remove dead code 2017-04-24 18:21:22 -07:00
ZappoMan
95a3e0a092 fix whitespace 2017-04-24 18:06:33 -07:00
ZappoMan
382645ddd0 more cleanup 2017-04-24 18:01:54 -07:00
ZappoMan
aa955ee360 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-24 17:36:30 -07:00
ZappoMan
c9aad6b762 new approach to the tpose fix, as well as other improvements 2017-04-24 17:36:05 -07:00
humbletim
28b3eef7aa add getJointTranslations() methods 2017-04-24 19:22:02 -04:00
Atlante45
24f4107c92 Unload script when replaced with empty URL 2017-04-24 15:56:37 -07:00
Atlante45
d292451f91 Remove unnecessary const 2017-04-24 15:43:36 -07:00
Dante Ruiz
2a997f2a4d fix for ubuntu build error 2017-04-24 23:08:02 +01:00
Dante Ruiz
8705db07e5 removed dead code 2017-04-24 22:22:49 +01:00
Dante Ruiz
249862141a Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-24 22:09:09 +01:00
Dante Ruiz
367a6ac03c first prototype 2017-04-24 22:09:01 +01:00
Seth Alves
aea8b020d2 Merge pull request #10254 from druiz17/tablet-crash 
Potential fix for crash for TabletScriptingInterface::getTabletWindow
 2017-04-24 12:35:04 -07:00
David Rowe
d52125e2f5 Merge branch 'master' into 21249 2017-04-25 07:19:56 +12:00
Dante Ruiz
f69691afd5 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-24 19:57:48 +01:00
Dante Ruiz
d057dfebf0 got input recording to work 2017-04-24 19:57:38 +01:00
Sam Gateau
b1a3b1f48b Merge pull request #10227 from samcake/brown 
Introducing support for the ResourceBuffer binding point in the gpu lib, the Batch and the backends
 2017-04-22 08:51:54 -07:00
Seth Alves
17b83dd64c Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-21 17:19:47 -07:00
sam gateau
733e268391 FIx the SSBO usage on amd, needed a bit more explanation on the glsl side 2017-04-21 16:17:18 -07:00
Andrew Meadows
3f9f16cc98 Merge pull request #10223 from kunalgosar/blendshapesbug 
Make setBlendshape changes persist
 2017-04-21 16:11:13 -07:00
Dante Ruiz
64fcfd33a4 working on loading files 2017-04-21 22:38:53 +01:00
sam gateau
0a615f35a7 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-21 14:31:15 -07:00
ZappoMan
da68c49dc1 more cleanup 2017-04-21 13:31:40 -07:00
ZappoMan
f07884602a more CR feedback 2017-04-21 13:13:29 -07:00
ZappoMan
088cdae320 CR feedback 2017-04-21 11:14:47 -07:00
ZappoMan
ff45ad53a3 some more CR cleanup 2017-04-21 10:40:41 -07:00
Dante Ruiz
50ed4a61f7 Merge branch 'master' of github.com:highfidelity/hifi into tablet-crash 2017-04-21 18:26:37 +01:00
Dante Ruiz
8cfa03fa56 tablet cpp ownership 2017-04-21 18:26:26 +01:00
ZappoMan
f133713d0e CR feedback 2017-04-21 10:21:34 -07:00
ZappoMan
fbc699d6b2 handle overflow case 2017-04-21 09:30:00 -07:00
ZappoMan
c03182546b some cleanup 2017-04-21 09:11:51 -07:00
Dante Ruiz
641a7390ba Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-21 16:46:55 +01:00
ZappoMan
125b3d5f4e ignore old identity packets 2017-04-21 07:51:17 -07:00
David Rowe
daedb94b04 Merge branch 'master' into 21249 2017-04-21 14:50:28 +12:00
ZappoMan
c197979354 add more logging 2017-04-20 18:36:00 -07:00
ZappoMan
7f1a87ac4f remove random http failure 2017-04-20 17:31:20 -07:00
ZappoMan
e89b6c5d2c some initial debugging on tpose avatars 2017-04-20 17:26:31 -07:00
Sam Gateau
a668ed0409 Merge pull request #10244 from samcake/ambient 
Cleaning the Engine/Task/Job interface
 2017-04-20 15:48:21 -07:00
Dante Ruiz
cbd2a532a8 remove debug statments 2017-04-20 23:28:41 +01:00
Dante Ruiz
1ec4081a99 crash fix 2017-04-20 21:38:20 +01:00
Seth Alves
f7378abb08 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-20 02:40:10 -07:00
Zach Fox
50456f71ed Merge pull request #10142 from Triplelexx/21258 
21258 - Don't render (or heavily use GPU) when window in minimized
 2017-04-19 16:26:49 -07:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
Dante Ruiz
b2a11aa9ab check for null when we dont 2017-04-19 21:30:43 +01:00
Dante Ruiz
d4c8d06575 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-19 20:42:11 +01:00
Dante Ruiz
07f674eabe exprting compressed file 2017-04-19 20:41:56 +01:00
samcake
7f72efa714 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-04-19 11:51:25 -07:00
Sam Gateau
788849e19a Merge pull request #10208 from jherico/gl41_variable 
Adding support for variable allocated textures to the GL 4.1 backend
 2017-04-19 11:42:23 -07:00
Brad Davis
472835d65c Port fix from master 2017-04-19 11:22:20 -07:00
Brad Davis
bccc06d2fe Fix resource texture memory usage tracking 2017-04-19 10:35:19 -07:00
Chris Collins
889b054085 Merge pull request #10067 from humbletim/fix-Entities-setLocalJointTranslations 
Fix Entities.setLocalJointTranslations
 2017-04-19 09:32:28 -07:00
druiz17
57f6529ce6 Merge pull request #10239 from druiz17/edit-model 
Fix issue of tablet proxy not choose the correct root
 2017-04-19 09:19:46 -07:00
David Rowe
00b6b2a2c0 Implement desktop recordings browser dialog 2017-04-19 12:34:59 +12:00
samcake
5af171f69f Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-04-18 17:08:02 -07:00
samcake
63fe579022 simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead' 2017-04-18 17:05:40 -07:00
Dante Ruiz
1cf9485143 fixed compile issue 2017-04-19 00:23:05 +01:00
Brad Davis
2a2102c7fe Recompute memory pressure state after each promote / demote call 2017-04-18 15:12:34 -07:00
Dante Ruiz
ce8dba21a0 fix tablet proxy choosing wrong root 2017-04-18 22:49:43 +01:00
Dante Ruiz
5cd4007aaa got input recording working 2017-04-18 21:53:23 +01:00
kunalgosar
ffdbc12968 copy into new vector 2017-04-18 12:20:03 -07:00
Seth Alves
0807e036e8 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-18 11:59:23 -07:00
Seth Alves
21ca767b7c remove setPosition and setRotation for actions because they were never finished and never used. 2017-04-18 11:59:16 -07:00
Andrew Meadows
31bfc98b87 use const reference for ScenePointer when possible 2017-04-18 11:52:22 -07:00
Andrew Meadows
5a458c9923 remove last qApp usage from Avatar class 2017-04-18 11:52:21 -07:00
Andrew Meadows
685a01482c remove Camera argument from Avatar::render() 2017-04-18 11:52:21 -07:00
kunalgosar
06c5fa0585 correctly resizing blendshapes vector 2017-04-18 11:44:59 -07:00
kunalgosar
d215856b23 cleanup to blendshapes 2017-04-18 11:44:59 -07:00
kunalgosar
0a295fc258 setBlendshapes will presist 2017-04-18 11:44:59 -07:00
samcake
f8a59aa255 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-18 11:04:16 -07:00
David Rowe
dae6d6fb69 Stub desktop dialog to select recording to play from ATP assets 2017-04-18 11:43:42 +12:00
Dante Ruiz
cd095915ef removed emacs junk file from my repo 2017-04-18 00:32:30 +01:00
Dante Ruiz
6d44cd4d1e Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-18 00:18:55 +01:00
Dante Ruiz
c298886896 hooking up the input playback 2017-04-18 00:17:14 +01:00
Zach Fox
e13000410e Whoops 2017-04-17 11:02:27 -07:00
druiz17
4bf3fa56f8 saving work 2017-04-16 21:26:09 -07:00
Seth Alves
fbd4677a9a add a way to set hinge-constraint motor speed from javascript 2017-04-15 21:10:02 -07:00
Seth Alves
b4ff3a8691 don't destroy and recreate constraints when reinserting rigid body 2017-04-15 21:08:59 -07:00
Seth Alves
d42970d480 fix hinge-constraint constructors to use otherAxis 2017-04-15 08:51:08 -07:00
Sam Cake
61ed5c3ce9 THank you mac 2017-04-15 01:35:28 -07:00
Sam Cake
2b97171061 Avoiding temp variable reference to appease mac and fixing a warning 2017-04-15 01:06:01 -07:00
Sam Cake
038d01ce04 Avoiding temp variable reference to appease mac and fixing a warning 2017-04-15 00:45:50 -07:00
Sam Cake
96960a505d COmpleted the Resource Buffer, compilation and binding works. Now need to help on the shader side 2017-04-14 23:22:45 -07:00
Seth Alves
41fb05ecf7 bump protocol version 2017-04-14 16:26:54 -07:00
Seth Alves
371118a6c0 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 16:26:30 -07:00
Seth Alves
f08fecbfa7 make sure new constraint data gets transmitted over network 2017-04-14 16:25:27 -07:00
David Rowe
2731c13a5c Merge remote-tracking branch 'upstream/master' into 21249 2017-04-15 09:51:16 +12:00
Seth Alves
708008d8a5 cleanups 2017-04-14 13:43:48 -07:00
Sam Gateau
3519a72f8a Merge pull request #10190 from samcake/ambient-bis 
Introducing a tool to debug the current Zone Stack
 2017-04-14 13:28:59 -07:00
Seth Alves
07b23b8235 expose other hinge-constraint parameters to javascript 2017-04-14 13:28:25 -07:00
Seth Alves
d17d12446b Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 12:49:03 -07:00
Seth Alves
d0144f4110 avatar-action-far-grab works now 2017-04-14 12:44:54 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache 
cleanup Agent RSI handling, make loadRecording async
 2017-04-14 21:35:51 +02:00
Stephen Birarda
7b48feca66 address code review comments 2017-04-14 11:53:53 -07:00
Seth Alves
b1dc5be316 make far-grab it's own action (which is just like spring) in order to avoid bootstrapping own avatar 2017-04-14 11:48:06 -07:00
Sam Cake
f991475004 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-04-14 11:33:21 -07:00
Seth Alves
2dab3069da fix bug that was causing spring action to cause constant re-insertion of its rigidbody into bullet. store UUIDs rather than shared pointers in _objectDynamicsByBody so that refcounting works right and actions get their destructors called. 2017-04-14 11:06:40 -07:00
Seth Alves
f5a5369055 attempt to remove dynamics associated with a rigid-body before removing the rigid-body 2017-04-14 07:06:53 -07:00
Seth Alves
52aee63e05 keep track of objectDynamics per rigidBody 2017-04-14 06:08:58 -07:00
Sam Cake
bb15b8c701 ANd fixing the gl41 rendering 2017-04-14 00:46:41 -07:00