Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-15 10:57:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
53275 commits 25 branches 28 tags 1.2 GiB
Commit graph

53275 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Seth Alves
9cd2717163 Merge pull request #10083 from vladest/tablet-ui-scriptslog-back 
Script log now back to HUD
 2017-03-31 14:12:15 -07:00
Howard Stearns
0c07003768 Merge pull request #10049 from AndrewMeadows/avoid-invisible-avatars 
Avoid invisible avatars
 2017-03-31 13:48:41 -07:00
Howard Stearns
0f90ba49ba Merge pull request #10090 from howard-stearns/fix-location-node-id-update 
restore lost code
 2017-03-31 13:30:25 -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
Seth Alves
3073b47ea3 Merge pull request #10065 from ctrlaltdavid/21242 
Address tablet scrollbar issues
 2017-03-31 12:43:53 -07:00
Ken Cooke
fa53ebef30 Merge pull request #9996 from zfox23/cleanup_selectAudioDevice 
FB3651: Fix audio devices switching when they shouldn't
 2017-03-31 12:07:49 -07:00
samcake
c8970dd704 Fixing the warning on windows 2017-03-31 11:34:03 -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
Howard Stearns
fc1b2d8bee Merge pull request #10086 from howard-stearns/PAL_v2 
update from master to pal
 2017-03-31 10:51:48 -07:00
Dante Ruiz
b6901bba3e added tabletWebView.qml 2017-03-31 18:48:08 +01:00
howard-stearns
364bfd84bd Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-31 10:46:35 -07:00
samcake
6a0c07a692 Fixing a bad counter for numFaces 2017-03-31 10:39:13 -07:00
Vladyslav Stelmakhovskyi
7558765042 Script log now back to HUD 2017-03-31 14:20:15 +02:00
Sam Cake
dd73cb7b8e Use a magic number gpu::Texture::SINGLE_MIP instead of 1 2017-03-30 23:46:37 -07:00
Sam Cake
61d78bc931 BRinging the cool texture management of the gl45 backend to gl41, which fixes the broken ao on 41 among other things 2017-03-30 23:29:37 -07:00
ZappoMan
4da8e5e18f fix left/right legs for kinect 2017-03-30 20:01:59 -07:00
ZappoMan
53c439ffba add foot IK targets as actions 2017-03-30 19:11:16 -07:00
samcake
47e9668b8f improving the gl41 backend to mimic the gl45 2017-03-30 17:59:59 -07:00
Seth Alves
715493922e code review 2017-03-30 17:33:01 -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
4712ec7400 Reset pollCount; debug log when expired generated by client 2017-03-30 17:02:15 -07:00
Seth Alves
9ef4d01772 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-30 17:00:07 -07:00
David Rowe
a5c683192b Improve entity properties scroll handle operation in tablet 2017-03-31 12:26:22 +13:00
trent
e9035a1efb More fixes for the OBJ reader. The data seems to be fine. The rendering seems not so fine. 2017-03-30 19:10:15 -04:00
Zach Fox
0bdd0f5c08 Merge pull request #10052 from vladest/tablet-ui-ambient-occlusion 
Set z-order of comboboxes to make sure lowest will no overlap higher …
 2017-03-30 15:19:43 -07:00
Zach Fox
05c34fb3ee Move some things around so ComboBox works (and layout improves) 2017-03-30 15:19:19 -07:00
trent
c5bb419bd1 Fixed OBJ reader crash, did not fix OBJ reader not working properly. 2017-03-30 18:16:55 -04:00
samcake
25edb44b75 Fix the problem with the cursor and scattering, 2017-03-30 15:15:14 -07:00
Ryan Huffman
150dcd7dec Merge remote-tracking branch 'upstream/master' into stable-merge 2017-03-30 14:22:27 -07:00
trent
864184a107 wip OBJ loader rewrite; wip because it crashes. 2017-03-30 17:11:40 -04:00
Zach Fox
c24b8b47a9 Minor layout changes 2017-03-30 14:08:29 -07:00
trent
5bf3da9a7f Restoring hifi version of the OBJ files to get rid of my debug nonsense. 2017-03-30 16:14:42 -04:00
trent
dd2ed559b6 Merge branch 'master' of https://github.com/highfidelity/hifi into 21240 2017-03-30 16:13:28 -04: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
samcake
26000288d7 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-03-30 11:45:12 -07:00
Seth Alves
c62b07d26f add setLandscape call to tablet 2017-03-30 11:36:21 -07:00
Seth Alves
36ad3af48e attempt to avoid a hang on shutdown 2017-03-30 11:35:24 -07:00
Andrew Meadows
76ef2b5d9f Merge pull request #10059 from ZappoMan/addKinectHandRotation 
some more kinect work
 2017-03-30 11:05:44 -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
samcake
73a8ec3e72 Merge pull request #10068 from kencooke/audio-debugbuild-fix 
Fix the crash in Debug builds
 2017-03-30 10:12:37 -07:00
David Kelly
348674a267 Merge pull request #10034 from davidkelly/dk/avatarEntityIssue 
bad serialization of Avatar Entity parentID
 2017-03-30 10:12:19 -07:00