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

4096 commits

Author SHA1 Message Date
Thijs Wenker
ee218faf5e Merge branch '20724' of github.com:thoys/hifi into 20724 2015-11-04 21:21:57 +01:00
Thijs Wenker
0ebd6e47cc fix magic number 2015-11-04 21:21:03 +01:00
Howard Stearns
4fd2027fb4 change name 2015-11-04 11:42:21 -08:00
ericrius1
3c227db08d explode heli 2015-11-04 11:27:16 -08:00
Thijs Wenker
128a0c2397 securityCamera.js - Camera Entity example 2015-11-04 20:23:03 +01:00
Seth Alves
c2f9a49598 don't grab light 2015-11-04 11:15:57 -08:00
Howard Stearns
3fdd7ca470 obscure the code and increase the likelihood of future whitespace-only diffs 2015-11-04 10:57:03 -08:00
Howard Stearns
883f9c09bf add gratuitous whitespace 2015-11-04 10:49:12 -08:00
Howard Stearns
fe12891f61 whitespace only 2015-11-04 10:48:02 -08:00
Seth Alves
1e498a41f0 rework search logic 2015-11-04 10:46:20 -08:00
Howard Stearns
7b9245022c Merge branch 'away' of https://github.com/howard-stearns/hifi into away 2015-11-04 10:46:16 -08:00
EdgarPironti
ade0862948 Spacemouse fixes 2015-11-04 00:49:40 -08:00
EdgarPironti
1ab683643c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-04 00:36:38 -08:00
Zach Pomerantz
df4be6c0ba Add growth script to examples 2015-11-03 23:48:05 -08:00
Brad Davis
439bdbc0e4 Merge pull request #6298 from samcake/controllers 
Controllers : Removing dead files
 2015-11-03 19:57:37 -08:00
Thijs Wenker
d60661ff8a preview camera button in edit.js script 2015-11-04 03:24:32 +01:00
EdgarPironti
7adf38f781 Spacemouse migration 2015-11-03 18:22:55 -08:00
EdgarPironti
2a84cadd5d Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 18:22:29 -08:00
Thijs Wenker
d7279e4c88 Support for Camera Entities. 
- New entity type: camera, with just the basic properties of an entity (position, rotation, name etc.).
- New CameraMode: CameraEntity
- Example script using the new cameraEntity
- Updated edit.js to use the CameraEntities (with button to preview the camera)
 2015-11-04 02:51:23 +01:00
Howard Stearns
4a54f2052e Merge branch 'master' of https://github.com/highfidelity/hifi into away 2015-11-03 17:42:38 -08:00
Atlante45
d8797ef9d7 Initialize relativePosition/Rotation 2015-11-03 16:07:37 -08:00
Brad Hefta-Gaub
d21415b00d Merge pull request #6295 from imgntn/cleanup_tests 
Remove timers test file
 2015-11-03 15:43:02 -08:00
samcake
57bc2f3093 Removing dead js files 2015-11-03 15:37:36 -08:00
howard-stearns
4bf9861350 Forgot license header. 2015-11-03 15:36:02 -08:00
ericrius1
0650280fb6 tweaks 2015-11-03 15:14:56 -08:00
ericrius1
ed2bd07585 rotating blade 2015-11-03 14:54:05 -08:00
Stephen Birarda
8346ce27b3 allow a non-colliding grab of locked entities 2015-11-03 14:22:41 -08:00
ericrius1
0846c3bef4 moving 2015-11-03 14:12:56 -08:00
James B. Pollack
b83b24b096 remove strange test file 2015-11-03 13:42:18 -08:00
ericrius1
58587a5780 spotlight 2015-11-03 13:26:39 -08:00
howard-stearns
fb4174b9a2 Control alphaVar, and deal with overlapping cycles. 2015-11-03 13:11:31 -08:00
ericrius1
443df042a4 playing with light pos/rot 2015-11-03 12:40:41 -08:00
EdgarPironti
d99838de9c Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-03 12:25:19 -08:00
ericrius1
82dbdec78c helicopter 2015-11-03 11:54:01 -08:00
James B. Pollack
811fd0cec7 prep for meeting 2015-11-03 10:42:15 -08:00
Seth Alves
27b239176f fix grab 2015-11-03 10:16:56 -08:00
Howard Stearns
70b1165393 Merge branch 'master' of https://github.com/highfidelity/hifi into away 2015-11-03 10:01:36 -08:00
EdgarPironti
5d695da630 Do not merge - Spacemouse 2015-11-02 23:31:10 -08:00
Howard Stearns
1b7ed3d847 away script 2015-11-02 20:40:40 -08:00
James B. Pollack
192e4c8185 Merge pull request #6274 from ZappoMan/rightClickMenu 
add example of overriding default rightClick behavior
 2015-11-02 18:58:12 -08:00
James B. Pollack
aeac31cf6a dont delete cubes by default 2015-11-02 16:37:24 -08:00
Seth Alves
fe2c0effd0 oops left debug on 2015-11-02 16:17:46 -08:00
Seth Alves
0a5f43bba7 fix up boolean test 2015-11-02 16:16:13 -08:00
James B. Pollack
15af28337b add color busters game for testing 2015-11-02 16:02:30 -08:00
Seth Alves
181901ed19 distance grab works better with hmd on 2015-11-02 14:42:28 -08:00
Brad Hefta-Gaub
b94258f953 add example of overriding default rightClick behavior 2015-11-02 11:55:50 -08:00
Eric Levin
7838683909 Merge pull request #6189 from imgntn/fjs 
Add functional.js library
 2015-11-02 11:10:19 -08:00
James B. Pollack
e79ebdb8aa cleanup syntax 2015-11-01 19:47:13 -08:00
Brad Hefta-Gaub
286905c20c Merge pull request #6250 from jherico/peek 
Adding peek support for endpoints
 2015-10-31 16:09:27 -07:00
Seth Alves
9346366fc5 fix grab script 2015-10-31 14:28:54 -07:00
Brad Davis
abbfe15395 Adding peek support for endpoints 2015-10-31 14:26:14 -07:00
Brad Hefta-Gaub
46f9a432ab fix handControllerGrab.js 2015-10-31 14:21:50 -07:00
James B. Pollack
459b449a7f rename folder 2015-10-30 20:52:19 -07:00
James B. Pollack
0a083c070f color busters cooperative game 2015-10-30 20:21:53 -07:00
Seth Alves
896ed3927c merge from upstream 2015-10-30 19:17:43 -07:00
James B. Pollack
c67bfc8883 Merge pull request #6180 from huffman/line-js 
Add js line library for drawing infinite poly lines
 2015-10-30 17:47:31 -07:00
Seth Alves
944f0965c0 some refactoring and a bug fix -- grab script can throw things again 2015-10-30 16:35:50 -07:00
Ryan Huffman
77e0023b43 Fix lifetime bug with first PolyLine in InfiniteLine 2015-10-30 16:31:15 -07:00
Seth Alves
cf83ca22bb change how kinematic objects get data back to entity when an action is active 2015-10-30 15:30:54 -07:00
Seth Alves
b102081f2f upon release, set velocity after returning entity to being dynamic 2015-10-30 11:35:51 -07:00
Brad Hefta-Gaub
b5fd3424b8 Merge pull request #6245 from EdgarPironti/controllers 
Fixed controllerExample.js parse error
 2015-10-30 11:10:08 -07:00
EdgarPironti
f887bbd45c Fixed controllerExample parse error 2015-10-30 11:06:20 -07:00
Seth Alves
93503d0a21 make kinematic grab set entities kinematic in bullet and update entity position 2015-10-30 11:03:13 -07:00
Brad Davis
49e7d42c2c Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-30 10:07:40 -07:00
James B. Pollack
846310f9fb Merge pull request #6208 from ericrius1/closePaintModel 
Added to the whiteboard model, and some bug fixes
 2015-10-29 17:05:20 -07:00
ericrius1
6bdf66534f light tweak 2015-10-29 16:53:03 -07:00
Atlante45
8b46ed7dff Check keyLight is defined 2015-10-29 16:42:48 -07:00
ericrius1
b6b71e7e76 increased range and intensity of light 2015-10-29 16:40:50 -07:00
Atlante45
c237072195 edit.js fix 2015-10-29 15:29:12 -07:00
ericrius1
020566b76a no deleting 2015-10-29 14:14:15 -07:00
Atlante45
904326cd1c edit.js fix 2015-10-29 14:11:27 -07:00
Brad Davis
036ae62dd3 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-29 14:00:52 -07:00
Brad Hefta-Gaub
1c2973f17d removed old metavoxel example, since the api is no longer available 2015-10-29 12:34:24 -07:00
Brad Hefta-Gaub
1f53e425eb Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-10-29 12:28:28 -07:00
Brad Davis
f21633e368 Merge pull request #6222 from ZappoMan/hardwareChanged 
Handle input plugin register/remove when activated/deactivated by menus
 2015-10-29 12:24:17 -07:00
Brad Hefta-Gaub
3bbba99e2b Merge pull request #6178 from samcake/color 
Refactor the KeyLIght properties in their own group
 2015-10-29 10:44:44 -07:00
samcake
517387621a Fixing the keyLIght Direction ui for edit.js and fix the case for D to d 2015-10-29 10:40:28 -07:00
Brad Davis
ccbae81dad Merge branch 'master' into HEAD 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-10-29 10:24:38 -07:00
Eric Levin
42fb683085 Merge pull request #6184 from imgntn/toybox_sounds 
Add Arcade Game Sound To Toybox
 2015-10-29 10:24:23 -07:00
samcake
025422792d Fixing the keyLIght Direction ui for edit.js 2015-10-29 10:13:28 -07:00
Brad Hefta-Gaub
a3cd032a41 register/remove devices when the input plugins are activated/deactivated 2015-10-29 10:06:21 -07:00
Andrew Meadows
f9012d5051 Merge pull request #6187 from sethalves/fix-actions-ttl 
fix actions bug
 2015-10-29 09:30:21 -07:00
samcake
630cdb8a9d Modify the html presentiong the zone enity properties to match the internal new representation 2015-10-28 17:29:06 -07:00
samcake
a5b95d7307 Fixing the entity properties view with the new properties group 2015-10-28 16:46:56 -07:00
ericrius1
1b1490bb75 added blocker so user cant get so close to whiteboard 2015-10-28 16:02:15 -07:00
ericrius1
e9bdb872bd added light to whiteboard 2015-10-28 15:25:11 -07:00
Brad Davis
570b4a32da Merge pull request #6206 from samcake/controllers 
Controllers : Add a new kind onf controller to expose ReadOnly state from the application
 2015-10-28 13:42:15 -07:00
Brad Davis
3c1a0930da Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	interface/src/avatar/MyAvatar.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-10-28 13:38:22 -07:00
ericrius1
ac2effb33c Not erasing board, models hosted on s3 2015-10-28 13:32:10 -07:00
samcake
b90af1a1ce Fixing typo and review comments 2015-10-28 13:21:45 -07:00
ericrius1
4027782335 Fixed issue with overlays disapearing on release grab 2015-10-28 13:18:57 -07:00
samcake
07c13f4d66 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-28 12:54:46 -07:00
Brad Hefta-Gaub
30f7c44f61 emit hardwareChanged signal to scripts 2015-10-28 09:34:18 -07:00
ericrius1
2f835b19fa surface is now a model 2015-10-27 17:17:19 -07:00
samcake
6ec87086bc Adding the state controller 2015-10-27 16:57:06 -07:00
ericrius1
d67f4958cd wait longer for dimensions 2015-10-27 13:44:29 -07:00
ericrius1
ed6a866ff9 ready for demo 2015-10-27 13:43:13 -07:00
ericrius1
0512da0e39 updated url 2015-10-27 13:07:11 -07:00
ericrius1
25ded2bd92 added shapetype 2015-10-27 13:03:44 -07:00
ericrius1
8fcc071026 only can draw on whiteboard 2015-10-27 12:24:29 -07:00
Atlante45
1bebdc8e70 Fix scripts syntax errors 2015-10-27 12:11:27 -07:00
ericrius1
f0a1335957 fixed paint initially showing up white 2015-10-27 12:09:07 -07:00
ericrius1
fa22249f7a Improving model 2015-10-27 12:03:30 -07:00
ericrius1
8a85468254 changing model, repositioning 2015-10-27 10:39:44 -07:00
Ryan Huffman
2cd2af2b13 Add headers to line.js and lineExample.js 2015-10-27 09:49:52 -07:00
Ryan Huffman
983c551ce3 Clean up line.js and make lifetime settable 2015-10-27 09:13:16 -07:00
James B. Pollack
d78fe089f6 add mit license 2015-10-26 17:00:54 -07:00
Ryan Huffman
2abb6a2fd5 Clean up line.js 2015-10-26 16:45:58 -07:00
Ryan Huffman
1a1ab29978 Add lineExample.js 2015-10-26 16:45:43 -07:00
James B. Pollack
a1cd4a31cb fix typo 2015-10-26 16:41:03 -07:00
James B. Pollack
88a312f992 add functional js library... mmm, curry 2015-10-26 16:28:18 -07:00
James B. Pollack
da5db326e8 make cat quieter 2015-10-26 16:03:10 -07:00
Brad Hefta-Gaub
9c4199ef16 Merge pull request #6186 from jherico/pingpong 
Fixing spray can script
 2015-10-26 14:56:06 -07:00
Seth Alves
8d0aaed41a fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl' 2015-10-26 13:50:21 -07:00
Brad Davis
b2c3311947 Merge pull request #6174 from samcake/controllers 
Controllers : Adding a moving average for the velocity field returned by the Hydra controller
 2015-10-26 13:46:32 -07:00
Brad Davis
d91d0a2027 Fixing spray can script 2015-10-26 12:47:31 -07:00
James B. Pollack
fc8184ffed add arcade sound 2015-10-26 12:25:51 -07:00
Brad Davis
34b5178393 Fixing ping-ping entity script 2015-10-26 11:55:23 -07:00
Brad Hefta-Gaub
88ba6cda24 Merge pull request #6177 from jherico/guns 
Controller Branch - Fix gun.js
 2015-10-26 10:51:08 -07:00
Ryan Huffman
d6230fbed3 Remove trailing commas in line.js 2015-10-26 10:46:36 -07:00
Ryan Huffman
6b9b4d4e6e Add libraries/line.js 2015-10-26 10:44:39 -07:00
Brad Davis
75b2ee94b2 PR feedback 2015-10-25 19:37:41 -07:00
Brad Davis
3e50174114 Updating gun.js to new controller API 2015-10-24 16:26:50 -07:00
Brad Hefta-Gaub
394511ac1b fix frisbee.js to work with new API 2015-10-24 09:50:09 -07:00
Brad Davis
f61cf843bc Merge pull request #6172 from ZappoMan/fixScripts 
fix walkApi.js to detect hydra in official way
 2015-10-23 21:04:17 -07:00
Brad Hefta-Gaub
6cffe8cb6a Merge pull request #6169 from EdgarPironti/controllers2 
fix toyball.js
 2015-10-23 20:21:00 -07:00
Brad Hefta-Gaub
0b99728575 Merge pull request #6175 from AlessandroSigna/controllers 
fix stick.js
 2015-10-23 20:20:00 -07:00
Brad Hefta-Gaub
3a2328a887 Merge pull request #6173 from EdgarPironti/controllers 
Fixed sword.js
 2015-10-23 20:07:52 -07:00
AlessandroSigna
7f3f202567 fix stick.js 2015-10-23 18:23:15 -07:00
samcake
eae316100a Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 18:18:27 -07:00
samcake
d400c694f6 Cleaning up for release 2015-10-23 18:09:54 -07:00
EdgarPironti
0d15182adb Fixed sword.js 2015-10-23 18:09:43 -07:00
Brad Hefta-Gaub
4a19a14682 fix walkApi.js to detect hydra in official way 2015-10-23 17:53:34 -07:00
Brad Davis
304fe49628 Merge pull request #6170 from ZappoMan/fixScripts 
various controller script updates
 2015-10-23 17:43:54 -07:00
Brad Hefta-Gaub
060f87d14a CR feedback 2015-10-23 17:33:45 -07:00
samcake
be843a0035 adding a rnning average on the velocity values returned by the hydra and adding a simple js to test 2015-10-23 17:32:54 -07:00
Brad Hefta-Gaub
9aaef9aabd fix hydraPaint.js to use new API 2015-10-23 17:32:06 -07:00
EdgarPironti
0959c98132 Fixed tab 2015-10-23 17:26:44 -07:00
Brad Davis
4e6f64833f Conditional support from JS 2015-10-23 17:24:04 -07:00
Brad Hefta-Gaub
9ba1b800d9 CR feedback 2015-10-23 17:15:39 -07:00
Brad Hefta-Gaub
090dc5409b CR feedback 2015-10-23 17:14:59 -07:00
Brad Hefta-Gaub
ed20e7d209 CR feedback 2015-10-23 17:14:13 -07:00
EdgarPironti
c64290b5cd Removed unused variables 2015-10-23 17:13:29 -07:00
Brad Hefta-Gaub
9285cf8e2c fix hydraGrabHockey.js to use new API 2015-10-23 17:12:26 -07:00
Brad Hefta-Gaub
6b795364c8 make handGrab treat shoulder bumbers and triggers as merged control 2015-10-23 16:30:40 -07:00
EdgarPironti
5c09391170 fix toyball.js 2015-10-23 16:19:40 -07:00
AlessandroSigna
5d8d8c8f0d Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 15:50:39 -07:00
AlessandroSigna
37e1e43ce0 Fix paddleBall.js 2015-10-23 15:48:29 -07:00
Brad Hefta-Gaub
7e3192d0f6 fix drumstick.js 
fix drumstick.js
 2015-10-23 14:22:50 -07:00
AlessandroSigna
6001968d92 Fix paddleBall.js 2015-10-23 13:52:22 -07:00
AlessandroSigna
4c14cd757b Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 13:47:16 -07:00
Brad Davis
56deef9d6e Moving omniTool to a route mapped input 2015-10-23 13:40:36 -07:00
Brad Davis
be148686a7 Fixing omnitool 2015-10-23 13:40:36 -07:00
Brad Davis
d83ad7fdc1 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-23 13:35:24 -07:00
AlessandroSigna
c2078aca3f Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 11:27:16 -07:00
EdgarPironti
5bae83173c Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 11:16:02 -07:00
James B. Pollack
6392b7080b move scripts no longer in toybox to better locations 2015-10-23 10:36:32 -07:00
Brad Davis
63df9fb959 Fixing raw sound playback and air guitar 2015-10-22 22:37:18 -07:00
AlessandroSigna
ae2f7f6ff6 Fix paddleBall.js 2015-10-22 18:50:23 -07:00
EdgarPironti
eaaec516c2 fix controllerExample 2015-10-22 18:41:57 -07:00
Brad Davis
103fe3c545 Merge pull request #6155 from ZappoMan/fixScripts 
fix airGuitar.js
 2015-10-22 18:19:26 -07:00
samcake
3e4bada313 remove uneeded var 2015-10-22 18:03:47 -07:00
samcake
9015e98b70 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-22 16:13:54 -07:00
samcake
0ad4634eac Check that the velocity information is passed correctly and fixed clap.js 2015-10-22 16:13:12 -07:00
samcake
2db87e0d2d Remove hydramove.js and expose the velocity and angular Velocity for hydra 2015-10-22 15:55:36 -07:00
Brad Hefta-Gaub
c826b48c92 fix airGuitar.js 2015-10-22 15:05:59 -07:00
Brad Davis
5227c40298 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-22 12:15:41 -07:00
samcake
2ebf862da9 Merge pull request #6148 from jherico/controllerFunctions 
Fixing controller functions & makeAxis
 2015-10-22 11:56:58 -07:00
EdgarPironti
09cdc01599 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-22 11:50:45 -07:00
Brad Davis
7ed9ed8500 Merge pull request #6149 from ZappoMan/exposeMyAvatarHandsToJS 
make handControllerGrab.js work with new API
 2015-10-22 11:40:48 -07:00
Brad Davis
6cf0bdcffe Testing function destination and fixing bug in rule ordering for multi-soure 2015-10-22 10:00:11 -07:00
Brad Davis
5d4cbfdacb Resolving ambiguity between functions and inputs differently 2015-10-22 09:50:24 -07:00
Brad Davis
4938e5ea84 Fixing function based routes, makeAxis 2015-10-22 09:50:23 -07:00
Brad Hefta-Gaub
3e7364608b make handControllerGrab.js work with new API 2015-10-22 09:17:29 -07:00
Brad Davis
637654adea Wiring up step yaw 2015-10-21 18:46:09 -07:00
EdgarPironti
f3dd529a5f Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-21 15:02:40 -07:00
Brad Hefta-Gaub
d865eb2e24 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-21 12:46:26 -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
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
Brad Davis
21a3079a39 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-21 10:05:32 -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
samcake
e0615309bb Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-20 17:48:38 -07:00
Brad Davis
0e419e3fbb Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-20 17:47:37 -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
samcake
16f96715a3 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-20 10:16:08 -07:00
Brad Davis
8d0148a1ca Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-20 10:13:31 -07:00
Brad Hefta-Gaub
dfe3e5b1cb fix laser lifetimes 2015-10-20 09:30:27 -07:00
samcake
8701d73ee9 DOing the groundwork to pass along the pose 
still not working
 2015-10-19 19:05:37 -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
Brad Hefta-Gaub
8578b40236 get JS source functions working across threads 2015-10-17 14:14:45 -07:00
Brad Hefta-Gaub
7956d737ab fix thread safety issue on JS based fliters 2015-10-17 14:08:21 -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
Brad Hefta-Gaub
f90f0ed1f3 apply Huffman's feedback to Sam's PR 2015-10-17 12:34:32 -07:00
Brad Hefta-Gaub
fd5a5bb104 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-17 12:22:39 -07:00
Brad Hefta-Gaub
75c59fad99 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-10-17 12:18:14 -07:00
samcake
941f95c7d4 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-16 18:07:25 -07:00
samcake
20416455db Adding the loadMapping feature 2015-10-16 18:06:58 -07:00
samcake
f675035fd1 Merge pull request #6101 from jherico/controllers 
Hydra controller updates and test code
 2015-10-16 17:43:44 -07:00
Brad Davis
5bac1aae2d Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-16 17:23:30 -07:00
Brad Davis
db0fa6b8ed Update hydra mappings and test code 2015-10-16 17:23:09 -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
samcake
6d3d29b6b7 Adding a new mapping 2015-10-16 15:24:44 -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
samcake
f0034844e7 Actions working from the Controller layer 2015-10-16 12:24:12 -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
samcake
43d7fe491e wiring the actions 2015-10-15 17:53:53 -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
samcake
2ad6c2067b MErging maybe finally ?????? 2015-10-15 14:43:15 -07:00
ericrius1
e8b6b32572 Remembering whiteboards last color between sessions 2015-10-15 14:12:15 -07:00
Brad Davis
80c962a4cc Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-15 12:27:53 -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
samcake
cdfe9788d1 Merging 2015-10-15 10:49:08 -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
samcake
12e103c90c Get json creating the mappings from js 2015-10-14 17:41:39 -07:00
ericrius1
87439a049e Made color indicator thinner 2015-10-14 17:22:46 -07:00
Brad Davis
e39219c2b5 Fixes and PR comments 2015-10-14 16:51:52 -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