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

24192 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
08d300afcd use a flag to indicate that simulation ownership should be grabbed 2015-04-20 11:49:10 -07:00
Seth Alves
88f289f3c1 small cleanup and some debugging prints 2015-04-20 11:19:48 -07:00
Seth Alves
fbff3627dc attempt to claim simulation ownership of entities the avatar crashes with 2015-04-20 11:13:51 -07:00
Seth Alves
f452e47577 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-20 08:49:33 -07:00
Brad Hefta-Gaub
29971a5c59 Merge pull request #4664 from samcake/orange 
Teaching Project, Cleaning the interface for the default Sun light properties and more
 2015-04-19 09:57:04 -07:00
Clément Brisset
464c69dbaf Merge pull request #4663 from ctrlaltdavid/menu-tidying 
Move visibility methods into DiscoverabilityManager
 2015-04-18 20:02:15 +02:00
Sam Gateau
687ca7fee5 Update the cookies.js to be able to edit and test direction and color, validate that the SunDirection and color and on/off is working 2015-04-17 19:00:40 -07:00
Seth Alves
b3cb9fe9a4 fix comment some more 2015-04-17 15:33:41 -07:00
Seth Alves
e9d8c53f75 undo dice testing hack 2015-04-17 15:18:05 -07:00
Seth Alves
adfc82e169 remove commented-out code 2015-04-17 15:10:34 -07:00
Seth Alves
dac57c44da if measured acceleration is close to zero, send zero to entity server, else send gravity 2015-04-17 15:05:47 -07:00
David Rowe
931c46345e Move visibility methods into DiscoverabilityManager 2015-04-17 14:15:50 -07:00
Sam Gateau
11879f6142 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-17 13:04:00 -07:00
Philip Rosedale
3814fbc0c2 Merge pull request #4658 from ctrlaltdavid/dde-filtering 
DO NOT MERGE - DDE filtering
 2015-04-17 15:41:03 -04:00
Clément Brisset
84dc128d40 Merge pull request #4657 from samcake/yellow 
Address missing rendering pieplines for translucent and simplify Model rendering code
 2015-04-17 20:47:04 +02:00
Seth Alves
292ba20cf3 pull andrew's measure-acceleration branch 2015-04-17 11:35:12 -07:00
Sam Gateau
f1e0d5855e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-17 11:33:39 -07:00
Sam Gateau
525d1040ed Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-04-17 11:32:35 -07:00
Sam Gateau
edb388ed83 Fixing the function with no implementation 2015-04-17 11:32:05 -07:00
David Rowe
ee48024831 Remove uninitialized method reference 2015-04-17 11:31:48 -07:00
Seth Alves
07b9d73edf bump protocol version 2015-04-17 11:20:35 -07:00
Seth Alves
d90dec066c if an entity has no simulatorID, pull it out of list of entities with simulatorIDs 2015-04-17 11:12:13 -07:00
Leonardo Murillo
db294ce0ec Merge pull request #4661 from birarda/master 
domain-server access token sanity for ENV, cleanup AM token output
 2015-04-17 12:05:27 -06:00
Seth Alves
32ced31f60 adjust logic related to claiming and releasing simulation ownership during scripted changes to entities 2015-04-17 10:57:00 -07:00
David Rowe
6b085ca668 Move method out of Menu class 2015-04-17 10:53:04 -07:00
Stephen Birarda
f94fcdab7b print if DS is using an access token from env 2015-04-17 10:44:18 -07:00
Stephen Birarda
64d17f101a obfuscate set access token from AM log 2015-04-17 10:44:01 -07:00
Seth Alves
3da2d1680d fix code that causes scripted changes to physics-related entity properties to claim simulation ownership 2015-04-17 10:41:11 -07:00
David Rowe
c823fcd083 Code tidying 2015-04-17 10:35:48 -07:00
Seth Alves
deec577db6 if nodes are fighting over phyics variables, squash physics-related properties in the updates from the loser of the race 2015-04-17 10:21:52 -07:00
Seth Alves
c69aaa806b if a uuid is null, don't send a uuid of all zeros 2015-04-17 09:55:49 -07:00
Seth Alves
f77038c52d when ignoring an incoming packet, still read it so the data-stream pointer doesn't get screwed up 2015-04-17 09:37:48 -07:00
Seth Alves
639b9ef9ff Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-17 08:50:07 -07:00
Clément Brisset
59e75826fe Merge pull request #4634 from ctrlaltdavid/20471 
CR for Job #20471 - Create rain.js
 2015-04-17 16:33:27 +02:00
Clément Brisset
516acee1c7 Merge pull request #4647 from huffman/fix-multiple-scripts-on-restart 
Fix stop/reload all scripts affecting already-stopped scripts
 2015-04-17 16:29:23 +02:00
Clément Brisset
e780d8e482 Merge pull request #4648 from ctrlaltdavid/dde-shutdown 
Terminate DDE process gracefully
 2015-04-17 16:28:32 +02:00
Brad Davis
8cdc5306cb Merge pull request #4660 from ZappoMan/HMDToolsTweaks 
revert mac version of HMD tools back to meta-H
 2015-04-16 22:44:22 -07:00
Sam Gateau
1c5c7cc239 faking a checkbox to do a boolean property control 2015-04-16 17:55:55 -07:00
Sam Gateau
b5b146b81b Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution 
Expose these to javascript
 2015-04-16 17:35:37 -07:00
ZappoMan
41e7b75a8d revert mac version of HMD tools back to meta-H 2015-04-16 17:14:18 -07:00
Seth Alves
62a45ccebb re-enable code that gives up simulation ownership 2015-04-16 17:00:36 -07:00
Seth Alves
116123256a Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-16 16:45:39 -07:00
Seth Alves
faf5e7415d don't explicitly release simulator status 2015-04-16 16:32:51 -07:00
David Rowe
d60ee3b6e2 Add velocity filtering to DDE eyelids 2015-04-16 16:28:22 -07:00
Seth Alves
ec26b4595a adjust comment 2015-04-16 16:27:30 -07:00
Seth Alves
f48f9caea4 cut back on debuging prints 2015-04-16 16:18:13 -07:00
Seth Alves
1484d6e37f fix READ_ENTITY_PROPERTY_UUID_TO_PROPERTIES to use binary version 2015-04-16 16:10:01 -07:00
Seth Alves
3b2a15f76a more debugging 2015-04-16 15:52:48 -07:00
David Rowe
c46f21152f Add velocity filtering to DDE head movement 
Based on filtering code in Faceshift.cpp.
 2015-04-16 15:47:02 -07:00
Seth Alves
ea8dcfa5b5 read UUIDs as UUIDs rather than as strings. more debugging prints 2015-04-16 15:33:43 -07:00