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

4614 commits

Author SHA1 Message Date
AlessandroSigna
1f854784e1 not load the last recording 2015-11-18 15:17:06 -08:00
ericrius1
d4c7b6b9b9 laser working 2015-11-18 15:11:17 -08:00
Brad Hefta-Gaub
6719092094 add an example of an entityScript that subscribes to messages 2015-11-18 15:03:07 -08:00
ericrius1
4bf1c36fd6 Firing works 2015-11-18 14:32:49 -08:00
ericrius1
aed5629eca equipping 2015-11-18 12:50:42 -08:00
ericrius1
47c2119888 Adding generic pistol 2015-11-18 12:25:36 -08:00
James B. Pollack
ac336af9b5 start spatial key 2015-11-18 11:33:52 -08:00
James B. Pollack
12e2178dd3 cleanup 2015-11-18 11:28:07 -08:00
James B. Pollack
9e1f030840 merge 2015-11-18 11:23:38 -08:00
James B. Pollack
5f3e3ed9d1 cleanup 2015-11-18 11:06:48 -08:00
ericrius1
fc9dfe8da5 Merge branch 'master' into rats 2015-11-18 10:48:43 -08:00
James B. Pollack
d3ee0d4998 handle bubble solidity 2015-11-18 10:44:24 -08:00
James B. Pollack
de953ce14d better spatialkey 2015-11-18 10:41:53 -08:00
Anthony J. Thibault
b481d7c73d Merge branch 'master' into tony/remove-joint-states 2015-11-18 09:38:21 -08:00
James B. Pollack
eb48342d07 add inversiona nd spatialkey 2015-11-18 09:10:04 -08:00
Philip Rosedale
9c29ba2ca3 Merge pull request #6408 from imgntn/newbubble 
Change out bubble model
 2015-11-17 20:30:59 -08:00
Philip Rosedale
5b853ddf57 Merge pull request #6402 from sethalves/grab-equip 
grab script bumper is an equip toggle
 2015-11-17 20:15:26 -08:00
Brad Hefta-Gaub
a1e10a9f04 Merge pull request #6309 from thoys/20724 
CR for Job #20724 - Camera entity mode
 2015-11-17 20:05:22 -08:00
AlessandroSigna
5400381583 improved the structure 2015-11-17 18:03:26 -08:00
AlessandroSigna
8566d84709 fixed cleanup - unload 2015-11-17 18:03:25 -08:00
Seth Alves
94f18672d4 equip from a distance uses a spring to pull the object to the hand before equipping it 2015-11-17 17:18:16 -08:00
Stephen Birarda
5dc48dc9dc resolve conflicts on merge with upstream/master 2015-11-17 17:04:12 -08:00
James B. Pollack
b340a99d69 Merge pull request #6290 from zzmp/examples/growth 
Add growth script to examples
 2015-11-17 17:01:28 -08:00
Stephen Birarda
8e4d7c69ce handle AudioInjectorManager for scripted ACs 2015-11-17 17:01:11 -08:00
James B. Pollack
e0a9048287 new bubble model 2015-11-17 16:59:14 -08:00
Stephen Birarda
ab5c8e072f handle blocked AudioInjectorManager for restart 2015-11-17 16:31:18 -08:00
James B. Pollack
e375a95947 remove unused methods from steering 2015-11-17 16:24:14 -08:00
ericrius1
cc23ecb810 lowered volume on sound 2015-11-17 16:08:10 -08:00
Brad Hefta-Gaub
9c4286b6ca Merge branch 'master' of https://github.com/highfidelity/hifi into messaging 2015-11-17 15:50:54 -08:00
ericrius1
eac91e71e8 updated model 2015-11-17 15:30:38 -08:00
ericrius1
f256b1804c enter entity triggers gun script 2015-11-17 15:12:52 -08:00
Seth Alves
5ae3c5aea0 adjust size of near-grab radius. 2015-11-17 14:59:06 -08:00
Seth Alves
c6051bb325 reduce size of near-grab radius. don't draw pick laser until we know we aren't going to do a near grab 2015-11-17 14:58:20 -08:00
Brad Hefta-Gaub
d8a3927311 debug the late connect case 2015-11-17 14:43:06 -08:00
Brad Hefta-Gaub
85aa3b3f83 handle subscribe when messages mixer is not available 2015-11-17 14:28:51 -08:00
Brad Hefta-Gaub
8112b3b57e add senderUUID to the messageReceived signal 2015-11-17 14:16:22 -08:00
Brad Davis
6664d8d919 Merge pull request #6398 from ZappoMan/messaging 
messages-mixer
 2015-11-17 14:03:03 -08:00
Brad Hefta-Gaub
2f142eb088 add a receiver example 2015-11-17 13:33:30 -08:00
James B. Pollack
3d2dc5a7a2 slower rats, pop from stack 2015-11-17 13:24:34 -08:00
Seth Alves
d21a2fee20 don't use spatial-key for normal grab, only equip. allow switching from a near or far grab to an equip. 2015-11-17 13:12:22 -08:00
ericrius1
cb524d540d rats deleting on hit 2015-11-17 12:55:06 -08:00
Brad Hefta-Gaub
5b9791d800 add message received signal 2015-11-17 11:50:10 -08:00
James B. Pollack
bb7328e476 hide nest 2015-11-17 11:35:16 -08:00
James B. Pollack
08ca03e0af ratssss 2015-11-17 11:33:48 -08:00
Seth Alves
1d4e1eabcb Merge branch 'master' of github.com:highfidelity/hifi into grab-equip 2015-11-17 11:01:22 -08:00
Brad Hefta-Gaub
c27a127739 add example script 2015-11-17 10:41:26 -08:00
ericrius1
90ef96746f blockign ray 2015-11-17 10:41:07 -08:00
ericrius1
2a9bbe3612 change relative pathing 2015-11-17 10:36:23 -08:00
ericrius1
005fd04585 Merge remote-tracking branch 'origin/rats' into rats 
Conflicts:
	examples/drylake/exterminatorGame/pistol.js
 2015-11-17 10:08:52 -08:00
ericrius1
85cb37d4b0 Moved exterminatorGame to drylake folder 2015-11-17 10:07:56 -08:00
Seth Alves
b062d23f61 bumper is now an equip toggle 2015-11-17 09:51:52 -08:00
ericrius1
423eef33d5 added hit effect back to entities 2015-11-17 09:48:34 -08:00
James B. Pollack
f669f8ac79 prep for adding to drylake 2015-11-17 00:34:14 -08:00
Eric Levin
7e4fe4b521 Update pistol.js 2015-11-16 23:06:45 -08:00
James B. Pollack
6098282736 end 2015-11-16 19:10:41 -08:00
James B. Pollack
a9379c41fe gnight 2015-11-16 19:04:07 -08:00
Anthony J. Thibault
80eb247b9c WIP checkin 
* AnimManipulator: added absolute and relative position and translation support
* Rig: added _overrideFlags and _overridePoses for script overrides.
 2015-11-16 18:49:47 -08:00
samcake
ba952581d0 Merge pull request #6389 from AlessandroSigna/groupRecording 
added group recording feature
 2015-11-16 17:57:11 -08:00
samcake
d66049f323 Merge pull request #6386 from AlessandroSigna/recorder 
added examples for messages synchronization
 2015-11-16 17:55:32 -08:00
ericrius1
d4a8537e8b changed title of npm module 2015-11-16 17:31:27 -08:00
AlessandroSigna
f40ff69c75 added scripts for group recording 2015-11-16 17:27:00 -08:00
ericrius1
845a32b51d removed rogue comment from eraseBoardEntityScript 2015-11-16 17:25:36 -08:00
ericrius1
b79d8824e6 removed another unused npm module from package.json file 2015-11-16 17:23:32 -08:00
ericrius1
f1f601decb removed unused npm module from package.json file 2015-11-16 17:23:01 -08:00
ericrius1
1c8b3e394c fixed spacing of app.js 2015-11-16 17:19:31 -08:00
ericrius1
7ea0a626d9 added to readme 2015-11-16 17:17:37 -08:00
ericrius1
6eebb57fab ws to wss to avoid mixed content server error 2015-11-16 17:14:53 -08:00
ericrius1
0e423d4ccf load data from server and display on load 2015-11-16 17:06:38 -08:00
ericrius1
cbdf0bbf1f Added readme 2015-11-16 17:03:04 -08:00
EdgarPironti
b6c27588b6 ControlledAC.js refactoring 2015-11-16 16:50:47 -08:00
ericrius1
c33a539221 got sockets working 2015-11-16 16:38:47 -08:00
ericrius1
09819b4298 sending message to all connections 2015-11-16 16:33:52 -08:00
ericrius1
3e7934767a username is now correct 2015-11-16 16:13:13 -08:00
Stephen Birarda
aa77c4894c add an AudioInjectorManager for more efficient threading 2015-11-16 16:04:10 -08:00
ericrius1
0ef37e4996 board header 2015-11-16 15:58:50 -08:00
ericrius1
b8cdff7a7a style tweaking 2015-11-16 15:46:22 -08:00
ericrius1
3c363f2664 removed extraneous socketTest.js file 2015-11-16 15:31:05 -08:00
ericrius1
0a9a903f79 made jquery node module 2015-11-16 15:29:06 -08:00
ericrius1
6ac53c7276 added game server code 2015-11-16 15:26:17 -08:00
ericrius1
763c6383f5 added blood splattering effect, and sending score to server 2015-11-16 14:44:42 -08:00
Brad Davis
cb26fc67fc Move recording interface back to float/seconds 2015-11-16 14:44:22 -08:00
ericrius1
f77b7b9105 renamed weapons folder to exterminatorGame 2015-11-16 14:09:47 -08:00
Eric Levin
ed1ee50865 rand names for testing 2015-11-16 13:54:24 -08:00
James B. Pollack
da2f5c7848 work 2015-11-16 12:57:43 -08:00
Eric Levin
eca11d3a99 sending message in correct format 2015-11-16 12:47:16 -08:00
Anthony J. Thibault
516aff2ee0 Kneel.js: Added comment to clearify js API 2015-11-16 11:37:12 -08:00
James B. Pollack
cafcf446d5 Merge branch 'master' into bow 2015-11-16 11:36:09 -08:00
James B. Pollack
2d7dd2fcf2 fires 2015-11-16 11:35:31 -08:00
Anthony J. Thibault
55adedcec8 Merge branch 'master' into tony/remove-joint-states 2015-11-16 11:22:44 -08:00
Seth Alves
89ed3751ae Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug 2015-11-14 14:00:20 -08:00
James B. Pollack
cdc6394a70 moar bowwww 2015-11-13 18:22:36 -08:00
Brad Davis
7a34d4f567 Merge pull request #6387 from samcake/controllers 
Recording : Updating the recorder.js and a few fixes
 2015-11-13 17:56:57 -08:00
samcake
89e5db11a0 More fixes 2015-11-13 17:41:41 -08:00
Eric Levin
4e9be8cdd0 fixed conflicts 2015-11-13 17:10:02 -08:00
Eric Levin
ceca720fae fix bug 2015-11-13 17:08:17 -08:00
AlessandroSigna
5e395713a6 fix script url 2015-11-13 16:33:54 -08:00
AlessandroSigna
5b66416b8c added cleanup before delete 2015-11-13 16:32:22 -08:00
AlessandroSigna
c8349dda6e added examples for messages synchronization 2015-11-13 16:32:20 -08:00
Ryan Huffman
a7dfc99a2e Fix high score not updating in baseball 2015-11-13 16:14:53 -08:00
EdgarPironti
a80871a7a8 Fixes 2015-11-13 15:00:38 -08:00
EdgarPironti
eb0d91fc7e Fixes to Master recording for ACs 2015-11-13 15:00:38 -08:00
Stephen Birarda
666c76073a Merge branch 'baseball' of https://github.com/Atlante45/hifi into baseball 2015-11-13 14:48:15 -08:00
ericrius1
2e2dc57b23 pushing for test 2015-11-13 14:00:03 -08:00
Seth Alves
3746920655 allow action updates from others when we are the simulation owner 2015-11-13 13:56:30 -08:00
James B. Pollack
6129d3757e fire code and sound code 2015-11-13 11:28:09 -08:00
ericrius1
9fb74667d9 Don't move non physical objects 2015-11-13 11:20:52 -08:00
Seth Alves
1d0a2ddd3d grab debugging script 2015-11-13 11:15:57 -08:00
Eric Levin
6f994d6274 shootable 2015-11-13 11:15:44 -08:00
ericrius1
281d058a24 pistol tweaking 2015-11-13 10:55:09 -08:00
James B. Pollack
f3d602a6f3 things 2015-11-13 10:30:17 -08:00
Sam Gateau
89d120ab3d Few fixes to make the recorder.js run 2015-11-12 22:24:11 -08:00
James B. Pollack
ff2b5fc8da with child glow box 2015-11-12 19:49:52 -08:00
samcake
1fd37b51a2 trying to get somewhere.... 2015-11-12 17:54:35 -08:00
ericrius1
f50c4d3b18 IK working 2015-11-12 16:32:37 -08:00
ericrius1
13ec8f631d Workign with ik, fixed a bug 2015-11-12 16:20:17 -08:00
James B. Pollack
7774f9096b work 2015-11-12 12:31:53 -08:00
James B. Pollack
361a89ad46 redraw pre notch strings after firing 2015-11-12 11:32:25 -08:00
Stephen Birarda
ef778c554c Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-12 10:40:51 -08:00
James B. Pollack
c719f25fb2 Merge branch 'master' into bow 2015-11-12 10:37:13 -08:00
ericrius1
d43c63c109 going to add kickback decay 2015-11-12 10:28:51 -08:00
Seth Alves
3519dd248b Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug 2015-11-12 09:53:11 -08:00
Zach Pomerantz
33851baa3f Add directionality to examples/growth 
*There is a bug in here, but it may be in Interface.*
The sphere entities have a lifetime of 60s.
The first time the script is run, each click fires one clickReleaseOnEntity event.
If the entities expire (lifetime is reached), and the script is rerun a second time,
each click will fire two clickReleaseOnEntity events.
If this is repeated (waiting for expiration each time), then
the N-th repetition will fire N clickReleaseOnEntity events.
Note that each entity, across runs, has a unique uuid, as expected.
 2015-11-11 22:32:45 -08:00
James B. Pollack
2b8ad51b41 cleanup orientation of 2015-11-11 18:07:05 -08:00
James B. Pollack
595c628c39 it works! 2015-11-11 17:32:03 -08:00
Thijs Wenker
4c2c37acce Merge branch 'master' of https://github.com/worklist/hifi into 20724 2015-11-12 02:19:35 +01:00
Thijs Wenker
764af63ea9 remove Anchor entity from example and edit script, replace with invisible Box in example 2015-11-12 02:19:08 +01:00
James B. Pollack
1819e20f74 Merge pull request #6367 from ericrius1/marketplace 
Dynamic loading of models from specified directory
 2015-11-11 16:54:06 -08:00
ericrius1
1bf8ced2c4 kickback working 2015-11-11 16:40:44 -08:00
Brad Hefta-Gaub
a721b13e46 Merge pull request #6364 from imgntn/cleanuptoybox 
Remove Bball and Targets AC Resetter Script from Toybox
 2015-11-11 16:23:33 -08:00
Brad Hefta-Gaub
c4ad1d978b Merge pull request #6344 from imgntn/easystar 
Adapt EasyStar A* Pathfinding Library and Add Example
 2015-11-11 16:22:47 -08:00
Seth Alves
cffe4551dd merge from upstream 2015-11-11 16:15:07 -08:00
ericrius1
806d303dcd Added header file 2015-11-11 15:55:32 -08:00
Brad Hefta-Gaub
2363ca044e Merge pull request #6280 from imgntn/colorbuster 
Color Busters Game
 2015-11-11 15:52:18 -08:00
ericrius1
56dc9092e0 added s3 server 2015-11-11 15:52:12 -08:00
ericrius1
466caffd00 trying to add ik 2015-11-11 15:48:06 -08:00
ericrius1
4fc44b0929 Updated header summary to be more specific with how the loading works 2015-11-11 15:19:36 -08:00
EdgarPironti
da2b49a1b0 Remove hardcoded url 2015-11-11 15:07:33 -08:00
EdgarPironti
55d386aaab Fixes: Prompt and userData 2015-11-11 15:07:33 -08:00
EdgarPironti
0f057d7229 Set clip for ControlledAC 2015-11-11 15:07:32 -08:00
James Pollack
ffe9036755 debug 2015-11-11 14:51:20 -08:00
ericrius1
fa244f8670 updated rat model 2015-11-11 14:50:16 -08:00
ericrius1
e78a079796 tweaks to particle props 2015-11-11 14:28:30 -08:00
James B. Pollack
9681145a1f storage 2015-11-11 14:28:19 -08:00
ericrius1
5789ca2017 particle hit against walls 2015-11-11 14:20:58 -08:00
ericrius1
1e653133b4 muzzle flashes 2015-11-11 13:30:46 -08:00
AlessandroSigna
e4b1b54e00 added header 2015-11-11 12:07:54 -08:00
AlessandroSigna
f40e46957b handControlledHead.js added 2015-11-11 12:06:51 -08:00
Anthony J. Thibault
56e96ed24c Merge branch 'master' into tony/script-start-stop-anim 2015-11-11 11:33:24 -08:00
ericrius1
667464b493 rat moves back with force when shot 2015-11-11 11:01:34 -08:00
ericrius1
40a15a15f3 cleaning up pistol 2015-11-11 09:11:03 -08:00
ericrius1
3f5cd0237d Added header to dynamicLoader and removed files that are not ready for merging 2015-11-10 17:29:20 -08:00
ericrius1
3346d77c44 pistol 2015-11-10 17:25:54 -08:00
Eric Levin
c2fe937a5c Removed logging line 2015-11-10 17:07:55 -08:00
Atlante45
4f1420a5ee Tweak bat offsets 2015-11-10 17:05:27 -08:00
ericrius1
0aefb8747f Dynamic loading of models from specified directory 2015-11-10 16:55:17 -08:00
Anthony J. Thibault
e1d0a97807 Implemented MyAvatar.prefetchAnimation() JS method 2015-11-10 16:51:48 -08:00
ericrius1
e4b271d6d8 dynamic loading content from s3 2015-11-10 16:49:46 -08:00
Anthony J. Thibault
936c55a94e New MyAvatar animation JS interface 
JavaScript changes:

* removed MyAvatar.playAnimation
* removed MyAvatar.stopAnimation
* removed MyAVatar.getGetAnimationDetails
* removed MyAvatar.startAnimationByRole
* removed MyAvatar.stopAnimationByRole
* removed MyAVatar.getGetAnimationDetailsByRole
* removed MyAVatar.clearJointPriorities

* added MyAvatar.overrideAnimation(url, fps, loop, firstFrame, lastFrame)
* added MyAvatar.restoreAnimation()
* added MyAvatar.getAnimationRoles()
* added MyAvatar.overrideRoleAnimation(role, url, fps, loop, firstFrame, lastFrame)
* added MyAvatar.restoreRoleAnimation(role)
* added MyAvatar.prefetchAnimation(url)

* update kneel.js with new api.
* added theBird.js to test role override api.

C++ changes:

* Added getParent() and replaceChild() to AnimNode
* Added findByName() and traverse() to AnimNode
* Changed AnimStateMachine to hold nodes by childIndex instead of smart pointer.
  This allows script to replace nodes dynamically via overrideRoleAnimation
 2015-11-10 16:34:38 -08:00
James B. Pollack
b6bb54da32 Merge branch 'master' into bow 2015-11-10 15:30:50 -08:00
Seth Alves
4df65e4c11 Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug 2015-11-10 15:02:07 -08:00
Atlante45
3cbe1bc4da Mirror on x instead of z 2015-11-10 14:50:22 -08:00
Atlante45
ddf82c35e1 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-10 14:18:49 -08:00
Eric Levin
a2abc11df1 Merge pull request #6351 from huffman/script-path-resolution 
Update script engine path resolution behavior to behave consistently
 2015-11-10 14:10:42 -08:00
James B. Pollack
e7a2e82745 remove bball and targets resetter AC since we are doing this with hidden reset entities now 2015-11-10 13:58:07 -08:00
James B. Pollack
4ded489d23 Merge pull request #6362 from ericrius1/helicopter 
Added scripts for helicopter
 2015-11-10 13:53:30 -08:00
ericrius1
bf0677a0ce Moved helicopter scripts into drylake folder 2015-11-10 13:42:15 -08:00
Ryan Huffman
08c2759947 Remove unused include in createTargets.js 2015-11-10 11:39:50 -08:00
Ryan Huffman
031a93cb0e Fix utils include in createPingPongGun.js 2015-11-10 11:39:31 -08:00
Ryan Huffman
5f084730d9 Remove old includes in doll.js 2015-11-10 11:39:12 -08:00
Ryan Huffman
a264ed4795 Remove old includes in bubblewand 2015-11-10 11:38:57 -08:00
Ryan Huffman
a6bc1a2b5b Fix closePaint.js Script.include 2015-11-10 11:38:36 -08:00
Ryan Huffman
90a1fbe04e Fix magBalls.js resolvePath calls 2015-11-10 11:38:16 -08:00
Ryan Huffman
2a349620ee Fix walkSettings.js resolvePath calls 2015-11-10 11:37:59 -08:00
Ryan Huffman
e7e6c63c64 Fix edit.js resolvePath calls 2015-11-10 11:36:53 -08:00
Seth Alves
b9ca509f07 Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup 2015-11-10 09:50:12 -08:00
Ryan Huffman
6577c7a13c Fix magBalls include paths 2015-11-10 09:38:52 -08:00
Ryan Huffman
2ad4c5b9e2 Fix walkApi include paths 2015-11-10 09:38:40 -08:00
Ryan Huffman
29fd352169 Fix omniTool test module include path 2015-11-10 09:38:21 -08:00
Ryan Huffman
37d9d98594 Fix breakdance include paths 2015-11-10 09:37:53 -08:00
Ryan Huffman
b802da4fef Fix include in satellite.js 2015-11-10 09:37:36 -08:00
ericrius1
f5308530e6 Removed commented out line 2015-11-10 09:35:35 -08:00
ericrius1
df5353dc16 Merge branch 'refs/heads/master' into helicopter 2015-11-10 09:33:04 -08:00
Ryan Huffman
53ca4c857d Fix relative include path in entityCameraTool.js 2015-11-10 08:52:37 -08:00
James B. Pollack
789f3231e1 easier bouncing 2015-11-09 19:18:19 -08:00
James B. Pollack
1ec70e8170 add physics to the ball and make it bounce 2015-11-09 19:10:11 -08:00
Anthony J. Thibault
eacc2cae0c WIP checkpoint 2015-11-09 18:36:23 -08:00
James B. Pollack
17814446ca Add example with entities, add tween.js 2015-11-09 17:11:09 -08:00
Anthony J. Thibault
af2b3bb9d5 MyAvatar: removed priority, hold and maskedJoints from playAnimation js call 2015-11-09 16:56:49 -08:00
Ryan Huffman
03dd234253 Update pitching.js to get billboard ids lazily 2015-11-09 16:48:54 -08:00
Stephen Birarda
0b1ecdec74 use just location to go to path 2015-11-09 15:49:54 -08:00
Stephen Birarda
57b4302e0d Fix setting of location in bat.js 2015-11-09 15:44:23 -08:00
Stephen Birarda
b6c4ae757b fix reference to pitchAndHideAvatar 2015-11-09 15:41:11 -08:00
Stephen Birarda
44ab236673 Fix include in bat.js 2015-11-09 15:33:23 -08:00
Stephen Birarda
244fd86d1e add semi-colons to bat.js 2015-11-09 15:31:53 -08:00
James B. Pollack
8fc702485b werk 2015-11-09 14:39:30 -08:00
Stephen Birarda
cea2e0fafd don't force location in continueNearGrab 2015-11-09 14:21:14 -08:00
Seth Alves
8a434c8ab1 don't attempt to near-grab things that aren't physical 2015-11-09 14:10:26 -08:00
Stephen Birarda
962881ad31 use startNearTrigger and startFarTrigger for create button 2015-11-09 13:43:52 -08:00
Atlante45
3228ca6033 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-09 13:41:31 -08:00
Atlante45
dcf545f462 Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-09 13:41:23 -08:00
Atlante45
b15054c1fb Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-09 13:41:06 -08:00
Thijs Wenker
a58bd4ff05 Merge branch 'master' of https://github.com/worklist/hifi into 20724 2015-11-09 22:37:44 +01:00
Stephen Birarda
d65571ea41 use the birarda baseball script on the createBatButton 2015-11-09 13:36:20 -08:00
Stephen Birarda
9ec51d822e send the avatar to /baseball on bat pickup 2015-11-09 13:35:54 -08:00
Stephen Birarda
119a702ebd Merge branch 'baseball' of https://github.com/huffman/hifi into baseball 2015-11-09 13:34:30 -08:00
Atlante45
6a53021818 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-09 13:23:31 -08:00
Anthony J. Thibault
a0f21228f6 AnimGraph support for start and stop animation from JavaScript 
Follows the same model as the existing startAnimation and stopAnimation calls.
See kneel.js for an example.
 2015-11-09 12:19:01 -08:00
Eric Levin
7700e67734 Merge pull request #6326 from imgntn/entity_params 
Add Ability to Pass Parameters When Calling Methods on Entities
 2015-11-09 12:17:58 -08:00
Ryan Huffman
a400d63960 Cleanup Baseball in pitching.js 2015-11-09 12:02:28 -08:00
Ryan Huffman
5d4ce6aefc Update include paths in pitching.js to be relative 2015-11-09 12:02:10 -08:00
James B. Pollack
45ad2cce39 Merge branch 'master' into bow 2015-11-09 11:58:39 -08:00
Ryan Huffman
069284d8d1 Remove unused variable and print in pitching.js 2015-11-09 11:51:08 -08:00
Ryan Huffman
278c921a50 Clean up bat.js 2015-11-09 11:35:56 -08:00
Ryan Huffman
38fcdc3eff Remove unused code from pitching.js 2015-11-09 10:59:46 -08:00
Ryan Huffman
661b2180f5 Update updateBillboard argument 2015-11-09 10:59:31 -08:00
Ryan Huffman
dad3ccb238 Cleanup pitching.js 2015-11-09 10:58:36 -08:00
Ryan Huffman
1b3d595d1e Add comment to PITCHING_MACHINE_OUTPUT_OFFSET_PCT 2015-11-09 10:58:18 -08:00
James B. Pollack
b496240283 Merge branch 'master' into bow 2015-11-09 10:54:54 -08:00
James B. Pollack
ef7caa8da9 Add new collision hull and sound to ping pong gun 2015-11-09 10:48:12 -08:00
Ryan Huffman
b6d26862fd Add headers to baseball script files 2015-11-09 10:33:07 -08:00
Ryan Huffman
ec31504c11 Add detection of missing entity billboards in pitching.js 2015-11-09 10:30:21 -08:00
Eric Levin
8e039fe465 Merge pull request #6338 from imgntn/string_polyfills 
Add More Methods to stringHelpers.js
 2015-11-09 10:25:13 -08:00
Eric Levin
ceba1c4b02 Merge pull request #6340 from imgntn/usertiming 
Adapt UserTiming library and Add Example
 2015-11-09 10:25:04 -08:00
Ryan Huffman
20bdc7ee85 Rename getPitchingMachine to getOrCreatePitchingMachine 2015-11-09 10:10:59 -08:00
Ryan Huffman
30841169ee Move functions in baseball.js to utils.js 2015-11-09 10:04:19 -08:00
Seth Alves
030bb71f19 Merge pull request #6337 from howard-stearns/fix-agent-avatar 
fix agent avatar animation
 2015-11-09 09:38:27 -08:00
Seth Alves
f3d26e163d turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system 2015-11-07 07:19:27 -08:00
James B. Pollack
bf4320e5cc re-add this example 2015-11-06 22:55:33 -08:00
James B. Pollack
34d98cac5e Update usertiming.js 2015-11-06 22:12:03 -08:00
James B. Pollack
369eec2abd Update usertimingExample.js 2015-11-06 22:05:30 -08:00
James B. Pollack
4fbff5d667 Update usertimingExample.js 2015-11-06 21:39:53 -08:00
Clément Brisset
517ef7dfc8 Merge pull request #6336 from ericrius1/avatarMover 
Restores the avatar mover app after its loss in S3
 2015-11-06 19:30:24 -08:00
James B. Pollack
c4318bcbd3 add easystar lib 2015-11-06 17:38:53 -08:00
James B. Pollack
f478261ed0 cleanup 2015-11-06 16:21:53 -08:00
James B. Pollack
5893bfeb06 add user timing 2015-11-06 16:19:49 -08:00
James B. Pollack
f7d4a3821f add more methods 2015-11-06 15:42:56 -08:00
Howard Stearns
619746676b Fix ScriptAvatar (ac agent), and provide a simple working example assignment client script. 2015-11-06 15:31:03 -08:00
Ryan Huffman
e145d4955c Update tunnel detection to reverse all axes 2015-11-06 15:30:25 -08:00
Ryan Huffman
bc035b7e1e Adjust baseball speed to 7-15 m/s 2015-11-06 15:29:57 -08:00
ericrius1
c1690bcf32 restoring avatarMover app post S3-loss event 2015-11-06 15:19:14 -08:00
James B. Pollack
ced1a4899d promises 2015-11-06 15:10:23 -08:00
Ryan Huffman
51b14386a0 Adjust baseball pitch speed to 5-20 m/s 2015-11-06 15:08:35 -08:00
ericrius1
c289474909 avatr mover 2015-11-06 14:25:01 -08:00
ericrius1
a432a62dee model swapping 2015-11-06 13:53:25 -08:00
Atlante45
55c6706f76 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-06 13:31:39 -08:00
Atlante45
35b13b11eb Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-06 13:30:42 -08:00
Eric Levin
7be537c49c Merge pull request #6332 from imgntn/bubblwand_links 
Update Bubblewand Model References
 2015-11-06 13:28:27 -08:00
James B. Pollack
1d41ef868b update bubblewand model refs 2015-11-06 13:11:06 -08:00
Ryan Huffman
c964363ce5 Disable automatic playing of show in firework.js 2015-11-06 12:25:13 -08:00
Ryan Huffman
42e2c683fd Rename fireSounds to launchSounds 2015-11-06 12:24:52 -08:00
Ryan Huffman
4cce57881f Remove MAX_SIMULTANEOUS_FIREWORKS from firework.js 2015-11-06 12:24:19 -08:00
James B. Pollack
cf86d27417 cleanup headers 2015-11-06 11:50:34 -08:00
James B. Pollack
e928c8278b overload a single function and cleanup, add examples 2015-11-06 11:48:51 -08:00
Ryan Huffman
fbb47ecdda Remove hard-coded fireworks position from firework.js 2015-11-06 11:39:46 -08:00
Ryan Huffman
94bf2ecf27 Remove emitter pool from firework.js 2015-11-06 10:45:22 -08:00
Ryan Huffman
d5336db039 Cleanup print statements in pitching.js 2015-11-06 10:04:19 -08:00
Ryan Huffman
7da611d44b Adjust fireworks configuration in pitching.js 2015-11-06 10:03:57 -08:00
Ryan Huffman
5d2df1abbb Add helped function findEntity 2015-11-06 09:55:18 -08:00
samcake
63106f6991 Merge pull request #6322 from Atlante45/record 
Recording fixes from Clement.
 2015-11-06 09:28:58 -08:00
James B. Pollack
2fdc9202e4 Merge pull request #6313 from AlanZimmerman/playa 
Created playaSpawner
 2015-11-05 20:47:00 -08:00
AlessandroSigna
715b183a3c unified two ways to do the mapping in a single JS 2015-11-05 19:10:06 -08:00
AlessandroSigna
f9ebbea585 Merge branch 'master' of https://github.com/highfidelity/hifi into branchJS 2015-11-05 19:09:49 -08:00
ericrius1
94c5637024 marketplace spawner 2015-11-05 17:27:30 -08:00
Thijs Wenker
de98a17ada - rename CameraEntityItem to AnchorEntityItem 2015-11-06 01:58:08 +01:00
Anthony Thibault
b6b596b8af Merge pull request #6284 from howard-stearns/away 
Away/Pause
 2015-11-05 15:28:47 -08:00
Atlante45
a2f0d8a066 Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-05 15:14:32 -08:00
Atlante45
147cc088ba Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-05 15:14:23 -08:00
Atlante45
c1029450d9 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-05 15:14:15 -08:00
James B. Pollack
31b540ca38 mid test 2015-11-05 14:29:58 -08:00
ericrius1
f8de01a856 Fixed bug where eraser wouldn't erase 2015-11-05 14:14:49 -08:00
Atlante45
07b3597ae3 Fix recording scripts 2015-11-05 14:01:37 -08:00
Seth Alves
c4194f2359 don't try to grab polylines. set wantTrigger on various whiteboard parts 2015-11-05 13:26:23 -08:00
Howard Stearns
8f65ee87bc Clean up script, go away when putting HMD (not just on startup), and clear stopper properly. 2015-11-05 13:19:29 -08:00
Howard Stearns
aef8b7639d Merge branch 'master' of https://github.com/highfidelity/hifi into away 2015-11-05 11:58:08 -08:00
James B. Pollack
87503ca4c6 Merge branch 'master' into bow 2015-11-05 11:00:51 -08:00
James B. Pollack
c898d9a474 set wantstrigger correctly on lightswitch 2015-11-05 10:48:16 -08:00
Seth Alves
4a3b434fd4 change grabbing-non-colliding to trigger. fix whiteboard and some other scripts 2015-11-05 10:35:02 -08:00
James B. Pollack
7dc40548d3 Merge branch 'master' into bow 2015-11-05 10:21:37 -08:00
Seth Alves
4ffaa7db8e don't attempt to grab particles or zones 2015-11-05 09:46:39 -08:00
Seth Alves
7cb8adb090 get rid of code that computes release velocity 2015-11-05 09:45:06 -08:00
Seth Alves
3154b9d75f don't set release velocity 2015-11-05 09:44:50 -08:00
Brad Davis
86b852231e Merge pull request #6286 from EdgarPironti/master 
Spacemouse migration
 2015-11-04 19:15:35 -08:00
AlessandroSigna
eac73671e0 Added some documentation and examples for the new mapping system 2015-11-04 17:40:35 -08:00
Seth Alves
05a977e31b get rid of code that computes release velocity 2015-11-04 16:26:30 -08:00
Seth Alves
adb9118dc1 don't set release velocity 2015-11-04 16:21:02 -08:00
Ryan Huffman
1c9e3434a9 Adjust behavior of tunnel-detection in pitching.js 2015-11-04 16:01:08 -08:00
ericrius1
b7840fdd6b explosion 2015-11-04 15:01:55 -08:00
Alan Z
8b20a3c903 Created playaSpawner and fixed cleanup issue 2015-11-04 14:41:11 -08:00
Ryan Huffman
6ae4ef78dd Update max fireworks in pitching.js to be 10 2015-11-04 14:38:48 -08:00
Ryan Huffman
4d5ed2efcf Fix fireworks not being deleted 2015-11-04 14:38:30 -08:00
Stephen Birarda
f67d4d33f4 make the crowd a bit louder 2015-11-04 14:32:36 -08:00
James B. Pollack
9b7bdca73a merge handcontroller 2015-11-04 14:12:00 -08:00
Seth Alves
1cbe6c4463 don't attempt to grab particles or zones 2015-11-04 13:59:37 -08:00
Ryan Huffman
e0ad714ab7 Clean up print messages in pitching.js 2015-11-04 13:11:34 -08:00
Ryan Huffman
2a115fc9ab Remove preallocation of particles in firework.js 2015-11-04 13:11:20 -08:00
Ryan Huffman
de69b2298b Decrease number of fireworks on high score 2015-11-04 12:55:18 -08:00
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
Ryan Huffman
8056498f39 Update pitching machine to shoot fewer fireworks 2015-11-04 12:11:07 -08:00
Ryan Huffman
bed7a1f5c3 Improve performance of fireworks 2015-11-04 12:10:42 -08:00
Ryan Huffman
d0d3aaa09c Update bat.js to ensure pitching machine is running in continueNearGrab 2015-11-04 12:10:19 -08:00
Howard Stearns
4fd2027fb4 change name 2015-11-04 11:42:21 -08:00
Stephen Birarda
d5c6b0bdc0 allow a distance grab on the create bat button 2015-11-04 11:31:01 -08:00
ericrius1
3c227db08d explode heli 2015-11-04 11:27:16 -08:00
Atlante45
8223e032c0 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-04 11:26:46 -08:00
Atlante45
234271a40d Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-04 11:26:38 -08:00
Atlante45
d9cd986db2 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-04 11:26: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
Stephen Birarda
ff2438ef03 use bat script that fully hides avatar 2015-11-04 10:23:06 -08:00
Stephen Birarda
8607a1ef50 Revert "remove continueNearGrab from bat script" 
This reverts commit ea2b9e906b.
 2015-11-04 10:22:53 -08:00
Stephen Birarda
c2b0d127f3 use bat script without continued near grab 2015-11-04 09:33:42 -08:00
Stephen Birarda
ea2b9e906b remove continueNearGrab from bat script 2015-11-04 09:33:09 -08:00
Stephen Birarda
73aa016d8c use rawgit URL for bat script 2015-11-04 09:23:16 -08:00
Ryan Huffman
cb2a698488 Update urls in baseball scripts to be absolute 2015-11-04 09:22:05 -08:00
Ryan Huffman
f5c89dedb5 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-04 08:56:01 -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
James B. Pollack
46294e3e26 Merge branch 'master' into bow 2015-11-03 20:10:28 -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
Atlante45
55894f2eee Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-03 17:46:24 -08:00
Atlante45
04f4e49158 Merge branch 'baseball' of github.com:huffman/hifi into baseball 2015-11-03 17:45:43 -08:00
Howard Stearns
4a54f2052e Merge branch 'master' of https://github.com/highfidelity/hifi into away 2015-11-03 17:42:38 -08:00
Stephen Birarda
9ae3c8b593 change bat relative rotation yaw to 90 2015-11-03 16:58:30 -08:00
Stephen Birarda
e7bc2e349a use real userData in createBatButton script 2015-11-03 16:55:11 -08:00
Stephen Birarda
9488a8ed24 use HTTP URL for bat script URL 2015-11-03 16:42:31 -08:00
Stephen Birarda
5b3809b543 update the bat script URL 2015-11-03 16:13:14 -08:00
Stephen Birarda
804db537bf volume changes for crowd, bat avatar suppression fix 2015-11-03 16:11:13 -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
8c0592caba add semicolons to createBatButton script 2015-11-03 14:52:40 -08:00
Ryan Huffman
5211824e0e Fix script include paths in firework.js and pitching.js 2015-11-03 14:43:43 -08:00
Stephen Birarda
501b905e7a change script URL for bat to HTTP 2015-11-03 14:25:38 -08:00
Stephen Birarda
8346ce27b3 allow a non-colliding grab of locked entities 2015-11-03 14:22:41 -08:00
Stephen Birarda
06dbe2693a fix for created bat properties 2015-11-03 14:21:52 -08:00
ericrius1
0846c3bef4 moving 2015-11-03 14:12:56 -08:00