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

3692 commits

Author SHA1 Message Date
James B. Pollack
384a6a8154 rename /toys to /toybox, remove non toybox scripts, update master refs 2015-10-21 11:36:49 -07:00
Eric Levin
970d189262 Merge pull request #6125 from imgntn/toybox_ac 
[Scripts] Add Toybox AC Scripts, cleanup their headers, organize
 2015-10-21 11:24:59 -07:00
James B. Pollack
0b06cf1dfb cleanup 2015-10-21 10:53:32 -07:00
James B. Pollack
68d43dc576 reduce number of toybox sound scripts 2015-10-21 10:50:37 -07:00
James B. Pollack
80fb12b1a4 Merge branch 'master' into toybox_ac 2015-10-21 09:58:49 -07:00
Brad Hefta-Gaub
6465bb85dd Merge pull request #6124 from imgntn/bball_fixes 
[Scripts]  Fix Basketball Solidity in Toybox
 2015-10-21 09:11:12 -07:00
Seth Alves
f85ef9267b oops 2015-10-20 18:29:27 -07:00
Seth Alves
311254c395 require user-data to have wantsTrigger in it before non-colliding calls will happen 2015-10-20 18:26:12 -07:00
Seth Alves
7dcbb5849a another bug 2015-10-20 17:44:12 -07:00
Seth Alves
ed480f651f missed a line 2015-10-20 17:43:31 -07:00
Seth Alves
f16b62df83 - grab script: possible fix for line disappearing 
- grab script: go from 3 pickrays back to 1
- grab script: put "sphere" test back in, but with fixed distance test
 2015-10-20 17:34:35 -07:00
James B. Pollack
8e1c3c32d1 additions to debug and also to handle some two handed situations 2015-10-20 16:24:17 -07:00
Andrew Meadows
d02fe784a9 css and cfg filetypes are text in .gitattributes 2015-10-20 13:58:44 -07:00
Andrew Meadows
4ff05e8c2a fix lin endings of some JS files 2015-10-20 13:26:19 -07:00
James B. Pollack
b0ae55ee63 update cat purr header 2015-10-20 11:28:04 -07:00
James B. Pollack
771e5a4f9d add toybox ac scripts, write headers for them, organize 2015-10-20 11:21:09 -07:00
James B. Pollack
af09871bed fix basketball solidity in toybox 2015-10-20 11:08:28 -07:00
Brad Hefta-Gaub
dfe3e5b1cb fix laser lifetimes 2015-10-20 09:30:27 -07:00
Seth Alves
41f7ef1e2e cleanups 2015-10-19 16:53:27 -07:00
Seth Alves
6138775270 put back support for spatialKey 2015-10-19 15:40:14 -07:00
Seth Alves
5a968e3c96 tweak 2015-10-19 15:20:04 -07:00
Seth Alves
8fbf081223 git rid of sphere test 2015-10-19 14:51:18 -07:00
Seth Alves
353f92f1ba Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-17 13:09:52 -07:00
James B. Pollack
31cc451fd4 css cleanup 2015-10-16 16:42:29 -07:00
James B. Pollack
c6fcaf158b add color to more props 2015-10-16 16:15:20 -07:00
James B. Pollack
aa6aaf912e add color bars below position inputs 2015-10-16 16:07:20 -07:00
Seth Alves
aaad1a4a36 Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes 2015-10-16 14:34:21 -07:00
James B. Pollack
4b21bdf308 testing 2015-10-16 11:50:13 -07:00
Seth Alves
c98685f6d3 in STATE_CONTINUE_FAR_GRABBING_NON_COLLIDING, when the ray moves off of the entity, switch back to search state 2015-10-16 11:39:27 -07:00
Seth Alves
066696e201 don't go into continue-far-grabbing-non-colliding mode. 2015-10-16 11:18:41 -07:00
Brad Hefta-Gaub
26f82e899e Merge pull request #6079 from ericrius1/whiteboard 
Entity whitelist for raypicking and whiteboard painting example
 2015-10-15 17:50:35 -07:00
Brad Hefta-Gaub
c3ee419ad7 Merge pull request #6086 from imgntn/flashlight_life 
[Scripts] Add lifetime to lights created by flashlight
 2015-10-15 17:42:57 -07:00
ericrius1
97fe0170cb glowing box for black color 2015-10-15 17:09:41 -07:00
ericrius1
e8b6b32572 Remembering whiteboards last color between sessions 2015-10-15 14:12:15 -07:00
ericrius1
dc6875f5b5 Strokes moving forward to avoid zfighting and incorrect overlaps 2015-10-15 11:50:23 -07:00
ericrius1
3b59bffb79 Deleting only strokes from the whiteboard where the erase button was clicked on 2015-10-15 11:38:18 -07:00
Seth Alves
c884f466bc adjust timing of action refresh 2015-10-15 10:40:58 -07:00
ericrius1
55c68e0509 Merge branch 'master' into whiteboard 2015-10-15 10:08:32 -07:00
James B. Pollack
d8c979b9d4 add lifetime to lights created by flashlight 2015-10-15 10:07:21 -07:00
Seth Alves
c96f7562f2 Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes 2015-10-15 09:28:57 -07:00
Thijs Wenker
c99573ea64 Fixed support for calling setJointMumblers with joint name. Walk.js runs smooth now! 2015-10-15 15:35:35 +02:00
Thijs Wenker
8111432088 Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX 2015-10-15 14:50:20 +02:00
ericrius1
87439a049e Made color indicator thinner 2015-10-14 17:22:46 -07:00
ericrius1
5082ac4583 Added color status bar 2015-10-14 16:46:23 -07:00
ericrius1
4c709cba35 Fixed color indicator position 2015-10-14 16:17:57 -07:00
ericrius1
cfca0fe8c0 Adding a color indicator to whiteboard 2015-10-14 15:58:18 -07:00
Eric Levin
0b92bc11f6 fixed spacing 2015-10-14 13:26:10 -07:00
ericrius1
eb7b720945 got rid of whitespace 2015-10-14 13:24:22 -07:00
ericrius1
db5f7cac8d Fixed name of whiteboard entity script URL 2015-10-14 12:03:10 -07:00
ericrius1
c63ef10c67 got rid of query string 2015-10-14 11:50:35 -07:00