Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 10:50:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12380 commits 76 branches 59 tags 1.2 GiB
Commit graph

3578 commits

Author SHA1 Message Date
Atlante45
49eadac024 Bumped octree stats packet version 2014-04-29 13:52:07 -07:00
Atlante45
85d007adfd Merge branch 'master' of https://github.com/highfidelity/hifi into clockSkew_win_bug 2014-04-29 12:49:02 -07:00
Atlante45
f74bd491d6 CR 2014-04-29 12:48:50 -07:00
Atlante45
6595b29a4f More bug tracking 2014-04-29 10:55:30 -07:00
Clément Brisset
4c42a403e7 Merge pull request #2738 from huffman/19598 
Login window
 2014-04-28 19:28:50 -07:00
Andrew Meadows
c7dbc5984f add local gravity option parameter for MyAvatar 2014-04-28 16:40:22 -07:00
Atlante45
8686fecdad Switch OctreeSceneStats to quintX 2014-04-28 16:08:26 -07:00
Andrew Meadows
a7c4b02f2d merge new work into andrew/inertia 2014-04-28 09:52:06 -07:00
Ryan Huffman
45fdd00608 Merge remote-tracking branch 'upstream/master' into 19598 
Conflicts:
	interface/src/ui/FramelessDialog.h
 2014-04-28 09:13:00 -07:00
Ryan Huffman
cbd5fbe9b3 Add loginFailed signal to AccountManager 2014-04-28 08:59:44 -07:00
Andrew Meadows
b05a315b5a merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-25 14:52:44 -07:00
Brad Hefta-Gaub
b0a561198b Merge pull request #2721 from Atlante45/improved_undo 
Handle subtrees with undo
 2014-04-25 14:32:49 -07:00
Andrew Meadows
c2f1507df1 move AVATAR_MOTION_OBEY_GRAVITY to libs 2014-04-25 14:16:42 -07:00
Andrew Meadows
357aac833e expose AVATAR_MOTION_OBEY_GRAVITY const to JS 2014-04-25 14:15:40 -07:00
Andrew Meadows
2d5bfc81cd add Vec3.distance(Vec3, Vec3) for JS 2014-04-25 14:14:34 -07:00
Clément Brisset
c2a91b4ee9 Merge pull request #2732 from ZappoMan/fixtimestamps 
improved guards against extremely unlikely packets
 2014-04-25 13:55:13 -07:00
Clément Brisset
f0a87c1072 Merge pull request #2733 from birarda/master 
pass the owner scope for oauth token requests
 2014-04-25 13:42:00 -07:00
Atlante45
3143e10bd8 CR 2014-04-25 13:33:59 -07:00
Stephen Birarda
8e12c0d8e5 pass the owner scope to auth requests 2014-04-25 13:22:18 -07:00
ZappoMan
7c1b5ba092 Merge branch 'master' of https://github.com/worklist/hifi into fixtimestamps 
Conflicts:
	libraries/shared/src/SharedUtil.cpp
 2014-04-25 13:14:52 -07:00
Atlante45
8b4a910040 Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
ZappoMan
6acdf9cd6c fix issues with bad timestamps 2014-04-25 11:21:02 -07:00
Andrew Meadows
f91c098589 merge 2014-04-24 19:13:22 -07:00
Andrew Meadows
0a7a5031ee expose COLLISION_GOUP_* constants to JS 2014-04-24 14:17:10 -07:00
Andrew Meadows
73d0674565 expose MyAvatar.collisionGroups to JS 2014-04-24 11:19:08 -07:00
Atlante45
1844eb2c9e Pre CR tweaks 2014-04-24 11:12:01 -07:00
Atlante45
37fbbb0297 Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo 2014-04-24 11:01:34 -07:00
Atlante45
9bdcfe6d04 Undo now fully support local subtrees 2014-04-24 11:01:12 -07:00
Atlante45
2494e589a9 Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo 2014-04-23 17:36:01 -07:00
Andrzej Kapolka
4f8c1f9c65 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 16:09:23 -07:00
Clément Brisset
d441e6a453 Merge pull request #2717 from AndrewMeadows/inertia 
avatar bounding capsule collision against voxels
 2014-04-23 16:06:14 -07:00
Atlante45
a24f092efe Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo 2014-04-23 13:47:12 -07:00
Andrew Meadows
c5f1a8abd6 formatting 2014-04-23 13:37:13 -07:00
Andrzej Kapolka
d38d3db224 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 12:25:43 -07:00
Atlante45
ae566c55f6 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-23 10:38:29 -07:00
Atlante45
378afdf117 More undo work 2014-04-23 10:35:24 -07:00
Andrzej Kapolka
c471a55f1f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 09:40:51 -07:00
Andrew Meadows
a7771bc142 repair header comments for AABox.* 2014-04-23 09:05:11 -07:00
Andrew Meadows
7464ca0879 non-rounded collision solution in comments 2014-04-23 08:38:58 -07:00
Andrew Meadows
1986ac6be3 collisions with cube get rounded normals at edges 2014-04-22 20:53:12 -07:00
Atlante45
448e3a0947 Merge branch 'master' of https://github.com/highfidelity/hifi into improved_undo 2014-04-22 14:42:58 -07:00
Andrew Meadows
f3fd81ca59 use glm::modf() for less code 2014-04-22 14:26:52 -07:00
Atlante45
fea0a262a6 Put back missing windows header 2014-04-22 12:35:50 -07:00
Atlante45
3eeb3a539d Fixed lack of resolution in usecTimestampNow() 2014-04-22 11:48:43 -07:00
Andrew Meadows
62121b1232 remove include of StreamUtils.h again 2014-04-22 11:46:15 -07:00
Andrew Meadows
65d3b4dc39 fix penetration direction for sphere-vs-AACube 2014-04-22 11:43:23 -07:00
Andrew Meadows
f033990fae merge upstream/master into andrew/inertia 2014-04-22 10:49:44 -07:00
Andrew Meadows
7537d240bb toward working avatar-vs-voxel collisions again 2014-04-22 10:48:42 -07:00
Andrew Meadows
a45bc6c110 remove const from CollisionList subscript operator 2014-04-22 10:48:05 -07:00
AndrewMeadows
94fabf7875 Merge pull request #2709 from ZappoMan/shared_and_weak_pointers 
Voxel/Particle Server Performance Improvements
 2014-04-22 10:28:39 -07:00