Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-28 03:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
12092 commits 71 branches 56 tags 1.2 GiB
Commit graph

12092 commits

Author SHA1 Message Date
ZappoMan
c2bcb32804 add support for sending unverified datagrams to nodes 2014-04-18 15:33:27 -07:00
ZappoMan
334f688e4e add support for sending unverified datagrams to nodes 2014-04-18 15:30:45 -07:00
ZappoMan
0e124eca3c Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 2014-04-18 15:05:54 -07:00
ZappoMan
50f7db8fe1 quiet some debugging 2014-04-18 15:02:10 -07:00
AndrewMeadows
b356e3903d Merge pull request from birarda/master 
changes to smooth JS dynamic bot demo
 2014-04-18 14:36:00 -07:00
ZappoMan
2c02178802 Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers 
Conflicts:
	assignment-client/src/AssignmentClient.cpp
	assignment-client/src/AssignmentClient.h
	libraries/shared/src/NodeList.cpp
 2014-04-18 14:28:54 -07:00
Stephen Birarda
92f2794ea8 add a property to Sound to tell if empty 2014-04-18 14:26:56 -07:00
Stephen Birarda
1a895b9342 add property for display name to JS 2014-04-18 14:24:50 -07:00
Brad Hefta-Gaub
57a221f343 Merge pull request from AndrewMeadows/inertia 
improved collision shapes for head models
 2014-04-18 14:06:45 -07:00
Stephen Birarda
aa5d7aa0b1 fix incorrectly named slot in Sound 2014-04-18 13:58:33 -07:00
Stephen Birarda
3b8cf8c172 fix mixed signal and slot 2014-04-18 13:55:22 -07:00
Stephen Birarda
3884f1721f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-18 13:52:13 -07:00
Stephen Birarda
6ef4e145c5 add better Sound error handling 2014-04-18 13:51:58 -07:00
AndrewMeadows
4406c7b33f Merge pull request from birarda/master 
add missing pool handling for scripts to DS
 2014-04-18 13:47:47 -07:00
AndrewMeadows
aaac7ac82c Merge pull request from ey6es/master 
Added head translation for Faceplus.
 2014-04-18 13:45:00 -07:00
Stephen Birarda
e9768ca4fc add missing pool handling to DS 2014-04-18 13:34:30 -07:00
Andrew Meadows
54153a70a3 merge upstream/master into andrew/inertia 2014-04-18 11:30:26 -07:00
Andrew Meadows
26487aad06 more correct bounding shapes for Models 2014-04-18 11:19:21 -07:00
Stephen Birarda
e4d30c5f1f Update dancing_bot.js 
put gangnam style animation back - it's royalty free
 2014-04-18 10:57:50 -07:00
AndrewMeadows
a10aaa537e Merge pull request from ZappoMan/moonshot 
added wet/dry mix, and alternate distance attenuation features
 2014-04-18 10:34:55 -07:00
ZappoMan
2dc39512a2 CR feedback 2014-04-18 10:19:09 -07:00
AndrewMeadows
220c9c40f3 Merge pull request from birarda/agent-avatar-manager 
expose AvatarHashMap to Agent for Avatar querying from assignment-client
 2014-04-18 09:58:34 -07:00
Stephen Birarda
6adfb91e93 rename AvatarHash to AvatarList 2014-04-18 09:40:35 -07:00
Stephen Birarda
9713edbba9 Update dancing_bot.js 
conceal URL from dancing_bot script (even though it will stay in history)
 2014-04-18 09:00:43 -07:00
ZappoMan
fa787adce2 added wet/dry mix, and alternate distance attenuation features 2014-04-18 08:55:32 -07:00
Stephen Birarda
77202af20d add debug for erase from AvatarHashMap, repair check for display name 2014-04-17 18:05:22 -07:00
Stephen Birarda
75f35c5858 optionally add an AvatarHashMap instance to the ScriptEngine 2014-04-17 17:55:16 -07:00
Stephen Birarda
f8106e5063 add an AvatarHashMap to the Agent 2014-04-17 17:49:55 -07:00
Stephen Birarda
47d4ef0b2d add a method to determine if avatar with display name exists 2014-04-17 17:44:41 -07:00
Stephen Birarda
e75d14139f fix avatar kill behaviour 2014-04-17 17:21:38 -07:00
Andrzej Kapolka
828bedc3e8 Slight fix for dancing bot script. 2014-04-17 17:07:02 -07:00
Stephen Birarda
3e4369f2ff kill avatars in hash map after a timeout threshold 2014-04-17 16:57:00 -07:00
Stephen Birarda
69d3360675 add a convenience method to AvatarHashMap to check for avatar removal 2014-04-17 16:48:24 -07:00
Stephen Birarda
e303ce1a12 move some Avatar management to AvatarHashMap 2014-04-17 16:37:40 -07:00
Andrew Meadows
cfdbdad2d8 improved method for disabling bad joint shapes 2014-04-17 16:22:35 -07:00
Andrzej Kapolka
3af02a3327 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-17 16:07:48 -07:00
Stephen Birarda
7c048b7512 Merge pull request from ey6es/animate 
Provide basic support for loading FBX animations (including in agent code) and applying them to models.
 2014-04-17 16:05:32 -07:00
Andrzej Kapolka
15d4f59ceb Moved AnimationObject to separate source files. 2014-04-17 15:52:32 -07:00
Andrzej Kapolka
197127fbde Added ability to read FBX textures embedded in FBX files. 2014-04-17 15:42:23 -07:00
Andrew Meadows
3072161a30 improved collision shapes of models 2014-04-17 15:18:46 -07:00
Andrew Meadows
3acc518e8a make float literals obey the coding standard 2014-04-17 15:18:15 -07:00
Andrzej Kapolka
6251b6b819 Merge fix. 2014-04-17 13:55:16 -07:00
Andrzej Kapolka
599b472cf7 Merge branch 'master' of https://github.com/highfidelity/hifi into animate 
Conflicts:
	assignment-client/src/Agent.cpp
 2014-04-17 13:51:32 -07:00
Andrzej Kapolka
0a2670ea23 Detabbed. 2014-04-17 13:42:29 -07:00
Andrzej Kapolka
a12b90c65b Add head translation to Faceplus. Closes . 2014-04-17 13:34:37 -07:00
Brad Hefta-Gaub
4fe2ec3950 Merge pull request from birarda/ds-script-preload 
allow passing of preload scripts to DS on launch
 2014-04-17 11:42:00 -07:00
Brad Hefta-Gaub
4ef9aa9e64 Merge pull request from birarda/ds-web 
add pool option to DS script webpage
 2014-04-17 11:40:15 -07:00
Brad Hefta-Gaub
ad3bd75308 Merge pull request from Atlante45/random_sounds 
Random sounds
 2014-04-17 11:36:15 -07:00
Andrzej Kapolka
58b063ee12 Make sure we call allReferencesCleared on the right thread. 2014-04-17 11:13:22 -07:00
Andrzej Kapolka
197ce036c4 Remove debugging line. 2014-04-17 11:06:28 -07:00