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

43685 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
76940bad34 Merge pull request #7897 from howard-stearns/reset-hud-on-driving 
reset hud on driving
 2016-05-27 10:40:12 -07:00
Howard Stearns
5b6660e7ea Default preference to false. 2016-05-27 10:35:46 -07:00
Howard Stearns
e4d36cc2c2 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-27 10:32:01 -07:00
Howard Stearns
abd2b150f5 Merge branch 'reset-hud-on-driving' of https://github.com/howard-stearns/hifi into reset-hud-on-driving 2016-05-27 10:31:42 -07:00
Chris Collins
3e79b67612 Merge pull request #7977 from hyperlogic/bug-fix/avatar-lod 
Bugfix for avatar LOD
 2016-05-27 10:15:26 -07:00
Andrew Meadows
1132b4666a Merge pull request #7975 from jherico/shared_shapes 
Moving shape definition to a shared location
 2016-05-27 07:28:11 -07:00
Chris Collins
8ad572a269 Merge pull request #7976 from birarda/session-id-with-place-request 
send session ID in AccountManager without curly braces
 2016-05-26 15:59:18 -07:00
Brad Davis
6a962d7aab Unix build fix 2016-05-26 15:51:36 -07:00
Stephen Birarda
1ec421350d send the UUID session ID without curly braces 2016-05-26 14:56:51 -07:00
Anthony J. Thibault
b4d14f06d8 Bugfix for avatar LOD 
If an avatar was LOD'ed out, it would never become visible again, because the bounds of the skeleton model were never again.
This ensures that the model bound is updated, even when the avatar is LOD'ed away.
 2016-05-26 14:35:17 -07:00
howard-stearns
9ff1a695f0 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-26 13:52:23 -07:00
Chris Collins
4120ed9f0b Merge pull request #7964 from ZappoMan/protocolVersionCheck 
check for all protocols matching when connecting to a domain
 2016-05-26 13:02:18 -07:00
Brad Davis
2c02c963d4 Moving shape definition to a shared location 2016-05-26 12:22:39 -07:00
Brad Hefta-Gaub
88813c47f0 Merge pull request #7960 from howard-stearns/fix-hand-controllers-after-input-changes 
Fix hand controller pointer after input changes.
 2016-05-26 12:16:23 -07:00
Brad Hefta-Gaub
8ec425106a Merge pull request #7968 from birarda/audio-is-playing 
fix collision of isPlaying property and slot for AudioInjectors
 2016-05-26 12:06:00 -07:00
howard-stearns
991da9e248 fix cut-paste error in settings. 2016-05-26 09:51:55 -07:00
Howard Stearns
029c76f489 Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-25 20:40:03 -07:00
Howard Stearns
8e6853bec6 Merge branch 'master' of https://github.com/highfidelity/hifi into fix-hand-controllers-after-input-changes 2016-05-25 18:54:29 -07:00
Brad Hefta-Gaub
485c8aceac Merge pull request #7942 from sethalves/fix-edit-js-restart 
fix a race that keeps some scripts from restarting
 2016-05-25 17:22:17 -07:00
Brad Hefta-Gaub
78b6a6c661 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
 2016-05-25 17:18:27 -07:00
Brad Hefta-Gaub
f2acc82899 Merge pull request #7971 from birarda/session-id-with-place-request 
optionally include the metaverse session ID as HTTP header when sending usage data
 2016-05-25 17:14:27 -07:00
Brad Hefta-Gaub
06cb625d09 Merge pull request #7959 from hyperlogic/tony/improved-avatar-mixer-precision 
Improved Avatar Mixer Rotation Precision
 2016-05-25 17:14:12 -07:00
Brad Hefta-Gaub
7131920312 Merge pull request #7966 from ctrlaltdavid/20932 
make file dialog resizable and movable
 2016-05-25 17:13:55 -07:00
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 Hefta-Gaub
84f541285f Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 2016-05-25 15:01:15 -07:00
Seth Alves
3184304179 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-25 14:14:09 -07:00
Seth Alves
cb40cfbead Merge pull request #7972 from jherico/entity_shape_protocol_fix 
Fix broken protocol for shapes
 2016-05-25 14:13:15 -07:00
Seth Alves
7d4462ba81 Merge branch 'entity_shape_protocol_fix' of github.com:jherico/hifi into fix-edit-js-restart 2016-05-25 13:54:33 -07:00
Brad Davis
b16e701ea3 Fix broken protocol for shapes 2016-05-25 13:53:28 -07:00
Seth Alves
49769f7d29 trying again -- frantic clicking on reload no longer appears to wedge things 2016-05-25 13:39:13 -07:00
Seth Alves
75329c812c Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-25 13:06:24 -07:00
howard-stearns
dc7d6d470d Don't reset head when we come back. 2016-05-25 12:21:50 -07:00
Stephen Birarda
66bdbf910d optionally include the metaverse session ID as an http header 2016-05-25 11:55:04 -07:00
Seth Alves
b0ce65ec01 trying to mimic previous behavior more closely 2016-05-25 11:42:06 -07:00
Stephen Birarda
3137cd64e1 clear AddressManager previous lookup on 404 2016-05-25 11:40:17 -07:00
Seth Alves
36ce6491dd Merge pull request #7969 from jherico/entity_shape_collision_fix 
Fix primitive shape collisions
 2016-05-25 11:39:18 -07:00
howard-stearns
2accccef9e Merge branch 'reset-hud-on-driving' of https://github.com/howard-stearns/hifi into reset-hud-on-driving 2016-05-25 11:32:01 -07:00
howard-stearns
8198a1b4d1 Add preference to control behavior. 2016-05-25 11:30:45 -07:00
Brad Davis
8f3918b5ba Fix primitive shape collisions 2016-05-25 11:21:05 -07:00
Stephen Birarda
64720444cf correct existing uses of the isPlaying property 2016-05-25 11:11:06 -07:00
Stephen Birarda
ba77aaf7ef remove collision of isPlaying property and slot 2016-05-25 11:06:08 -07:00
howard-stearns
5d806cba7f Merge branch 'master' of https://github.com/highfidelity/hifi into reset-hud-on-driving 2016-05-25 10:47:31 -07:00
Seth Alves
04bd27ea55 Merge branch 'fix-edit-js-restart' of github.com:sethalves/hifi into fix-edit-js-restart 2016-05-25 10:41:03 -07:00
Seth Alves
ef709c09d0 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-25 09:46:30 -07:00
Seth Alves
cd6b9a8a5f Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-25 09:46:12 -07:00
David Rowe
9ec6b77460 Make file browser dialog movable 2016-05-25 13:49:01 +12:00
Anthony J. Thibault
ea8ba7e2d1 Fixes based on code review feedback. 
* Use isNaN instead of glm::isnan
* prefer abort() over writing to a nullptr, in release assert.
* warn if packet size does not match expectations
 2016-05-24 18:12:40 -07:00
David Rowe
1c4eed640f Fix up file browser resize handle and outlining 2016-05-25 13:10:26 +12:00
Brad Hefta-Gaub
ff45633c21 bump entities version/CR feedback 2016-05-24 17:36:52 -07:00