Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 08:06:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51984 commits 22 branches 28 tags 1.2 GiB
Commit graph

51984 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
e88895935b Revert "Actually merge from master" 
This reverts commit 056d6fbe4f.
 2017-03-24 17:56:48 -07:00
Zach Fox
056d6fbe4f Actually merge from master 2017-03-24 10:10:17 -07:00
Zach Fox
915ace0087 Revert "Merge from Master" 
This reverts commit e48123b5bb.
 2017-03-24 10:04:51 -07:00
Zach Fox
3f95982f34 Fix bug due to incorrect merge... 2017-03-23 14:00:50 -07:00
Zach Fox
98ee02f84f Use OpacityMask instead of hack; fix connectionsTab 2017-03-23 10:49:31 -07:00
Zach Fox
a7623dcac8 Use OpacityMask instead of hack; fix connectionsTab 2017-03-23 10:48:44 -07:00
David Kelly
0edcdde746 better key mapping 2017-03-23 10:40:34 -07:00
David Kelly
a08346719c one bit of defensive code, plus some temporary logging 2017-03-23 10:29:45 -07:00
Zach Fox
e48123b5bb Merge from Master 2017-03-23 09:54:14 -07:00
David Kelly
aa085e577d more vis work 2017-03-23 09:19:04 -07:00
David Kelly
a0c19d6b59 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-22 17:02:03 -07:00
David Kelly
7b52afb58b vis changes to fade. Still needs more work 2017-03-22 17:01:42 -07:00
Zach Fox
692ef369c7 Attempted Stale PAL fix - hard to test! 2017-03-22 15:14:11 -07:00
David Kelly
675612c1e9 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-22 14:56:23 -07:00
David Kelly
020dcca78d end handshake when successful, stop handshake sound if other guy pulls out 2017-03-22 14:55:57 -07:00
Zach Fox
bf191eabb7 Some new stale PAL behavior 2017-03-22 13:35:48 -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