Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 19:00:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
40893 commits 25 branches 0 tags 1.1 GiB
Commit graph

312 commits

Author SHA1 Message Date
Brad Hefta-Gaub
7483b8546b remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it 2016-03-17 17:05:35 -07:00
Chris Collins
307a0cf05a Merge pull request #7349 from zzmp/fix/guard-skybox-tex 
Guard against failure to load skybox tex
 2016-03-16 15:06:52 -07:00
Howard Stearns
010aaa55c0 const ref 2016-03-14 22:13:26 -07:00
Howard Stearns
d7e3699bc8 Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility 2016-03-14 17:45:52 -07:00
Zach Pomerantz
b6322164cf Guard against failure to load skybox tex 2016-03-14 11:15:06 -07:00
Seth Alves
dbd548a8c7 fix a crash 2016-03-13 11:01:11 -07:00
howard-stearns
8799bf2d55 Alternative implementation, which only selects visible bestZone. 2016-03-11 16:36:13 -08:00
howard-stearns
e538edba0a Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility 2016-03-11 10:22:01 -08:00
howard-stearns
9cdd0ac6d0 Respect zone visibility property. 2016-03-11 10:19:44 -08:00
Zach Pomerantz
40378920b1 Merge branch 'master' of github.com:highfidelity/hifi into fix/skybox-tex 2016-03-10 21:44:31 -08:00
Zach Pomerantz
d7d351fc63 Guard against unloaded env cubemaps 2016-03-10 12:50:52 -08:00
Zach Pomerantz
d615e2e83b Avoid redundant zone updates 2016-03-10 12:27:45 -08:00
Zach Pomerantz
1640314076 Use one procedural for skybox (avoid copies) 2016-03-10 10:12:22 -08:00
Zach Pomerantz
74e1d32221 Reuse procedural on skybox 2016-03-09 19:40:27 -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
Zach Pomerantz
5c64115b26 Use keyLight in DLE instead of _skyboxTexture 2016-03-01 14:44:34 -08:00
samcake
630c61e61d Reflection is working correctly with the PBR property, ship t 2016-02-29 18:54:43 -08:00
Zach Pomerantz
c20bd6cbbc Update Scene on ZoneEntity update 
ZoneEntity is unique in that it is not updated
every frame that it is rendered, but only
when the avatar moves.

This introduces custom code so that the
RenderableZoneEntity initiates an update
in the EntityTreeRenderer on update,
to improve usability of zone editing.
 2016-02-25 10:06:19 -08:00
Zach Pomerantz
9000c3479b Avoid double-update of zone 2016-02-25 10:06:19 -08:00
Zach Pomerantz
95d98e3ed7 Wire up zone ambientURL 2016-02-24 16:07:04 -08:00
Brad Hefta-Gaub
8b8b99c7e0 HMD mouse checkpoint 2016-02-17 21:19:01 -08:00
Brad Hefta-Gaub
a40a562db2 handle two conner cases where preload would get called twice 2016-02-11 09:33:52 -08:00
Brad Davis
47a1c16430 Resolving warnings 2016-01-21 15:15:18 -08:00
Brad Davis
f9f9ddd8bd Yet more atmosphere removal 2016-01-21 15:15:17 -08:00
Brad Davis
b8109af196 Ignite the atmosphere 2016-01-21 15:15:15 -08:00
Brad Hefta-Gaub
d10e1cc39d CR feedback, dead code cleanup 2016-01-18 12:09:21 -08:00
Brad Hefta-Gaub
8f8afabbfe Merge pull request #6811 from Atlante45/master 
Fix skybox not always rendering correctly
 2016-01-13 21:00:48 -08:00
Atlante45
11dc3cd261 Move primitive rendering out of DeferredLightingEffect 2016-01-13 11:47:43 -08:00
Atlante45
e8d7411eea Indentation/Coding Standard 2016-01-12 20:49:38 -08:00
Atlante45
47586e97a6 Stay closer to the old code (Use early exit) 2016-01-12 20:49:25 -08:00
Atlante45
911375b7a1 Don't change apply zone logic 2016-01-12 20:49:25 -08:00
Atlante45
5e41421f9d Fix for skybox not always loading 2016-01-12 20:49:25 -08:00
Brad Hefta-Gaub
2435e160a8 only emit collision events if you're the owner 2016-01-05 16:56:24 -08:00
Seth Alves
bfa8cc1969 merge from upstream 2016-01-03 06:47:25 -08:00
ericrius1
390dce4613 Adding blacklist 2015-12-24 11:48:40 -08:00
Seth Alves
5e4a165b4d Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-22 11:23:09 -08:00
Zach Pomerantz
5a86f0c23f Nest JS props in SceneScriptingInterface 2015-12-21 14:32:06 -08:00
Seth Alves
c74f8bca49 location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent 2015-12-14 09:13:36 -08:00
Ryan Huffman
89c412c324 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-04 11:38:28 -08:00
Anthony J. Thibault
f120e10ff4 Merge branch 'master' into tony/remove-joint-states 2015-11-24 15:00:05 -08:00
Ryan Huffman
dac491ef41 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-24 09:59:22 -08:00
Brad Hefta-Gaub
ce46c30647 change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete 2015-11-23 16:27:06 -08:00
Anthony J. Thibault
cb89f09635 Removed EntityRig and AvatarRig. One Rig to rule them all. 2015-11-20 14:27:01 -08:00
Ryan Huffman
2a416ebc61 Merge branch 'master' of https://github.com/highfidelity/hifi into received-message 2015-11-18 16:52:23 -08:00
Brad Davis
036ae62dd3 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-29 14:00:52 -07:00
Andrew Meadows
0c5b4115ed Merge pull request #6221 from huffman/physics-substep-fix 
Physics substep fix
 2015-10-29 12:39:15 -07:00
Brad Hefta-Gaub
1f53e425eb Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-10-29 12:28:28 -07:00
Ryan Huffman
913026280c Fix EntityTreeRenderer dropping contact end events 2015-10-26 13:02:39 -07:00
samcake
ff57b73bd6 Creating the COlorUTils in shared to deal with all the standard color conversions 2015-10-26 10:53:21 -07:00
samcake
bc7ad9d3f7 Move the keyLIght properties in their own group and add the ambientURL in 2015-10-26 09:27:06 -07:00