Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 23:51:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
35141 commits 74 branches 59 tags 1.2 GiB
Commit graph

4209 commits

Author SHA1 Message Date
James B. Pollack
328950065f make bow equippable and change it so you dont have to load arrows 2015-11-18 15:33:47 -08:00
AlessandroSigna
1f854784e1 not load the last recording 2015-11-18 15:17:06 -08:00
Brad Hefta-Gaub
6719092094 add an example of an entityScript that subscribes to messages 2015-11-18 15:03:07 -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
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
Brad Hefta-Gaub
9c4286b6ca Merge branch 'master' of https://github.com/highfidelity/hifi into messaging 2015-11-17 15:50:54 -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
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
Brad Hefta-Gaub
5b9791d800 add message received signal 2015-11-17 11:50:10 -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
Seth Alves
b062d23f61 bumper is now an equip toggle 2015-11-17 09:51:52 -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
AlessandroSigna
f40ff69c75 added scripts for group recording 2015-11-16 17:27:00 -08:00
EdgarPironti
b6c27588b6 ControlledAC.js refactoring 2015-11-16 16:50:47 -08:00
Stephen Birarda
aa77c4894c add an AudioInjectorManager for more efficient threading 2015-11-16 16:04:10 -08:00
Brad Davis
cb26fc67fc Move recording interface back to float/seconds 2015-11-16 14:44:22 -08:00
James B. Pollack
da2f5c7848 work 2015-11-16 12:57:43 -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
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
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
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
Seth Alves
1d0a2ddd3d grab debugging script 2015-11-13 11:15:57 -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
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
James B. Pollack
c719f25fb2 Merge branch 'master' into bow 2015-11-12 10:37:13 -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
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
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
James B. Pollack
9681145a1f storage 2015-11-11 14:28:19 -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
3f5cd0237d Added header to dynamicLoader and removed files that are not ready for merging 2015-11-10 17:29:20 -08:00
Eric Levin
c2fe937a5c Removed logging line 2015-11-10 17:07:55 -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
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
James B. Pollack
8fc702485b werk 2015-11-09 14:39:30 -08:00
Seth Alves
8a434c8ab1 don't attempt to near-grab things that aren't physical 2015-11-09 14:10:26 -08:00
Thijs Wenker
a58bd4ff05 Merge branch 'master' of https://github.com/worklist/hifi into 20724 2015-11-09 22:37:44 +01: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
James B. Pollack
45ad2cce39 Merge branch 'master' into bow 2015-11-09 11:58:39 -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
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
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
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
ericrius1
c289474909 avatr mover 2015-11-06 14:25:01 -08:00
ericrius1
a432a62dee model swapping 2015-11-06 13:53:25 -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