Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-05 06:59:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43706 commits 6 branches 1 tag 1.1 GiB
Commit graph

43706 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
a1c32f8c44 Merge branch 'master' into tony/improved-avatar-mixer-precision 2016-05-23 10:24:52 -07:00
Anthony J. Thibault
5fe01acaa8 Added more comments to AvatarDataPacket section. 2016-05-23 10:03:13 -07:00
Seth Alves
00336f4860 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-23 09:58:20 -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
Brad Hefta-Gaub
72dc24178f Merge pull request #7958 from jherico/keystick_fix 
fix keys getting stuck
 2016-05-23 08:19:43 -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
d7142aee80 try to make osx clang happy, also 2016-05-21 18:06:21 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -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
Seth Alves
748e0bb4fc Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-21 08:35:25 -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
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
David Rowe
5a27d656c5 Potential OSX fix plus extra logging 2016-05-21 13:03:58 +12: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
howard-stearns
fa78eea434 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-20 16:50:54 -07:00
howard-stearns
9a428947e4 Simplify code. 2016-05-20 16:50:17 -07:00
howard-stearns
6568c0563d Delay on entry/exit. 2016-05-20 16:43: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
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
howard-stearns
22c8407e4a Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-20 13:55:06 -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
howard-stearns
dcc8764fa7 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-20 13:41:41 -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