Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 05:33:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23373 commits 71 branches 56 tags 1.2 GiB
Commit graph

23373 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
c0b1ff4a57 Merge pull request #4500 from AndrewMeadows/inertia 
avatar can jump when using CharacterController
 2015-03-25 14:48:54 -07:00
Ryan Huffman
1c0e7e26a2 Merge pull request #4507 from birarda/friends-only-location 
make friends-only discoverability mode work as described
 2015-03-25 13:48:08 -07:00
Stephen Birarda
f075674415 Merge pull request #4502 from huffman/webwindow-open-url 
Add more functionality to WebWindow (get/set url, raise)
 2015-03-25 13:25:29 -07:00
Stephen Birarda
c40909cec5 Merge pull request #4506 from murillodigital/master 
More .com changes
 2015-03-25 12:06:23 -07:00
Leonardo Murillo
d1d183e190 More .com changes 2015-03-25 13:05:10 -06:00
Stephen Birarda
7a9c1e20ab use new AccountManager API in DiscoverabilityManager 2015-03-25 12:04:47 -07:00
Stephen Birarda
4bf8e9f625 change AccountManager request API, leverage in networking and DS 2015-03-25 12:04:04 -07:00
Stephen Birarda
78ebc3fde6 Merge pull request #4505 from murillodigital/master 
Switching to .com
 2015-03-25 11:54:49 -07:00
Stephen Birarda
89e5fef808 send friends_only key for discoverability 2015-03-25 11:46:08 -07:00
Leonardo Murillo
c3c1d4a5ae Switching to .com 2015-03-25 12:36:37 -06:00
Philip Rosedale
f90580b7ee Merge pull request #4503 from samcake/orange 
Putting the GLERRORCHECK only in debug
 2015-03-25 11:29:19 -07:00
Sam Gateau
045dbb11a3 Putting the GLERRORCHECK only in debug 2015-03-25 11:07:19 -07:00
Andrew Meadows
2440c47648 remove extra whitespace 2015-03-25 11:06:19 -07:00
Andrew Meadows
2128f21308 only set ADD bit with UPDATE_SHAPE when enabled 2015-03-25 11:02:48 -07:00
Ryan Huffman
bb4417acc6 Merge branch 'master' of github.com:highfidelity/hifi into webwindow-open-url 2015-03-25 10:49:24 -07:00
Andrew Meadows
674b2c97a2 added comments to zlib license 2015-03-25 08:53:33 -07:00
Clément Brisset
e6ac502fb5 Merge pull request #4497 from huffman/update-edit-help 
Update edit help
 2015-03-25 14:09:22 +01:00
Andrew Meadows
430158c109 updateShapeIfNecessary() is a more correct name 2015-03-24 23:35:09 -07:00
Andrew Meadows
d497620976 avatar can jump with E key when walking 2015-03-24 23:05:46 -07:00
Andrew Meadows
b87360f0f5 merge upstream/master into andrew/inertia 2015-03-24 17:41:07 -07:00
Andrew Meadows
44eca08fa4 PhysicsEngine doesn't need AvatarData 
MyAvatar now owns its CharacterController
fix for bug of phantom collision obj when avatar's physics are disabled
 2015-03-24 17:38:35 -07:00
Philip Rosedale
9c24d2d0eb Merge pull request #4496 from stojce/20397 
CR for Job #20397 - Create a test script that builds and places a bunch of houses for load testing
 2015-03-24 17:35:44 -07:00
Philip Rosedale
fe61387121 Merge pull request #4498 from ZappoMan/LODUITweaks 
Some LOD UI Tweaks
 2015-03-24 17:34:27 -07:00
ZappoMan
0e44126106 added LOD Warnings to notifications.js 2015-03-24 16:38:13 -07:00
Ryan Huffman
d54526b8bb Merge branch 'master' of git://github.com/highfidelity/hifi into webwindow-openurl 2015-03-24 15:43:36 -07:00
Andrew Meadows
3c16c7066c Merge pull request #4495 from birarda/location-update-bug 
send an immediate location update when domain changes
 2015-03-24 15:33:59 -07:00
ZappoMan
b67cf3af24 more tweaks to LOD tools dialog 2015-03-24 14:33:06 -07:00
ZappoMan
f43b8bbe8e make AvatarLODMultiplier based on octreeSizeScale 2015-03-24 13:59:46 -07:00
Ryan Huffman
3f986229d1 Rename edit-entities-commands.html to edit-commands.html 2015-03-24 13:43:10 -07:00
Ryan Huffman
6c941d73d5 Update edit.js help 2015-03-24 13:34:14 -07:00
ZappoMan
619428c325 move LOD FPS settings to Preferences 2015-03-24 13:32:22 -07:00
Stephen Birarda
1a6865b41b send immediate location update when domain changes 2015-03-24 13:15:30 -07:00
Philip Rosedale
288bb5be38 Merge pull request #4493 from ZappoMan/avatarClipBugs 
more fixes to avatar parts not rendering
 2015-03-24 09:29:03 -07:00
Philip Rosedale
26fbabc4fd Merge pull request #4492 from ZappoMan/LODUITweaks 
Tweaks to the LOD UI
 2015-03-24 09:28:33 -07:00
ZappoMan
a9e4d25f97 more fixes to avatar parts not rendering 2015-03-24 08:32:27 -07:00
ZappoMan
168e8e8b80 more fixes to avatar parts not rendering 2015-03-24 08:31:45 -07:00
ZappoMan
0c2b95aa1d Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks 2015-03-24 08:24:32 -07:00
Seth Alves
dfd9b9958b Merge pull request #4482 from AndrewMeadows/bispinor 
CharacterController can walk up ledges #2
 2015-03-23 18:25:58 -07:00
ZappoMan
69f261ae94 tweaks to the LOD Tools UI 2015-03-23 16:44:19 -07:00
ZappoMan
fa122a227b tweaks to the LOD Tools UI 2015-03-23 16:44:07 -07:00
Brad Hefta-Gaub
92a639d2ee Merge pull request #4486 from ctrlaltdavid/sixense-build-instructions 
Building with Sixense build requires four of the SDK libraries
 2015-03-23 11:17:33 -07:00
Brad Hefta-Gaub
25bfc29081 Merge pull request #4489 from Atlante45/light_types 
Light types
 2015-03-23 11:16:48 -07:00
samcake
f54d5612a6 Merge pull request #4490 from ZappoMan/avatarClipBugs 
Bug Fix - hack to get avatar parts rendering, fix to crash in updateJointState
 2015-03-23 11:15:37 -07:00
ZappoMan
9fb53e3d72 CR feedback 2015-03-23 11:13:42 -07:00
ZappoMan
3e8508f149 CR feedback 2015-03-23 11:13:35 -07:00
ZappoMan
b705d76336 total hack to ignore frustum culling in case of avatar mesh parts with no transform 2015-03-23 10:43:21 -07:00
Atlante45
c26f17e16b Update from light properties 2015-03-23 18:36:40 +01:00
ZappoMan
fe8ad9517f added debugging for model mesh boxes 2015-03-23 10:08:08 -07:00
Atlante45
ea0f3f05e7 Tune sound down 2015-03-23 17:55:23 +01:00
Atlante45
fdfdba5d2d Couple tweaks 2015-03-23 17:46:57 +01:00