Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 00:47:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
43516 commits 69 branches 56 tags 1.2 GiB
Commit graph

43516 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
cd1e910844 Add a generic shape primitive 2016-05-21 23:46:44 -07:00
Brad Davis
e07674134f Merge pull request #7950 from ZappoMan/removeDisableEntityNACKS 
remove old debug feature that is no longer needed.
 2016-05-21 10:12:19 -07:00
Brad Hefta-Gaub
567f7f4b77 Merge pull request #7953 from ctrlaltdavid/20929 
fix not being able to teleport to user when users window moved right
 2016-05-21 09:25:07 -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
Brad Hefta-Gaub
5b98b062f8 Merge pull request #7840 from sethalves/avatar-entities-3 
Avatar entities
 2016-05-21 07:57:11 -07:00
David Rowe
a294170c74 Fix not being able to teleport to user when users window moved right 2016-05-21 15:50:06 +12: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
5906f88226 Merge pull request #7952 from sethalves/fix-walking-far-grab 
fix distance-grabbing and walking at the same time
 2016-05-20 16:54:52 -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
Seth Alves
a24d63a39c make distance-grab work better when avatar is walking 2016-05-20 15:45:00 -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
Chris Collins
8dbc6af719 Merge pull request #7944 from Atlante45/fix/edit-js 
fix edit.js to handle userData that's not in JSON
 2016-05-20 15:14:13 -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
Seth Alves
d95d3ff3ac clean up debugging prints 2016-05-20 14:56:47 -07:00
Brad Davis
73342b2758 PR feedback 2016-05-20 14:50:24 -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
a7316069e6 Merge pull request #7948 from sethalves/fix-model-url-change 
fix entity dissapears when switching between models in asset-server
 2016-05-20 14:00:02 -07:00
Brad Hefta-Gaub
db78dcbb79 Merge pull request #7949 from howard-stearns/hand-controller-tuning 
fix hand controller load and freezing
 2016-05-20 13:47:54 -07:00
Brad Hefta-Gaub
00bd3b2e8a remove more dead code 2016-05-20 13:43:08 -07:00
Brad Hefta-Gaub
770fab956f remove dead code 2016-05-20 12:23:06 -07:00
howard-stearns
c299aef8f2 fix 588, 558 2016-05-20 12:15:30 -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
962066c7d1 send user hostname breakdown with heartbeat 2016-05-20 11:24:54 -07:00
Stephen Birarda
7d2d60f200 split assigned and un-assigned nodes 2016-05-20 11:24:54 -07:00
Stephen Birarda
5884e1eadd rename metaverse heartbeat methods 2016-05-20 11:24:54 -07:00
Stephen Birarda
3b2a9b7b98 fix set of place name on DomainServerNodeData 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
Atlante45
0353e562e4 entityProperties.html handles non object userData 2016-05-20 10:18:32 -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
Brad Hefta-Gaub
f1278894c7 Merge pull request #7941 from zzmp/fix/vsync-halving 
fix vsync halving fps
 2016-05-20 09:30:13 -07:00
Zach Pomerantz
fff260c2b9 Guard against zero-sized gl buffer copy 2016-05-20 09:27:50 -07:00
Zach Pomerantz
2026226fe2 Handle vsync without halving fps 2016-05-20 09:04:39 -07:00
Brad Hefta-Gaub
1cce891f7c Merge pull request #7947 from ZappoMan/zzmp-fix/avatar-inputs-pos 
fix AvatarInputs spawning on bottom-left
 2016-05-20 08:59:54 -07:00