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

53655 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
8c020a0ec2 saving work 2017-04-25 18:01:19 +01:00
Dante Ruiz
2a997f2a4d fix for ubuntu build error 2017-04-24 23:08:02 +01:00
Dante Ruiz
b023356fb7 added javascript file 2017-04-24 22:29:13 +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
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
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
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
Dante Ruiz
cc34cb96e4 making ui for input recorder 2017-04-21 18:15:47 +01:00
Brad Davis
a62a44ff6a Merge pull request #10252 from jherico/organize_resources 
Organize the files in the JS and QML projects to appear in a folder hierarchy
 2017-04-21 09:38:59 -07:00
Ken Cooke
a5ed3007b3 Merge pull request #10248 from vladest/notify-sound-inject 
Notify sound inject
 2017-04-21 09:26:36 -07:00
Dante Ruiz
641a7390ba Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-21 16:46:55 +01: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
Brad Davis
a8de6eab8c Organize the files in the JS and QML projects to appear in a folder hierarchy 2017-04-20 14:39:06 -07:00
Dante Ruiz
1ec4081a99 crash fix 2017-04-20 21:38:20 +01:00
Vladyslav Stelmakhovskyi
2665ede06f Audio injector cleanup 2017-04-20 21:32:14 +02:00
Vladyslav Stelmakhovskyi
b2533b6106 Code nitpick. Pointer cleanup on exit 2017-04-20 21:12:57 +02:00
Zach Pomerantz
b77917b8d1 Merge pull request #10241 from zzmp/fix/display-fail 
Update Display menu on unsuccesful selection
 2017-04-20 12:04:51 -04:00
Vladyslav Stelmakhovskyi
06406ef7de Merge branch 'master' into notify-sound-inject 2017-04-20 17:46:08 +02:00
Vladyslav Stelmakhovskyi
023d03d9f8 Implemented snap sound using sound injector 2017-04-20 17:43:16 +02: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
Brad Hefta-Gaub
a555846d5d Merge pull request #10235 from volansystech/21206 
21206 Far grab improvement to draw held entity toward yourself
 2017-04-19 14:33:09 -07: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
volansystech
b194ddeb66 Resolve Comments of @sethalves 2017-04-19 16:39:23 +05:30
samcake
2c16b2bf3a Expose the runtime from the engine in Stats 2017-04-18 18:12:42 -07: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
Sam Gateau
4df41ff7d3 Merge pull request #10206 from AndrewMeadows/avatar-renderer-001 
Cleanup dependencies in Avatar class in preparation for migration to new lib
 2017-04-18 16:45:51 -07:00
Dante Ruiz
1cf9485143 fixed compile issue 2017-04-19 00:23:05 +01:00
Zach Pomerantz
c7a7fa90ec update Display menu on unsuccesful selection 2017-04-18 18:47:57 -04: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
f8ec49eb96 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-18 21:53:37 +01:00