Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-05-05 10:47:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38691 commits 6 branches 1 tag 1.1 GiB
Commit graph

242 commits

Author SHA1 Message Date
Babiuch, Ryan Nicholas
0069849da3 Consider existing velocity in calculating energy costs when editing entities. 2016-02-04 08:55:23 -06:00
Babiuch, Ryan Nicholas
dca7ff967c Conform to coding standard. 2016-02-04 08:26:56 -06:00
Babiuch, Ryan Nicholas
142ec76600 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-04 08:18:47 -06:00
Andrew Meadows
63df34541d Merge pull request #6802 from huffman/agent-simulation 
Fix Agents bidding on simulation ownership
 2016-02-03 13:45:12 -08:00
Babiuch, Ryan Nicholas
786400eb53 Merge branch 'WorkingEnergy' 2016-02-03 14:53:28 -06:00
Babiuch, Ryan Nicholas
3d727d76c2 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-03 13:39:13 -06:00
Babiuch, Ryan Nicholas
3cb2f9c4b7 Exposed energy cost multiplier to scripting. 
- field: costMultiplier
 2016-02-03 13:29:42 -06:00
Babiuch, Ryan Nicholas
7dd5bca17f Bug fixes and debt reductions on energy calculations. 
- removed superfluous code interfacing with scripts
- favor floats over doubles in cost calculations
- default avatar energy is maximum float value for cases where energy script is not loaded in order to still manipulate entities.
 2016-02-03 10:46:28 -06:00
Ryan Huffman
25632b63b7 Adjust Entities.addEntity to not bid on simulation from AC Script 2016-02-02 13:00:35 -08:00
Ryan Huffman
eff02d3e3a Fix Agents bidding on simulation ownership 2016-02-02 10:47:51 -08:00
Stephen Birarda
095f0b9349 rename canAdjustLocks to isAllowedEditor for multi-purpose 2016-02-01 16:46:11 -08:00
Babiuch, Ryan Nicholas
47f7d55e2c Working energy usage for entity manipulation. 
- Working example in examples/example/ui/MyEnergyBar.js
 2016-02-01 08:32:52 -06:00
Brad Hefta-Gaub
1ef01d670d Revert "Make entity properties be undefined after entity is unloaded" 2016-01-25 18:07:14 -08:00
David Rowe
d020114e59 Make entity properties return undefined value after entity is deleted 2016-01-24 08:39:49 +13:00
Seth Alves
28d673cb97 try again to make this thread safe 2016-01-19 16:00:02 -08:00
Seth Alves
edea0320e6 try again to make this thread safe 2016-01-19 15:44:22 -08:00
Seth Alves
f265656e74 expose getJointNames for entities to js 2016-01-19 12:55:17 -08:00
Seth Alves
d6e3b85237 fix javascript access via localPosition and localRotation 2016-01-18 11:15:32 -08:00
Seth Alves
942e77166e merge from upstream 2016-01-05 11:11:19 -08:00
Seth Alves
96f506a98d code review 2016-01-05 07:27:27 -08:00
Seth Alves
3026415f03 add some missing property handling boilerplate 2016-01-04 16:17:00 -08:00
Seth Alves
202a6ae294 debugging 2016-01-04 15:56:08 -08:00
Seth Alves
ccf29e3772 debugging 2016-01-04 15:52:58 -08:00
Seth Alves
9304477233 split out calls for rotation and translation 2016-01-04 15:29:06 -08:00
Seth Alves
5beba58e5f debugging 2016-01-04 15:05:08 -08:00
Seth Alves
bd35532c5d debugging 2016-01-04 15:02:45 -08:00
Seth Alves
ef8673610f debugging 2016-01-04 14:58:13 -08:00
Seth Alves
cd92a9fa1a adjust timestamps 2016-01-04 14:51:43 -08:00
Seth Alves
9a708f2e74 try splitting edit into 2 packets 2016-01-04 14:48:49 -08:00
Seth Alves
6c8eb90ee0 debugging 2016-01-04 14:42:37 -08:00
Seth Alves
7f2e0cd103 expose a way to set translation and rotation of all model joints at once 2016-01-04 14:13:08 -08:00
Seth Alves
2147b0d78e fix locking 2016-01-04 12:31:58 -08:00
Seth Alves
768934ae11 update entity timestamps when sending joint information 2016-01-04 11:29:15 -08:00
Seth Alves
bfa8cc1969 merge from upstream 2016-01-03 06:47:25 -08:00
Seth Alves
fe0a656d54 Merge branch 'master' of github.com:highfidelity/hifi into set-model-entity-joints 2015-12-30 12:45:32 -08:00
ericrius1
390dce4613 Adding blacklist 2015-12-24 11:48:40 -08:00
Seth Alves
175506bbf1 when a script sets joint-data on a model-entity, send an edit packet 2015-12-23 16:06:04 -08:00
Seth Alves
84bcfb7d71 hook up a way for scripts to set model-entity joint state 2015-12-22 17:43:01 -08:00
Seth Alves
c84fa5f821 cleanups 2015-12-21 14:45:18 -08:00
Seth Alves
701f99d28e only send a queryAACube for entities to entity-server 2015-12-18 16:28:11 -08:00
Seth Alves
688448fe41 more queryAABox experimenting 2015-12-17 16:18:41 -08:00
Seth Alves
473212e5b7 try to be more coherent about queryAABox meaning 2015-12-17 14:29:41 -08:00
Seth Alves
b83579e6e5 include queryAABox in physics-induced sends 2015-12-16 17:25:49 -08:00
Seth Alves
951db42146 only send queryAABox if something about the location changed 2015-12-15 16:17:49 -08:00
Seth Alves
0013d58365 include queryAACube when scripts make changes 2015-12-15 14:25:02 -08:00
Seth Alves
c74f8bca49 location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent 2015-12-14 09:13:36 -08:00
Seth Alves
ec9f1e0754 possible fix for crash when grabbing bubblewand 2015-12-08 09:44:43 -08:00
Seth Alves
0bf276efa5 adjust method names to fit convention 2015-12-07 14:37:35 -08:00
Seth Alves
982e986f1a Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-07 14:31:18 -08:00
Seth Alves
96e9580473 change some more parameters back to being pass-by-reference, where it's safe 2015-12-07 05:30:19 -08:00