Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 16:36:46 +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
Zach Fox
93191778dd Merge branch 'discovery_appUi' into notificationsForFourApps 2018-09-18 12:32:33 -07:00
Zach Fox
a97f9eb79a Logic for Wallet notifications; some bugfixes 2018-09-18 12:28:03 -07:00
NissimHadar
719176b931 Newer version. 2018-09-18 12:01:13 -07:00
Zach Fox
d487914656 Prevent text notification from appearing when not necessary 2018-09-18 11:28:59 -07:00
Sam Gateau
d768809fbc
Merge pull request #13969 from SamGondelman/modelBugs 
Fixing Model animation bugs
 2018-09-18 11:28:37 -07:00
Kerry Ivan Kurian
8f5923d562 Show installed apps on start of marketplace item tester 
Also, refactor a bit.
 2018-09-18 11:23:32 -07:00
NissimHadar
3ca06dc714 Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests 2018-09-18 10:17:37 -07:00
NissimHadar
69f5e9110a Minor cleanup 2018-09-18 10:16:42 -07:00
Wayne Chen
4807b5af7b fixing display of user/pw incorrect 2018-09-18 09:57:26 -07:00
Wayne Chen
f82063ed46 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-09-18 09:17:28 -07:00
NissimHadar
f872a95a7a Added number of failures to log. 2018-09-18 08:49:11 -07:00
Kerry Ivan Kurian
f2a046da91 Install marketplace item tester 2018-09-18 00:08:09 -07:00
NissimHadar
0c3e3e977e Corrected pulling PR number from the executable name. 2018-09-17 16:06:11 -07:00
Anthony Thibault
8229c14c44
Fix for type in AnimStats.qml 2018-09-17 15:17:43 -07:00
Gabriel Calero
78b4139039 Fix android login infinite loading (case 18459) 2018-09-17 19:16:04 -03:00
Zach Fox
c453594eb7 Overhaul notification logic for PAL 2018-09-17 14:41:18 -07:00
Alexia Mandeville
5c9d31688f Adding handshake control to image 2018-09-17 14:01:23 -07:00
luiscuenca
b39391ca7a From first frame 2018-09-17 13:53:57 -07:00
luiscuenca
f339bbdd7f Fix bug while walking 2018-09-17 13:29:04 -07:00
NissimHadar
f046d3b87d Delete allocated memory where needed. 
Added option to run server-less
Added option to select build.
 2018-09-17 13:21:01 -07:00
Roxanne Skelly
499c0594c7 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-17 13:04:48 -07:00
Zach Fox
143a059b16 Small changes to AppUI and PAL 2018-09-17 11:11:36 -07:00
Zach Fox
23fab0985b Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-17 11:11:21 -07:00
Anthony Thibault
11fe657c05 Swaped AnimVar and StatMachine panels 2018-09-17 10:33:04 -07:00
luiscuenca
ff319ebd95 Bypass position updates from mixer 2018-09-17 09:47:22 -07:00
Seth Alves
1e8ae1a294 fix scaling of worn shape entities 2018-09-15 16:36:55 -07:00
David Rowe
5b3d92e816 Persist showing mini tablet for a while after it would otherwise hide 2018-09-16 08:09:26 +12:00
Seth Alves
f86075b2dd Revert "Fix for angularVelocity zeroing out on duplication or undo" 
This reverts commit 9c96a10f6c.
 2018-09-15 09:21:12 -07:00
Seth Alves
1a44054c49 attempt fix for fb-17131 2018-09-15 09:15:43 -07:00
Sam Gateau
cb8af882ca Merge branch 'master' of github.com:highfidelity/hifi into black 2018-09-14 20:27:52 -07:00
Sam Gateau
986dece4ec Add name of the batch during tracing and introduce detailed tracing if needed and one error message in the case the materialMap is detected in an fst file but not understood 2018-09-14 20:24:22 -07:00
John Conklin II
be76c43aec
Merge pull request #13999 from gcalero/dont_popup_login_android 
Don't popup login dialog in android
 2018-09-14 16:06:03 -07:00
John Conklin II
cb8e3c6452
Merge pull request #14003 from danteruiz/snap-fix 
Fix snapshot settings issue in HMD
 2018-09-14 15:34:22 -07:00
Zach Fox
68e6142f8b Follow wallet setup referrer when autogenerating new wallet 2018-09-14 15:34:00 -07:00
John Conklin II
49e578ebef
Merge pull request #13998 from AndrewMeadows/dont-zero-kinematic 
don't zero kinematic velocities when releasing simulation ownership
 2018-09-14 15:18:06 -07:00
David Rowe
9d051b71bb Fix mini tablet sometimes flipping when grabbed by other hand 2018-09-15 10:14:22 +12:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip 
Safe Teleport Target
 2018-09-14 15:11:18 -07:00
Anthony Thibault
b0cde2afcc Small addition to Anim Stats 
* During a state machine interp the previous state now shows up in AlphaValues panel, with parentheses around the name.
* Added 3 new fields
  * Position - in world coordinate frame.
  * Heading - the facing angle in the world corrdinate frame.
  * Local Vel - the velocity of the character in the local coordinate frame. (left, forward, up).
 2018-09-14 15:05:17 -07:00
Zach Fox
9c5544af39 Merge in big work from appui_notifications branch 2018-09-14 14:37:04 -07:00
Zach Fox
9e50904376 Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-14 14:36:22 -07:00
Roxanne Skelly
555432dd49 Blank js file to force build (and prep for appinfo parsing) 2018-09-14 14:13:26 -07:00
Dante Ruiz
ff52639bc3 fix update 2018-09-14 14:10:36 -07:00
Dante Ruiz
4eb5c9714b fix snapshot settings 2018-09-14 12:59:28 -07:00
Roxanne Skelly
f419937157 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-14 11:49:54 -07:00
Roxanne Skelly
5edb76ef34 Checkpoint Tray Notifier 2018-09-14 11:35:20 -07:00
luiscuenca
04e6225a95 Threshold back 2018-09-14 11:22:47 -07:00
Wayne Chen
0afea6fbd1 removing double login fail signal 2018-09-14 11:08:53 -07:00
luiscuenca
8c9173b639 Safe landing for discrepancies 2018-09-14 11:06:30 -07:00
David Back
86972cf4fb
Merge pull request #13992 from dback2/entityListSearchCase 
Fix entity list search case-sensitivity and allow id search
 2018-09-14 10:58:44 -07:00
Gabriel Calero
72eeeac2ba Don't popup login dialog in android 2018-09-14 14:40:30 -03:00