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

4975 commits

Author SHA1 Message Date
James B. Pollack
3b6cd4c2d1 initial live earthqukes commit 2015-12-05 14:11:59 -08:00
Atlante45
0603ead972 Have panels collapsed by default 2015-12-04 21:01:53 -08:00
Atlante45
acb9e2774e Basic implementation of debug zone resizing 2015-12-04 21:01:53 -08:00
Atlante45
41af377878 More g-buffer debugging options 2015-12-04 21:01:53 -08:00
David Rowe
404deba78d Adjust avatar thumb root joint angle to look better 2015-12-05 16:26:21 +13:00
David Rowe
560b9f012f Get hand positioning and orientation working again 2015-12-05 16:25:28 +13:00
Atlante45
b45b1cc513 More work on live g-buffer debug 2015-12-04 17:43:00 -08:00
Atlante45
5bfcd4ed91 Fix scripted checkbox 2015-12-04 17:30:45 -08:00
samcake
119cc733b5 Merging with master 2015-12-04 17:17:33 -08:00
James B. Pollack
bfe12cf8db stability improvments 2015-12-04 15:49:04 -08:00
James B. Pollack
b8e731fd22 adjustments 2015-12-04 15:25:55 -08:00
James B. Pollack
f867ebf1d1 every sixth rat 2015-12-04 15:18:35 -08:00
Atlante45
1d498af76e Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-04 15:18:25 -08:00
James B. Pollack
b1ec1eb113 make injectors more stable 2015-12-04 15:17:13 -08:00
Philip Rosedale
06c8235b19 Merge pull request #6544 from sethalves/distance-grab-adjustment 
distance-hold adjustment
 2015-12-04 14:34:10 -08:00
James B. Pollack
51b0c48866 splicing and dicing 2015-12-04 14:05:31 -08:00
James B. Pollack
3211bec7ce increase distance for rat to be in the nest and deleted 2015-12-04 13:57:59 -08:00
James B. Pollack
7ed0e3d8ae change clear rat order 2015-12-04 13:56:38 -08:00
James B. Pollack
a9aecb5c49 add rat sounds 2015-12-04 13:54:59 -08:00
Atlante45
c27944ae28 Simple normal map debug 2015-12-04 10:44:23 -08:00
Seth Alves
4246672813 enable head-moving of distance grabbing 2015-12-04 10:38:24 -08:00
Brad Hefta-Gaub
d9a1563396 Merge pull request #6152 from sethalves/parents 
Parents
 2015-12-04 10:26:57 -08:00
James B. Pollack
493a8f6f82 Merge branch 'master' into ratsteer 2015-12-04 10:26:47 -08:00
ericrius1
7e7327042a Merge branch 'master' into polylineOptimizations 2015-12-04 09:53:01 -08:00
Seth Alves
17b5ade9c0 allow moving distantly grabbed objects with head 2015-12-03 16:45:46 -08:00
Seth Alves
a600df5ea6 try a different method of exagerating hand motion onto distanly held object 2015-12-03 16:04:39 -08:00
Clément Brisset
d6a2a2550b Merge pull request #6526 from imgntn/butterfly 
Update model for butterflies.js
 2015-12-03 15:25:55 -08:00
ericrius1
5f881e7650 polylines now take color as a uniform 2015-12-03 13:46:29 -08:00
James B. Pollack
fbca1c9754 another toy 2015-12-03 11:12:28 -08:00
James B. Pollack
cf5c8c08e2 update toys to be inverted while held 2015-12-03 11:10:22 -08:00
ericrius1
2336dd96dd lights 2015-12-02 18:10:45 -08:00
David Rowe
a0dcf72a3b Use animation handlers to control hand position and orientation 2015-12-03 14:09:46 +13:00
ericrius1
d2d0326c02 using deployed texture 2015-12-02 16:44:47 -08:00
David Rowe
0f3722a05c Fix Leap Motion calibration avatar pose 2015-12-03 13:14:22 +13:00
ericrius1
07430fb75a Merge branch 'master' into polylineOptimizations 2015-12-02 15:59:32 -08:00
ericrius1
8aeb559848 flowy 2015-12-02 15:58:30 -08:00
Seth Alves
6eae98fb28 merge from upstream 2015-12-02 14:38:26 -08:00
James B. Pollack
a9438490fe update butterfly model 2015-12-02 12:53:19 -08:00
Brad Hefta-Gaub
33b859df33 Merge pull request #6416 from kencooke/audio-reverb 
New reverb
 2015-12-02 11:22:12 -08:00
Brad Hefta-Gaub
ba0ce5f3b3 Merge pull request #6480 from samcake/controllers 
Playback: Trying to get the Agent to Master connection more reliable
 2015-12-02 11:08:15 -08:00
Ken Cooke
fbd7549430 Better reverb script defaults 2015-12-02 11:05:06 -08:00
samcake
0ae7060316 the correct includes 2015-12-02 10:23:31 -08:00
Brad Hefta-Gaub
112cdaf028 Merge pull request #6512 from AndrewMeadows/remove-debug-cruft 
remove debug option for disabling physics updates
 2015-12-02 10:00:29 -08:00
samcake
586ed51436 rename AgentPoolCOntroller.js 2015-12-02 09:56:16 -08:00
Brad Hefta-Gaub
b6398a7930 fix PlayRecordingOnAC.js to use new API 2015-12-02 09:51:52 -08:00
samcake
c7b9d7d26e Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-12-02 09:49:03 -08:00
Seth Alves
0595ef0938 merge from upstream 2015-12-02 09:30:19 -08:00
James B. Pollack
e67f372bcf make pistol shoot differently and not alter controller mappings 2015-12-01 18:24:13 -08:00
samcake
86af28dbab Fighting for one hour with the ready message being misunderstood by master 2015-12-01 18:18:18 -08:00
James B. Pollack
1eca1540c6 Merge pull request #6519 from ericrius1/toyboxSounds 
added collision sounds to flashlight, spraycan, and bow
 2015-12-01 17:08:19 -08:00
Eric Levin
34234da2d1 fixed spacing 2015-12-01 17:05:51 -08:00
ericrius1
40fb45c6d3 fixed accidental newline in handgrab 2015-12-01 17:04:10 -08:00
ericrius1
0fd1bdaec5 fixed accidental newline in handgrab 2015-12-01 17:03:11 -08:00
ericrius1
e4199439af added collision sounds to some toys 2015-12-01 17:00:43 -08:00
ericrius1
386afa272c disable grab while attachment version of pistol script is running 2015-12-01 16:50:09 -08:00
Eric Levin
948479b0e8 Merge pull request #6517 from imgntn/disable2hands 
Support disabling both hands in handControllerGrab.js
 2015-12-01 16:25:23 -08:00
ericrius1
191f7f2c22 no audio for now 2015-12-01 16:22:11 -08:00
James B. Pollack
aca0fa7beb support disabling both hands 2015-12-01 16:03:19 -08:00
James B. Pollack
52d6fdac1a Merge pull request #6487 from ctrlaltdavid/20740 
Get the Leap Motion working again
 2015-12-01 15:40:48 -08:00
Atlante45
c4e43c4e0b Merge branch 'baseball-test' of github.com:Atlante45/hifi into baseball 2015-12-01 15:16:05 -08:00
Atlante45
f06b5b05b3 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-01 15:14:58 -08:00
Atlante45
0b93e637e8 Update bat rotation 2015-12-01 15:13:46 -08:00
Atlante45
e6763c2208 Update bow's relative position 2015-12-01 15:03:25 -08:00
Atlante45
97454ae446 Update handControllerGrab.js 2015-12-01 14:32:59 -08:00
Seth Alves
e0eae23dd3 Merge pull request #6515 from imgntn/personal_lasers 
Personal lasers in handControllerGrab.js
 2015-12-01 13:29:05 -08:00
James B. Pollack
fb8316ff12 reduce pistol vol 2015-12-01 13:15:08 -08:00
James B. Pollack
3c8e31cd42 Merge pull request #6509 from ericrius1/toyboxFixes 
Toybox Tweaking
 2015-12-01 13:07:10 -08:00
James B. Pollack
b787e71587 Update doll.js 2015-12-01 13:06:30 -08:00
James B. Pollack
31d2f6463f cleanup 2015-12-01 13:03:51 -08:00
James B. Pollack
25422084b9 make it so that only you can see your beams until youre grabbing something 2015-12-01 13:02:40 -08:00
Anthony Thibault
dde971cb4f Merge pull request #6514 from howard-stearns/update-ScriptableAvatar 
Update ScriptableAvatar
 2015-12-01 12:44:04 -08:00
samcake
b6530b8b30 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-12-01 12:37:13 -08:00
samcake
ff3ae85245 Separating the ui to get the url from the actual loading to maybe avoid playbackMaster.js crash? 2015-12-01 12:36:49 -08:00
Seth Alves
b8d800f5b8 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-12-01 11:59:10 -08:00
Howard Stearns
6e15ae9d7d Update robot agent script to randomly select among all HiFi avatars, identified by name, and with a random turn from front. 2015-12-01 11:49:17 -08:00
Philip Rosedale
8e40889068 Merge pull request #6508 from sethalves/fix-observers-dont-see-equip-motion 
possible fix for observers not seeing a held entity moving
 2015-12-01 11:41:08 -08:00
Andrew Meadows
ab6367ff4e remove debug option for disabling physics updates 2015-12-01 11:13:01 -08:00
ericrius1
a83f374036 tweaking light trail 2015-12-01 10:50:25 -08:00
Seth Alves
7f95e1eec6 make sure observed held objects are active in bullet, disable equip spring action 2015-12-01 10:49:07 -08:00
Atlante45
db0083ab83 Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-12-01 10:25:07 -08:00
Stephen Birarda
05862eff00 add fire sounds to assets JSON 2015-12-01 10:22:42 -08:00
ericrius1
191cab2e5f adding light trail app 2015-12-01 10:15:47 -08:00
ericrius1
a3f8c52aa3 temp fix for doll, moved cat 2015-12-01 10:09:29 -08:00
Ken Cooke
a725c8b12e Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb 2015-12-01 09:12:24 -08:00
Ken Cooke
e25e6b5003 Test script with sliders for all reverb parameters 2015-12-01 06:44:56 -08:00
Sam Cake
921cd94c07 Finally a more stable api and playback use case 2015-12-01 00:15:12 -08:00
Seth Alves
e62eb08301 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-30 21:38:02 -08:00
James B. Pollack
1ba6bfa2e0 lazers 2015-11-30 18:58:53 -08:00
samcake
196f7e71c4 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-30 18:35:04 -08:00
samcake
1b197987ec MOnday spent on improving the Agent/Clint coordination, but still bugs 2015-11-30 18:34:40 -08:00
Atlante45
083205916f Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-30 18:25:53 -08:00
ericrius1
b67c481726 resolved merge conflicts 2015-11-30 18:19:57 -08:00
Atlante45
ac85ed9787 Merge branch 'baseball' of github.com:Atlante45/hifi into baseball-test 2015-11-30 18:15:59 -08:00
ericrius1
90595949f1 moved exterminator game out of dry lake 2015-11-30 18:14:57 -08:00
Atlante45
3bbd20a7bd Merge branch 'master' of https://github.com/highfidelity/hifi into baseball-test 2015-11-30 18:02:34 -08:00
ericrius1
8992f6bb44 moved pistol to toybox 2015-11-30 17:57:01 -08:00
Atlante45
6903cd4d8f Merge branch 'baseball' of github.com:birarda/hifi into baseball 2015-11-30 17:19:39 -08:00
Stephen Birarda
52dc2cf746 change the assets file to json 2015-11-30 17:17:06 -08:00
ericrius1
71d361ed3b fixed hydra paint, adding more interactive brushes 2015-11-30 17:06:35 -08:00
Atlante45
52fb711656 Move baseballCrowd to correct directory 2015-11-30 17:06:09 -08:00
Stephen Birarda
cba09beff4 add pop sounds (which don't require attribution) 2015-11-30 17:02:30 -08:00
James B. Pollack
8b7cfde02a Merge pull request #6505 from imgntn/boww 
Fix release hand message for bow
 2015-11-30 17:02:08 -08:00
James B. Pollack
7c12379ada fix release hand message 2015-11-30 17:00:40 -08:00
Seth Alves
b7ebe5b92b merge from upstream 2015-11-30 16:59:52 -08:00
Stephen Birarda
c451ede051 add crowd noises to assets yaml 2015-11-30 16:59:13 -08:00
Stephen Birarda
4a80e72d14 complete attribution for removed files 2015-11-30 16:48:05 -08:00
Stephen Birarda
f7537e3dc3 add initial version of asset description 2015-11-30 16:44:14 -08:00
Howard Stearns
6f50d91208 Merge pull request #6461 from hyperlogic/tony/remove-joint-states 
Refactor of Rig and MyAvatar animation JavaScript interface
 2015-11-30 16:28:15 -08:00
Ryan Huffman
6fe370c4ef Remove old comment in firework.js 2015-11-30 16:02:00 -08:00
Ryan Huffman
0ed249f0e7 Update script path include in firework.js 2015-11-30 16:01:53 -08:00
Stephen Birarda
1b1efe53d9 fix for two space indentation in createBatButton.js 2015-11-30 15:59:12 -08:00
Stephen Birarda
733665d722 fix spacing in baseballCrowd.js 2015-11-30 15:53:42 -08:00
Clément Brisset
e168966b87 Merge pull request #6409 from birarda/injector-hybrid 
more efficient threading of networked AudioInjector objects
 2015-11-30 15:36:41 -08:00
ericrius1
706a67b9a1 lowered restitution to 0 to avoid too many collision sounds playing 2015-11-30 15:10:32 -08:00
Seth Alves
02c4730388 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-30 14:09:31 -08:00
Stephen Birarda
a33e57dfdb remove audio files from history 2015-11-30 14:06:09 -08:00
Stephen Birarda
4573e5c59e resolve conflicts on merge with upstream/master 2015-11-30 13:32:38 -08:00
James B. Pollack
8267c70bb1 hide avoiders 2015-11-30 12:45:10 -08:00
James B. Pollack
bd58a45d5a Merge branch 'ratsteer' of https://github.com/imgntn/hifi into ratsteer 2015-11-30 12:44:22 -08:00
James B. Pollack
cd4ac8ac69 good enough 2015-11-30 12:44:06 -08:00
ericrius1
b7884f487c rats 2015-11-30 11:44:34 -08:00
ericrius1
22efcb1854 Added sounds to pistol 2015-11-30 11:42:34 -08:00
James B. Pollack
1190f1b6cc Merge branch 'master' into ratsteer 2015-11-30 11:25:50 -08:00
Anthony J. Thibault
11bfed4185 Merge branch 'master' into tony/remove-joint-states 2015-11-30 11:21:44 -08:00
samcake
1be494a257 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-30 09:36:29 -08:00
Sam Cake
3f43fde459 AFter 3 days on that piece of shit i just give up, js is just too hard to debug, i m very sad 2015-11-30 04:11:17 -08:00
Seth Alves
9548b0e138 get parent-id field working 2015-11-29 13:38:27 -08:00
Seth Alves
bbc9d5d131 add missing single-quote 2015-11-29 13:04:45 -08:00
James Pollack
44f69a2a18 Merge branch 'master' into bow 2015-11-29 11:37:25 -08:00
Seth Alves
e91a8684a4 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-29 10:17:36 -08:00
James Pollack
0625d4f4c2 remove debugging string 2015-11-28 23:40:58 -08:00
James Pollack
55f797838f remove unused key 2015-11-28 23:22:00 -08:00
James Pollack
1e2398cbea use constants 2015-11-28 23:04:52 -08:00
James Pollack
1315201bdc update name of function 2015-11-28 22:55:44 -08:00
James Pollack
017ffb8f2e change way messages get sent to the hand disabler 2015-11-28 22:54:31 -08:00
James Pollack
8f51ee6f58 rename hand disabler 2015-11-28 22:29:12 -08:00
James B. Pollack
fe0a732b5d remove rattest file 2015-11-27 13:11:00 -08:00
James B. Pollack
b23a9dd346 Merge branch 'master' into ratsteer 2015-11-27 13:06:36 -08:00
James B. Pollack
8daeb0fa0d revert hand grab script to current master 2015-11-27 12:18:11 -08:00
James B. Pollack
9ec2a01475 isolate grab script changes from bow branch 2015-11-27 12:13:53 -08:00
James B. Pollack
b6a165d3ef Merge branch 'master' into bow 2015-11-27 11:41:21 -08:00
James B. Pollack
0ba6d172e8 Merge branch 'bow' of https://github.com/imgntn/hifi into bow 2015-11-27 11:21:33 -08:00
James B. Pollack
c237485023 revert playaspawner 2015-11-27 11:21:18 -08:00
Seth Alves
ca75802b9c unmangle merge 2015-11-26 06:43:28 -08:00
Seth Alves
36e293608a more adding parentID to edit.js 2015-11-26 05:31:52 -08:00
Sam Cake
37d3083e07 Getting the Actor class starting to work and usable for the playback master! 2015-11-26 00:41:46 -08:00
samcake
3273fbcad4 Creating the master / agent hiring system 2015-11-25 17:10:38 -08:00
Anthony J. Thibault
23def8d173 Merge branch 'master' into tony/remove-joint-states 2015-11-25 13:55:23 -08:00
Clément Brisset
5ff482071e Merge pull request #6465 from ericrius1/polyLineFix 
moved logic to build vertex buffer to renderable polyline class, recalculati…
 2015-11-25 11:02:02 -08:00
samcake
184669762a Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-25 10:28:55 -08:00
Andrew Meadows
bc20b72645 Merge pull request #6453 from howard-stearns/avatar-render-controller2 
Survive Flash Mobs Without Making Everyone Sick
 2015-11-25 09:52:28 -08:00
Sam Cake
574eb3dc99 Improving the Master/Agent api 2015-11-25 02:50:12 -08:00
David Rowe
6e076985f2 JSLint 2015-11-25 16:46:53 +13:00
David Rowe
46cbc349d1 Fix laserPointer.js for Hydras 
Leap Motion working already.
 2015-11-25 16:39:09 +13:00
David Rowe
566b27156c Fix hand and finger joint control in leapHands.js for HMD mode 2015-11-25 15:45:33 +13:00
AlessandroSigna
cb0b5b5d02 added prompt 2015-11-24 18:31:41 -08:00
samcake
bad01d02f8 building the master/agent api 2015-11-24 18:31:28 -08:00
James B. Pollack
1776b08e1b end of day 2015-11-24 17:35:18 -08:00
David Rowe
6736eefbc1 Fix arm and finger joint control in leapHands.js for desktop mode 2015-11-25 14:14:22 +13:00
Anthony J. Thibault
f120e10ff4 Merge branch 'master' into tony/remove-joint-states 2015-11-24 15:00:05 -08:00
James B. Pollack
23f10659b0 update to new trigger method 2015-11-24 14:00:23 -08:00
James B. Pollack
be7d52a773 protect beam disabler from others 2015-11-24 13:35:53 -08:00
James B. Pollack
50c1786e9b trigger changes and message debugging 2015-11-24 12:46:01 -08:00
James B. Pollack
2add609387 use new thingo 2015-11-24 12:12:01 -08:00
samcake
bba5bf7a21 Trying to get the Agent to Mater more reliable 2015-11-24 11:28:00 -08:00
James B. Pollack
29ddc74be7 Merge branch 'master' into ratSteer 2015-11-24 11:23:03 -08:00
James B. Pollack
52edc3b701 cleanup beamdisabler 2015-11-24 10:43:33 -08:00
James B. Pollack
13e1042bfa use messages instead of hidden entities to disable beams 2015-11-24 10:37:08 -08:00
Thijs Wenker
712048ce51 ignore other than left press events in edit.js, this makes the rightclick camera more confortable while in edit.js/edit mode 2015-11-24 19:35:10 +01:00
James B. Pollack
fd26427390 add pullback / pushfwd 2015-11-24 10:23:29 -08:00
Stephen Birarda
ab7cbc0b76 Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid 2015-11-24 10:45:00 -06:00
Brad Hefta-Gaub
1d8e2edafb Merge pull request #6464 from ericrius1/whiteboardFix 
updated whiteboard to use new controller approach
 2015-11-23 19:44:28 -08:00
James B. Pollack
2ff4e87a93 add animation urls to rat 2015-11-23 18:28:57 -08:00
James B. Pollack
1d2ad7d5ac Merge branch 'master' into ratsteer 2015-11-23 18:24:39 -08:00
AlessandroSigna
70cf5c6726 fixed icon position 2015-11-23 17:59:31 -08:00
AlessandroSigna
489cde7269 removed the local save of the recording 2015-11-23 17:51:58 -08:00
Eric Levin
40be9ae121 Commented out whiteboard cleanup 2015-11-23 17:15:26 -08:00
AlessandroSigna
44c95c13fb further UI fixes 2015-11-23 16:57:24 -08:00
ericrius1
0980dbed60 added accidently-deleted particles.js file back 2015-11-23 15:25:43 -08:00
ericrius1
c36719cba7 Removed deprecated rat files 2015-11-23 15:24:28 -08:00
ericrius1
0f4e531be6 Added a monster shooting gallery 2015-11-23 15:22:34 -08:00
AlessandroSigna
8f1ce6e1fb overlay added - waiting for official logos 
missing null assignment
 2015-11-23 14:52:16 -08:00
Stephen Birarda
0997d3dcae resolve conflicts on merge with upstream/master 2015-11-23 16:15:15 -06:00
James B. Pollack
0fd389b02f remove arrowTest 2015-11-23 12:53:58 -08:00
James B. Pollack
c22a07bba7 bow collisions, etc 2015-11-23 12:36:39 -08:00
ericrius1
1409ed2d18 moved logic to build vertices buffer to renderable class, recalculating vertices anytime any of the normals, point, or strokeWidths data changes 2015-11-23 12:28:44 -08:00
Eric Levin
7e8b692499 Update whiteboardEntityScript.js 
Removed logging
 2015-11-23 12:04:13 -08:00
Seth Alves
171f6da264 Merge branch 'master' of github.com:highfidelity/hifi into parents 2015-11-23 11:43:56 -08:00
James B. Pollack
aa2450d755 cleanup, debugging script 2015-11-23 11:15:36 -08:00
ericrius1
08a64f6a6b updated whiteboard to use new controller approach' 2015-11-23 10:08:23 -08:00
James B. Pollack
b6d0be0090 Merge branch 'master' into bow 2015-11-23 10:03:15 -08:00
ericrius1
656d2f5c61 url tweaks 2015-11-23 09:52:37 -08:00
James B. Pollack
8e81c3252a cleanup and mostly? working 2015-11-22 22:24:42 -08:00
James B. Pollack
aa832311f5 add beam disabler 2015-11-22 22:12:43 -08:00
Anthony J. Thibault
821264a031 Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states 2015-11-22 16:15:03 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
James B. Pollack
3f4dee80d9 more cleanup 2015-11-21 02:32:54 -08:00
James B. Pollack
945243306b cleanup 2015-11-21 01:47:20 -08:00
James B. Pollack
f56c4ff575 still debugging 2015-11-20 21:14:28 -08:00
AlessandroSigna
05d311cff3 remove Windows.prompt cause of crash 2015-11-20 18:58:49 -08:00
AlessandroSigna
a1053ee5a0 pop up a prompt with url 2015-11-20 18:58:47 -08:00
AlessandroSigna
7069f7d6ab added clip load to asset + clean code 2015-11-20 18:58:46 -08:00
AlessandroSigna
a306e8d5b1 master can upload performance file on asset 2015-11-20 18:58:45 -08:00
samcake
6e9e53bd0c Clean up a bit of the playbackAgent script 2015-11-20 18:17:53 -08:00
James B. Pollack
b2dd900cb2 rotate correctly 2015-11-20 18:12:06 -08:00
James B. Pollack
a65b3b9aaa collisions 2015-11-20 17:12:54 -08:00
James B. Pollack
06322b1d6b dont update prenotch for everyone 2015-11-20 16:30:05 -08:00
samcake
5d17fa0b34 Merge pull request #6458 from ZappoMan/acPlayback 
allow playbackAgents to auto-register
 2015-11-20 16:25:02 -08:00
James B. Pollack
c6be37f63f lifetime 2015-11-20 16:10:39 -08:00
Philip Rosedale
ba0f30a487 Merge pull request #6457 from imgntn/damping 
Rename linearDamping to damping in scripts
 2015-11-20 16:08:16 -08:00
Brad Hefta-Gaub
985fcf7c4b remove unneeded example 2015-11-20 16:02:01 -08:00
Brad Hefta-Gaub
f56d2fba7f allow playbackAgents to auto-register 2015-11-20 16:00:43 -08:00
EdgarPironti
46bb45cee9 Agents/Master upgrading 2015-11-20 15:51:16 -08:00
James B. Pollack
aba65bd9b8 rename linearDamping to damping 2015-11-20 15:45:08 -08:00
James B. Pollack
c98bfca359 collisions 2015-11-20 15:41:50 -08:00
Stephen Birarda
9ddebc8d13 resolve conflicts on merge with upstream/master 2015-11-20 15:29:44 -08:00
James B. Pollack
4efe31f158 work 2015-11-20 15:15:57 -08:00
Howard Stearns
a43b0e0ed8 Remove obsolete script (superseed by animatedAvatarAgent.js), per https://app.asana.com/0/26225263936266/55964805077915/f 
(This PR does _not_ remove proceduralAnimationAPI.js that it includes, as the api is included in other scripts. Nor does this PR remove other scripts.)
 2015-11-20 15:03:31 -08:00
Brad Hefta-Gaub
75dfef067c test script 2015-11-20 14:40:27 -08:00
James B. Pollack
49e815f3d6 Merge remote-tracking branch 'upstream/master' into bow 2015-11-20 14:33:26 -08:00
howard-stearns
1ddcc62db9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2 2015-11-20 14:05:40 -08:00
Brad Hefta-Gaub
c7673aad4a Merge pull request #6447 from huffman/polyline-texture 
Add texture property to polyline entity type
 2015-11-20 13:31:34 -08:00
Clément Brisset
c45fe5caae Merge pull request #6440 from cozza13/20741 
CR for Job #20741 - Change default
 2015-11-20 11:43:57 -08:00
James B. Pollack
8a65c7a48f draw strings sooner, arrow force squared, disable grab on arrow 2015-11-20 10:26:41 -08:00
EdgarPironti
e267926725 JSON computing 2015-11-19 20:04:04 -08:00
EdgarPironti
d75209cb37 Fixes to clip_url overwriting 2015-11-19 20:04:03 -08:00
EdgarPironti
fb90ffec5c Migration of AC playback 2015-11-19 20:04:03 -08:00
James B. Pollack
225909f8a1 play notch sound at right time 2015-11-19 19:25:51 -08:00
James B. Pollack
ea59e0887d more bow features and debug prep 2015-11-19 19:22:54 -08:00
Brad Hefta-Gaub
e6db72c887 Merge pull request #6437 from imgntn/grasp_equip 
Grasp hands when equipping entities
 2015-11-19 18:28:44 -08:00
Brad Hefta-Gaub
a59dc6a423 Merge pull request #6419 from imgntn/betterbubbles 
Improvments to Bubblewand
 2015-11-19 18:26:59 -08:00
Brad Hefta-Gaub
ce9c3f1969 Merge pull request #6433 from AlessandroSigna/groupRecording 
cleanup directory + recording bug fix
 2015-11-19 18:26:33 -08:00
Chris Collins
7f8274f58f removed omnitool 
removed omnitool
 2015-11-19 18:08:12 -08:00
Brad Hefta-Gaub
f80a765a29 add Assets.uploadData() and Assets.downloadData() 2015-11-19 17:28:20 -08:00
James B. Pollack
6f76f0cbc0 release grasp at cleanup 2015-11-19 16:22:54 -08:00
ericrius1
8aa7228e54 fixed offsets 2015-11-19 16:19:00 -08:00
James B. Pollack
3f89d73fc6 add grasp to equip and example 2015-11-19 16:15:34 -08:00
Ryan Huffman
b122dad7ea Add begin and middle textures to InfiniteLine 2015-11-19 15:16:23 -08:00
ericrius1
947d04e7f1 tweak to sensitivity 2015-11-19 14:39:13 -08:00
ericrius1
32f65eceaa less sensitive firing 2015-11-19 14:32:03 -08:00
ericrius1
688afa4c69 only show laser when press trigger a bit 2015-11-19 14:23:37 -08:00
James B. Pollack
83238cf8c9 Merge remote-tracking branch 'upstream/master' into bow 2015-11-19 11:31:39 -08:00
Seth Alves
2c1ca526df Merge pull request #6423 from ZappoMan/messaging 
add an example of an entityScript that subscribes to messages
 2015-11-19 10:32:36 -08:00
ericrius1
8c5abd05c8 added gun to toybox 2015-11-19 10:13:00 -08:00
AlessandroSigna
b4f9c4158f cleanup directory + bug fix 2015-11-19 09:45:28 -08:00
Brad Hefta-Gaub
45e8ebbe8c Merge pull request #6432 from huffman/lod-range 
Increase available range in LOD Tools
 2015-11-19 09:40:10 -08:00
Ryan Huffman
f523cad0a9 Add lodTest.js for testing LOD settings 2015-11-19 09:24:29 -08:00
Howard Stearns
0a8fd9cbad Spread avatars around (not up to) a larger area. 2015-11-19 09:22:41 -08:00
ericrius1
c5898896bc monster model 2015-11-18 19:12:23 -08:00
samcake
74beeefe06 Merge pull request #6420 from jherico/dargo 
Make recording and playback work in interface, playback in agent
 2015-11-18 17:52:09 -08:00
ericrius1
4b66546bd6 adding a shooting range 2015-11-18 17:23:12 -08:00
Brad Davis
98cc7408b1 Fixing issues found in AC playback test 2015-11-18 17:17:20 -08:00
James B. Pollack
670cca4eb7 fix sounds 2015-11-18 16:35:28 -08:00
ericrius1
5f3da64a25 gun lining up right 2015-11-18 16:34:39 -08:00
James B. Pollack
52582e130a add lifetime to arrows, disable arrow tracker 2015-11-18 16:32:47 -08:00
ericrius1
8f0adb5337 applying force, now must figure out positioning 2015-11-18 16:11:34 -08:00
ericrius1
1c9f94f3c0 added effects back in 2015-11-18 16:04:31 -08:00
James B. Pollack
b9aa9cf980 cleanup 2015-11-18 15:53:10 -08:00
Stephen Birarda
cb708859fb resolve conflicts on merge with upstream master 2015-11-18 15:34:56 -08:00
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
ericrius1
53f75e305a moved barrel point forward so ray doesnt hit gun 2015-11-18 15:26:30 -08:00
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