Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43587 commits 2 branches 0 tags 1.1 GiB
Commit graph

17820 commits

Author SHA1 Message Date
Brad Hefta-Gaub
0a96b144e3 Merge pull request #7970 from birarda/api-recheck-on-fail 
clear AddressManager previous lookup on 404
 2016-05-25 17:13:44 -07:00
samcake
b76cda3c89 Merge pull request #7945 from Geenz/20901 
20901: Add Range Based Light Attenuation
 2016-05-25 16:39:01 -07:00
Brad Davis
b16e701ea3 Fix broken protocol for shapes 2016-05-25 13:53:28 -07:00
Stephen Birarda
3137cd64e1 clear AddressManager previous lookup on 404 2016-05-25 11:40:17 -07:00
Brad Davis
8f3918b5ba Fix primitive shape collisions 2016-05-25 11:21:05 -07:00
Brad Hefta-Gaub
b8b39b962d Merge pull request #7868 from jherico/entity_shape 
Add a generic shape primitive
 2016-05-24 08:40:58 -07:00
Brad Hefta-Gaub
bfb3f2cdfe Merge pull request #7955 from sethalves/quiet-compiler 
quiet gcc 5 warnings
 2016-05-23 19:44:21 -07:00
Clément Brisset
a8b359dd60 Merge pull request #7943 from birarda/api-recheck-on-fail 
refresh connection info for place/domain while not connected
 2016-05-23 10:57:58 -07:00
Brad Hefta-Gaub
f69c0ce5e5 Merge pull request #7957 from jherico/procedural_skybox_fix 
fix broken procedural skybox when leaving and re-entering
 2016-05-23 09:29:31 -07:00
Geenz
bd6f6d2eef Typo. 
Not quite sure how this got here.
 2016-05-23 09:53:22 -04:00
Brad Davis
1f2f9da019 fix keys getting stuck 2016-05-22 23:34:45 -07:00
Brad Davis
11de8a52b2 fix broken procedural skybox when leaving and re-entering 2016-05-22 22:52:56 -07:00
Brad Davis
2c703e963c More shapes 2016-05-22 19:48:59 -07:00
Geenz
ff3fca3dc3 Remove no longer necessary light vector parameter. 2016-05-22 21:50:48 -04:00
Geenz
180f4ba4f5 Tweaked light attenuation formula some more. 
Keeping the ulightvec parameter for now - I want to revisit this later.
 2016-05-22 21:02:28 -04:00
Geenz
9e9f95059f Merge remote-tracking branch 'highfidelity/master' into 20901 2016-05-22 18:08:58 -04:00
Brad Davis
cd1e910844 Add a generic shape primitive 2016-05-21 23:46:44 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Brad Hefta-Gaub
ac49feda22 Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS 
Conflicts:
	libraries/entities/src/EntityEditPacketSender.h
 2016-05-21 09:23:45 -07:00
Geenz
a80f47e550 Merge remote-tracking branch 'highfidelity/master' into 20901 2016-05-20 21:12:42 -04:00
Seth Alves
637735bbc3 unmangle merge 2016-05-20 18:07:38 -07:00
Seth Alves
f91a2403be merge from upstream 2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
e012630db2 Merge pull request #7860 from birarda/place-referrer 
send lookup hostname to DS for split counts, correct number of DS connected users
 2016-05-20 17:00:46 -07:00
Brad Hefta-Gaub
18613908df Merge pull request #7800 from sethalves/no-fly-zones 
No fly zones
 2016-05-20 16:59:55 -07:00
Brad Hefta-Gaub
dc29e97d32 Merge pull request #7870 from jherico/input_cleanup 
Update input plugins default active state & joint handling
 2016-05-20 16:13:06 -07:00
Brad Hefta-Gaub
2062291810 Merge pull request #7926 from zzmp/fix/debug-script-crash 
fix crash on shutdown in debug
 2016-05-20 15:35:32 -07:00
Brad Hefta-Gaub
9dded91af3 Merge pull request #7934 from AndrewMeadows/trim-convex-hulls 
reduce number of points in unreasonable convex hulls
 2016-05-20 15:30:36 -07:00
Brad Hefta-Gaub
2a94b641e3 Merge pull request #7930 from zzmp/fix/zero-copy-crash 
fix crash from zero-sized copy
 2016-05-20 15:11:00 -07:00
Andrew Meadows
2e30f0916c remove debug logging and add some comments 2016-05-20 15:07:47 -07:00
Brad Davis
07562f72af Doing a pass over the input plugins and controller code 2016-05-20 14:50:23 -07:00
Seth Alves
ff36b39067 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-20 14:38:53 -07:00
Brad Hefta-Gaub
770fab956f remove dead code 2016-05-20 12:23:06 -07:00
Seth Alves
76f4a25694 move code that clears old scale and registration to after model is loaded 2016-05-20 11:40:46 -07:00
Stephen Birarda
33379824c8 clear place name if switching to a domain ID string 2016-05-20 11:25:26 -07:00
Stephen Birarda
5ab876114f send hostname to DS with every DS packet to handle changes 2016-05-20 11:24:54 -07:00
Stephen Birarda
7110fe98eb associate incoming place name with DomainServerNodeData 2016-05-20 11:24:54 -07:00
Stephen Birarda
51c16739f2 provide a getter for the place name in AddressManager 2016-05-20 11:24:54 -07:00
Andrew Meadows
83b8ef8131 clean up stream formatting of vec3 and friends 2016-05-20 09:41:26 -07:00
Andrew Meadows
f3fc00bc3a add comment for why MAX_HULL_POINTS is 42 2016-05-20 09:41:26 -07:00
Andrew Meadows
5a826d696a cleanup after code review 2016-05-20 09:41:26 -07:00
Andrew Meadows
9fae1a7edd tweak log format 2016-05-20 09:41:26 -07:00
Andrew Meadows
7866fcf78c trim high-point convex hulls 2016-05-20 09:41:26 -07:00
Brad Hefta-Gaub
95f7ea5609 Merge pull request #7922 from samcake/red 
improve performance of Light volume pass
 2016-05-20 09:33:55 -07:00
Zach Pomerantz
4c8ff557db Merge branch 'master' of github.com:highfidelity/hifi into fix/debug-script-crash 2016-05-20 09:31:30 -07:00
Brad Hefta-Gaub
8760cd0807 Merge pull request #7929 from zzmp/fix/script-downloaded-shutdown 
fix crash on shutdown from scriptDownloaded callback
 2016-05-20 09:31:04 -07:00
Brad Hefta-Gaub
25e7b9935e Merge pull request #7932 from zzmp/fix/shadows 
fix shadow box that appears when flying
 2016-05-20 09:30:29 -07:00
Zach Pomerantz
fff260c2b9 Guard against zero-sized gl buffer copy 2016-05-20 09:27:50 -07:00
Stephen Birarda
e8d7f9614a refresh API info during re-connect - case 570 2016-05-19 17:59:42 -07:00
Geenz
e2f5d22c98 Merge remote-tracking branch 'highfidelity/master' into 20901 2016-05-19 20:57:31 -04:00
Brad Hefta-Gaub
a1ec6c2961 Merge pull request #7938 from sethalves/set-age-of-imported-to-zero 
fix age of imported entities
 2016-05-19 17:53:31 -07:00