Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-18 21:38:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54411 commits 25 branches 28 tags 1.2 GiB
Commit graph

54411 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
20c8356bb2 debugging rotation fix 2017-05-05 22:55:53 +01:00
Dante Ruiz
3894c7c2ff Merge branch 'master' of github.com:highfidelity/hifi into config-pucks 2017-05-04 16:54:00 +01:00
Andrew Meadows
ec1c99cb71 Merge pull request #10376 from sethalves/fix-guard-against-bad-hinge 
guard against bad hinge-constraint settings
 2017-05-03 20:34:07 -07:00
Seth Alves
c693687927 react to very small vectors instead of just zero-length ones 2017-05-03 20:23:10 -07:00
Seth Alves
f867a8e718 guard against bad hinge-constraint settings 2017-05-03 20:12:42 -07:00
Zach Fox
affc7fc654 Merge pull request #10369 from druiz17/url-fix 
Fix tablet webview showing incorrect url.
 2017-05-03 16:58:06 -07:00
Zach Fox
d28d89e8ff Merge pull request #10368 from zfox23/palWebViewtoTabletWebView 
PAL WebView is now a TabletWebView
 2017-05-03 16:51:32 -07:00
anshuman64
a924a33428 Merge pull request #10361 from ctrlaltdavid/21315 
Fix numeric keys not displaying in social media sharing dialogs
 2017-05-03 16:41:43 -07:00
Seth Alves
a259d00b63 Merge pull request #10332 from sethalves/bullet-constraints-5 
Bullet constraints
 2017-05-03 16:30:34 -07:00
Zach Fox
259d6f8ec6 Merge pull request #10370 from zfox23/fixEventEnum 
Fix event enum
 2017-05-03 15:45:22 -07:00
Zach Fox
4d49ae5b09 Remove the +1s 2017-05-03 15:43:57 -07:00
Zach Fox
07d3e482cf ARG 2017-05-03 15:40:39 -07:00
Dante Ruiz
5390a29859 tabletwebview-url-fix 2017-05-03 23:05:05 +01:00
Zach Fox
eaf819d11d Remove FIXME 2017-05-03 14:59:07 -07:00
Zach Fox
066b2db73f Make the change 2017-05-03 14:57:31 -07:00
Sam Gateau
8507fffcc2 Merge pull request #10313 from samcake/ambient-bis 
Fixing the the mip gpu copy for compressed format texture in GL41Backend
 2017-05-03 14:50:55 -07:00
Chris Collins
c4c62e790b Merge pull request #10341 from jherico/texture_transfer_crash 
Prevent possible crash in texture buffering thread
 2017-05-03 15:50:49 -05:00
Dante Ruiz
31f6038e45 limbs tracking pucks 2017-05-03 20:08:42 +01:00
Zach Pomerantz
4a8f5e380f Merge pull request #10358 from zzmp/fix/minimize-deadlock 
Fix deadlock from minimizing
 2017-05-03 15:06:27 -04:00
Howard Stearns
fb8cfd720e Merge pull request #10362 from cfresquet/requestModuleRefactor 
Request module refactor
 2017-05-03 11:57:23 -07:00
Zach Fox
ae72b9b73d Merge pull request #10357 from zfox23/newSnapshotReview_Improvements2 
Lots of Snapshot app improvements, Round Two
 2017-05-03 11:44:40 -07:00
Zach Fox
c82a07016d New Preparing text; Better disabled behavior 2017-05-03 11:30:44 -07:00
Stephen Birarda
5d1abe4499 Merge pull request #10307 from huffman/fix/ktx-crash 
Fix for resource downloads getting capped
 2017-05-03 11:25:51 -07:00
Zach Fox
09488c4987 Disabled state for share butotns 2017-05-03 11:02:44 -07:00
CFresquet
afa72210e0 requested tweaks to makeUserConnection.js 2017-05-03 10:28:44 -07:00
Ryan Huffman
44b6d12b75 Merge pull request #10356 from sethalves/fix-grab-cleanups 
Fix grab cleanups
 2017-05-03 09:53:31 -07:00
CFresquet
28b166c51f further request fiddling 2017-05-03 07:51:49 -07:00
CFresquet
b54ea63af7 incremental request module fixes 2017-05-03 07:35:30 -07:00
CFresquet
15db80c8ba request module updates 2017-05-03 07:32:23 -07:00
David Rowe
7fdcb9b1f0 Fix numeric keys not displaying in social media sharing dialogs 2017-05-03 14:59:41 +12:00
Zach Fox
ff3a76f716 No magic numbers! 2017-05-02 18:23:15 -07:00
Zach Fox
653dda7000 Fix pausing after snapshot in HMD 2017-05-02 17:21:50 -07:00
samcake
48eb30936e Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis 2017-05-02 17:20:10 -07:00
samcake
0ecf599267 Adressing the warning 2017-05-02 17:19:22 -07:00
Zach Fox
aa46534b60 Whoops. 2017-05-02 17:10:57 -07:00
Zach Pomerantz
ad8d3e5490 continue idling while minimized 2017-05-02 20:05:55 -04:00
Zach Fox
964e79ce14 It's working! 2017-05-02 16:58:33 -07:00
Zach Fox
68fa8e06ef Super amped about this. Only need to add disabled state? 2017-05-02 16:38:16 -07:00
Dante Ruiz
fb502a7fed add offset function 2017-05-03 00:37:35 +01:00
samcake
dc50db7ee5 One more warning from gcc 2017-05-02 16:27:28 -07:00
Dante Ruiz
8e2b25eacc working on computing offsets 2017-05-03 00:25:41 +01:00
Seth Alves
0cd0e46ca5 make clone work again 2017-05-02 16:20:59 -07:00
Zach Fox
5d38cd543d Yet another checkpoint 2017-05-02 16:06:13 -07:00
Seth Alves
ef628eaec6 Merge pull request #10352 from highfidelity/move-recorder 
Move old recorder.js script to script-archive
 2017-05-02 16:03:36 -07:00
Zach Fox
7817c72ea1 Another checkpoint 2017-05-02 15:58:43 -07:00
Seth Alves
f1170dc17d AvatarList not AvatarManager 2017-05-02 15:48:12 -07:00
Seth Alves
eed4da3570 some cleanups, delete far-grabs during transition to near-grab rather than set ttl to zero 2017-05-02 15:36:38 -07:00
Zach Fox
0beceae59b Checkpoint 2017-05-02 15:19:20 -07:00
Sam Gateau
a7eecdfb26 Merge pull request #10265 from samcake/ambient 
Making the render engine Job/Task system configurable and reusable
 2017-05-02 14:55:53 -07:00
samcake
41f0b1682e Fixing warnings too 2017-05-02 14:45:41 -07:00