Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 23:32:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
53755 commits 67 branches 56 tags 1.2 GiB
Commit graph

2663 commits

Author SHA1 Message Date
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
Brad Hefta-Gaub
1962a49f3b Merge pull request #10225 from sethalves/bullet-constraints-1 
Bullet constraints + far-grab bootstrap fix
 2017-04-25 13:36:47 -07:00
Brad Hefta-Gaub
0783433d75 Merge pull request #10251 from birarda/edit-baked-column 
add a column to edit.js to identity baked models
 2017-04-25 13:04:48 -07:00
Philip Rosedale
eaa2102d3f Code review fixes 2017-04-24 21:03:17 -07:00
Clément Brisset
77cd2d08b2 Merge pull request #10106 from MrRoboman/W-21204-tetherball-toy 
Added tetherball create and entity scripts
 2017-04-24 16:36:21 -07:00
Philip Rosedale
92368d981b Half Duplex script 2017-04-21 18:22:53 -07:00
Stephen Birarda
3452dd0251 increment colspan count in table footer 2017-04-20 15:20:48 -07:00
Stephen Birarda
924624b127 add new glyphs with check, reference in entityList 2017-04-20 14:21:13 -07:00
Stephen Birarda
f64efe18c0 add an isBaked column to edit.js 2017-04-20 14:21:13 -07:00
Seth Alves
f7378abb08 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-20 02:40:10 -07:00
Brad Hefta-Gaub
a555846d5d Merge pull request #10235 from volansystech/21206 
21206 Far grab improvement to draw held entity toward yourself
 2017-04-19 14:33:09 -07:00
volansystech
b194ddeb66 Resolve Comments of @sethalves 2017-04-19 16:39:23 +05:30
howard-stearns
3113dced7b Be sure to callback even on profile failure. 2017-04-18 12:06:44 -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
volansystech
e5c7587ad8 Improve far grabbing based on timescale. 2017-04-18 20:01:02 +05:30
volansystech
7e0efed062 Improve speed of grabbing. 2017-04-18 00:54:01 +05:30
Seth Alves
db98020974 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-15 07:22:16 -07:00
Seth Alves
371118a6c0 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 16:26:30 -07:00
Zach Fox
b410399a16 Resolve your paths, silly! 2017-04-14 16:26:29 -07:00
Zach Fox
85e5173abe Fix embedded location 2017-04-14 16:11:37 -07:00
Zach Fox
f81dce5e70 Fix the bug 2017-04-14 15:42:19 -07:00
Chris Collins
6a6800b8c3 Merge pull request #10222 from sethalves/fix-late-touch-cant-grab-tablet 
fix can't grab tablet
 2017-04-14 14:57:06 -07:00
Andrew Meadows
45bb639ef5 Merge pull request #10128 from kunalgosar/fingerpainting 
Make it easier to exit FingerPaint
 2017-04-14 14:34:57 -07:00
Seth Alves
110cfb47d1 turn off handControllerGrab debug prints 2017-04-14 14:23:27 -07:00
Seth Alves
6420ddd038 grab script checks for touch devices continually, rather than just when the script starts 2017-04-14 14:20:04 -07:00
kunalgosar
891d52909e fixed typo in comments 2017-04-14 14:10:19 -07:00
Sam Gateau
3519a72f8a Merge pull request #10190 from samcake/ambient-bis 
Introducing a tool to debug the current Zone Stack
 2017-04-14 13:28:59 -07:00
Seth Alves
d17d12446b Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 12:49:03 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache 
cleanup Agent RSI handling, make loadRecording async
 2017-04-14 21:35:51 +02:00
Stephen Birarda
7b48feca66 address code review comments 2017-04-14 11:53:53 -07:00
Seth Alves
1009182c06 grab and handControllerGrab use new far-grab action 2017-04-14 11:52:07 -07:00
Seth Alves
af5a352f02 turn on handControllerGrab debug prints 2017-04-14 08:10:31 -07:00
Rob Kayson
2257af42be removed extra actions, creating all entities in create script. 2017-04-12 17:07:59 -07:00
Seth Alves
0dab94fada Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:34:46 -07:00
Seth Alves
0eb9507a10 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0 2017-04-12 16:25:50 -07:00
Zach Fox
3f91fb8e55 Remove unnecessary comment 2017-04-12 14:45:57 -07:00
Zach Fox
c724c2e50b New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
87b2d5bf8a New loading icon 2017-04-12 14:45:57 -07:00
Zach Fox
75f1168b19 Clearer function names 2017-04-12 14:45:57 -07:00
Zach Fox
7b92989b1d Fix it 2017-04-12 14:45:57 -07:00
Zach Fox
2579ac1baa It's working! 2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b Checkpoint! 2017-04-12 14:45:56 -07:00
volansystech
7bc3435cfa Initial Commit.. 
If distanceToObject from avatar is more than 15, we are accelarting entity travel by 2x.
This will help user to grab the entity in lesser time.
 2017-04-13 02:51:30 +05:30
Seth Alves
026dde2e68 allow kinematic near-grab to be turned on or off for a given entity 2017-04-12 10:14:16 -07:00
Thijs Wenker
695c55bc3d fix teleport cool-in, added missing TARGETTING state and some ESLINT style fixes 2017-04-12 03:44:24 +02:00
Chris Collins
b07ed13023 Merge pull request #10184 from druiz17/snapshot-fix 
snapshot bug fixes
 2017-04-11 13:00:46 -07:00
samcake
79bcf95792 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-04-11 10:00:34 -07:00
samcake
4a47737d0b REfining the Config behavior, trying to pr next 2017-04-10 19:01:49 -07:00
Dante Ruiz
daf25c1fe8 fix crashes when clicking in the homebutton 2017-04-11 00:25:08 +01:00