Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 03:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
23462 commits 25 branches 0 tags 1.1 GiB
Commit graph

7785 commits

Author SHA1 Message Date
Stephen Birarda
80ecbed02b Merge pull request #4524 from ctrlaltdavid/fix-xmlhttprequest-auth 
Fix authorization of API calls in XMLHttpRequest
 2015-03-27 15:35:14 -07:00
David Rowe
c456760419 Extract API URL into a const 2015-03-27 15:24:55 -07:00
Philip Rosedale
53970cb530 Merge pull request #4525 from ZappoMan/defaultAvatarBodyFix 
fix bug in default avatars
 2015-03-27 14:54:35 -07:00
ZappoMan
1821683453 fix bug in default avatars 2015-03-27 14:44:35 -07:00
David Rowe
1ee797efa4 Fix authorization of API calls in XMLHttpRequest 2015-03-27 13:59:52 -07:00
Andrew Meadows
5b85a2aa44 merge upstream/master into andrew/inertia 2015-03-27 13:56:54 -07:00
Andrew Meadows
bee8c0e237 "hover" if the "jump" key is held down long enough 2015-03-27 13:56:03 -07:00
Andrew Meadows
be5fdbf217 enable avatar collisions by default 
also remove old gravity features
 2015-03-27 13:36:20 -07:00
Philip Rosedale
6550b4e311 Merge pull request #4509 from AndrewMeadows/inertia 
character transitions into "hover" when stepping over abyss
 2015-03-27 13:16:36 -07:00
Brad Hefta-Gaub
2255c30d58 Merge pull request #4512 from Atlante45/ordered_fst 
Hint order for FST files
 2015-03-27 09:41:50 -07:00
Andrew Meadows
b9b2c30bba use QObject::deleteLater() not explicit delete 2015-03-27 09:01:44 -07:00
Andrew Meadows
e75bb3cd9c merge upstream/master into andrew/inertia 2015-03-27 08:14:36 -07:00
Atlante45
e16c8852fb extra ; 2015-03-27 14:43:09 +01:00
Atlante45
daaba330d5 Turn lambda into helper function 2015-03-27 14:41:32 +01:00
Andrew Meadows
821ac605f5 smoother motion on steps 
faster motion when "flying"
cleanup of MyAvatar::updatePosition()
 2015-03-26 19:48:52 -07:00
ZappoMan
8e7ead2ead fix locking issue in enter/leave entity scripts 2015-03-26 16:05:31 -07:00
Andrew Meadows
0035e8df88 merge 2015-03-26 15:17:14 -07:00
Andrew Meadows
8a951e0dd3 minor cleanup 2015-03-26 15:16:57 -07:00
Andrew Meadows
0ef4022e94 tweak gravity and step heights of controller 2015-03-26 15:14:46 -07:00
Andrew Meadows
858dbeb674 remove one line of cruft 2015-03-26 13:23:15 -07:00
Andrew Meadows
9c6ea7380f merge 2015-03-26 13:20:51 -07:00
Atlante45
c26b499671 Add forgotten include 2015-03-26 15:58:18 +01:00
Atlante45
716e9bfe4f Hint order for FST files 2015-03-26 15:40:48 +01:00
Philip Rosedale
da779fa0ef Merge pull request #4510 from birarda/new-entry 
use the new place 'entry' as entry point
 2015-03-25 16:38:08 -07:00
Philip Rosedale
29b9212259 Merge pull request #4501 from Atlante45/light_types 
Light types
 2015-03-25 16:34:05 -07:00
Stephen Birarda
ef0281ab43 use the new placename entry as entry point 2015-03-25 15:30:03 -07:00
Andrew Meadows
48d4647a1b merge upstream/master into andrew/inertia 2015-03-25 15:06:02 -07:00
Seth Alves
c0b1ff4a57 Merge pull request #4500 from AndrewMeadows/inertia 
avatar can jump when using CharacterController
 2015-03-25 14:48:54 -07:00
Andrew Meadows
429a258df0 enable hover when far above floor 2015-03-25 14:38:27 -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
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
Leonardo Murillo
c3c1d4a5ae Switching to .com 2015-03-25 12:36:37 -06: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
Andrew Meadows
674b2c97a2 added comments to zlib license 2015-03-25 08:53:33 -07:00
Atlante45
725a8795fb Merge branch 'master' of https://github.com/highfidelity/hifi into light_types 2015-03-25 16:39:11 +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
Atlante45
3563efb584 extra ; 2015-03-24 21:52:53 +01: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
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
ZappoMan
fe8ad9517f added debugging for model mesh boxes 2015-03-23 10:08:08 -07:00