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

51969 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Kelly
020dcca78d end handshake when successful, stop handshake sound if other guy pulls out 2017-03-22 14:55:57 -07:00
David Kelly
34a89e4b9a added sounds, new haptics, and some cleanup 2017-03-22 13:26:51 -07:00
David Kelly
a594419688 friend->connection which I should have done long ago 2017-03-22 10:09:48 -07:00
David Kelly
59b02261e5 minor cleanup, remove waiting visualization completely 2017-03-21 16:08:25 -07:00
David Kelly
b32dc6658b Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-21 13:27:18 -07:00
David Kelly
5bcd7ca97f visuals update. Will do some cleaning shortly 2017-03-21 13:27:00 -07:00
Zach Fox
78f1acfd62 Don't crash when ignoring not-present node 2017-03-21 10:46:15 -07:00
Zach Fox
058faa8c0f Row color bugfix 2017-03-21 10:03:51 -07:00
Zach Fox
29e97381eb PAL open, user leaves, gray out row 2017-03-20 17:20:28 -07:00
Zach Fox
d16acc5a7f Stale PAL Notification 2017-03-20 15:24:49 -07:00
Zach Fox
6c4b23195b One-line warning fix...I swear I've done this before 2017-03-20 13:26:50 -07:00
Zach Fox
0506fc0033 New goTo() behavior; Fix goBack 2017-03-20 12:55:38 -07:00
David Kelly
81cb63df6b new particle effect, first pass 2017-03-20 11:42:58 -07:00
David Kelly
c425c32b8f hack somewhat different visualization in. If this is ok, will cleanup 2017-03-17 14:56:47 -07:00
David Kelly
58ac34b336 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-17 08:46:04 -07:00
David Kelly
2758e740bf hacked in a particle effect (as entity) plus popped sphere into existence 2017-03-17 08:45:24 -07:00
Zach Fox
fc2a501474 Cleanup JS<->QML messaging 2017-03-16 15:38:39 -07:00
David Kelly
140ef736ee Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-16 13:19:42 -07:00
David Kelly
60000becce more careful stopping of intervals, edge case stuff 2017-03-16 13:19:17 -07:00
Zach Fox
b3821bb02d fix location vs AddressManager woes 2017-03-16 12:57:21 -07:00
Zach Fox
05fec328c0 Make tablet popups work like they should 2017-03-16 10:38:46 -07:00
David Kelly
2552e572a7 Merge pull request #9882 from davidkelly/dk/newMessageStuff 
updated messaging for friends gesture
 2017-03-16 10:25:03 -07:00
David Kelly
f0fad5981a Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into dk/newMessageStuff 2017-03-16 09:01:13 -07:00
David Kelly
4f6123ee29 more messaging rework - dealing with edges 2017-03-15 16:41:07 -07:00
Howard Stearns
278138a7f0 Merge pull request #9913 from howard-stearns/PAL_v2 
Pal v2
 2017-03-15 16:40:27 -07:00
howard-stearns
84fd17bd88 use location.metaverseServerUrl instead of hardcoded value. 2017-03-15 16:33:23 -07:00
howard-stearns
f662571cab send credentials to private data-webs as well 2017-03-15 15:46:25 -07:00
howard-stearns
155e1b8e85 Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-15 15:45:36 -07:00
howard-stearns
c0c92fd8d1 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-15 15:20:28 -07:00
Brad Hefta-Gaub
ed380a7738 Merge pull request #9895 from zzmp/clean/noise-gate 
Strip AudioNoiseGate of dead code
 2017-03-15 13:21:56 -07:00
Zach Fox
786180291b Bugfixes and improvements 2017-03-15 11:46:33 -07:00
David Kelly
d8719ac3a9 cleanup, switch to overlays with texture swapping, move overlay to between hands 2017-03-15 11:15:58 -07:00
Anthony Thibault
495deba771 Merge pull request #9877 from hyperlogic/bug-fix/debug-draw-races 
Fixes for race conditions in DebugDraw
 2017-03-15 10:38:26 -07:00
Seth Alves
dc82895feb Merge pull request #9870 from Atlante45/fix/js-exceptions 
Fix JS exception messages formatting
 2017-03-15 09:32:04 -08:00
Seth Alves
94e2cd6e68 Merge pull request #9845 from AndrewMeadows/fix-rare-physics-crash 
fix rare physics crash
 2017-03-15 09:30:29 -08:00
howard-stearns
6c88bc98b4 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-15 09:24:30 -07:00
Zach Pomerantz
f43706dfe1 clean AudioNoiseGate 2017-03-15 00:14:55 +00:00
Zach Pomerantz
0abcda86a8 mv AudioNoiseGate to audio 2017-03-15 00:14:55 +00:00
Brad Hefta-Gaub
a38ab4ff80 Merge pull request #9884 from Atlante45/old-stable 
Merge Stable back into Master.
 2017-03-14 16:59:41 -07:00
Zach Fox
0a6bcd7fca Massive performance boost 2017-03-14 16:24:06 -07:00
David Kelly
0a35fa34f9 some reworking, cleaning, bug fixing... 2017-03-14 14:22:44 -07:00
Zach Fox
5da0dfc4ac Merging from Pal_v2_Zach 2017-03-14 14:05:50 -07:00
David Kelly
f821ccc8c3 fix typo - doh! 2017-03-14 10:00:19 -07:00
Brad Hefta-Gaub
a8d18adf83 Merge pull request #9872 from ZappoMan/fadeInWhenOpeningNoiseGate 
code review changes
 2017-03-14 09:26:14 -07:00
David Kelly
246d2f4017 fix comments at top 2017-03-14 08:58:14 -07:00
David Kelly
9daa94ce73 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into dk/newMessageStuff 2017-03-14 08:55:02 -07:00
David Kelly
7765daf382 handle cleanup, race, etc..., more to come 2017-03-13 18:57:01 -07:00
Zach Fox
e3d0842ddc Implement browser in PAL 2017-03-13 18:39:47 -07:00
David Kelly
fa7283a6e2 initial new messaging - working but needs cleanup 2017-03-13 18:33:36 -07:00
Anthony J. Thibault
6747f553bf Add DebugDraw to .eslintrc config file 
(cherry picked from commit c7cd0fdc38)
 2017-03-13 15:23:22 -07:00