Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-07 05:42:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85900 commits 21 branches 28 tags 1.2 GiB
Commit graph

159 commits

Author SHA1 Message Date
Johnathan Franck
68b1c74b43 Change URLs to point to high fidelity server 2017-05-10 14:46:12 -04:00
Johnathan Franck
31919d4399 Add happy music to balloon spawner after countdown 2017-05-08 12:28:40 -04:00
Rob Kayson
1873558df1 added floating lantern box that spawns floating lanterns 2017-05-06 18:41:57 -07:00
Johnathan Franck
bc7ea11297 Added enity script for balloon spawner and sample json entity with userData to attach script to 2017-05-03 18:46:12 -04:00
Thijs Wenker
2fd6786225 Merge pull request #10295 from PhilipRosedale/halfDuplex 
Reduce log spam
 2017-04-27 02:17:48 +02:00
Philip Rosedale
a880ca1262 Reduce log spam 2017-04-26 16:51:26 -07:00
Brad Hefta-Gaub
f1bd371fbe Merge pull request #10175 from PhilipRosedale/springHold 
New Tutorial and entity scripts
 2017-04-26 13:16:17 -07:00
Philip Rosedale
8826dbef78 removed old gravity example 2017-04-25 22:37:20 -07:00
Philip Rosedale
c69d064cc3 code review fixes 2017-04-25 22:14:03 -07:00
Thijs Wenker
5457b8d214 Merge pull request #10260 from PhilipRosedale/halfDuplex 
Half Duplex script
 2017-04-26 01:47:16 +02:00
Philip Rosedale
16dd6a2ce1 Code review / lint 2017-04-25 15:37:39 -07:00
Philip Rosedale
eaa2102d3f Code review fixes 2017-04-24 21:03:17 -07:00
Philip Rosedale
663e682f23 Merge branch 'halfDuplex' of https://github.com/PhilipRosedale/hifi into springHold 2017-04-24 20:46:48 -07:00
Philip Rosedale
92368d981b Half Duplex script 2017-04-21 18:22:53 -07:00
Rob Kayson
a0c8c4df52 tetherball stick and ball remove themselves after 2 seconds if user who has them equipped leaves the domain 2017-04-18 10:07:02 -07:00
Rob Kayson
2257af42be removed extra actions, creating all entities in create script. 2017-04-12 17:07:59 -07:00
Philip Rosedale
20307af4fe remove debug prints 2017-04-09 21:31:45 -07:00
Philip Rosedale
6bec948457 springhold, touch, nBody tutorial scripts 2017-04-09 21:29:33 -07:00
Rob Kayson
49858d3ec5 Equip stick instead of grab. String is less rigid. Fixed bug where the ball was not recognized when other clients equipped the stick. 2017-04-07 19:16:29 -07:00
Rob Kayson
6763ca9b27 added tetherball create and entity scripts 2017-04-03 11:55:47 -07:00
Clément Brisset
82114ae6ab Merge pull request #9940 from Atlante45/fix/sit 
Fix a few sitting bugs noticed at the meetup
 2017-03-28 11:14:31 -07:00
ZappoMan
84836d9331 fix typo that broke gun 2017-03-24 09:58:56 -07:00
ZappoMan
bc331af6a0 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-24 08:46:43 -07:00
ZappoMan
246f377a07 Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick 2017-03-23 10:40:37 -07:00
Triplelexx
d1db04f93a fix lost forwardOffset declaration 2017-03-22 18:57:00 +00:00
Triplelexx
2d1ca99e2e change variable names that use Quat.getForward 2017-03-22 17:00:12 +00:00
Triplelexx
a964edee91 change all references of Quat.getFront to Quat.getForward in scripts directory 2017-03-21 22:25:30 +00:00
Atlante45
eab2c314d8 Preload sitting animation 2017-03-17 17:17:05 -07:00
Atlante45
893a5b1b18 Only override inAir and flying animation roles 2017-03-17 17:16:58 -07:00
Atlante45
1ce4dcc6e5 Fix attempt for avatar stuck in geometry. 2017-03-17 16:11:47 -07:00
Atlante45
eccc9ff47c Prevent 2 avatars from staying seated in the same chair 2017-03-17 16:11:17 -07:00
Atlante45
c1466c2dec Fix a couple sitting bugs 2017-03-17 10:45:13 -07:00
Atlante45
698791295a Expose DriveKeys enum to JS 2017-03-16 20:03:27 -07:00
Atlante45
42316e713d CR drive keys 2017-03-16 16:24:52 -07:00
Atlante45
3e9474e878 CR 2017-03-16 16:24:36 -07:00
Atlante45
35dd45ddf9 Capture drive keys while avatar is seated 2017-03-16 15:44:18 -07:00
Atlante45
b14a4faf61 Guard against script loading before avatar 2017-03-14 10:54:22 -08:00
Atlante45
9e6312ba0e Make sit script more stable. 2017-03-13 18:06:32 -08:00
Atlante45
f0d971fc6f Put avatar in front of chair on situp to avoid infinite collisions 2017-03-13 18:06:32 -08:00
Atlante45
1a375432e0 Only grab primary clicks 2017-03-13 18:06:32 -08:00
Atlante45
34889d38c9 Override all roles instead of just fly 2017-03-13 18:06:32 -08:00
Menithal
01ba44c572 Fixed print 2017-03-06 21:32:27 +02:00
Menithal
d50a0e33a9 CR. Run through Lint ECMAScript 5 standard 
Meaning all const are out, non-variable definitions are out, etc
 2017-03-06 21:07:16 +02:00
Menithal
04d3bf0c38 Cleanup and safeguards 
- RegistrationPoint can no longer be set for magnetic blocks, will set it to
0.5 on snap.
- Simplified axis lock logic
 2017-03-06 10:55:47 +02:00
Menithal
fe19b5511c Fixed up blocks scripts 2017-03-04 21:55:21 +02:00
Menithal
ea3f7f0274 Initial Magnetic block 2017-03-04 18:50:30 +02:00
Menithal
6d4abca0c1 Base line progress 2017-03-04 11:12:19 +02:00
ZappoMan
6400bb6319 CR feedback 2017-03-02 14:34:14 -08:00
ZappoMan
9e71801ae1 remove properties from RayToEntityIntersectionResult 2017-03-01 18:21:04 -08:00
Atlante45
38317a23c9 Keep orientation while seated 2017-02-27 17:33:26 -08:00
Atlante45
cd10b828dd Store whether avatar is sitting in a setting 2017-02-27 16:38:57 -08:00
Atlante45
40fdc4ea41 Remove extra script 2017-02-27 16:38:57 -08:00
Atlante45
b82817e54c Alternative sit script 2017-02-27 16:38:56 -08:00
Atlante45
e9316d30d0 More IK smoothing experimentation 2017-02-27 16:38:56 -08:00
Atlante45
834755588a Reset sensors and body 2017-02-27 16:38:56 -08:00
Atlante45
68e3e23bfc Remove Avatar parenting to chair 2017-02-27 16:38:56 -08:00
Atlante45
cbaaaa21c6 Use head orientation for sitting 2017-02-27 16:38:56 -08:00
Atlante45
0629c6dbf7 Cancel body pitch/roll when getting out of the chair. 2017-02-27 16:38:56 -08:00
Atlante45
0440e2fd60 Set higher tolerance 2017-02-27 16:38:55 -08:00
Atlante45
bf3a69a0b3 Add 2D UI when close to the seat 2017-02-27 16:38:55 -08:00
Atlante45
187cd0d5cf Get IK error and stand up based on it 2017-02-27 16:38:55 -08:00
Atlante45
8e9fc83759 Fix sit anim reference 2017-02-27 16:38:55 -08:00
Atlante45
53948b8547 Check other avatar, disable movement in edit mode 2017-02-27 16:38:54 -08:00
Atlante45
1dbc133f12 Add animation state handler to the script 2017-02-27 16:38:54 -08:00
Atlante45
9033242584 More sit script work 2017-02-27 16:38:54 -08:00
Atlante45
1b2120d7e1 Sit script first draft 2017-02-27 16:38:54 -08:00
Seth Alves
4a650ff2bb Overlays::getOverlayAtPoint was depending on the order in which the overlays were added 2017-02-19 18:37:35 -08:00
humbletim
6320d872b4 remove commented code 2017-01-18 02:57:13 -05:00
humbletim
f88b39918f switch to messaging for toggle notifications; cleanup 2017-01-18 02:54:42 -05:00
humbletim
1048c2a3bf apply default userData values; add error checking; throttle toggle clicks 2017-01-18 01:40:28 -05:00
humbletim
27a2367634 update debugPrints 2017-01-17 01:27:48 -05:00
humbletim
c7a561aff9 trim extra debugging code 2017-01-17 01:23:03 -05:00
humbletim
827aa68d3f cleanup pass 2017-01-16 19:50:25 -05:00
humbletim
c9fd650e70 update to support click/far-click toggling and userData.disabled setting 2017-01-16 19:37:31 -05:00
Brad Hefta-Gaub
349f0763e5 Merge pull request #9310 from PhilipRosedale/chair 
Simple chair script
 2017-01-06 08:18:31 -08:00
Philip Rosedale
9bd858c1ab no log spam 2017-01-05 13:49:38 -08:00
Philip Rosedale
07ecf60485 remove sit when close 2017-01-05 13:48:31 -08:00
Philip Rosedale
65b9aaed1b one more try 2017-01-05 13:13:50 -08:00
Philip Rosedale
a689d52004 wrap far trigger too with seated check 2017-01-05 13:08:50 -08:00
Philip Rosedale
0ad9a8625b Added far trigger 2017-01-05 12:58:26 -08:00
Philip Rosedale
88429c4033 wrong file 2017-01-04 23:51:05 -08:00
Philip Rosedale
ba43a18529 simple chair entity script 2017-01-04 23:48:24 -08:00
August Rosedale
8613cd35ea entity script to push entities with hands 2016-12-30 07:11:02 -08:00
Philip Rosedale
b02d14fcc2 set right thing initially 2016-12-21 13:17:08 -08:00
Philip Rosedale
632bf997f3 debug off 2016-12-21 13:15:44 -08:00
Philip Rosedale
cf3a260646 added ability to rotate entity and sound direction 2016-12-21 13:13:59 -08:00
Philip Rosedale
4bade4400f fixed typo per review 2016-12-20 16:02:26 -08:00
Philip Rosedale
632af18c1d PR feedback - flag for setting color 2016-12-20 12:09:42 -08:00
Philip Rosedale
e2dfbf1b02 Addressed PR feedback - now dynamically reads userdata 2016-12-20 12:02:13 -08:00
Philip Rosedale
70942925bc Entity script for ambisonic sound emitter 2016-12-19 10:32:17 -08:00
James B. Pollack
d258c9ed7f pistol adjustments 2016-08-12 12:59:01 -07:00
Bing Shearer
aa70a38e79 Removed button color declarations to make icons visible. 2016-07-14 15:59:47 -07:00
Zach Pomerantz
c8ead2ad04 conform to coding braces standard 2016-06-21 13:28:15 -07:00
Zach Pomerantz
c784fa42e9 log failure to fetch metadata 2016-06-21 11:34:23 -07:00
Zach Pomerantz
aca3d4d90b add example script for metadata from metaverse 2016-06-16 15:22:34 -07:00
Zach Pomerantz
0f9c637c5a Wireframe a metadata overlay tutorial 2016-06-16 13:27:36 -07:00
Seth Alves
9fe827a93b d'oh 2016-05-09 15:28:25 -07:00
Seth Alves
7ab52b8869 don't check fbx files into sourc 2016-05-09 14:58:26 -07:00
Seth Alves
ced7a56e39 Philip's gravity example 2016-05-09 14:43:24 -07:00
James B. Pollack
a9ab531e27 clear up toolbar name 2016-05-02 17:01:44 -07:00