Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-29 13:31:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45683 commits 71 branches 59 tags 1.2 GiB
Commit graph

17426 commits

Author SHA1 Message Date
Brad Davis
adcfd55cc0 Batch replay reprojection 2016-08-12 22:28:23 -07:00
Brad Davis
7e93747acf Working on reprojection 2016-08-12 22:28:22 -07:00
Bradley Austin Davis
274321de8a First pass at threaded rendering 2016-08-12 22:18:36 -07:00
Clément Brisset
5a1c7bd4e6 Merge pull request #8407 from highfidelity/steam 
Steam integration
 2016-08-12 16:55:48 -07:00
Stephen Birarda
c330e005dd Merge pull request #8426 from Atlante45/steam 
New metaverse web API
 2016-08-12 13:32:41 -07:00
Brad Davis
e2f7b443fd Merge pull request #8339 from sethalves/overlay-children 
3D Overlays can be children
 2016-08-12 12:16:21 -07:00
James B. Pollack
7866786da9 Merge pull request #8406 from AlexanderOtavka/script-load 
Disable loading client scripts over ATP
 2016-08-12 11:01:14 -07:00
Atlante45
19b3aa9c89 New metaverse web API 2016-08-12 10:42:32 -07:00
Clément Brisset
7c698b8cbb Merge pull request #8423 from Atlante45/steam 
Update Steam branch
 2016-08-12 10:40:53 -07:00
Atlante45
e4dd4c1a41 Merge branch 'master' of https://github.com/highfidelity/hifi into steam 2016-08-12 10:38:05 -07:00
Seth Alves
c363ca9887 3d-model overlays can now be children 2016-08-11 15:29:09 -07:00
Seth Alves
15e2140cb2 Merge branch 'master' of github.com:highfidelity/hifi into overlay-children 2016-08-11 15:06:58 -07:00
Atlante45
c34153b67b Change Web API arg name to be more descriptif 2016-08-11 11:57:43 -07:00
Brad Hefta-Gaub
5bd5fc43d3 Merge pull request #8408 from SamGondelman/miniMirrorFade 
Mini mirror fades with overlays
 2016-08-10 11:07:47 -07:00
Brad Hefta-Gaub
a714f325fe Merge pull request #8333 from SamGondelman/miscFixes 
Miscellaneous cmake and render engine improvements
 2016-08-10 11:06:50 -07:00
Brad Hefta-Gaub
7503a495fd Merge pull request #8401 from ctrlaltdavid/21026 
Fix crash when adding new attachment
 2016-08-10 09:18:17 -07:00
SamGondelman
50a4c8b496 mini mirror fades with overlays 2016-08-09 18:02:56 -07:00
Zander Otavka
4e16998b45 Disable loading client scripts over ATP 2016-08-09 17:36:59 -07:00
Brad Hefta-Gaub
412052c285 Merge pull request #8380 from highfidelity/fade 
Add fade in loading effect
 2016-08-09 16:50:05 -07:00
Brad Hefta-Gaub
8abbe27c07 Merge pull request #8387 from SamGondelman/mappingFixes 
Fix Standard.A/B/X/Y primary thumb JSON mappings
 2016-08-09 16:43:45 -07:00
David Rowe
8e56e0bf18 Fix QML warning 2016-08-10 10:41:37 +12:00
SamGondelman
9b27f8bc0f Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-09 14:55:14 -07:00
Brad Hefta-Gaub
1834b035d7 Merge pull request #8382 from ctrlaltdavid/21024 
Disable Asset Browser's right-click popup menu if in HMD mode
 2016-08-09 12:41:48 -07:00
Brad Hefta-Gaub
d8f1847fde Merge pull request #8365 from huffman/feat/default-skybox 
Default skybox change
 2016-08-09 11:17:36 -07:00
Brad Hefta-Gaub
d8edf5c85a Merge pull request #8357 from sethalves/fsm-arrows-dont-walk 
FSM arrow keys don't make the avatar walk
 2016-08-09 11:17:00 -07:00
Atlante45
25b60d0c62 CR feedback 2016-08-09 10:07:57 -07:00
Seth Alves
607c168493 Merge branch 'master' of github.com:highfidelity/hifi into overlay-children 2016-08-09 09:01:55 -07:00
Ryan Huffman
8ee3f680c9 Change default skybox ambient intensity from 3.5 to 2.0 2016-08-08 16:03:03 -07:00
Ryan Huffman
6854f9fda4 Remove stars shaders and renderable 2016-08-08 16:03:03 -07:00
Ryan Huffman
eaa77edc25 Replace 'Stars' menu option with 'Default Skybox' 2016-08-08 16:03:03 -07:00
Ryan Huffman
9cbfe195cd Adjust commenting out of old stars rendering code 2016-08-08 16:03:03 -07:00
Ryan Huffman
4c662b0d60 Add static consts for default skybox values 2016-08-08 16:03:03 -07:00
Ryan Huffman
c47a5c5aad Add default skybox images 2016-08-08 16:03:03 -07:00
Ryan Huffman
5b69ca03f0 Move default skybox out of global and make irradiance gen optional 2016-08-08 16:03:03 -07:00
Ryan Huffman
35ea9908cd Add default skybox 2016-08-08 16:00:58 -07:00
Brad Hefta-Gaub
55c690d016 Merge pull request #8368 from huffman/feat/domain-connection-display 
Automatically show address bar after disconnected for X seconds
 2016-08-08 15:56:29 -07:00
Atlante45
f08b2f9257 Remove temporary override to reload QML 2016-08-08 15:39:44 -07:00
Atlante45
51b45f8f73 Steam invite are facing the current position 2016-08-08 15:39:25 -07:00
Atlante45
aa2ae31aab CR UI fixes 2016-08-08 15:39:25 -07:00
Atlante45
7ec2f98cf2 Join lobby on startup 2016-08-08 15:39:25 -07:00
Atlante45
42c9a695ff Invite friends in HMD 2016-08-08 15:39:25 -07:00
Atlante45
a13950752b Update steam location with discoverability 2016-08-08 15:39:25 -07:00
Atlante45
f0ff975248 UI wiring 2016-08-08 15:39:25 -07:00
Atlante45
205df0cf51 login UI first draft 2016-08-08 15:39:25 -07:00
Atlante45
cea0e182c0 Interface login through steam 2016-08-08 15:39:25 -07:00
SamGondelman
328d3128fa merge from master 2016-08-08 13:30:39 -07:00
SamGondelman
a5f3089fda fix ABXY mapping for touch 2016-08-08 13:14:14 -07:00
Ryan Huffman
fb14628a7e Handle case in entity loading priority function where max dim size is <= 0 2016-08-08 10:39:27 -07:00
Ryan Huffman
d367583426 Clean up priority loading implementation 2016-08-08 08:53:06 -07:00
Ryan Huffman
d48bc96cf9 Add ability to set number of concurrent downloads 2016-08-08 08:53:06 -07:00