Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 11:22:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53513 commits 71 branches 56 tags 1.2 GiB
Commit graph

2117 commits

Author SHA1 Message Date
Seth Alves
371118a6c0 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 16:26:30 -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
Seth Alves
d17d12446b Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1 2017-04-14 12:49:03 -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
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
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
Dante Ruiz
daf25c1fe8 fix crashes when clicking in the homebutton 2017-04-11 00:25:08 +01:00
Dante Ruiz
382204a9a9 open feed after logging in 2017-04-10 22:33:07 +01:00
Dante Ruiz
df6498c67c fix snapshot login for toolbar-mode 2017-04-10 21:59:37 +01:00
Dante Ruiz
6922ba5c77 removed unnessary prints 2017-04-10 21:08:40 +01:00
Dante Ruiz
e0f19944bc Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix 2017-04-10 20:58:46 +01:00
Dante Ruiz
4e94aaa9e8 finished allowing to go back to previous app 2017-04-10 20:58:10 +01:00
Anthony Thibault
746b7aadbd Merge pull request #10133 from sethalves/fix-teleport-which-something-equipped 
Fix teleport when something equipped
 2017-04-09 19:00:21 -07:00
Dante Ruiz
86c67a3017 tablet pages 2017-04-08 02:01:21 +01:00
Chris Collins
8e12f62cbb Merge pull request #10153 from druiz17/goto-fix 
Ability to toggle goto with the crt-l and enter keys
 2017-04-07 16:36:41 -07:00
Howard Stearns
5d341778c5 fix notification word wrapping 2017-04-07 07:08:19 -07:00
howard-stearns
b089fd03b8 make connection messaging when not logged in 2017-04-06 16:48:11 -07:00
Dante Ruiz
a89081601c fix merge issues 2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d toggle goto in tablet 2017-04-06 22:27:37 +01:00
Howard Stearns
f7ef587c61 Merge pull request #10138 from davidkelly/dk/3935 
Now you can forget connections
 2017-04-06 14:05:25 -07:00
David Kelly
34a2cefb98 Merge pull request #10132 from davidkelly/dk/analyticsForConnections 
initial analytics for connections
 2017-04-06 10:45:39 -07:00
David Kelly
a92162dea9 no mo useless debug statements 2017-04-06 08:50:22 -07:00
David Kelly
61ece265f4 now you can forget connections 2017-04-05 18:16:16 -07:00
Seth Alves
2e4e10759f teleport raypick now ignores equipped or grabbed entities 2017-04-05 13:17:03 -07:00
David Kelly
1b6bf90843 initial analytics for connections 2017-04-05 11:10:06 -07:00
Anthony J. Thibault
c33f10ca1b Recenter body on teleport, also it works more consistently. 
If your avatar happens to be squatting, your body will stand up straight after you teleport.
Also, setting MyAvatar.position can sometimes fail due to the multi-threaded nature of scripting.
Instead, teleport.js uses goToPosition to move the avatar, as a result teleport feels much more responsive now.
 2017-04-04 18:05:46 -07:00
kunalgosar
a5b10cc51e alert window to give directions 2017-04-04 15:35:38 -07:00
kunalgosar
b8500e45ad added tutorial 2017-04-04 15:35:38 -07:00
kunalgosar
d66038fff2 press B to exit finger painting 2017-04-04 15:35:38 -07:00
Seth Alves
b0b214012c Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts 
Fix broken eventBridge on tablet after Reload All Scripts.
 2017-04-04 10:45:08 -07:00
Anthony J. Thibault
8ff457a1b6 Fix broken eventBridge on tablet after Reload All Scripts. 
The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object.
For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.
 2017-04-03 16:03:55 -07:00
Anthony Thibault
999bd0d339 Merge pull request #10075 from sethalves/tablet-ui 
Tablet ui -- misc changes + landscape mode
 2017-04-03 10:43:34 -07:00
Seth Alves
b9e84691ad Merge pull request #10092 from ctrlaltdavid/dead-code 
Remove some dead code in edit.js
 2017-04-03 09:40:30 -07:00
Seth Alves
43e1cec8a3 merge from upstream 2017-04-03 06:28:59 -07:00
Chris Collins
3c62826ef9 Merge pull request #10091 from ctrlaltdavid/21248 
Fix HTML controls not working properly in the tablet
 2017-04-01 08:41:44 -07:00