Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 17:51:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
46271 commits 75 branches 59 tags 1.2 GiB
Commit graph

46271 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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