Commit graph

134 commits

Author SHA1 Message Date
Triplelexx
257932cedc remove cache buster 2018-01-31 22:00:30 +00:00
luiscuenca
7dfdc8da59 Redesign and clean of unused lineWidths 2017-11-09 17:50:38 -07:00
Zach Fox
7998984d8e Missed tons of spots! 2017-10-24 14:30:47 -07:00
David Rowe
fc4e440dc4 Update system scripts to use new properties 2017-10-14 08:32:14 +13:00
David Rowe
46ce68a893 Fix lasers 2017-10-03 13:33:11 +13:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
rick@ghostpunch.com
52c8d77d8e Merge branch 'master' of git://github.com/highfidelity/hifi into jh21402 2017-07-20 17:03:46 -04:00
rick@ghostpunch.com
451b7ec1de Revert the role name filter change as it has already been added to the repo 2017-07-20 17:01:02 -04:00
rick@ghostpunch.com
2b9da2bcba Fix another typo. Sigh... 2017-07-20 15:44:59 -04:00
rick@ghostpunch.com
cc0ed9ead4 Corrected typo in role name search filter. Removed commented out debug print 2017-07-20 15:26:12 -04:00
Atlante45
c0da0cb439 Update sit script in the repo 2017-07-20 11:56:41 -07:00
rick@ghostpunch.com
8cf60df5b0 Address #21402 Added a handler to Sit.js script for the onLoadComplete signal to which re-applys the siting animation rol overrides. This works around a bug that shows up if the user switches avatars while the current avatar has overloaded anim roles. 2017-07-11 18:24:19 -04:00
Burt Sloane
2b111358e1 extra quote 2017-06-29 16:49:00 -07:00
Ken Cooke
fba1a8ddaa Fix halfDuplex script 2017-06-26 08:28:29 -07:00
Burt Sloane
f1485afccc public script 2017-06-22 13:01:11 -07:00
Burt Sloane
4f7a1a6e2e got rid of tabs 2017-06-15 16:35:53 -07:00
Burt Sloane
7022c4009f midi in and out 2017-06-15 15:18:06 -07:00
Johnathan Franck
d365931611 Merge branch 'master' of https://github.com/highfidelity/hifi into 21300 2017-05-18 20:53:40 -04:00
Johnathan Franck
7f8f870d9f Fix coding standard issues 2017-05-17 22:32:29 -04:00
Andrew Meadows
d705f529a0 use 'tractor' instead of 'spring' in JS files 2017-05-16 08:35:54 -07:00
Rob Kayson
9fc0ad0d28 fix indent floatingLanternBox 2017-05-12 15:12:43 -07:00
Rob Kayson
f3d8d1641f fix indent createFloatingLanternBox.js 2017-05-12 15:10:40 -07:00
Rob Kayson
a12e8e34db coding standard 2017-05-12 15:06:22 -07:00
Johnathan Franck
f1ab013511 Prevent user from setting too low of a spawn rate, rename spawnTime to spawnDuration and clean up parent object after countdown 2017-05-11 23:26:28 -04:00
Johnathan Franck
556d0318ef Use script.resolve 2017-05-10 15:15:31 -04:00
Johnathan Franck
68b1c74b43 Change URLs to point to high fidelity server 2017-05-10 14:46:12 -04:00
Johnathan Franck
31919d4399 Add happy music to balloon spawner after countdown 2017-05-08 12:28:40 -04:00
Rob Kayson
1873558df1 added floating lantern box that spawns floating lanterns 2017-05-06 18:41:57 -07:00
Johnathan Franck
bc7ea11297 Added enity script for balloon spawner and sample json entity with userData to attach script to 2017-05-03 18:46:12 -04:00
Thijs Wenker
2fd6786225 Merge pull request #10295 from PhilipRosedale/halfDuplex
Reduce log spam
2017-04-27 02:17:48 +02:00
Philip Rosedale
a880ca1262 Reduce log spam 2017-04-26 16:51:26 -07:00
Brad Hefta-Gaub
f1bd371fbe Merge pull request #10175 from PhilipRosedale/springHold
New Tutorial and entity scripts
2017-04-26 13:16:17 -07:00
Philip Rosedale
8826dbef78 removed old gravity example 2017-04-25 22:37:20 -07:00
Philip Rosedale
c69d064cc3 code review fixes 2017-04-25 22:14:03 -07:00
Thijs Wenker
5457b8d214 Merge pull request #10260 from PhilipRosedale/halfDuplex
Half Duplex script
2017-04-26 01:47:16 +02:00
Philip Rosedale
16dd6a2ce1 Code review / lint 2017-04-25 15:37:39 -07:00
Philip Rosedale
eaa2102d3f Code review fixes 2017-04-24 21:03:17 -07:00
Philip Rosedale
663e682f23 Merge branch 'halfDuplex' of https://github.com/PhilipRosedale/hifi into springHold 2017-04-24 20:46:48 -07:00
Philip Rosedale
92368d981b Half Duplex script 2017-04-21 18:22:53 -07:00
Rob Kayson
a0c8c4df52 tetherball stick and ball remove themselves after 2 seconds if user who has them equipped leaves the domain 2017-04-18 10:07:02 -07:00
Rob Kayson
2257af42be removed extra actions, creating all entities in create script. 2017-04-12 17:07:59 -07:00
Philip Rosedale
20307af4fe remove debug prints 2017-04-09 21:31:45 -07:00
Philip Rosedale
6bec948457 springhold, touch, nBody tutorial scripts 2017-04-09 21:29:33 -07:00
Rob Kayson
49858d3ec5 Equip stick instead of grab. String is less rigid. Fixed bug where the ball was not recognized when other clients equipped the stick. 2017-04-07 19:16:29 -07:00
Rob Kayson
6763ca9b27 added tetherball create and entity scripts 2017-04-03 11:55:47 -07:00
Clément Brisset
82114ae6ab Merge pull request #9940 from Atlante45/fix/sit
Fix a few sitting bugs noticed at the meetup
2017-03-28 11:14:31 -07:00
ZappoMan
84836d9331 fix typo that broke gun 2017-03-24 09:58:56 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00
Triplelexx
d1db04f93a fix lost forwardOffset declaration 2017-03-22 18:57:00 +00:00