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

135 commits

Author SHA1 Message Date
Seth Alves
9ca89172f6 change grab script to equip with parenting rather than action. various other changes to messaging. added initial version of attachedEntitiesManager.js. updated toybox scripts to track messaging changes 2016-01-29 15:17:46 -08:00
James B. Pollack
eca75ba66d cleanup 2016-01-25 14:48:15 -08:00
James B. Pollack
9be2a73d4a update bow to use parenting for prenotch string 2016-01-25 12:36:03 -08:00
Philip Rosedale
7387d6e5f1 Merge pull request #6869 from imgntn/pistolfix 
Make Pistol Quieter and Minor Adjustments
 2016-01-21 11:15:07 -08:00
James B. Pollack
e63e509835 Update createPistol.js 2016-01-21 09:33:38 -08:00
James B. Pollack
b91e5c27e1 Update createPistol.js 2016-01-20 10:45:40 -08:00
James B. Pollack
8d3468265f make pistol collision sound quieter, other adjustments 2016-01-20 10:44:02 -08:00
Andrew Meadows
d990482c0a use collidesWith for bow.js workaround 2016-01-19 11:42:29 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
Andrew Meadows
e763c055b3 more namechanges in JS scripts 2016-01-15 15:24:46 -08:00
Andrew Meadows
29a52bf0ba namechange collisionsWillMove --> dynamic 2016-01-15 15:23:52 -08:00
U-GAPOS\andrew
3aa1837e07 disable collisions between arrow and bow 
(the bow is currently kinematic while held)
 2016-01-13 16:57:51 -08:00
James B. Pollack
7c18359fba cleanup 2016-01-05 16:17:11 -08:00
James B. Pollack
68e03a08c0 targets fix 2016-01-05 15:43:49 -08:00
ericrius1
4360595ed6 Fix to pistol.js so muzzle flash particle system doesn't stick around forever 2016-01-04 11:29:57 -08:00
James B. Pollack
5caa6cbdbf Update pistol.js 
leading zeroes
 2015-12-29 18:38:57 -08:00
ericrius1
4cc94b44ba muzzle is in sync 2015-12-29 18:30:07 -08:00
ericrius1
1a84b5c0f0 Fixing issue with muzzle flash and hit point being out of sync for pistol 2015-12-29 18:13:34 -08:00
Thijs Wenker
505f4ce7e4 Merge branch 'master' of https://github.com/worklist/hifi into 20736 
Conflicts:
	examples/controllers/handControllerGrab.js
 2015-12-23 02:37:38 +01:00
ericrius1
2dbb3bd84a Added grab offsets to createPingPongGun.js 2015-12-18 15:12:46 -08:00
Thijs Wenker
cfd2c2785c Merge branch 'master' of https://github.com/worklist/hifi into 20736 2015-12-12 21:16:02 +01:00
Brad Hefta-Gaub
27d28900a4 Merge pull request #6580 from imgntn/parented_flashlight 
Update Flashlight to use Parenting
 2015-12-10 07:43:10 -08:00
Atlante45
17daff920c Fix all entities using relative grab pos/rot 2015-12-09 14:25:18 -08:00
Atlante45
4ee5bf316a Fix bow offsets 2015-12-09 14:25:18 -08:00
Thijs Wenker
4a18b5ffe4 small update to have the bow shoot arrows with the creatorSessionUUID in the userData 2015-12-08 20:29:18 +01:00
James B. Pollack
27ce0a36d3 cleanup logging 2015-12-07 12:20:06 -08:00
James B. Pollack
e9f21b4dba make lights parented to flashlight instead of updated in loop 2015-12-07 11:30:10 -08:00
Atlante45
1d498af76e Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-04 15:18:25 -08:00
James B. Pollack
fbca1c9754 another toy 2015-12-03 11:12:28 -08:00
James B. Pollack
cf5c8c08e2 update toys to be inverted while held 2015-12-03 11:10:22 -08:00
James B. Pollack
e67f372bcf make pistol shoot differently and not alter controller mappings 2015-12-01 18:24:13 -08:00
Atlante45
c4e43c4e0b Merge branch 'baseball-test' of github.com:Atlante45/hifi into baseball 2015-12-01 15:16:05 -08:00
Atlante45
e6763c2208 Update bow's relative position 2015-12-01 15:03:25 -08:00
James B. Pollack
fb8316ff12 reduce pistol vol 2015-12-01 13:15:08 -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
b787e71587 Update doll.js 2015-12-01 13:06:30 -08:00
ericrius1
a3f8c52aa3 temp fix for doll, moved cat 2015-12-01 10:09:29 -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
ericrius1
8992f6bb44 moved pistol to toybox 2015-11-30 17:57:01 -08:00
James B. Pollack
7c12379ada fix release hand message 2015-11-30 17:00:40 -08:00
James Pollack
0625d4f4c2 remove debugging string 2015-11-28 23:40:58 -08:00
James Pollack
017ffb8f2e change way messages get sent to the hand disabler 2015-11-28 22:54:31 -08:00
James B. Pollack
b6a165d3ef Merge branch 'master' into bow 2015-11-27 11:41:21 -08:00
James B. Pollack
23f10659b0 update to new trigger method 2015-11-24 14:00:23 -08:00
James B. Pollack
50c1786e9b trigger changes and message debugging 2015-11-24 12:46:01 -08:00
James B. Pollack
2add609387 use new thingo 2015-11-24 12:12:01 -08:00
James B. Pollack
13e1042bfa use messages instead of hidden entities to disable beams 2015-11-24 10:37:08 -08:00
James B. Pollack
fd26427390 add pullback / pushfwd 2015-11-24 10:23:29 -08:00
James B. Pollack
0fd389b02f remove arrowTest 2015-11-23 12:53:58 -08:00