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

733 commits

Author SHA1 Message Date
Andrew Meadows
feafa0a60b remove old Ragdoll and avatar interactions 2015-03-11 14:29:03 -07:00
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -07:00
Seth Alves
3604fd639a formatting 2015-03-08 20:03:10 -07:00
Seth Alves
a8b688d540 move _velocity into base class. walking on a cube works 2015-03-04 15:26:02 -08:00
Seth Alves
8eec66c066 merge upstream, avatar can now fall onto a cube 2015-03-03 18:37:16 -08:00
Andrew Meadows
9ad88c3793 Referentials do math using meters 2015-02-26 13:42:08 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
Philip Rosedale
d74856e01b add angularVelocity to controller 2015-02-24 11:21:04 -08:00
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
David Rowe
d704af21ac Generalize "faceshift" data handling to "facetracker" 
DDE face tracking data is now broadcast to other avatars.
 2015-02-18 12:41:54 -08:00
Stephen Birarda
e99012efbb updates to build guides to remove soxr 2015-02-17 10:33:12 -08:00
Stephen Birarda
8c998a65ee use the glm find_package and check externals 2015-02-13 12:50:32 -08:00
Stephen Birarda
a4752aaab0 use external project glm in avatars 2015-02-13 10:22:09 -08:00
Stephen Birarda
e47333a808 specify QScriptable include under QtScript 2015-02-04 11:08:26 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
Atlante45
1cfd98b2d7 Name threads 2015-01-31 00:50:12 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277 
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
 2015-01-30 13:49:45 -08:00
Atlante45
19ea9724ab Re-add accidentally removed int size() 2015-01-30 11:41:14 -08:00
Atlante45
2d973e5288 Move updateMyAvatar to AvatarManager 2015-01-29 16:55:32 -08:00
Atlante45
6b7a391885 move a couple avatar initialisations outside avatar maanger 2015-01-29 16:00:57 -08:00
Atlante45
9095eeeeb9 Return WeakPointer in avatarHashMap 2015-01-29 15:50:59 -08:00
Atlante45
c25ae9d506 Merge branch 'android' of git://github.com/birarda/hifi into android 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityCollisionSystem.cpp
	libraries/entities/src/EntityCollisionSystem.h
 2015-01-27 15:04:17 -08:00
Stephen Birarda
54660dd1a2 resolve conflicts on merge with upstream master 2015-01-27 14:24:48 -08:00
Atlante45
4278407137 Account for avatar scale in Hand(Data) get/set 
When using localToWorld/WorldToLocal type functions
 2015-01-26 16:48:33 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Atlante45
4eac6cd410 Moved IDENTITY_FRONT/UP/RIGHT to GLMHelpers 2015-01-23 13:19:03 -08:00
Atlante45
ee9f183e14 Update static flag 2015-01-23 12:14:54 -08:00
Atlante45
a616edbb55 Remove avatars dependency on model,gpu,fbx (OpenGL) 2015-01-23 12:14:13 -08:00
Atlante45
6d9deffdaa Remove avatars dependency to octree 2015-01-23 11:58:22 -08:00
Atlante45
9f58865937 Add AvatarHashMap and AvatarManager to DM 2015-01-23 11:46:11 -08:00
Stephen Birarda
343b09c855 remove AudioClient dependency on Recorder 2015-01-21 13:21:37 -08:00
Stephen Birarda
0eced09f1d intial removal of Audio to audio-client 2015-01-21 11:49:06 -08:00
Brad Hefta-Gaub
9d45bed0e2 Merge pull request #4103 from Atlante45/applications_diet_cpp11 
DependencyManager update
 2015-01-14 17:17:07 -08:00
Atlante45
b922b028e9 Fixes body not rotating for other avatars 2015-01-14 16:47:20 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
Atlante45
063e95bd79 Clement doesn't know how to use radians 2015-01-09 14:31:34 -08:00
Atlante45
f2b7cb005a Removed leans/Changed Head rotation in avatardata packets 2015-01-09 11:16:49 -08:00
Atlante45
16e1fc8c3a Added isMyAvatar to AvatarData too 2015-01-09 11:16:05 -08:00
Atlante45
05d2887c94 Move Torso twist to HeadData with Lean 2015-01-09 11:15:01 -08:00
Atlante45
6fc3e1cf81 change message size 2015-01-08 11:51:14 -08:00
Atlante45
0bae05b924 Remove chat message 2015-01-08 11:25:53 -08:00
Atlante45
b8a3bdb6bd Cleanup headers 2015-01-08 11:25:35 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
Stephen Birarda
dfb02aea0c resolve conflicts on merge, add cstring inc 2015-01-05 09:25:30 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
Brad Hefta-Gaub
43e6ba77fa Merge pull request #4007 from AndrewMeadows/inertia 
Bullet physics part 1
 2014-12-31 10:33:00 -08:00
ZappoMan
27d8ccb51e more voxelEctomy 2014-12-30 19:58:04 -08:00
ZappoMan
49d8f2b2f5 more work on voxelEctomy 2014-12-30 18:52:33 -08:00
Philip Rosedale
dc9937e11a only twist own body, remove unused head functions 2014-12-30 17:02:53 -08:00