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

39949 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
cfce5af8d4 Merge pull request #7191 from samcake/orange 
Better Shading Model and support fr Stingray material
 2016-03-01 18:24:09 -08:00
samcake
aed2ad72d1 Using another formula for the specularDistribution giving much better results 2016-03-01 17:09:57 -08:00
samcake
16ac69315f Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture 2016-03-01 16:38:02 -08:00
Brad Davis
0a7a43b47e Merge pull request #7232 from ZappoMan/hmdHacking 
fix away state when starting in HMD
 2016-03-01 16:15:20 -08:00
Clément Brisset
2560cd0229 Merge pull request #7226 from birarda/domain-security 
reinstate verified domain ownership with statically linked OpenSSL
 2016-03-01 15:31:24 -08:00
Brad Hefta-Gaub
77b371e375 fix away state when starting in HMD 2016-03-01 15:00:19 -08:00
samcake
f09f28096f Merge pull request #6 from zzmp/refactor/skybox-tex-orange 
Use keyLight in DLE instead of _skyboxTexture
 2016-03-01 14:49:13 -08:00
Zach Pomerantz
5c64115b26 Use keyLight in DLE instead of _skyboxTexture 2016-03-01 14:44:34 -08:00
Stephen Birarda
04fd7bcdb2 create the directory to hold account file if not present 2016-03-01 14:42:09 -08:00
Chris Collins
6c54faf664 Merge pull request #7230 from zzmp/fix/tex-cache 
Fix inline fbx texture caching
 2016-03-01 14:36:36 -08:00
Zach Pomerantz
d5a5ce8c70 Refactor helper from lambda to static fn 2016-03-01 13:25:10 -08:00
Stephen Birarda
72cbfe2dc7 add a comment for static libraries specifically 2016-03-01 13:04:37 -08:00
Stephen Birarda
248aa58d23 force statically linked OpenSSL on windows 2016-03-01 13:04:37 -08:00
Stephen Birarda
f44cf3903c re-instate verified domain ownership for full automatic networking 
This reverts commit 34408c8144.
 2016-03-01 13:04:37 -08:00
Stephen Birarda
b0c11e6562 Merge pull request #7217 from huffman/udt-random-seq 
Randomize initial send sequence number in UDT
 2016-03-01 12:59:10 -08:00
Zach Pomerantz
19c83e869f Add helper to buildNetworkMaterial 2016-03-01 12:33:55 -08:00
Zach Pomerantz
c5cb3543eb Cache inline textures under fbx 2016-03-01 12:29:32 -08:00
samcake
9fb318570b Ajusting the pure Ambient SH lighting pass and more review issues 2016-03-01 12:24:44 -08:00
Brad Hefta-Gaub
d10f02f73c Merge pull request #7213 from Atlante45/fix/resource-caching 
Fix resource caches overlap
 2016-03-01 12:15:13 -08:00
Atlante45
14ae35e741 CR 2016-03-01 12:00:43 -08:00
Atlante45
4944d0a8d0 Handle threading inside AssetServer 2016-03-01 12:00:43 -08:00
Atlante45
f0ccada945 Fix for Ubuntu 2016-03-01 12:00:43 -08:00
Atlante45
6a4b93a4e7 Proper fix for DiskCacheInfo 2016-03-01 12:00:43 -08:00
Atlante45
40d307a37b Temporary fix to disk cache editor crash 2016-03-01 12:00:43 -08:00
Atlante45
2c1762526d Move all resource requests to the same thread 2016-03-01 12:00:43 -08:00
Andrew Meadows
c1b3858193 Merge pull request #7228 from ZappoMan/hmdHacking 
HMD and Away improvements
 2016-03-01 11:48:09 -08:00
Ryan Huffman
aa63dcc9d2 Add PacketType qMetaType 2016-03-01 11:36:49 -08:00
Ryan Huffman
cc9c87d281 Fix packet version mismatch not showing for domain packets 2016-03-01 11:36:49 -08:00
samcake
7120b64a33 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-01 10:53:40 -08:00
samcake
89920370db A bunch of typo fixes after review 2016-03-01 10:53:08 -08:00
Brad Hefta-Gaub
ba7b5c6e23 some improvements 2016-03-01 10:43:49 -08:00
Chris Collins
926b93b4db Merge pull request #7224 from ctrlaltdavid/20816 
Change Running Scripts reload, close, and tree buttons when pressed
 2016-03-01 10:26:58 -08:00
Brad Hefta-Gaub
ae824bb180 Merge pull request #7173 from ericrius1/whiteboardV2 
Whiteboard using markers and erasers
 2016-03-01 09:12:16 -08:00
Brad Hefta-Gaub
52c38e56a4 make the HMD away overlay 3d 2016-02-29 21:25:25 -08:00
Brad Hefta-Gaub
501d23021f slight improvement to Away to have the paused overlay follow your view in HMD 2016-02-29 20:53:18 -08:00
Brad Hefta-Gaub
95c92f7a27 tweak depthReticle to work better with away 2016-02-29 20:35:25 -08:00
Brad Hefta-Gaub
a3f4dbddcf Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-29 20:23:14 -08:00
Brad Hefta-Gaub
2c3fdc995f Away improvements 2016-02-29 20:23:06 -08:00
samcake
e72035ee3d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-29 18:55:30 -08:00
samcake
630c61e61d Reflection is working correctly with the PBR property, ship t 2016-02-29 18:54:43 -08:00
Howard Stearns
c0eef51d41 Merge pull request #7222 from ZappoMan/depthReticleWork 
more reticle improvements
 2016-02-29 17:42:03 -08:00
Eric Levin
33fe2e9b36 Update markerEntityScript.js 2016-02-29 16:11:08 -08:00
Chris Collins
d68fa4e9ad Merge pull request #7210 from imgntn/tiltmaze 
Tilt Maze Should Delete Stray Balls
 2016-02-29 15:46:54 -08:00
Ryan Huffman
548a672df9 Update DomainList version to 18 2016-02-29 15:31:38 -08:00
Ryan Huffman
04f512c99b Add extra debug to udt connection 2016-02-29 14:58:25 -08:00
Brad Hefta-Gaub
dc4c4e8c94 some tweaks to auto-hide 2016-02-29 14:24:43 -08:00
Ryan Huffman
57a6cbc9dd Remove _hasReceivedData 2016-02-29 14:22:49 -08:00
Ryan Huffman
2229e397fa Move seq num initialization to handshake 2016-02-29 14:22:26 -08:00
Ryan Huffman
b442075205 Add initial seq number to handshake 2016-02-29 14:22:08 -08:00
David Rowe
a32452db8b Change Running Scripts reload, close, and tree buttons when pressed 
Provides visual feedback to user.
 2016-03-01 10:43:46 +13:00