Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 10:07:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72789 commits 25 branches 0 tags 1.1 GiB
Commit graph

72789 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kerry Ivan Kurian
38fd9523ee Attempt to load content set 
This does not result in the user seeing the content set.
 2018-09-19 15:57:29 -07:00
Roxanne Skelly
bda179697e Tray Notifications - users handling changes 
Since the 'users' api call doesn't support a 'since', we now query
all of the online connections each time to keep track of connections
that join or leave.
 2018-09-19 15:50:50 -07:00
Kerry Ivan Kurian
66bf45c3ef Update location only if certificate id 2018-09-19 15:18:18 -07:00
Kerry Ivan Kurian
5bc7d944f9 Remove whitespace 2018-09-19 15:17:13 -07:00
Ryan Huffman
8805ce49e3 Remove verbose logging of keyboard messages in edit.js and gridTool.js 2018-09-19 15:06:58 -07:00
Ryan Huffman
431daecd8e Fix shifting of yaw rotation handle 2018-09-19 14:33:51 -07:00
Wayne Chen
7e796f7e7f committing requested changes 2018-09-19 14:26:30 -07:00
David Back
e701c79984 Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-19 14:06:28 -07:00
Roxanne Skelly
aba183b165 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-19 13:40:18 -07:00
Ryan Huffman
788c883c02 Fix Circle3DOverlay not rendering solid circle to exact degrees 2018-09-19 13:38:35 -07:00
Alexander Ivash
e5b7b7f12a FB18061 - Avatar favorites cannot be moved to a different joint - At Save the wearable jumps to the original joint 2018-09-19 23:07:21 +03:00
Wayne Chen
4ce942b0f2 updating spawn location/floor in redirect 2018-09-19 13:00:56 -07:00
Wayne Chen
8d0e55c1cd Merge branch 'master' of https://github.com/highfidelity/hifi 2018-09-19 13:00:33 -07:00
Roxanne Skelly
d5f756c79d Tray Notifier Checkpoint 
* Add app launch
* Add authentication for auth-related calls
* Refactor notifications code
 2018-09-19 12:40:15 -07:00
John Conklin II
3b1e0dc7d9
Merge pull request #13987 from zfox23/discovery_appUi 
Discovery Notifications Project Checkpoint: Discovery apps now use AppUI module; PEOPLE app notifications
 2018-09-19 12:38:28 -07:00
NissimHadar
6c2b1271ab Merge crap. 2018-09-19 12:34:27 -07:00
John Conklin II
6c63f92f39
Merge pull request #13933 from SamGondelman/accelerationSpread 
Fix particle acceleration spread
 2018-09-19 11:49:42 -07:00
John Conklin II
60c07280f8
Merge pull request #13971 from SamGondelman/parabola 
Correct transparent parabola shader
 2018-09-19 11:46:24 -07:00
Zach Fox
144771b77b Request JSON from server 2018-09-19 11:35:17 -07:00
Brad Davis
783ea21951 Fix AMD highlighting effect 2018-09-19 11:21:12 -07:00
Wayne Chen
a43799fffa moving settings check within slotted functions 2018-09-19 10:40:49 -07:00
Wayne Chen
01594d7a52 fixing settings check in domain handler 2018-09-19 10:17:14 -07:00
David Back
46c8083fb9 only call selectEntity one time per trigger 2018-09-19 10:13:15 -07:00
sam gateau
c05cbf065b fixing the texcoord1 input in skined vertex shader 2018-09-19 10:13:14 -07:00
Wayne Chen
795580f4e1 adding 404 redirect toggle with interstitial 2018-09-19 09:55:15 -07:00
Sam Gateau
61644c48f0 Update the slp tp reflect the chanes in the vertex shaders 2018-09-19 09:18:09 -07:00
NissimHadar
b5e901fc54 Merge branch 'addDailyTests' of https://github.com/NissimHadar/hifi into addDailyTests 2018-09-19 07:06:32 -07:00
NissimHadar
357bea520f Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests 2018-09-19 07:01:09 -07:00
Stephen Birarda
3a7785d10f fix for deadlock in other avatar entity removal 2018-09-18 17:52:24 -07:00
sam gateau
609bc6385e Merge branch 'black' of github.com:samcake/hifi into black-bis 2018-09-18 17:40:45 -07:00
sam gateau
ec6117e9bb bringing the blendshape in skin shader only work in master 2018-09-18 17:40:29 -07:00
Zach Fox
f70ecdad16 Small bugfix 2018-09-18 17:00:53 -07:00
Zach Fox
9db11aeda7 Bugfixes and new algo for PAL notifs 2018-09-18 16:35:53 -07:00
Wayne Chen
8b3fff120a Merge branch 'master' of https://github.com/highfidelity/hifi 2018-09-18 16:28:33 -07:00
Wayne Chen
be5f498c2f reversion 2018-09-18 15:47:54 -07:00
Zach Fox
4987164706 Notifications for GOTO (using a cool algorithm) 2018-09-18 15:30:43 -07:00
Wayne Chen
43fe98a511 reversion 2018-09-18 15:29:28 -07:00
Wayne Chen
f39c829635 Merge branch 'master' of https://github.com/wayne-chen/hifi into fixMainTextContainerQML 2018-09-18 15:28:29 -07:00
Wayne Chen
48e4b38312 reversion 2018-09-18 15:28:15 -07:00
Wayne Chen
1e5d3d6d54 Merge branch 'master' of https://github.com/wayne-chen/hifi into fixMainTextContainerQML 2018-09-18 15:26:26 -07:00
Wayne Chen
8274f4cb4c reverting domain handler change 2018-09-18 15:26:12 -07:00
Wayne Chen
085e6a16fd Merge branch 'master' of https://github.com/highfidelity/hifi into fixMainTextContainerQML 2018-09-18 15:21:01 -07:00
Zach Fox
55a0f77697 Notifications for MARKET 2018-09-18 14:45:14 -07:00
NissimHadar
8301b472fe Automated login. 2018-09-18 14:22:10 -07:00
Gabriel Calero
32da2cbef6 Show password in android login 2018-09-18 18:11:11 -03:00
Kerry Ivan Kurian
cfa9d185f0 Add full resource paths to list in marketplace item tester 2018-09-18 14:02:16 -07:00
Kerry Ivan Kurian
a592565b7b Enable marketplace item test for avatar file 2018-09-18 13:25:01 -07:00
luiscuenca
96e8b060eb Enable transit animations 2018-09-18 12:42:37 -07:00
Zach Fox
04b44d0594 Fix small since bug 2018-09-18 12:38:33 -07:00
Kerry Ivan Kurian
645ad2bb7a Enable marketplace item test for avatar url 2018-09-18 12:36:03 -07:00