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

32145 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
8609769c20 cat now listens for touch event from controller 2015-09-24 11:58:54 -07:00
ericrius1
1e1cfb6aae Flipped lights so up is lights on and vica versa 2015-09-24 10:15:50 -07:00
ericrius1
f334651a57 deleted handControllerGrab 2015-09-24 10:05:27 -07:00
ericrius1
81c175eabf toggle light switch 2015-09-23 17:34:37 -07:00
ericrius1
153a30de0d flip 2015-09-23 17:24:56 -07:00
ericrius1
d0b5d62bb7 Updated master script to make jslint happy 2015-09-23 16:21:36 -07:00
ericrius1
a1dccc2a92 Changed cat position 2015-09-23 16:13:31 -07:00
ericrius1
276b0b71cb Added tin can to master script and changed its position 2015-09-23 14:52:59 -07:00
ericrius1
a2b0e66e13 Sound working for spraypaint 2015-09-23 13:36:00 -07:00
ericrius1
2c20a12f13 refactoring spraypaint to use new events 2015-09-23 13:34:21 -07:00
ericrius1
b0923acc2f Reorg for pathing 2015-09-23 12:34:10 -07:00
ericrius1
6bd89f9689 Toys re-org 2015-09-23 12:22:18 -07:00
ericrius1
4f96f2406b Merge branch 'master' into toybox 2015-09-23 12:14:23 -07:00
ericrius1
c7cb77a6ab moved spraycan into toybox folder, and added spraypaint sound 2015-09-23 12:08:28 -07:00
ericrius1
9818e2549c handControllerscript is now on par with master 2015-09-23 11:38:30 -07:00
ericrius1
cc69f51882 Cat meows when hand is close 2015-09-23 11:30:14 -07:00
ericrius1
a7facc9f3c Adding a mew sound to cat when user moves hand close 2015-09-23 11:10:27 -07:00
ericrius1
8feabdb518 adding cat, modified dice positions 2015-09-23 10:54:56 -07:00
ericrius1
573cdc5271 Added another light switch- the garage light switch controls the three lights closest to it, and hallway light controls the two near hall 2015-09-23 10:07:59 -07:00
ericrius1
9d9de61afa updated die starting positions 2015-09-23 09:36:30 -07:00
ericrius1
cf701095c4 updated light switch sound volume to be 50% of what it was 2015-09-23 09:33:02 -07:00
Brad Hefta-Gaub
ec9bf0791b Merge pull request #5875 from ctrlaltdavid/20689 
Don't run Script Editor scripts from the cache
 2015-09-23 08:52:30 -07:00
Andrew Meadows
feeead0e0a Merge pull request #5879 from ZappoMan/fixWarning 
fix a bunch of warnings
 2015-09-23 08:24:21 -07:00
Brad Hefta-Gaub
387c4fbd92 fix bad oglplus pragma warnings 2015-09-22 21:52:16 -07:00
Brad Hefta-Gaub
17a3fd159a apparently unix doesn't like the generic type version of sqrt() 2015-09-22 21:43:09 -07:00
Brad Hefta-Gaub
02e1de3ba3 more warnings fixes 2015-09-22 21:35:13 -07:00
Brad Hefta-Gaub
cd9aad4f41 more warnings fixes 2015-09-22 21:28:45 -07:00
Brad Hefta-Gaub
9436d2922f more warnings fixes 2015-09-22 21:18:04 -07:00
Brad Hefta-Gaub
5b00783f18 more warnings fixes 2015-09-22 20:54:36 -07:00
Brad Hefta-Gaub
8d8035a418 Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarning 
Conflicts:
	libraries/render-utils/src/Model.cpp
	libraries/render-utils/src/Model.h
 2015-09-22 20:54:25 -07:00
Brad Hefta-Gaub
3fe4de4511 Merge pull request #5751 from imgntn/bubblewand_hotfix_2 
Bubble Wand
 2015-09-22 20:35:58 -07:00
Brad Hefta-Gaub
52842cb287 more warnings fixes 2015-09-22 20:34:40 -07:00
Howard Stearns
a9460b9b41 Merge pull request #5881 from AndrewMeadows/ik-repairs-004 
remove underpose attenuation from IK relaxation step
 2015-09-22 19:45:40 -07:00
James Pollack
3e3d7a8bfa JS Linting and Coding Standards 2015-09-22 18:12:51 -07:00
Brad Hefta-Gaub
e99ad75a28 more warnings fixes 2015-09-22 18:01:39 -07:00
Brad Hefta-Gaub
6f7e13b3c1 more warning fixes 2015-09-22 17:26:45 -07:00
Brad Hefta-Gaub
7536fed09a more warning fixes 2015-09-22 17:22:09 -07:00
Andrew Meadows
d25ba8946e fix animation attenuation from IK relaxation step 2015-09-22 17:20:26 -07:00
Andrew Meadows
2edffaf91a remove unused variables 2015-09-22 17:20:13 -07:00
Andrew Meadows
11fee94459 remove warning about signed/unsigned comparison 2015-09-22 17:19:47 -07:00
Philip Rosedale
474dc3920c Merge pull request #5878 from ctrlaltdavid/20690 
DO NOT MERGE - QA for 20690 - Don't look straight ahead in fullscreen mirror
 2015-09-22 16:52:52 -07:00
Brad Hefta-Gaub
efda121619 fix a bunch of warnings on windows 2015-09-22 16:40:17 -07:00
David Rowe
eda12fd3af Don't look straight ahead in fullscreen mirror 2015-09-22 16:15:54 -07:00
ericrius1
99dc5a5127 updated doll's sound when picked up 2015-09-22 15:55:35 -07:00
ericrius1
f2afd66615 v2? 2015-09-22 15:50:46 -07:00
ericrius1
ad0c0d3b2b no v1 to avoid caching 2015-09-22 15:50:06 -07:00
ericrius1
55f76a4296 Added more sconce lights to lightSwitch.js 2015-09-22 15:45:18 -07:00
Brad Hefta-Gaub
17b2bf1c33 Merge pull request #5864 from birarda/master 
make sure server/mixers are first in FIFO
 2015-09-22 14:57:49 -07:00
Brad Hefta-Gaub
5bcce50b98 Merge pull request #5846 from bob-long/master 
Display the face blend coefficients and update the value in real time.
 2015-09-22 14:56:56 -07:00
Andrew Meadows
3af1329be2 Merge pull request #5825 from thoys/20655 
CR for Job #20655 - Add ability to close one script from another script
 2015-09-22 14:52:39 -07:00