Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 11:53:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
44008 commits 71 branches 56 tags 1.2 GiB
Commit graph

44008 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
414c43c012 Current state 2016-06-13 19:10:50 -07:00
samcake
93eb60801a Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-13 10:45:52 -07:00
samcake
f69c72f984 Fixing the VaryingPair problem 2016-06-13 10:44:31 -07:00
samcake
6a5dff06c4 Pushing a shitty state where the pairs of Varyings don;t get copied correctly 2016-06-13 09:46:24 -07:00
Brad Hefta-Gaub
fc1a154a6a Merge pull request #8053 from audreyt/patch-1 
Update BUILD_OSX.md
 2016-06-13 07:47:30 -07:00
Brad Hefta-Gaub
92909af52c Merge pull request #8044 from ctrlaltdavid/20957 
fix model export
 2016-06-12 19:43:51 -07:00
Brad Hefta-Gaub
da28b0f3e7 Merge pull request #8048 from ctrlaltdavid/20961 
fix import of invalid JSON file failing silently
 2016-06-12 19:42:53 -07:00
Brad Hefta-Gaub
a9729830b0 Merge pull request #8052 from sethalves/fix-permissions-grid-1 
fix some permissions-grid bugs
 2016-06-12 17:20:50 -07:00
唐鳳
1ec145298f Update BUILD_OSX.md 
Qt5.6 removed QTWebKit which hifi depends on. Before we complete the migration listed in https://wiki.qt.io/Porting_from_QtWebKit_to_QtWebEngine the build instruction need to tap into qt55 in historical brew versions.
 2016-06-12 21:07:49 +08:00
samcake
d0dbcb3144 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-11 19:09:22 -07:00
samcake
c325cc50dd Adding the depth aware blur 2016-06-11 18:54:22 -07:00
Seth Alves
924c949af5 permissions for the local node were being updated without the various *changed* signals being called. this was keeping the asset-server menu item from being correct, among other things 2016-06-11 15:16:45 -07:00
Seth Alves
e79767a121 authed username wasn't being saved in permissions, so that interface would get briefly disconnected when their permissions changed. 2016-06-11 15:16:02 -07:00
Brad Hefta-Gaub
27c6df660c Merge pull request #8009 from sethalves/permissions-grid 
Permissions grid
 2016-06-10 20:39:26 -07:00
Seth Alves
4c45d081cd merge from upstream 2016-06-10 19:57:46 -07:00
samcake
28886f6ec3 Many improvments 2016-06-10 17:18:12 -07:00
Chris Collins
006eb8fe64 Merge pull request #8031 from birarda/api-recheck-on-fail 
re-instate domain API connection info refresh during failure, fix localhost connection after downgrade
 2016-06-10 15:26:42 -07:00
samcake
a307c826ae Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-10 09:21:02 -07:00
Stephen Birarda
3c4f336e72 re-instate NodeList reset on limit of check ins reached 2016-06-10 09:11:25 -07:00
Brad Hefta-Gaub
fda91677f8 Merge pull request #8049 from kencooke/master 
Use shared CPUDetect.h for CPU detection
 2016-06-10 08:25:27 -07:00
Brad Hefta-Gaub
426d67f5bf Merge pull request #8038 from jherico/pure_virtual 
Attempt to get better logging from pure virtual call crashes
 2016-06-10 08:25:10 -07:00
samcake
6831710efb Adding the deawSCattering pass 2016-06-09 19:13:28 -07:00
David Rowe
2953ca08cb Fix import of invalid JSON file failing silently 2016-06-10 12:04:41 +12:00
Ken Cooke
dd0d594524 cleanup 2016-06-09 16:31:09 -07:00
Stephen Birarda
e4ebafa0d8 add a menu option to force the wrong DS connect version 2016-06-09 15:53:19 -07:00
Stephen Birarda
12e5851ba4 fix connection denial message, put version back 2016-06-09 15:53:19 -07:00
Stephen Birarda
f963adb5dd send connection denial for connect version mismatch 2016-06-09 15:53:19 -07:00
Stephen Birarda
4b5a554122 remove check in version downgrading from NodeList 2016-06-09 15:53:19 -07:00
Stephen Birarda
c5a4a72a84 trigger domain API refresh from DomainHandler 2016-06-09 15:53:19 -07:00
Stephen Birarda
e39c708bf6 require two triggers for API refresh, fix check for ICE domain 2016-06-09 15:53:19 -07:00
Stephen Birarda
f59335ceff don't thrash API re-check when connection denied 2016-06-09 15:53:19 -07:00
Stephen Birarda
8318e9ccc8 Revert "additional revert related change" 
This reverts commit 3119b654dc.
 2016-06-09 15:53:19 -07:00
Stephen Birarda
1e9e264124 Revert "Revert "refresh API info during re-connect - case 570"" 
This reverts commit b8c80e2222.
 2016-06-09 15:53:19 -07:00
David Rowe
d54247da8d Format hover popups 2016-06-10 10:13:54 +12:00
Ken Cooke
d7079fce8c Use shared CPUDetect.h for CPU detection 2016-06-09 15:07:24 -07:00
samcake
75a2864845 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-09 14:36:28 -07:00
samcake
0b873365ed save current state 2016-06-09 14:35:44 -07:00
David Rowe
786c74d7f9 Vertically center table headings, reduce font size in subheadings 2016-06-10 08:57:52 +12:00
Seth Alves
441b5a20d8 merge from upstream 2016-06-09 13:23:41 -07:00
Brad Davis
cd7c6be590 Fix formatting 2016-06-09 12:25:21 -07:00
Brad Hefta-Gaub
ae9b8696d4 Merge pull request #8013 from zzmp/feat/add-metadata 
add basic metadata to domains
 2016-06-09 12:18:28 -07:00
Brad Hefta-Gaub
3c5af56421 Merge pull request #8010 from hyperlogic/feature/hmd-lean-recenter-property 
Added MyAvatar.hmdLeanRecenterEnabled property
 2016-06-09 12:17:51 -07:00
Brad Hefta-Gaub
020077b6cb Merge pull request #8045 from ctrlaltdavid/load-dfaults-button 
fix height of Load Defaults button in Running Scripts dialog
 2016-06-09 12:06:01 -07:00
Seth Alves
bade215907 maximum 'tmp' entity lifetime is now a domain-server setting, defaults to 1 hour 2016-06-09 10:41:30 -07:00
Brad Davis
eee1ba0906 trying to get buildability 2016-06-09 10:19:38 -07:00
Seth Alves
203ea5ddc7 Merge branch 'master' of github.com:highfidelity/hifi into permissions-grid 2016-06-09 09:53:33 -07:00
Anthony J. Thibault
1aae22f5a5 Optimized MyAvatar.getCharacterControllerEnabled() 
Instead of doing a blocking queued invokeMethod, it just calls into CharacterController.isEnabled() which is now thread-safe.
 2016-06-09 09:35:19 -07:00
samcake
7bd686167e Adding the generation of the Scattering on GPU 2016-06-09 09:33:03 -07:00
Brad Davis
ff8d4883b1 Attempt to get better logging from pure virtual call crashes 2016-06-08 22:35:39 -07:00
David Rowe
5352bd4b76 Fix height of Load Defaults button 2016-06-09 17:15:17 +12:00