Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-11 05:43:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87168 commits 25 branches 0 tags 1.1 GiB
Commit graph

962 commits

Author SHA1 Message Date
ericrius1
e9d3246809 second hand moving based on actual time 2016-03-15 17:49:03 -07:00
Eric Levin
377d89e9d6 added lifetime to water particle effect 2016-03-15 14:08:50 -07:00
James B. Pollack
b6955ec77f refs 2016-03-14 18:59:15 -07:00
James B. Pollack
432810704e tidy 2016-03-14 18:53:29 -07:00
James B. Pollack
8877a6c570 tidyyy guy! 2016-03-14 17:58:12 -07:00
Andrew Meadows
cb62af770f namechange urchin --> anemone 2016-03-14 17:10:33 -07:00
Andrew Meadows
d18f988cba namechange URCHIN --> ANEMONE 2016-03-14 17:07:35 -07:00
James B. Pollack
2c8f13b538 entity script reset 2016-03-14 16:47:18 -07:00
James B. Pollack
8050bdd742 range 2016-03-11 20:00:49 -08:00
James B. Pollack
cb83bec341 switches 2016-03-11 19:49:23 -08:00
James B. Pollack
68cc87298f cleanup 2016-03-11 16:39:58 -08:00
James B. Pollack
801f2b3f9f add animated urchin 2016-03-11 16:38:39 -08:00
James B. Pollack
0733cd4bda plays sounds and stuff 2016-03-10 17:09:16 -08:00
Eric Levin
8828b93062 Merge pull request #7261 from imgntn/newfishes 
Home Fishtank
 2016-03-10 13:23:36 -08:00
James B. Pollack
c05e996913 remove lifetime 2016-03-10 10:38:49 -08:00
James B. Pollack
a8ac556103 merge 2016-03-09 17:41:14 -08:00
James B. Pollack
f35ab59044 adjust bubbles and add a treasure chest 2016-03-09 17:36:45 -08:00
James B. Pollack
09cccd563d constraints for music box 2016-03-09 16:57:40 -08:00
James B. Pollack
7cdd3d5b3e Merge pull request #7296 from imgntn/cellscience 
Various Cellscience Fixes
 2016-03-09 15:11:58 -08:00
James B. Pollack
5a54bc548b remove ungrabbable signal 2016-03-09 12:19:02 -08:00
James B. Pollack
dee532e84f try to make loading of nav buttons more realiable, etc 2016-03-09 12:14:53 -08:00
James B. Pollack
5daacdf952 set offset to zeros 2016-03-09 12:01:22 -08:00
James B. Pollack
f8b4cf942e initial 2016-03-09 11:58:32 -08:00
Seth Alves
143d8a0929 Merge pull request #7267 from ericrius1/growingPlant 
Plant that blooms flowers when it is watered by a water can
 2016-03-09 11:28:38 -08:00
James B. Pollack
3a5f7f1cbe cleanup and headers 2016-03-09 09:19:01 -08:00
James B. Pollack
de45fef3fc Merge branch 'newfishes' of https://github.com/imgntn/hifi into newfishes 2016-03-09 09:14:56 -08:00
James B. Pollack
55bc4be167 Merge branch 'master' into newfishes 2016-03-09 09:04:38 -08:00
ericrius1
9d1217e02d aded lifetime to flowers so they die after a while 2016-03-08 17:37:56 -08:00
ericrius1
a236fceead color pallete 2016-03-08 16:58:42 -08:00
ericrius1
f7028cef6e Flowers blending more into rocks 2016-03-08 16:51:24 -08:00
ericrius1
17454fdb01 two colors 2016-03-08 16:36:59 -08:00
ericrius1
c928b9e411 starting color 2016-03-08 16:09:19 -08:00
ericrius1
41782dbd8d basic shader 2016-03-08 15:56:06 -08:00
ericrius1
bcd8d8fb30 no water sound 2016-03-08 15:46:55 -08:00
James B. Pollack
d4fd9d4157 Update tank.js 2016-03-08 13:55:28 -08:00
James B. Pollack
645f0da280 code cleanupo 2016-03-08 13:50:04 -08:00
James B. Pollack
b08a9baa5c move cellscience 2016-03-08 13:44:03 -08:00
ericrius1
451856ae67 fixed path 2016-03-08 08:14:57 -08:00
James B. Pollack
249d88b619 add base to fishtank 2016-03-07 19:59:27 -08:00
ericrius1
7b69aa375e moved plant to home folder 2016-03-07 18:18:38 -08:00
James B. Pollack
fbe640e351 the model was different so adjust things 2016-03-07 16:38:15 -08:00
Andrew Meadows
dfe0575237 Merge pull request #7260 from imgntn/newponggun 
New Ping Pong Gun Model
 2016-03-07 15:51:59 -08:00
James B. Pollack
15feb7a414 add falloffRadius to sconce lights in toybox 2016-03-07 12:07:22 -08:00
James B. Pollack
fdaa1f9ded cleanup by default 2016-03-07 11:45:38 -08:00
James B. Pollack
70fd3559ea cleanup; 2016-03-07 11:43:59 -08:00
James B. Pollack
6d82dcb533 not the targets 2016-03-07 11:38:05 -08:00
James B. Pollack
5f9b64444c second bubble system, quieter noise 2016-03-07 10:19:21 -08:00
James B. Pollack
9a860bd31a update ping pong gun model url 2016-03-06 15:01:35 -08:00
James B. Pollack
2740391c3b end of day 2016-03-04 18:17:09 -08:00
James B. Pollack
3929af7187 fishtweaks 2016-03-04 18:01:32 -08:00
James B. Pollack
691c0c7d24 gofish! 2016-03-04 17:29:22 -08:00
James B. Pollack
e3d44c4e27 add urchin and rocks 2016-03-04 14:22:57 -08:00
James B. Pollack
3f146a734b user inner tank for bounds 2016-03-01 19:46:39 -08:00
James B. Pollack
cd233165e7 whitelist and blacklist inner contianer and corner entities 2016-03-01 19:41:05 -08:00
James B. Pollack
87e13543c2 use inner container for tank 2016-03-01 19:14:41 -08:00
James B. Pollack
5cb792183e start inner tank 2016-03-01 17:51:05 -08:00
James B. Pollack
1bcd85d106 only look attractor if close 2016-03-01 17:44:21 -08:00
James B. Pollack
24da3b1019 cleanup and parenting 2016-03-01 12:02:07 -08:00
James B. Pollack
ba2e977968 fish swim to where youre looking 2016-03-01 10:53:50 -08:00
James B. Pollack
42ec6de512 starts 2016-02-29 18:23:20 -08:00
James B. Pollack
c05849714b bubbles etc 2016-02-29 16:21:43 -08:00
Chris Collins
d68fa4e9ad Merge pull request #7210 from imgntn/tiltmaze 
Tilt Maze Should Delete Stray Balls
 2016-02-29 15:46:54 -08:00
James B. Pollack
96f5ff5fbd switching computers 2016-02-28 21:05:36 -08:00
Brad Hefta-Gaub
70614aba90 Merge pull request #7184 from imgntn/cellscience 
Cellscience Updates
 2016-02-26 16:53:00 -08:00
James B. Pollack
6c6ea3f0a7 code cleanup 2016-02-26 10:42:45 -08:00
James B. Pollack
83713898cc maze should delete stray balls 2016-02-26 10:34:27 -08:00
James B. Pollack
b0cb4b7199 disable boundaries 2016-02-26 10:26:02 -08:00
James B. Pollack
16bebc437b ...spaces? 2016-02-25 13:09:45 -08:00
James B. Pollack
8d5834475a spaces! 2016-02-25 13:07:09 -08:00
James B. Pollack
751b991522 semicolons 2016-02-25 12:36:35 -08:00
James B. Pollack
9b6889e237 no tabs 2016-02-25 12:32:59 -08:00
James B. Pollack
f62777af96 cleanup 2016-02-25 12:32:06 -08:00
James B. Pollack
643365bc5a new models 2016-02-24 15:42:51 -08:00
James B. Pollack
5e57366ba7 urls 2016-02-24 15:06:57 -08:00
James B. Pollack
baa030b7b0 cleanup and submit 2016-02-24 13:18:01 -08:00
James B. Pollack
46fbf38b5d ac movers 2016-02-24 12:36:18 -08:00
James B. Pollack
2958030d5a clean 2016-02-23 18:58:51 -08:00
James B. Pollack
cf6d78b26e disconnect 2016-02-23 18:29:10 -08:00
James B. Pollack
35831856ea prints 2016-02-23 18:25:05 -08:00
James B. Pollack
c362b779ae fish size 2016-02-23 18:20:27 -08:00
James B. Pollack
03a4de4f92 branch 2016-02-23 18:10:12 -08:00
James B. Pollack
4866ab9ead cleanup by default 2016-02-23 17:35:58 -08:00
James B. Pollack
19a72871ac fishes run by an entity with a handoff 2016-02-23 17:17:15 -08:00
James B. Pollack
6fd149f22d no avatar 2016-02-23 12:27:05 -08:00
James B. Pollack
fb7943efae new start 2016-02-23 12:24:10 -08:00
James B. Pollack
cebc6937a3 no cleanup 2016-02-23 11:52:43 -08:00
James B. Pollack
5ed8fc534c tilt maze 2016-02-23 11:48:25 -08:00
James B. Pollack
19ce178791 light at the end 2016-02-22 19:20:01 -08:00
James B. Pollack
46aebabd9b switch branches 2016-02-22 17:54:45 -08:00
James B. Pollack
c102abd11f scale 2016-02-22 14:25:13 -08:00
James B. Pollack
e4bc0ce691 tests 2016-02-22 13:08:58 -08:00
James B. Pollack
f7b3da078b dont move cells in space, just angular velocity 2016-02-22 11:36:53 -08:00
James B. Pollack
f0d8ffce65 cleanup errors 2016-02-22 10:25:56 -08:00
James B. Pollack
ac11648b76 cleanup 2016-02-18 15:06:12 -08:00
James B. Pollack
214723f1bf baton for moving vesicles" 
"
 2016-02-18 14:27:47 -08:00
James B. Pollack
f5ad297986 Merge branch 'master' into cellscience 2016-02-18 12:43:39 -08:00
James B. Pollack
f2dcbec0e6 werk 2016-02-18 11:09:47 -08:00
James B. Pollack
ab17a95d71 premeeting 2016-02-18 10:29:40 -08:00
James B. Pollack
13157e34a4 maze entity script 2016-02-17 17:16:29 -08:00
James B. Pollack
380ddf8b47 working with destroy etc; 2016-02-17 16:19:20 -08:00
James B. Pollack
75b17bc1cd work 2016-02-17 10:08:25 -08:00
James B. Pollack
d5a28565ce end of day 2016-02-16 18:33:54 -08:00
James B. Pollack
af91a06897 cleanup 2016-02-16 17:26:18 -08:00
James B. Pollack
355f25bb8f updatez 2016-02-16 17:25:56 -08:00
James B. Pollack
979c2feeb0 tiltmaze 2016-02-16 12:49:28 -08:00
James B. Pollack
e828a7e6e2 quiet prints 2016-02-12 19:38:40 -08:00
James B. Pollack
f346ac7023 logging 2016-02-12 13:58:02 -08:00
James B. Pollack
0bf822f17b update and add another entity script 2016-02-11 16:48:54 -08:00
Seth Alves
5dd044dc29 Merge pull request #7041 from imgntn/cellscience 
Change the way cellscience entities intitialize & audio plays
 2016-02-10 14:22:30 -08:00
James B. Pollack
9a34b68bff add ownership hack to own and handoff movement 2016-02-10 12:50:11 -08:00
James B. Pollack
22c53fc395 full voiceover vol 2016-02-10 10:05:26 -08:00
James B. Pollack
d920a3d721 updates 2016-02-09 18:05:14 -08:00
James B. Pollack
937ba3b796 zoom differently o avoid bug 2016-02-08 16:07:54 -08:00
James B. Pollack
0368bfc4ee sound on the server 2016-02-08 13:53:12 -08:00
James B. Pollack
325c7525c7 work 2016-02-08 13:43:41 -08:00
James B. Pollack
a80641a2c4 changes 2016-02-08 13:15:49 -08:00
James B. Pollack
720175f862 a couple more prints 2016-02-05 19:51:02 -08:00
James B. Pollack
82789113a8 quiet print messages 2016-02-05 19:50:08 -08:00
ericrius1
39bb68931f updated gun position 2016-02-05 15:48:34 -08:00
James B. Pollack
0c92c52d26 more volume 2016-02-04 14:52:50 -08:00
James B. Pollack
76350a39f8 increase volume more and fix not having logDebug function 2016-02-04 14:46:58 -08:00
James B. Pollack
708c6e8d25 volume 2016-02-04 11:37:46 -08:00
James B. Pollack
82f9b3f97f increase vol for voiceover 2016-02-04 11:33:54 -08:00
James B. Pollack
663dadd1b4 only disconnect mouse if connected 2016-02-04 08:51:42 -08:00
Eric Levin
2af6c08057 Merge pull request #7022 from imgntn/mastertoys 
Fix userData for pistol in toybox reset scripts
 2016-02-03 17:47:21 -08:00
Eric Levin
32fc973698 Merge pull request #7010 from imgntn/cellscience 
Decrease Cell Science Volume
 2016-02-03 17:46:56 -08:00
James B. Pollack
51b335c902 reduce cellscience volume 2016-02-03 09:53:14 -08:00
James B. Pollack
61daed5376 fix userdata for pistol 2016-02-02 17:39:43 -08:00
Andrew Meadows
ee96341380 Merge pull request #7001 from imgntn/masterOffsets 
Update reset scripts to use new offset style
 2016-02-02 08:25:32 -08:00
James B. Pollack
822a64a08b decrease volume 2016-02-01 17:16:27 -08:00
James B. Pollack
25fe8583c8 decrease all volume 2016-02-01 16:48:15 -08:00
James B. Pollack
bad6a15f09 light update 2016-02-01 14:48:17 -08:00
James B. Pollack
d2bea1f32c update reset scripts to use new offset style 2016-02-01 13:53:27 -08:00
James B. Pollack
3e43821a52 remove doc file from scripts dir 2016-01-30 12:44:45 -08:00
James B. Pollack
fb6fcab078 add simple headers to all files 2016-01-30 12:28:48 -08:00
James B. Pollack
7d0eb79115 sanatize files and remove unused messages stuff 2016-01-30 12:13:40 -08:00
James B. Pollack
514edee3f1 cleanup and fix script paths to get random movement working again 2016-01-30 11:53:10 -08:00
James B. Pollack
0e036d3e2c cellscience 2016-01-29 16:58:49 -08:00
James B. Pollack
64cb053c16 update it in the other spawner script 2016-01-26 10:30:26 -08:00
James B. Pollack
ce97fae1be update dice location 2016-01-26 10:27:55 -08:00
James B. Pollack
eca75ba66d cleanup 2016-01-25 14:48:15 -08:00
James B. Pollack
9a49504c56 cleanup 2016-01-25 14:32:52 -08:00
James B. Pollack
be15227bf7 test rotation 2016-01-25 14:08:19 -08:00
James B. Pollack
296a897f94 also rotate string before parenting 2016-01-25 14:03:40 -08:00
James B. Pollack
a56e213478 master scripts 2016-01-25 13:57:09 -08:00
James B. Pollack
f0ff0b45de Update hiddenEntityReset.js 2016-01-21 09:33:56 -08:00
James B. Pollack
ff9eb7f20d Update masterReset.js 2016-01-21 09:33:21 -08:00
James B. Pollack
8d3468265f make pistol collision sound quieter, other adjustments 2016-01-20 10:44:02 -08:00
Andrew Meadows
48374ef5bc more ignoreForCollisions to collisionless 2016-01-19 09:06:17 -08:00
Andrew Meadows
29a52bf0ba namechange collisionsWillMove --> dynamic 2016-01-15 15:23:52 -08:00
ericrius1
9a51a011c5 further tweaks 2016-01-13 15:51:22 -08:00
ericrius1
5a9d533e70 ping pong and gun tweaks 2016-01-13 15:30:12 -08:00
ericrius1
cda6d6e4ea bow tweaks 2016-01-13 14:44:42 -08:00
ericrius1
f02cc8fd46 Tweaked bow position 2016-01-13 14:43:52 -08:00
ericrius1
0a371e4b75 Adjusted relative hand grab data for gun, ping ponger, and bow to to optimize for owen grabbing 2016-01-13 11:06:29 -08:00
James B. Pollack
74badfb667 Update masterReset.js 
leading zeroes
 2015-12-28 21:16:38 -08:00
James B. Pollack
79a60c0648 Update hiddenEntityReset.js 
leading zeroes
 2015-12-28 21:16:15 -08:00
ericrius1
cc35eaf4be Added glow effect to ravestick 2015-12-28 17:32:10 -08:00
James B. Pollack
4b50a030e0 Update masterReset.js 2015-12-28 10:23:08 -08:00
James B. Pollack
4f80753d7b Update masterReset.js 2015-12-28 10:22:34 -08:00
James B. Pollack
679070ff6e Update hiddenEntityReset.js 2015-12-28 10:22:02 -08:00
ericrius1
b4988b0998 Taking individual avatar hand size into consideration for grabbing objects 2015-12-23 15:09:10 -08:00
James B. Pollack
5e0a428dec Update hiddenEntityReset.js 
add zeroes
 2015-12-22 12:07:57 -08:00
James B. Pollack
51630734df Update masterReset.js 
add initial zeroes
 2015-12-22 12:07:02 -08:00
ericrius1
2c02e7ad63 grabbing works with left hand for ping pong gun now 2015-12-18 15:22:23 -08:00
ericrius1
77264b3f99 Ping pong gun lines up with hand 2015-12-18 14:52:39 -08:00
ericrius1
17af34a3be fixed spelling error 2015-12-17 15:48:05 -08:00
ericrius1
aa1f77ab1c adding ravestick to toybox demo room 2015-12-17 15:42:52 -08:00
Ryan Downe Karpf
950d020d77 Merge pull request #6553 from ericrius1/noBlockCollisions 
Blocks dont collide when held
 2015-12-04 11:59:39 -08:00
ericrius1
3bb1dedaf9 fixed syntax error 2015-12-04 11:41:23 -08:00
ericrius1
786e241a29 blocks dont collide when held 2015-12-04 10:14:40 -08:00
ericrius1
dec4cd012e made ping pong gun have restitution of 0 2015-12-02 18:26:09 -08:00
ericrius1
6d953a65dd changed restitution to 0 2015-12-02 12:09:21 -08:00
ericrius1
0180503447 removed collision sound url 2015-12-02 12:07:38 -08:00
ericrius1
e4199439af added collision sounds to some toys 2015-12-01 17:00:43 -08:00
James B. Pollack
3c8e31cd42 Merge pull request #6509 from ericrius1/toyboxFixes 
Toybox Tweaking
 2015-12-01 13:07:10 -08:00
James B. Pollack
77d66de7f3 Update masterReset.js 
add 0 before numbers
 2015-12-01 11:19:42 -08:00
James B. Pollack
0e4aaaceeb Update hiddenEntityReset.js 
add 0 before numbers
 2015-12-01 11:19:15 -08:00
ericrius1
a3f8c52aa3 temp fix for doll, moved cat 2015-12-01 10:09:29 -08:00
ericrius1
d80bfc0af6 more gravity for spraycan 2015-12-01 09:41:04 -08:00
ericrius1
880aed0e6b fixed missing brace 2015-11-30 18:29:20 -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
James B. Pollack
ea831238e6 Merge pull request #6504 from imgntn/bubblemaster 
Update master reset scripts for Toybox to have parity with bubble wand
 2015-11-30 17:36:40 -08:00
ericrius1
706a67b9a1 lowered restitution to 0 to avoid too many collision sounds playing 2015-11-30 15:10:32 -08:00
James B. Pollack
9b90c19781 cleanup 2015-11-30 13:24:33 -08:00
James B. Pollack
171ae02b03 update to parity with createWand.js 2015-11-30 13:12:39 -08:00
ericrius1
22efcb1854 Added sounds to pistol 2015-11-30 11:42:34 -08:00
ericrius1
125c32b8fc tweak 2015-11-24 16:18:09 -08:00
ericrius1
c720c97e70 tweak 2015-11-24 16:14:26 -08:00
ericrius1
3a9dcf56df tweak 2015-11-24 16:11:07 -08:00
ericrius1
224dea45e2 tweaked gun position in hand 2015-11-24 16:06:09 -08:00
James B. Pollack
914805ef41 added 2015-11-24 15:31:14 -08:00
James B. Pollack
a10d00f34d add bow to master reset 2015-11-24 15:25:15 -08:00
ericrius1
d202ccb29c entity reset switch can be triggered again with hand controller 2015-11-23 15:52:21 -08:00
James B. Pollack
aba65bd9b8 rename linearDamping to damping 2015-11-20 15:45:08 -08:00
ericrius1
8c5abd05c8 added gun to toybox 2015-11-19 10:13:00 -08:00
James B. Pollack
36dfe81fde fix link 2015-11-09 12:19:23 -08:00
James B. Pollack
ef7caa8da9 Add new collision hull and sound to ping pong gun 2015-11-09 10:48:12 -08:00
James B. Pollack
d8f169bd4e add collision sounds to bballs 2015-11-06 17:04:55 -08:00
James B. Pollack
1d41ef868b update bubblewand model refs 2015-11-06 13:11:06 -08:00
Seth Alves
4a3b434fd4 change grabbing-non-colliding to trigger. fix whiteboard and some other scripts 2015-11-05 10:35:02 -08:00
ericrius1
3019886344 Removing basketball hoop from reset scripts 
Hoop will be saved in SVO instead
 2015-11-02 11:08:06 -08:00
ericrius1
b067abe2d9 Added name to basketball hoop in reset scripts 2015-11-02 09:58:23 -08:00
James B. Pollack
c8e1aca4b6 fix box dimensions 2015-10-26 18:10:45 -07:00
James B. Pollack
7a7f649bf7 change from far grab to near grab 2015-10-26 17:55:13 -07:00
James B. Pollack
2d873012a3 make reset buttons invisible entities instead of text 2015-10-26 17:51:55 -07:00
James B. Pollack
90131f1291 make target reset wider 2015-10-26 16:00:14 -07:00
James B. Pollack
f436857a62 add reset buttons for basketballs and targets 2015-10-26 15:28:35 -07:00
James B. Pollack
384a6a8154 rename /toys to /toybox, remove non toybox scripts, update master refs 2015-10-21 11:36:49 -07:00
ericrius1
1c5dc0374a Added wantsTrigger to user data for a couple items to avoid breakage with new grab script changes 2015-10-21 10:16:31 -07:00
James B. Pollack
af09871bed fix basketball solidity in toybox 2015-10-20 11:08:28 -07:00
James B. Pollack
4b21bdf308 testing 2015-10-16 11:50:13 -07:00
James B. Pollack
c84d2fc36a fix target script url 2015-10-13 10:44:43 -07:00
James B. Pollack
309cde7f28 invert solidity of most toybox objects while held 2015-10-13 10:31:36 -07:00
James B. Pollack
0f998e81af add min reset distance 2015-10-12 17:03:32 -07:00
James B. Pollack
fc8a4f4f2d cleanup 2015-10-12 17:00:49 -07:00
James B. Pollack
02620c4b0d make targets ungrabbable 2015-10-12 16:59:42 -07:00
James B. Pollack
bc4200d8d7 push last positions to array 2015-10-12 16:35:06 -07:00
James B. Pollack
47471e837f reset targets once they have stopped moving 2015-10-12 16:31:36 -07:00
ericrius1
08a94189b7 explicitly setting isSpotlight to false 2015-10-12 09:31:12 -07:00
ericrius1
ab32470699 Fixed syntax error in hiddenEntityResetScript 2015-10-12 09:12:33 -07:00
James B. Pollack
4661b49e3d fix regressions introduced by deciding not to call setEntityCustomData 2015-10-09 14:57:24 -07:00
James B. Pollack
f2283ab9f2 Update masterReset.js 
The gate shouldn't be grabbable
 2015-10-09 10:39:03 -07:00
James B. Pollack
b41398be30 Update hiddenEntityReset.js 
Basketball rack should be grabbable;We are removing back gate.
 2015-10-09 10:36:04 -07:00
James B. Pollack
b06fd3876b Update masterReset.js 
The basketball rack should not be grabbable; this got changed in the last commit.  Also we're removing the back gate.
 2015-10-09 10:33:47 -07:00
Eric Levin
2b34c5a917 got rid of wasteful network calls 2015-10-09 08:26:00 -07:00
ericrius1
948b37d681 Added targets to entity switch reset 2015-10-08 18:07:40 -07:00
James B. Pollack
772ea16c71 cleanup 2015-10-08 17:52:33 -07:00
James B. Pollack
ad6fdc813f alignment, targets, sounds, master script 2015-10-08 17:50:41 -07:00
ericrius1
b7f52ea542 Moved entity reset switch, fixed some style issues 2015-10-08 10:11:21 -07:00
ericrius1
3e822dbfc6 Adding far grab event to reset switch 2015-10-07 18:03:17 -07:00
ericrius1
f230dcd1c0 Fixed headers 2015-10-07 17:07:43 -07:00
ericrius1
3dd74a33d3 new attempt 2015-10-07 16:50:10 -07:00
ericrius1
18155f968b adding logging 2015-10-07 16:29:55 -07:00
ericrius1
032e503be6 change 2015-10-07 16:22:13 -07:00
ericrius1
54d82e6cc6 testing one 2015-10-07 16:10:21 -07:00
ericrius1
bfde77747a Not deleting reset switch unless client script runs 2015-10-07 16:03:11 -07:00
ericrius1
7e7c6bca8d deleting switch from client script 2015-10-07 16:01:08 -07:00
ericrius1
3c8b1b2a4e attempting duplicate script approach 2015-10-07 15:58:47 -07:00
ericrius1
3f3c91116b No calling within masterReset 2015-10-07 15:40:12 -07:00
ericrius1
39d0d82067 adding some logging 2015-10-07 15:39:32 -07:00
ericrius1
3465e3cc13 Adding hidden reset switch to room which, when grabbed or clicked on, will reset room 2015-10-07 15:21:24 -07:00
Brad Hefta-Gaub
ef054ffc6d Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-10-07 11:27:50 -07:00
Eric Levin
f01d4dde42 Merge pull request #6003 from imgntn/basketball_rack 
[Scripts] Basketball rack
 2015-10-07 10:59:20 -07:00
James B. Pollack
7aab34975f code quality 2015-10-06 17:08:51 -07:00
Brad Hefta-Gaub
0e5f4bc4c9 Merge pull request #5983 from ericrius1/lightFixes 
Light fixes in toybox
 2015-10-06 17:02:17 -07:00
James B. Pollack
4788480186 reset balls if they move too far 2015-10-06 16:48:34 -07:00
Brad Hefta-Gaub
be79101a93 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-06 15:20:37 -07:00
James B. Pollack
a37da41253 spell basketball rack correctly 2015-10-06 13:15:35 -07:00
James B. Pollack
5f2112b8a5 finish rack and add to master script, reorganize all bball related scripts 2015-10-06 11:28:36 -07:00
Eric Levin
0afaf84e2a Merge pull request #5979 from imgntn/ping_pong_gun 
[Script] Updates to Ping Pong Gun
 2015-10-06 09:47:53 -07:00
James B. Pollack
8cd549c958 adjust chair and plant starting positions 2015-10-05 14:02:24 -07:00
James B. Pollack
65ae811c9c make ping pong balls bigger and slower, change out gun model and adjust tip calculations, increase volume, add to master reset script 2015-10-05 11:16:55 -07:00
ericrius1
1ac1fcaf69 Light switches work properly now; no extra lights 2015-10-02 16:17:54 -07:00
ericrius1
e6e60e5e7a Lights should now only be created once at start of running reset master script, no matter how many people there are in the room 2015-10-02 15:58:32 -07:00
James Pollack
01044e3c05 adjust gun dimensions in toybox master script 2015-10-02 15:57:46 -07:00
Brad Hefta-Gaub
02536a5ab9 remove animationSettings from particles, add isEmitting 2015-10-02 14:17:01 -07:00
ericrius1
4b62048fb1 more light changes 2015-10-02 12:12:36 -07:00
ericrius1
0d599458e6 Merged from toybox 2015-10-02 11:34:07 -07:00
ericrius1
b595d916b6 fixed spacing issue 2015-10-02 11:10:08 -07:00
ericrius1
4dd2cf9cf5 Moved master reset script into new directory called unpublished scripts and changed relative pathing 2015-10-02 11:09:43 -07:00