Commit graph

331 commits

Author SHA1 Message Date
ericrius1
0e08b15db7 spacing fix attempt 2016-04-06 11:30:29 -07:00
ericrius1
2be2f940ea remove panel 2016-04-06 10:59:18 -07:00
ericrius1
21f6d7bee3 fixed largeroom illegal characters 2016-04-06 10:50:58 -07:00
ericrius1
ce290a1993 got rid of illegal character 2016-04-06 10:38:59 -07:00
ericrius1
9cac249122 f1 2016-04-06 10:36:38 -07:00
ericrius1
048d745af9 update 2016-04-01 17:53:02 -07:00
ericrius1
f7f7c18d72 added new audio room examples 2016-04-01 17:45:15 -07:00
ericrius1
5bbca785b3 added new audio room examples 2016-04-01 17:43:10 -07:00
Brad Hefta-Gaub
c28612ea9a Merge pull request #7037 from sethalves/dressing-room
Dressing room + grab fixes
2016-02-08 09:19:29 -08:00
Babiuch, Ryan Nicholas
142ec76600 Merge branch 'master' of github.com:highfidelity/hifi 2016-02-04 08:18:47 -06: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
Seth Alves
6ca17a904a merge James' doppelganger changes into Tony's 2016-02-01 09:58:24 -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
Anthony Thibault
6813f692da doppelganger.js: mirror joint rotations & translations about x-axis
It's not pretty, mostly due to the lack of JavaScript access to the skeleton parent linkage information,
and lack of conversions between absolute and relative-to-parent joint rotations/translations.
2016-01-30 16:16:26 -08:00
Brad Davis
ae6cba85e8 More atmosphere removal 2016-01-21 15:15:16 -08:00
James B. Pollack
a57ccdd0e8 messages 2016-01-20 13:37:58 -08:00
Andrew Meadows
48374ef5bc more ignoreForCollisions to collisionless 2016-01-19 09:06:17 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
Andrew Meadows
e763c055b3 more namechanges in JS scripts 2016-01-15 15:24:46 -08:00
Andrew Meadows
29a52bf0ba namechange collisionsWillMove --> dynamic 2016-01-15 15:23:52 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Philip Rosedale
40aecf3bf4 I was told there would be no math 2016-01-11 17:36:12 -08:00
Philip Rosedale
b8565358ff Added basic energy bar example 2016-01-11 09:16:33 -08:00
Anthony Thibault
95f821d61a Merge pull request #6732 from sethalves/set-model-entity-joints
hook up a way for scripts to set model-entity joint state
2016-01-05 17:31:18 -08:00
Seth Alves
9304477233 split out calls for rotation and translation 2016-01-04 15:29:06 -08:00
Seth Alves
9a979f4abf update doppelganger script 2016-01-04 14:18:24 -08:00
James B. Pollack
a2d21ed5cb Update doppelganger.js
delete correct id
2015-12-28 21:42:54 -08:00
James B. Pollack
bf296a36ed cleanup change model 2015-12-28 18:38:09 -08:00
James B. Pollack
d8ef19a019 working!! 2015-12-28 18:32:49 -08:00
James B. Pollack
5e6e2bd11c work 2015-12-28 13:06:43 -08:00
James B. Pollack
3f73f83cf1 add doppelganger 2015-12-27 11:23:54 -08:00
David Rowe
58f1371eba Fix particle radius and rgba start, middle, finish interpolation
Bezier interpolation of 3 points doesn't intersect the middle value.
Instead, use separate Bezier interpolations for start-middle and middle-
finish, so that the interpolated values intersect the middle value as a
user would expect.
2015-12-22 15:08:03 +13:00
David Rowe
c3e3af7c8c Document effect of Bezier interpolation on particle radius simulation 2015-12-18 15:11:43 +13:00
David Rowe
e2ecc388ca Indicate particle properties that (temporarily) aren't working 2015-12-18 15:10:47 +13:00
David Rowe
5aef309b8a Get particles in particlesTest.js emitting again 2015-12-18 15:09:36 +13:00
James B. Pollack
a9438490fe update butterfly model 2015-12-02 12:53:19 -08:00
ericrius1
386afa272c disable grab while attachment version of pistol script is running 2015-12-01 16:50:09 -08:00
ericrius1
b67c481726 resolved merge conflicts 2015-11-30 18:19:57 -08:00
ericrius1
90595949f1 moved exterminator game out of dry lake 2015-11-30 18:14:57 -08:00
ericrius1
8992f6bb44 moved pistol to toybox 2015-11-30 17:57:01 -08:00
James B. Pollack
23f10659b0 update to new trigger method 2015-11-24 14:00:23 -08:00
Brad Hefta-Gaub
e6db72c887 Merge pull request #6437 from imgntn/grasp_equip
Grasp hands when equipping entities
2015-11-19 18:28:44 -08:00
Brad Hefta-Gaub
f80a765a29 add Assets.uploadData() and Assets.downloadData() 2015-11-19 17:28:20 -08:00
James B. Pollack
3f89d73fc6 add grasp to equip and example 2015-11-19 16:15:34 -08:00
Brad Hefta-Gaub
a1e10a9f04 Merge pull request #6309 from thoys/20724
CR for Job #20724 - Camera entity mode
2015-11-17 20:05:22 -08:00
Brad Hefta-Gaub
d8a3927311 debug the late connect case 2015-11-17 14:43:06 -08:00
Brad Hefta-Gaub
85aa3b3f83 handle subscribe when messages mixer is not available 2015-11-17 14:28:51 -08:00