ZappoMan
d9f17d010c
first cut at adding new zone properties to edit tools
2015-05-07 11:41:23 -07:00
Atlante45
faabf29e84
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 19:58:26 +02:00
Atlante45
00571dad00
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 10:13:59 +02:00
ZappoMan
496da6fcd5
wire up the skybox color property to the new skybox renderer
2015-05-06 20:36:06 -07:00
ZappoMan
af2c3d91cf
Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones
2015-05-06 18:05:54 -07:00
Thijs Wenker
477447b95f
Planky game script
2015-05-06 23:36:44 +02:00
ZappoMan
f2ebb6e821
fix output of group names to be lowercase
2015-05-06 11:30:41 -07:00
ZappoMan
edb84a1a14
Merge branch 'master' of https://github.com/highfidelity/hifi into skyboxPropertiesInZones
2015-05-06 10:52:04 -07:00
Atlante45
50ba154615
Correctly wire setDrawZones
2015-05-06 17:04:01 +02:00
Clément Brisset
0470e72459
Merge pull request #4777 from cozza13/20529
...
CR for Job #20529 - Change defaulscripts.js
2015-05-06 16:12:22 +02:00
Chris Collins
7396bb138d
Removed headmove
...
removed head move, it is not being used by Oculus users at the moment
2015-05-05 16:52:38 -07:00
Seth Alves
e637a9b5ae
Merge pull request #4776 from PhilipRosedale/master
...
dice don't go away unless 'X' key is clicked, harmonicOscillator.js
2015-05-05 16:52:35 -07:00
Philip Rosedale
5fb79df4c9
dice don't go away unless 'X' key is clicked, added harmonicOscillator test script
2015-05-05 15:18:16 -07:00
ZappoMan
0cb14650b6
added skybox group properties to zones
2015-05-05 14:12:02 -07:00
ZappoMan
5fc5df7c55
change skyboxMode to backgroundMode
2015-05-05 12:38:44 -07:00
samcake
61f6139f4f
Merge pull request #4764 from ZappoMan/atmosphereInZones
...
First cut at adding "Atmosphere" support to zone
2015-05-05 11:00:58 -07:00
ZappoMan
4422c63c79
another sample for changing atmosphere properties
2015-05-04 20:31:37 -07:00
ZappoMan
4b9c6728e7
fix issue with skyboxMode getting randomly set
2015-05-04 18:58:35 -07:00
Eric Levin
39efde7e8c
added rotation ability to grab script
2015-05-04 18:14:46 -07:00
ZappoMan
8b3b32c70d
add example
2015-05-04 17:21:50 -07:00
Seth Alves
8890c40e15
Merge pull request #4750 from PhilipRosedale/master
...
Add limit to grab range to reduce max energy added by grabbing
2015-05-04 15:59:07 -07:00
Philip Rosedale
7e7500eaad
fix for coding standard
2015-05-04 15:57:21 -07:00
Stephen Birarda
6312d8643b
Merge pull request #4759 from ericrius1/dice
...
changed dice script to only play sound locally on collision, to avoid ev...
2015-05-04 14:27:09 -04:00
Eric Levin
d930c942ff
changed dice script to only play sound locally on collision, to avoid every client which sees collision injecting audio and creating that overloud effect
2015-05-04 10:16:50 -07:00
Stephen Birarda
6cff75f7c1
resolve conflicts on merge with upstream/master
2015-05-04 10:05:44 -07:00
Stephen Birarda
274e98974b
Merge pull request #4734 from Atlante45/ac_fix
...
Fix for bot_procedural
2015-05-04 12:44:08 -04:00
Philip Rosedale
475dad6863
Add limit to grab range to reduce max energy added by grabbing
2015-05-02 16:25:48 -07:00
Stephen Birarda
edade7baba
resolve conflicts on merge with upstream master
2015-05-01 16:24:16 -07:00
Stephen Birarda
6d0e612923
remove other tabs from moveJoints
2015-05-01 16:16:01 -07:00
Stephen Birarda
b32aecc456
fix tabs/spaces in moveJoints
2015-05-01 16:15:35 -07:00
Ryan Huffman
ddec694393
Update add-zone icon in edit.js
2015-05-01 15:38:06 -07:00
Seth Alves
5390630497
Merge pull request #4743 from huffman/sphere-color
...
Add support for changing sphere color in edit.js
2015-05-01 13:17:46 -07:00
Ryan Huffman
7f84b27880
Add support for changing sphere color in edit.js
2015-05-01 11:59:39 -07:00
Seth Alves
6139fc0d73
Merge pull request #4738 from huffman/entity-naming
...
Add 'name' property to entities
2015-05-01 11:58:30 -07:00
Stephen Birarda
7a2a391852
add script to move joints for av rate testing
2015-05-01 11:53:20 -07:00
Eric Levin
3ee111d757
added script to generate a lot of physical blocks within a specified range
2015-05-01 09:56:21 -07:00
Eric Levin
cac5fa1371
refactored grab script using velocity and spring force
2015-05-01 09:39:39 -07:00
Ryan Huffman
73a5b8c4e2
Add support for 'name' to edit.js
2015-05-01 08:42:23 -07:00
Eric Levin
4c80633a41
fixed bug where non-script related content would be deleted on script ending
2015-04-30 16:42:32 -07:00
Atlante45
762e6255d6
Fix botProcedural include
2015-05-01 00:34:24 +02:00
Eric Levin
a9c5f044c8
changed grab script so user can only grab with left mouse click and we update velocityof grabbed object every frame instead of flinging it onb release
2015-04-30 11:39:27 -07:00
Eric Levin
45ba678686
can now fling up and down as well as in xz plane
2015-04-29 23:40:53 -07:00
Eric Levin
2b9ec8b6bf
fixed bug in grab.js where drop line overlay was not showing in correct position on first grab
2015-04-29 22:13:26 -07:00
Brad Hefta-Gaub
40d2e97d44
Merge pull request #4673 from ctrlaltdavid/20496
...
CR for 20496 - Modify lobby.js to work as avatar selector
2015-04-29 21:51:08 -07:00
Brad Hefta-Gaub
f093c9e535
Merge pull request #4727 from huffman/edit-speedup
...
Update edit.js to buffer mouseMove events
2015-04-29 21:46:27 -07:00
Ryan Huffman
0d2991b9b0
Update edit.js to buffer mouseMove events
...
This helps keep events from getting backed up on the event queue by
handling move events in the update() loop and dropping extra move events
that might come before an update.
2015-04-29 16:24:36 -07:00
Eric Levin
489fbaac57
added grab.js to defaultScripts.js
2015-04-29 09:45:58 -07:00
Eric Levin
8b9236a18d
added grab.js script, which allows users to grab and fling physical objects
2015-04-29 09:44:22 -07:00
David Rowe
9576ad19a7
Move "Stereo Audio" option into developerMenu.js
...
And rename it "Stereo Input" to better relect what it does.
2015-04-28 14:14:10 -07:00
Stephen Birarda
b387c3e93a
Merge pull request #4689 from Atlante45/master
...
Send generated touchEndEvent if we don't get one from Qt
2015-04-24 13:07:12 -04:00
