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

45688 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
8e56e0bf18 Fix QML warning 2016-08-10 10:41:37 +12:00
David Rowe
afe76c69d2 Fix crash when adding new attachment 2016-08-10 10:41:16 +12:00
Zach Pomerantz
d5b822ddbe remove missing camera selectors 2016-08-09 15:23:36 -07:00
Zach Pomerantz
6965fb0520 refactor system html to split js/css 2016-08-09 15:23:31 -07:00
SamGondelman
956078bc91 teleport works with xbox controller 2016-08-09 15:17:36 -07:00
SamGondelman
9b27f8bc0f Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-09 14:55:14 -07:00
Ryan Huffman
093d80e102 Merge pull request #8397 from SamGondelman/ucharWarning 
Fix warning on OSX/Linux
 2016-08-09 14:31:16 -07:00
SamGondelman
5a4d15dd5b fix warning 2016-08-09 14:02:42 -07:00
SamGondelman
36d9f92101 performance optimization to minimize calling usecTimestampNow 2016-08-09 13:10:02 -07:00
Brad Hefta-Gaub
a2c0d515e8 Merge pull request #8388 from hyperlogic/feature/eslint-anon-func 
eslintrc: accept spaces after function keyword in anonymous functions
 2016-08-09 12:43:00 -07:00
Brad Hefta-Gaub
75edb74db4 Merge pull request #8386 from imgntn/edit_1_property_order 
Edit.js - change spatial property order and cleanup
 2016-08-09 12:42:20 -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
Zander Otavka
51fb52977e Generalize atp handling in network access managers 2016-08-09 11:46:08 -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
beaa1e107f Merge pull request #8392 from AlexanderOtavka/log-spam 
Suppress repeated ice server connection messages
 2016-08-09 11:17:16 -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
Andrew Meadows
85d87fe13f Merge pull request #8218 from huffman/feat/load-improvements 
Speed up gamma correction in cube map processing
 2016-08-09 11:10:36 -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
SamGondelman
ae9fb3768c CR notes 2016-08-08 17:45:25 -07:00
Zander Otavka
3df8aa0dba Suppress repeated ice server connection messages 2016-08-08 17:01:32 -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
36744d72d6 Fix warning using init list for QVariantMap 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
Ryan Huffman
43c1472b36 Move srgbToLinear lookup table to external cpp 2016-08-08 15:47:53 -07:00
Ryan Huffman
b800aa793d Fix gamma correction adjusting uchar to float when unnecessary 2016-08-08 15:45:05 -07:00
Ryan Huffman
9b137570cf Fix srgb_gen lookup table generation 2016-08-08 15:44:08 -07:00
Clément Brisset
59dec06235 Merge pull request #8390 from Atlante45/steam 
Update Steam branch with master
 2016-08-08 15:42:15 -07:00
Atlante45
f08b2f9257 Remove temporary override to reload QML 2016-08-08 15:39:44 -07:00
Atlante45
61d07cf952 Restore mateverse URL 2016-08-08 15:39:25 -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
2af32ca60e Only leave lobby if you were invited 2016-08-08 15:39:25 -07:00
Atlante45
7ec2f98cf2 Join lobby on startup 2016-08-08 15:39:25 -07:00
Atlante45
6b861e680f More work on lobby creation/invites 2016-08-08 15:39:25 -07:00
Atlante45
af76e47629 Fix linux build 2016-08-08 15:39:25 -07:00
Atlante45
3d6a6b9d6b Add steam.js to default scripts 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
e5290076be First draft for Steam friends 2016-08-08 15:39:25 -07:00
Atlante45
0663766074 Replace metaverse server with testing URL 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