Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 17:58:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
45591 commits 76 branches 59 tags 1.2 GiB
Commit graph

45591 commits

This branch
This branch
All branches
Author SHA1 Message Date
SamGondelman
d8545bc7a3 fix procedural transparency 2016-08-10 13:49:35 -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
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
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
Anthony J. Thibault
d36e60bbaa eslintrc: accept spaces after function keyword in anonymous functions 
Anonymous functions `function () {}` and `function() {}` will both be accepted by eslint.
 2016-08-08 15:20:58 -07:00
SamGondelman
de900e85c0 remove duplicate include 2016-08-08 14:10:47 -07:00
SamGondelman
328d3128fa merge from master 2016-08-08 13:30:39 -07:00
Brad Hefta-Gaub
882ad2f6fb Merge pull request #8311 from huffman/feat/angular-loading 
Add priority loading for model entities
 2016-08-08 13:06:56 -07:00
Brad Hefta-Gaub
b903c974bc Merge pull request #8371 from imgntn/teleport_cancel 
Cancel mode for teleporting
 2016-08-08 13:04:27 -07:00
Ryan Huffman
2ee511bae0 Fix syntax error 2016-08-08 12:30:11 -07:00
James B. Pollack
58ccc9581a cleanup 2016-08-08 12:20:48 -07:00
Ryan Huffman
d40b783ce2 Add comments to srgb_gen.py 2016-08-08 12:06:09 -07:00
Ryan Huffman
28b3ff9bca Update generation of srgb to linear lookup to include python script 2016-08-08 12:04:06 -07:00
James B. Pollack
bde46adee8 update description 2016-08-08 11:31:43 -07:00
SamGondelman
f311907982 fix merge mistake 2016-08-08 11:08:01 -07:00
James B. Pollack
f8c1d8f123 change property order and cleanup 2016-08-08 11:01:03 -07:00
SamGondelman
0ec1da4a0d Merge remote-tracking branch 'upstream/master' into loadingFade 2016-08-08 10:55:20 -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
2a071c4329 Fix improperly formatted floats 2016-08-08 10:39:06 -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
Ryan Huffman
4f9be2ae72 Fix camera position not being set for angular loading 2016-08-08 08:53:06 -07:00
Ryan Huffman
77e993510e Cleanup implementation of angular loading 2016-08-08 08:53:05 -07:00
Ryan Huffman
c594dcdf9f Add priority loading for model entities 2016-08-08 08:52:29 -07:00
Seth Alves
38314b180b Merge branch 'master' of github.com:highfidelity/hifi into fsm-arrows-dont-walk 2016-08-08 06:30:18 -07:00
Chris Collins
6585be036c Merge pull request #8381 from sethalves/unhide-advanced-button 
remove hidden attribute from advanced settings button
 2016-08-06 08:08:23 -07:00
David Rowe
38b5314322 Disable Asset Browser's right-click popup menu if in HMD mode 2016-08-06 17:53:59 +12:00