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

59280 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
eca7632111 Merge pull request #11376 from Atlante45/feat/auto-bake 
Pull Auto-Baking changes to TabletAssetServer.qml
 2017-09-15 14:31:18 -07:00
Ryan Huffman
c5852dfbe8 Add list compression to FBXWriter 2017-09-15 13:53:10 -07:00
Atlante45
c4d018504b Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 13:28:51 -07:00
Anthony Thibault
c7fc45e0ae Merge pull request #11375 from hyperlogic/bug-fix/avatar-attachments-rendering 
Avatar Attachments now render correctly
 2017-09-15 13:28:00 -07:00
vladest
de4f34aacb Add resizable flag. Use the flag for Create only 2017-09-15 21:49:38 +02:00
Seth Alves
d968bbad6c Merge pull request #11364 from sethalves/rework-scriptengine-lifetime 
Rework scriptengine lifetime
 2017-09-15 12:17:51 -07:00
Seth Alves
0816a8af27 fix grab entity methods 2017-09-15 12:07:50 -07:00
Seth Alves
b67c571aaa fix grab entity methods 2017-09-15 12:05:49 -07:00
samcake
c687932ca7 One more: 2017-09-15 11:44:35 -07:00
Atlante45
8711823a9b Sync up AssetServer.qml and TabletAssetServer.qml 2017-09-15 11:44:08 -07:00
Anthony J. Thibault
3f6c88e77f Avatar Attachments now render correctly 
* moved Avatar::fixupModelsInScene off the newly created render thread back
  to the main thread.
* updated Avatar::postUpdate to take a scene pointer, necessary for
  Avatar::fixupModelsInScene
* updated developer/tests/avatarAttachementTest.js to account for recent
  changes in avatar attachment scale, commit 712aff7ad.
* updated initialization of anim graph to use Model::isLoaded() instead of
  Model::initWhenReady() to know when the model was completely loaded.
 2017-09-15 11:23:09 -07:00
Seth Alves
df80b7ecfa stopNearTrigger, not end 2017-09-15 11:16:54 -07:00
samcake
97617c6dbe Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis 2017-09-15 11:13:34 -07:00
samcake
19cd537e65 addressing review comments 2017-09-15 11:10:25 -07:00
Seth Alves
39e6605f6f fix grab entity methods + jshint cleanups 2017-09-15 10:50:46 -07:00
Seth Alves
8a49edbecb code review 2017-09-15 10:08:35 -07:00
Chris Collins
2a77bb06c7 Merge pull request #11367 from highfidelity/RC-54-HOTFIX 
Build 54.1 Hotfix Fix for polyline crash
 2017-09-15 09:35:59 -07:00
Sam Gateau
30bf800963 Cleanup 2017-09-14 20:33:08 -07:00
Thijs Wenker
9f61e7471c Merge pull request #11365 from thoys/feat/cloneAvatarEntities 
Clone local avatar entities
 2017-09-15 04:51:18 +02:00
samcake
ec7536db2c Brining the changes just to fix the tablet issue 2017-09-14 18:36:20 -07:00
Ryan Huffman
fd1d4b9bd1 Update FBXBaker to only pack original indices if needed 2017-09-14 16:49:53 -07:00
Stephen Birarda
ef60d0afb3 Merge pull request #11368 from birarda/feat/draco-in-baking 
don't re-bake an already baked Draco FBX
 2017-09-14 16:47:48 -07:00
Ryan Huffman
7db8d1dcbc Add support for baked skinned meshes 2017-09-14 16:43:52 -07:00
Anthony J. Thibault
f534ee5ad9 laser offset fix 2017-09-14 16:37:45 -07:00
Ryan Huffman
3793062045 Add optional FBX 2015 encoding to FBXWriter 2017-09-14 16:31:10 -07:00
Stephen Birarda
2a62bac4f9 refuse to re-bake an already baked FBX 2017-09-14 16:08:11 -07:00
Brad Davis
d3ac7a388c Fix polyline rendering using default texture 2017-09-14 15:50:09 -07:00
Brad Davis
4c4df97c42 Fix transform of polylines with high update rates 2017-09-14 15:50:02 -07:00
Brad Davis
c0fb9dcf2e Fix polyline crash and flicker 2017-09-14 15:49:54 -07:00
Chris Collins
cfec2a29ae Merge pull request #11314 from jherico/polyline_crash 
Fix polyline crash and flicker
 2017-09-14 15:42:49 -07:00
Clément Brisset
9816070e70 Merge pull request #11366 from Atlante45/feat/auto-bake 
Update feat/auto-bake with master
 2017-09-14 15:36:32 -07:00
Atlante45
ae14f1f88e Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-09-14 15:34:20 -07:00
Clément Brisset
cbe61871dc Merge pull request #11346 from birarda/feat/draco-in-baking 
Add mesh compression to baking library and FBXReader
 2017-09-14 15:32:58 -07:00
Stephen Birarda
43196cd0a6 fix buffer resizing to only occur when attribute is present 2017-09-14 14:46:48 -07:00
Stephen Birarda
bb98df38d4 remove re-grabbing of draco faces 2017-09-14 14:42:40 -07:00
Thijs Wenker
af4bc59307 clone local avatar entities 2017-09-14 23:31:51 +02:00
Stephen Birarda
9cb4e2c5f2 address code review comments 2017-09-14 13:58:48 -07:00
Brad Davis
688ee68cf9 Ensure thread-safety for model pointer access 2017-09-14 12:29:23 -07:00
LaShonda Hopper
24b6cd71fc [Case 6107] Fixes Tablet import sorting (details below). 
This ports the fix from FileDialog to TabletFileDialog.

* There appears to be 2 versions of this file:
    * qml/dialogs/TabletFileDialog.qml
    * qml/hifi/tablet/tabletWindows/TabletFileDialog.qml

Testing the tablet within desktop mode works without this fix most
likely because it uses qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
which didn't receive the same refactor pass via d3282a4e.

Tested on Vive:  Menu -> Edit -> Import Entities

Changes Committed:
	modified:   interface/resources/qml/dialogs/TabletFileDialog.qml
 2017-09-14 14:49:49 -04:00
Seth Alves
10494cf3e0 Merge pull request #11359 from vladest/fix_runningscripts_selection 
use selection model of TreeView
 2017-09-14 11:22:08 -07:00
Seth Alves
11df5a447e Merge pull request #11310 from ElderOrb/case6718 
6718 PR11082: Help text cannot be dismissed by clicking on the text i…
 2017-09-14 11:17:48 -07:00
Brad Davis
aef85eb69d Fix polyline rendering using default texture 2017-09-14 10:48:14 -07:00
Seth Alves
cf2979dc78 Merge branch 'master' of github.com:highfidelity/hifi into rework-scriptengine-lifetime 2017-09-14 10:42:26 -07:00
Seth Alves
d89f2b77da rework ScriptEngine lifetimes using 'smart' pointers 2017-09-14 10:42:21 -07:00
Anthony J. Thibault
7959988622 Merge branch 'master' into feature/ant-man 2017-09-14 10:37:45 -07:00
Anthony J. Thibault
7c725756f1 IPD Fixes for controllerDispatcher and controllerModules 2017-09-14 10:36:05 -07:00
Seth Alves
dbaf60a957 Merge pull request #11363 from ElderOrb/lint-fix 
add missing comma
 2017-09-14 09:10:14 -07:00
beholder
61c5395f44 add missing comma 2017-09-14 18:48:43 +03:00
Brad Davis
501eee8b10 Fix transform of polylines with high update rates 2017-09-14 08:45:37 -07:00
Brad Davis
75e7146c5b Fix polyline crash and flicker 2017-09-14 08:45:36 -07:00