Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 11:34:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
46233 commits 76 branches 59 tags 1.2 GiB
Commit graph

46233 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
6704ae9ad4 Added dpi parameter to userData (this is temporary) 2016-08-23 10:09:17 -07:00
Anthony J. Thibault
9bafd82b2c marketplace now pops up a marketplace web entity 2016-08-23 10:09:16 -07:00
Brad Hefta-Gaub
21bc06f154 Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration 
handControllerGrab and web entity input integration
 2016-08-23 09:59:25 -07:00
Brad Hefta-Gaub
52cd222714 Merge pull request #8504 from zzmp/fix/argee 
fix typo argee->agree
 2016-08-23 09:52:43 -07:00
Howard Stearns
97c706f4cb Merge pull request #8511 from howard-stearns/size-card-up 
size activity card up
 2016-08-23 09:48:03 -07:00
howard-stearns
7601876641 Scale the activity card back up to match the window being scaled down, so 
that it covers the address bar.
 2016-08-23 09:44:28 -07:00
James B. Pollack
6ec429fa0b remove unused event listeners 2016-08-23 00:19:03 -07:00
James B. Pollack
d9a39553bd style edits and saved message 2016-08-23 00:14:53 -07:00
James B. Pollack
d0a25e7783 fix switching entities 2016-08-22 23:51:35 -07:00
Howard Stearns
7a9e832959 Merge pull request #8509 from ctrlaltdavid/discovery 
Fix server card window scale
 2016-08-22 21:35:07 -07:00
David Rowe
f7389dc059 Fix server card window scale 2016-08-23 16:28:32 +12:00
Seth Alves
6c80a35c4b Merge pull request #8477 from sethalves/fix-grab-ignore-ik-1 
ignoreIK flag on action-grabbable objects works again
 2016-08-22 18:48:39 -07:00
Seth Alves
219d9cefeb Merge pull request #8498 from birarda/temp-with-oauth 
allow temp domains to use access token when present
 2016-08-22 18:25:18 -07:00
James B. Pollack
e2a6c08f19 cleanup prints 2016-08-22 17:44:22 -07:00
James B. Pollack
4b61cc9f5f new user data editor 2016-08-22 17:30:08 -07:00
Zach Pomerantz
cbb115bbcc fix typo argee->agree 2016-08-22 16:34:23 -07:00
Howard Stearns
f53ce94b20 Merge pull request #8503 from howard-stearns/pr-review-comments-5 
pr review
 2016-08-22 16:10:47 -07:00
howard-stearns
bc90b0bc43 pr review 2016-08-22 16:09:09 -07:00
elisa-lj11
2d2cb45c5d Merge remote-tracking branch 'highfidelity/master' into zip_project 2016-08-22 16:05:16 -07:00
elisa-lj11
8bf87128d9 Fixed browser.qml 'onNewViewRequested' 2016-08-22 16:04:55 -07:00
Howard Stearns
bfb7d728ad Merge pull request #8502 from howard-stearns/pr-review-comments-4 
pr review comments 4
 2016-08-22 15:30:50 -07:00
howard-stearns
fc906df5f6 separate into three files 2016-08-22 15:04:38 -07:00
howard-stearns
6daf91166f pr comments 2016-08-22 15:03:51 -07:00
howard-stearns
056b90c662 separate into four files 2016-08-22 15:01:55 -07:00
Brad Hefta-Gaub
0397c6b6ca Merge pull request #8471 from AndrewMeadows/dont-assert-on-bad-data 
workaround bad FBXMesh data rather than assert
 2016-08-22 14:21:48 -07:00
Anthony J. Thibault
d015c5cfb5 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-22 14:13:17 -07:00
Zach Pomerantz
dbb916e2d9 fix redundant openvr fence condition 2016-08-22 13:59:18 -07:00
Zach Pomerantz
a67c5221e3 flush openvr fence before looking for it 2016-08-22 13:46:00 -07:00
Howard Stearns
f9d8ccaeac Merge pull request #8501 from howard-stearns/pr-review-comments-3 
Pr review comments 3
 2016-08-22 12:52:40 -07:00
howard-stearns
989974738a dead code removal 2016-08-22 12:50:51 -07:00
howard-stearns
d0b58d8f8e move thread safety into Application from caller 2016-08-22 12:49:51 -07:00
Howard Stearns
ba72dc6375 Merge pull request #8499 from howard-stearns/pr-review-comments-2 
pr review comments
 2016-08-22 11:04:57 -07:00
howard-stearns
80afc6a3b4 pr review comments 2016-08-22 10:59:21 -07:00
Anthony J. Thibault
b6a4904068 remove explicit check for WebEntity from setKeyboardFocus 
Also, don't get entityTree from entityScriptInterface instead go thru EntityTreeRenderer
 2016-08-22 10:56:35 -07:00
Stephen Birarda
d098a1ae28 allow temporary domains to use an access token when present 2016-08-22 10:50:39 -07:00
Ryan Huffman
bd86318611 Fix address bar being opened when moving between places on same domain 2016-08-22 10:36:56 -07:00
samcake
4da712fbdf Fixing bad include not respecting filename case (for linux) 2016-08-22 10:36:43 -07:00
Anthony J. Thibault
e1f7dfc4e1 Raised max iterations for IK to 16 from 4 
* IK now returns early if solution is "good enough"
* IK now has nsight markers for profiling
 2016-08-22 10:34:56 -07:00
samcake
44c6637160 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-22 10:32:06 -07:00
Andrew Meadows
d2d905fc86 speed up SH calculation with minimal error 2016-08-22 10:21:22 -07:00
Howard Stearns
ed3b04f97c Merge pull request #8494 from howard-stearns/pr-review-comments 
pr review comments
 2016-08-22 09:59:45 -07:00
howard-stearns
02d3666d86 code review cleanup 2016-08-22 09:58:27 -07:00
Brad Hefta-Gaub
60210c323f Merge pull request #8470 from sethalves/suggest-override 
add -Wsuggest-override to compile flags and deal with fallout
 2016-08-22 09:46:18 -07:00
Howard Stearns
b3623da772 Merge pull request #8492 from howard-stearns/larger-story-card 
larger story card
 2016-08-22 09:30:20 -07:00
sam
1e84f9dc90 back to noise seeded in image space 2016-08-21 23:37:24 -07:00
sam
4097fcb0f6 fixing the blurring issue 2016-08-21 00:27:43 -07:00
sam
557f898d95 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-20 19:57:24 -07:00
Seth Alves
9bcda1bb45 merge from upstream 2016-08-20 15:25:04 -07:00
Brad Hefta-Gaub
857e97e979 Merge pull request #8480 from sethalves/dont-say-insufficient-data-during-login 
don't send a login-denied packet when we're still waiting for user's public key
 2016-08-20 13:48:10 -07:00
Howard Stearns
f877e65703 larger story card 2016-08-20 10:45:02 -07:00