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

32693 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
e6fb587a8c Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-02 13:04:14 -07:00
Brad Hefta-Gaub
98e8b3083d comment 2015-10-02 13:04:02 -07:00
Brad Hefta-Gaub
328467e019 Merge pull request #5909 from imgntn/particle_explorer 
[Scripts] Particle Explorer
 2015-10-02 12:40:36 -07:00
Brad Hefta-Gaub
b27396606b fix first run 2015-10-02 12:34:46 -07:00
James Pollack
1c6e833028 cleanup weird function formatting, remove unused code, improve spacing for logical units 2015-10-02 12:31:55 -07:00
Brad Hefta-Gaub
9bb2ada0a7 Merge pull request #5964 from ericrius1/sprayPaint 
Added closePaint script and removed no longer used spray paint scripts
 2015-10-02 12:21:00 -07:00
Brad Hefta-Gaub
dce4d94f30 Merge pull request #5941 from ctrlaltdavid/particles-fix 
Fix particle radius, color, and alpha starts/finishes
 2015-10-02 11:40:47 -07:00
Brad Hefta-Gaub
4c556dd43a Merge pull request #5962 from samcake/calvin 
Rendering the background elements after opaque and only work on the far pixels
 2015-10-02 11:38:45 -07:00
James Pollack
55178cdc91 Merge remote-tracking branch 'upstream/master' into particle_explorer 2015-10-02 11:31:14 -07:00
Brad Hefta-Gaub
5a0ff4b1a2 Merge pull request #5841 from ericrius1/toybox 
Toybox master reset script
 2015-10-02 11:27:43 -07:00
Brad Hefta-Gaub
c6c430ca76 Merge pull request #5977 from jherico/marge 
Fixing 2D overlay mouse interaction
 2015-10-02 11:11:04 -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
Howard Stearns
639be1eef6 Merge pull request #5978 from AndrewMeadows/cleanup-sixense-calibration 
improved sixense/hydra calibration
 2015-10-02 10:50:05 -07:00
James Pollack
d1cbcf5554 roll back to full width window and set a min for emitRate so interface doesnt crash 2015-10-02 10:32:08 -07:00
ericrius1
f6c888599e Fixed a bug where particles weren't moving with can. 2015-10-02 10:22:48 -07:00
James Pollack
ea20fc9786 hack for it to work as a tool window 2015-10-02 10:08:10 -07:00
ericrius1
9f5a3066b8 changed masterResetEntity back to masterReset 2015-10-02 10:07:43 -07:00
ericrius1
71fe9b216c Removed extraneous masterReset script, and extra call to lightSwitches in correct script 2015-10-02 10:02:28 -07:00
Andrew Meadows
e9c71f3867 cleanup comments 2015-10-02 10:02:12 -07:00
ericrius1
a6df6c53f1 fixed more syntax errors 2015-10-02 09:55:41 -07:00
ericrius1
36f7bba87e Fixed some syntax errors, tweaked cat script so doesn't meow while it's already meowing 2015-10-02 09:53:30 -07:00
Andrew Meadows
50b2c8ae37 remove warnings in linux 2015-10-02 09:39:34 -07:00
Andrew Meadows
940b8eb529 improve some variable names 2015-10-02 09:39:13 -07:00
Andrew Meadows
98fe06be57 cleanup sixense/hydra calibration 2015-10-02 09:30:18 -07:00
Brad Hefta-Gaub
cf2693e712 working fistFrame lastFrame 2015-10-02 08:31:22 -07:00
Brad Davis
aa8979570c Working on 2D overlay mouse interaction 2015-10-02 00:35:37 -07:00
James B. Pollack
7c9d7ffefd single sysytem particle explorer with one way bindings is feature complete 2015-10-01 23:49:33 -07:00
James B. Pollack
d1432c51d5 Merge branch 'master' into particle_explorer 2015-10-01 21:21:52 -07:00
James B. Pollack
679fc1b5ad Merge branch 'master' of https://github.com/imgntn/hifi 2015-10-01 21:21:32 -07:00
samcake
71ad6195f2 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-10-01 19:25:25 -07:00
samcake
690620d74d Cleaning code 2015-10-01 19:23:32 -07:00
James Pollack
4b1b53e189 end of dat 2015-10-01 19:01:10 -07:00
James B. Pollack
a3c91b12b9 Update cat.js 2015-10-01 18:56:38 -07:00
James B. Pollack
0ce6a305bd Update cat.js 2015-10-01 18:52:08 -07:00
James B. Pollack
d0e079ee9d Update cat.js 
add globals, lint the code
 2015-10-01 18:46:32 -07:00
samcake
3490e08521 Little improvments on the performance side to get the Stencil pass and the masking of the background under reasonable performances 2015-10-01 18:42:09 -07:00
James B. Pollack
55d20e9d4c Update cat.js 2015-10-01 18:41:24 -07:00
James B. Pollack
59c1c7ee6a Update masterReset.js 
remove file versioning
 2015-10-01 18:40:12 -07:00
James B. Pollack
f200fcdfa2 Update cat.js 2015-10-01 18:35:34 -07:00
James B. Pollack
6cc2df9052 Update cat.js 
hook into isPlaying for sounds
 2015-10-01 18:34:22 -07:00
James B. Pollack
3565d96ffb Update sprayPaintCan.js 
add a header, cleanup
 2015-10-01 18:21:15 -07:00
James B. Pollack
54a51e6b8b Update and rename masterResetEntity.js to masterReset.js 
remove reference to 'entities' in the file name since this script does more than that.  also update the header file.
 2015-10-01 18:19:36 -07:00
James B. Pollack
6523a057a8 Update lightSwitchHall.js 
fix header file
 2015-10-01 18:18:27 -07:00
James B. Pollack
cfb9728fdb Update doll.js 
remove some unused code
 2015-10-01 18:17:35 -07:00
James B. Pollack
9098585e2f Update cat.js 
remove a lot of unused code and add flag for whether cat is already meowing so that it doesn't start another one until its done.  unfortunately i dont know how to read the audio isplaying state so we have to use a lame timeout
 2015-10-01 18:14:08 -07:00
James B. Pollack
b352ab4736 Update lightSwitchGarage.js 
fix header and spacing issues
 2015-10-01 18:04:37 -07:00
ericrius1
09f7dcb5e9 Merge branch 'imgntn-ericrius1-toybox' into toybox 2015-10-01 17:22:44 -07:00
ericrius1
d0be47bae9 fix merge 2015-10-01 17:22:12 -07:00
ericrius1
bf9a948ca9 Merge branch 'master' into toybox 2015-10-01 17:17:12 -07:00