Chris Collins
|
5036e63cb8
|
Changed Qt version for android
|
2017-04-25 13:05:59 -07:00 |
|
Brad Hefta-Gaub
|
0783433d75
|
Merge pull request #10251 from birarda/edit-baked-column
add a column to edit.js to identity baked models
|
2017-04-25 13:04:48 -07:00 |
|
Ken Cooke
|
d7bf42c77a
|
Merge pull request #10276 from mnafees/21222
CR for Job #21222 - Clean up plugins/hifiCodec dependencies
|
2017-04-25 06:16:51 -07:00 |
|
Mohammed Nafees
|
3382f9f5eb
|
Remove unnecessary dependencies from hifiCodec
|
2017-04-25 00:42:45 -04:00 |
|
Clément Brisset
|
77cd2d08b2
|
Merge pull request #10106 from MrRoboman/W-21204-tetherball-toy
Added tetherball create and entity scripts
|
2017-04-24 16:36:21 -07: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Stephen Birarda
|
3452dd0251
|
increment colspan count in table footer
|
2017-04-20 15:20:48 -07: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 |
|
Stephen Birarda
|
924624b127
|
add new glyphs with check, reference in entityList
|
2017-04-20 14:21:13 -07:00 |
|
Stephen Birarda
|
f64efe18c0
|
add an isBaked column to edit.js
|
2017-04-20 14:21:13 -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 |
|
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 |
|
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 |
|
Howard Stearns
|
89fa6601b9
|
Merge pull request #10238 from howard-stearns/callback-on-profile-failure
Be sure to callback even on profile failure.
|
2017-04-18 13:40:03 -07:00 |
|
kunalgosar
|
ffdbc12968
|
copy into new vector
|
2017-04-18 12:20:03 -07:00 |
|
howard-stearns
|
3113dced7b
|
Be sure to callback even on profile failure.
|
2017-04-18 12:06:44 -07:00 |
|
Andrew Meadows
|
da55c96c4c
|
protect against crash on invalid scene on shutdown
|
2017-04-18 11:52:22 -07:00 |
|
Andrew Meadows
|
014d7b8d8d
|
use viewFrustum position for laser pointer render filtering
|
2017-04-18 11:52:22 -07:00 |
|
Andrew Meadows
|
71c5644c23
|
more shared_ptr by const reference
|
2017-04-18 11:52:22 -07:00 |
|
Andrew Meadows
|
31bfc98b87
|
use const reference for ScenePointer when possible
|
2017-04-18 11:52:22 -07:00 |
|