Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53143 commits 2 branches 0 tags 1.1 GiB
Commit graph

19732 commits

Author SHA1 Message Date
Seth Alves
d1827cf12c Merge pull request #10002 from fayeli/tablet-photobooth 
Photobooth Improvements: Using Tablet & Ability to Rotate Model
 2017-04-03 16:05:13 -07:00
Andrew Meadows
66ff551a7c Merge pull request #10080 from ZappoMan/footActions 
add foot IK targets as actions, map Kinect feet to foot targets
 2017-04-03 12:06:14 -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
c45514a557 Merge pull request #10066 from vladest/tablet-ui-connection-dialog 
Implemented no connection dialog for Tablet UI
 2017-04-03 09:57:00 -07:00
Seth Alves
98a54d9119 Merge pull request #10101 from ctrlaltdavid/21252 
Fix tablet scrolling getting stuck to mouse pointer
 2017-04-03 09:52:45 -07:00
Seth Alves
0f936f7511 Merge pull request #10078 from hyperlogic/feature/avatar-skeleton 
Expose Avatar Skeleton to JavaScript
 2017-04-03 09:39:35 -07:00
Seth Alves
43e1cec8a3 merge from upstream 2017-04-03 06:28:59 -07:00
David Rowe
2b4afdb987 Fix tablet window getting stuck to pointer if release mouse off tablet 2017-04-02 12:58:11 +12: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
Chris Collins
cc8b52fff4 Merge pull request #10095 from druiz17/tablet-webView2.0 
Tablet webview now uses mobile format
 2017-04-01 08:33:09 -07:00
Dante Ruiz
7ca7ad5e0b removed junk file 2017-04-01 01:53:00 +01:00
Zach Fox
8a96969471 Merge pull request #9873 from highfidelity/PAL_v2 
PAL v2.0
 2017-03-31 17:00:41 -07:00
Dante Ruiz
b10f491c6e Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView2.0 2017-04-01 00:58:37 +01:00
Dante Ruiz
d1bf3e4bf2 fixed webview mobile view 2017-04-01 00:58:09 +01:00
Zach Fox
fd3167ca9c 'PEOPLE' back to 'CONNECTIONS' 2017-03-31 16:41:25 -07:00
Andrew Meadows
0181783290 Merge pull request #10064 from samcake/ambient 
Fix the sharp reflection happening after  pr 10036 and bugs on backend 4.1
 2017-03-31 16:04:00 -07:00
Seth Alves
cec02bbf6f Merge pull request #10011 from humbletim/fix-rightclick-menu-again 
Fix right-click popup menus in web views
 2017-03-31 15:48:11 -07:00
Chris Collins
b36f688a5a Merge pull request #10089 from sethalves/tablet-ui-use-stylus-by-default 
use tablet-ui stylus as default, rather than avatar finger
 2017-03-31 15:34:37 -07:00
David Kelly
8ceb6a20f0 friend/unfriend working 2017-03-31 15:05:21 -07:00
Zach Fox
6a4c2c5e12 Fix issues; checkpoint on new ComboDialog 2017-03-31 14:56:42 -07:00
David Rowe
25ac82f162 Don't send "move" events for non-move events 2017-04-01 10:47:04 +13:00
David Rowe
b03fd44240 Fix controls in HTML pages not responding to mouse events on tablet 2017-04-01 10:40:06 +13:00
Clément Brisset
9d0676dd87 Merge pull request #10088 from huffman/stable-merge 
Stable merge
 2017-03-31 14:27:42 -07:00
howard-stearns
5c8b2ba1c3 restore lost code 2017-03-31 13:28:14 -07:00
Seth Alves
8d4982d794 Merge pull request #10087 from druiz17/tablet-webView 
Better webview handing for the tablet
 2017-03-31 13:26:56 -07:00
Seth Alves
54c66aff07 use tablet-ui stylus as default, rather than avatar finger 2017-03-31 13:18:40 -07:00
Dante Ruiz
70d2d69557 Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView 2017-03-31 19:29:31 +01:00
Dante Ruiz
9658e1b8ac better web view handling 2017-03-31 19:25:03 +01:00
Dante Ruiz
b6901bba3e added tabletWebView.qml 2017-03-31 18:48:08 +01:00
Sam Cake
dd73cb7b8e Use a magic number gpu::Texture::SINGLE_MIP instead of 1 2017-03-30 23:46:37 -07:00
ZappoMan
53c439ffba add foot IK targets as actions 2017-03-30 19:11:16 -07:00
Anthony J. Thibault
22901a40c8 Expose Avatar skeletons to JavaScript 2017-03-30 17:27:40 -07:00
Dante Ruiz
8f402c73b0 saving work 2.0 2017-03-31 01:18:31 +01:00
Zach Fox
05c34fb3ee Move some things around so ComboBox works (and layout improves) 2017-03-30 15:19:19 -07:00
Ryan Huffman
150dcd7dec Merge remote-tracking branch 'upstream/master' into stable-merge 2017-03-30 14:22:27 -07:00
Zach Fox
c24b8b47a9 Minor layout changes 2017-03-30 14:08:29 -07:00
Howard Stearns
0edbf1fbd9 Merge pull request #10044 from howard-stearns/pal-backend-integration 
Pal backend integration
 2017-03-30 12:55:11 -07:00
Howard Stearns
3056bb16a2 typo, and delete request on abort/fail 2017-03-30 12:40:54 -07:00
David Rowe
985a804fe9 Merge branch 'master' into 21242 2017-03-31 08:03:05 +13:00
Seth Alves
c62b07d26f add setLandscape call to tablet 2017-03-30 11:36:21 -07:00
David Kelly
e66c075f8e Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-30 10:14:29 -07:00
Seth Alves
cc5fe05268 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-30 09:33:04 -07:00
samcake
e6d30fbb2f Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-03-29 18:22:47 -07:00
David Rowe
06910d1881 Add comment re scrollbar stability in tablet 2017-03-30 14:20:02 +13:00
David Rowe
f954767b84 Get entities list and entity properties scrollbars working on tablet 2017-03-30 14:04:03 +13:00
samcake
b6504bba56 Moving the num mips per texture to the creator so it s immutable and simpler 2017-03-29 17:58:56 -07:00
Howard Stearns
af25e0e21f Don't consider changes to location details as update-worthy if we're not discoverable. 2017-03-29 17:55:57 -07:00
Dante Ruiz
cb8660c699 saving work 2017-03-30 01:34:14 +01:00
Zach Fox
4887081e2c New PAL colors; slight layout changes 2017-03-29 16:30:24 -07:00
Howard Stearns
3a7edebb94 Adjust reporting of availability to metaverse. 2017-03-29 16:12:50 -07:00