Commit graph

2314 commits

Author SHA1 Message Date
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
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
Atlante45
53577107de Formatting 2015-04-24 19:06:46 +02:00
Atlante45
e2b60d35f0 Generate touchEndEvent if last event was more than 50 ms ago 2015-04-24 18:50:03 +02:00
Brad Hefta-Gaub
6c830459a6 Merge pull request #4688 from huffman/fix-zone-overlay
Fix new zone overlays not moving
2015-04-24 09:09:17 -07:00
Ryan Huffman
6a48010c0b Fix new zone overlays not moving 2015-04-24 09:01:12 -07:00
Atlante45
82a53c9139 Turn off all sections then turn on selected one
This fixes the issue of properties present in a couple sections but not
all that are going to only be displayed for the last section the are in
that is being processed.
2015-04-24 16:53:39 +02:00
Atlante45
32b78f02b4 Group ShapeType and CompoundShapeURL + add it to Zones 2015-04-24 16:52:51 +02:00
Andrew Meadows
0daaf20f01 Merge pull request #4675 from sethalves/detect-ballistic
Detect ballistic motion + fix up simulation-owner code + fix up EntityItem constructor
2015-04-23 14:19:51 -07:00
ZappoMan
aac5675579 add full domain example 2015-04-23 13:45:00 -07:00
Seth Alves
bc65616bb3 Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-23 13:09:22 -07:00
Brad Hefta-Gaub
33557e5b05 Merge pull request #4680 from huffman/edit-zone-limits
Add limits to zone fields in entity properties window
2015-04-23 12:42:32 -07:00
Atlante45
0b1d4fb1d6 Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 21:16:11 +02:00
Ryan Huffman
1657c50920 Add limits to zone fields in entity properties window 2015-04-23 12:00:13 -07:00
Ryan Huffman
361bf7e441 Remove unnecessary print 2015-04-23 10:15:18 -07:00
Ryan Huffman
78207f0d51 Make zones pickable in edit.js while control is down 2015-04-23 10:00:05 -07:00
Ryan Huffman
30b9e16c1a Remove unused findRayIntersection from zoneOverlayManager 2015-04-23 09:52:21 -07:00
Ryan Huffman
d45e935b93 Add show zone overlay option to menu 2015-04-23 09:52:01 -07:00
Ryan Huffman
4a99c21e7b Add zoneOverlayManager.js 2015-04-23 09:36:53 -07:00