Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 17:27:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
46252 commits 69 branches 56 tags 1.2 GiB
Commit graph

46252 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Howard Stearns
1dd255f9d8 Merge pull request #8490 from ctrlaltdavid/discovery 
Add icon to "Share in Feed" button
 2016-08-20 09:37:02 -07:00
David Rowe
80ee864143 Add icon to "Share in Feed" button 2016-08-20 18:17:49 +12:00
Howard Stearns
35829f5f01 Merge pull request #8489 from howard-stearns/merge-from-master-to-discovery3 
Merge from master to discovery3
 2016-08-19 21:36:48 -07:00
Howard Stearns
7428eb2635 Merge branch 'master' of https://github.com/highfidelity/hifi into discovery 2016-08-19 21:34:55 -07:00
Howard Stearns
0a67fea6fe Merge pull request #8488 from howard-stearns/snapshot-review-size 
decrease snapshot review dialog height
 2016-08-19 21:31:04 -07:00
Howard Stearns
527fb0941f decrease snapshot review dialog height 2016-08-19 21:28:12 -07:00
Howard Stearns
423083d244 Merge pull request #8487 from ctrlaltdavid/discovery 
Style snapshot dialog
 2016-08-19 21:15:21 -07:00
David Rowe
8d88726dba Fix spacing above image when single column 2016-08-20 13:57:00 +12:00
David Rowe
a94c24e6df Text and controls 2016-08-20 13:44:47 +12:00
Chris Collins
74cb2d4bcf Merge pull request #8461 from imgntn/demo_movement 
Movement changes for Hand Controllers
 2016-08-19 18:36:40 -07:00
samcake
9cdd079213 And again 2016-08-19 18:22:14 -07:00
Howard Stearns
c262b0a497 Merge pull request #8484 from howard-stearns/switch-to-html-cards 
switch over to metaverse server user story cards
 2016-08-19 17:55:32 -07:00
Chris Collins
9cd870bd34 Merge pull request #8485 from Atlante45/master 
Move steam.js to unpublishedScripts
 2016-08-19 17:18:08 -07:00
Atlante45
dd60683e29 Move steam.js to unpublishedScripts 2016-08-19 17:14:14 -07:00
James B. Pollack
0d42920f1b Merge remote-tracking branch 'upstream/master' into demo_movement 2016-08-19 16:45:44 -07:00
howard-stearns
993340811f switch over to metaverse server user story cards 2016-08-19 16:40:53 -07:00
David Rowe
6a9f221a9e Snapshot image border 2016-08-20 11:36:53 +12:00
David Rowe
3d2afaac77 Size and position snapshot dialog content blocks 2016-08-20 11:19:30 +12:00
Howard Stearns
e45f390fd2 Merge pull request #8481 from howard-stearns/discovery-code-cleanup 
discovery code cleanup
 2016-08-19 15:32:04 -07:00
Anthony J. Thibault
ff4c194756 eslint fix 2016-08-19 15:31:57 -07:00
howard-stearns
d49da23cb5 Merge branch 'master' of https://github.com/highfidelity/hifi 2016-08-19 14:54:29 -07:00
James B. Pollack
2b1e629cca some extra checks on settings values 2016-08-19 14:51:15 -07:00
howard-stearns
1e08914f8d simplify 2016-08-19 14:32:15 -07:00
James B. Pollack
3922192cfc update 2016-08-19 14:31:47 -07:00
James B. Pollack
653b1acc4a cleanup 2016-08-19 14:29:14 -07:00
howard-stearns
a3d64dbd9c code cleanup 2016-08-19 14:14:31 -07:00
Seth Alves
ac4ecc9907 don't send a login-denied packet when we're still waiting for user's public key. 2016-08-19 14:10:27 -07:00
Howard Stearns
e40b33e618 Merge pull request #8478 from howard-stearns/update-discovery-from-master2 
Update discovery from master2
 2016-08-19 13:28:34 -07:00
howard-stearns
b8b345fb43 Merge branch 'master' of https://github.com/highfidelity/hifi into update-discovery-from-master2 2016-08-19 13:04:39 -07:00
elisa-lj11
4aab389305 Merge remote-tracking branch 'highfidelity/master' into zip_project 2016-08-19 11:32:37 -07:00
elisa-lj11
8bc9a92429 removed extraneous debug prints 2016-08-19 11:32:13 -07:00
samcake
5ad66a17ee Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-08-19 11:09:31 -07:00
samcake
6a076bcee4 PRoviding a fix for the macOS build 2016-08-19 11:09:12 -07:00
Anthony J. Thibault
8bb6bb7c6f generalized keyboard focus interface 
Removed dynamic casts to RenderableWebEntityItem, instead
virtual methods were added to EntityItem to facilitate this.

* bool wantsKeyboardFocus()
* void setProxyWindow()
* QObject* getEventHandler()
 2016-08-19 10:56:52 -07:00
James B. Pollack
98f0290565 Merge pull request #8436 from huffman/feat/more-user-activity-data 
Add more user activity data
 2016-08-19 10:48:28 -07:00