Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 04:55:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
40009 commits 71 branches 56 tags 1.2 GiB
Commit graph

40009 commits

This branch
This branch
All branches
Author SHA1 Message Date
ericrius1
7b69aa375e moved plant to home folder 2016-03-07 18:18:38 -08:00
ericrius1
d4bc83f408 cleanup and bug fixes 2016-03-07 16:16:06 -08:00
ericrius1
3dc39600cd stop pouring on release 2016-03-07 15:32:40 -08:00
ericrius1
b9bd4cae93 better water effect 2016-03-07 14:58:59 -08:00
ericrius1
cdd4fdb03e slower growth 2016-03-07 14:04:45 -08:00
ericrius1
65c8f7cc45 flowers growing 2016-03-04 17:55:45 -08:00
ericrius1
3ad2d1aa9b flowers spawning and growing correctly 2016-03-04 17:32:29 -08:00
ericrius1
ef437b7f99 flowers staying in place 2016-03-04 16:48:55 -08:00
ericrius1
17dec9446a flowers are growing when watered 2016-03-04 16:15:37 -08:00
ericrius1
af2816b8db Merge branch 'master' into growingPlant 2016-03-04 14:35:16 -08:00
Ryan Huffman
f21815e332 Merge pull request #7245 from birarda/domain-security 
manually install OpenSSL DLLs for Qt
 2016-03-04 09:23:21 -08:00
Brad Hefta-Gaub
5b2c3b4b26 Merge pull request #7243 from thoys/20821 
CR for Job #20821 - Remove stray tray icon
 2016-03-03 18:10:56 -08:00
Stephen Birarda
3750d5d780 manually install OpenSSL DLLs for Qt 2016-03-03 17:57:34 -08:00
Brad Hefta-Gaub
7bb87305d4 Merge pull request #7234 from zzmp/fix/line3d-back-cull 
Render line3d without backface culling
 2016-03-03 17:16:54 -08:00
Brad Hefta-Gaub
0d48803761 Merge pull request #7236 from howard-stearns/entity-script-safety 
entity script safety
 2016-03-03 17:16:30 -08:00
Thijs Wenker
17f0688db5 removed stray traybar icon 2016-03-03 19:18:47 +01:00
ericrius1
8df0ed679d Merge remote-tracking branch 'upstream/master' into growingPlant 2016-03-02 08:47:29 -08:00
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
Howard Stearns
05943ed353 Entity scripts keep of the which entity they are executing for. When the entity goes away, any created timers do, too. Also, loading interface scripts is not allowed from entity scripts. 2016-03-01 16:50:58 -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
Zach Pomerantz
48aaac2971 Render line3d without backface culling 2016-03-01 14:57:02 -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