Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 00:56:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33300 commits 76 branches 59 tags 1.2 GiB
Commit graph

33300 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
5c95306e8e merge from upstream 2015-10-10 09:34:13 -07:00
Brad Hefta-Gaub
ded677e90f Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface 2015-10-10 09:33:55 -07:00
Brad Hefta-Gaub
25481e0a25 Merge pull request #6038 from Atlante45/asset-drop 
Asset file drop
 2015-10-10 09:32:58 -07:00
Brad Hefta-Gaub
69d6e5d298 Merge pull request #6046 from sethalves/flip-you-for-real 
add a userdata flag to toggle ignoreForCollisions while holding an entity
 2015-10-10 09:25:57 -07:00
Brad Davis
9e4a7a6226 Working on controller refactoring 2015-10-10 03:05:42 -07:00
Brad Hefta-Gaub
63f3156a61 add Controler.Actions 2015-10-09 21:23:19 -07:00
Brad Hefta-Gaub
f55b6115d6 cleanup sanatize name function 2015-10-09 21:11:38 -07:00
Brad Hefta-Gaub
5c5ee8d699 remove debug code 2015-10-09 21:01:44 -07:00
Brad Hefta-Gaub
d3ee9b0f39 more work on exposing device inputs as JavaScript named constants 2015-10-09 20:58:23 -07:00
Brad Hefta-Gaub
e48206f1b5 Merge pull request #6047 from howard-stearns/log-hydra-disconnect 
Log when hydra is disconnected.
 2015-10-09 20:41:27 -07:00
Seth Alves
7824d03e11 grab script picks 5x per second rather than 60x 2015-10-09 17:56:32 -07:00
Brad Davis
c2da6600f5 Fixing includes 2015-10-09 17:49:24 -07:00
Brad Davis
a801aeea50 Merge pull request #6048 from samcake/controllers 
Controllers Branch: adding example mapping files
 2015-10-09 17:48:35 -07:00
samcake
3d607f406f revert change to the slf file 2015-10-09 17:40:36 -07:00
samcake
297c3c9ed0 Fixing json issues 2015-10-09 17:37:51 -07:00
samcake
502cb90e02 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-09 17:32:14 -07:00
samcake
f80e59e6b9 Merge branch 'controllers' of https://github.com/samcake/hifi into controllers 2015-10-09 17:32:00 -07:00
Brad Davis
78624679ed Adding more parsing functions 2015-10-09 17:30:46 -07:00
samcake
c02d33c17c Adding example mapping files 2015-10-09 17:27:50 -07:00
samcake
01a3539a2a Merge branch 'controllers' of https://github.com/samcake/hifi into controllers 2015-10-09 17:25:45 -07:00
Brad Davis
c3775623aa Splitting files, adding test skeleton 2015-10-09 17:23:52 -07:00
samcake
0587c23b67 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-09 16:22:24 -07:00
Brad Davis
184e9a2209 Prototyping controllers 2015-10-09 16:20:55 -07:00
Howard Stearns
7ba149fbbd Log when hydra is disconnected. 2015-10-09 16:19:14 -07:00
Brad Hefta-Gaub
37f530f97f first cut at wiring up devices and inputs to JS 2015-10-09 16:15:29 -07:00
samcake
f0af4f1775 try debuging the sh orientation on mac 2015-10-09 16:08:35 -07:00
samcake
eb648e9b09 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-09 16:04:47 -07:00
Brad Davis
1dfafec5af Prototyping controller refactoring 2015-10-09 15:51:02 -07:00
Brad Hefta-Gaub
614a47c90d Merge pull request #6044 from Atlante45/json_asset 
Fix warnings
 2015-10-09 15:46:59 -07:00
Seth Alves
c6c44e8b81 add a userdata flag that allows toggling of the ignoreForCollisions entity property when an item is held. 2015-10-09 15:42:30 -07:00
James B. Pollack
139c396879 Merge pull request #6045 from imgntn/fix_reset 
[Script] Fix Master Reset Grabbability Regressions
 2015-10-09 15:38:11 -07:00
Howard Stearns
ce82ba87d2 Merge pull request #6011 from hyperlogic/tony/hmd-rest-detection 
When HMD is at rest, re-center the body under the avatar.
 2015-10-09 15:20:07 -07:00
James B. Pollack
4661b49e3d fix regressions introduced by deciding not to call setEntityCustomData 2015-10-09 14:57:24 -07:00
Stephen Birarda
b84109a781 Merge pull request #6040 from huffman/fix-null-node 
Fix case where we deref a null pointer in OctreeInboundPacketProcessor
 2015-10-09 14:57:16 -07:00
James B. Pollack
dcb5f2369d Merge remote-tracking branch 'upstream/master' 2015-10-09 14:54:13 -07:00
Anthony J. Thibault
0c489e3afd MyAvatar: Rename new instance variable after merge. 2015-10-09 14:46:05 -07:00
Anthony J. Thibault
b5ba621f78 Merge branch 'master' into tony/hmd-rest-detection 2015-10-09 14:36:18 -07:00
Anthony Thibault
4862e78fce Merge pull request #6012 from howard-stearns/align-body-to-head-on-reset 
Align body to head on reset
 2015-10-09 14:34:16 -07:00
samcake
4e72d945b6 try debuging the sh orientation on mac 2015-10-09 14:00:35 -07:00
Clément Brisset
a5f0b75e25 Merge pull request #6043 from huffman/fix-uninitialized-arr 
Fix uninitialized pointer in AssetResourceRequest
 2015-10-09 13:36:58 -07:00
Clément Brisset
aa221741e5 Merge pull request #6041 from birarda/packet-corruption 
fix for re-send timeout in SendQueue
 2015-10-09 13:33:34 -07:00
Atlante45
cba8b0962d Fix warnings 2015-10-09 13:29:59 -07:00
Atlante45
3e71c4cc4e CR 2015-10-09 13:18:05 -07:00
Brad Hefta-Gaub
1fb9d44ae0 Merge pull request #6042 from ctrlaltdavid/fix-particle-emitting 
Fix not stopping emitting particles when set isEmitting false
 2015-10-09 13:16:15 -07:00
Ryan Huffman
c02df56ceb Fix uninitialized pointer in AssetResourceRequest 2015-10-09 13:15:13 -07:00
Howard Stearns
700835a6d1 Merge branch 'master' of https://github.com/highfidelity/hifi into align-body-to-head-on-reset 2015-10-09 13:13:22 -07:00
Atlante45
ae83dfe041 Move auto-resize to update 2015-10-09 12:23:19 -07:00
Atlante45
bcd148cb87 Construct entity properties at definition 2015-10-09 12:23:19 -07:00
Atlante45
e056743621 Check for upload rights 2015-10-09 12:23:19 -07:00
Atlante45
2229f942df Spawn fbx dropped in front of avatar 2015-10-09 12:23:19 -07:00