Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 11:46:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85900 commits 22 branches 28 tags 1.2 GiB
Commit graph

958 commits

Author SHA1 Message Date
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