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

45951 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Howard Stearns
b3623da772 Merge pull request #8492 from howard-stearns/larger-story-card 
larger story card
 2016-08-22 09:30:20 -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
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
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
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
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
Howard Stearns
1eebf00d95 Merge pull request #8475 from howard-stearns/fixed-aspect-snapshots 
option for fixed aspect-ratio snapshots, and used in snapshot button
 2016-08-19 09:53:32 -07:00
howard-stearns
4d7d483c0e use ceil 2016-08-19 09:51:58 -07:00
James B. Pollack
b694b8e541 update turn rate for left stick 2016-08-18 17:24:18 -07:00
James B. Pollack
855561c014 moar 2016-08-18 16:52:32 -07:00
James B. Pollack
a0d4fd4c0e fix bug 2016-08-18 16:51:04 -07:00
James B. Pollack
214a705199 slow 180 rate 2016-08-18 16:50:50 -07:00
Chris Collins
a9fbc4ec2c Merge pull request #8448 from huffman/feat/domain-specify-backup-location 
Add backup directory setting to domain server
 2016-08-18 16:45:50 -07:00
howard-stearns
f6670a6374 new optional aspect-ratio argument to snapshot chain (javascript through 
c++ display plugin). When non-zero, it pulls out the largest piece from
the center that maintains that ratio.  Snapshot button uses 1.91.
 2016-08-18 16:29:42 -07:00
Howard Stearns
01fcaa024d Merge pull request #8463 from howard-stearns/html-user-story 
html drill-down user story
 2016-08-18 16:15:47 -07:00
James B. Pollack
3a8de5ab0d fix rotation function 2016-08-18 15:58:12 -07:00
James B. Pollack
bae51bcfd4 remove prints 2016-08-18 15:29:49 -07:00
James B. Pollack
c89103481b change load order 2016-08-18 14:40:08 -07:00
James B. Pollack
859d3ccadc tweaks 2016-08-18 14:36:52 -07:00
howard-stearns
aab3b83ad9 open login if user tries to share and is not logged in, rather than 
messaging user that they cannot share
 2016-08-18 14:20:53 -07:00
howard-stearns
4492c4e64e Allow javascript to safely open the correct login window (or answer that 
it is unneded).
 2016-08-18 14:19:36 -07:00