Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-04 06:41:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
8892 commits 74 branches 59 tags 1.2 GiB
Commit graph

8892 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
120001ecac Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-22 13:25:47 -08:00
Philip Rosedale
d068b668d8 add marker spheres at 1 meter away from origin for better avatar size testing 2014-01-22 12:48:10 -08:00
Stephen Birarda
d307412183 remove preEvaluateReset in ScriptEngine 2014-01-22 12:01:15 -08:00
Stephen Birarda
a9ce6c7467 use NodeList ownerUUID for DataServerScriptingInterface, fix double UUID send 2014-01-22 12:00:26 -08:00
Stephen Birarda
d57aec9793 don't use separate NodeList owner UUID and Avatar UUID 2014-01-22 11:48:04 -08:00
Brad Hefta-Gaub
aacad00791 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	interface/src/Application.cpp
 2014-01-22 11:16:21 -08:00
Philip Rosedale
b980a4da46 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-22 11:15:36 -08:00
ZappoMan
da9fccc9b2 Merge pull request #1610 from PhilipRosedale/master 
Example script drumSticks.js lets you play air drums
 2014-01-22 11:15:14 -08:00
ZappoMan
ed71e8b69d Merge pull request #1617 from birarda/redis-warnings 
remove unused hiredis externals
 2014-01-22 11:14:26 -08:00
Philip Rosedale
8137f24db0 Merge pull request #1619 from birarda/master 
add debugging for mesh and skeleton changes for other avatars
 2014-01-22 11:13:05 -08:00
Brad Hefta-Gaub
c3b681786a make particles and voxels JS APIs all operate on meters not domain units 2014-01-22 11:12:52 -08:00
Stephen Birarda
42c6498fe4 add debugging for mesh and skeleton changes for other Avatars 2014-01-22 11:11:38 -08:00
Andrzej Kapolka
15021b6ebc More work on metavoxel editing (track mouse ray intersection with grid). 2014-01-22 11:11:12 -08:00
Philip Rosedale
0b3cfc5fcb Merge branch 'master' of https://github.com/worklist/hifi 2014-01-22 10:57:58 -08:00
Philip Rosedale
eccf1e0fac Merge pull request #1614 from birarda/scripted-avatar 
expose MyAvatar to Interface ScriptEngine
 2014-01-22 10:57:45 -08:00
Brad Hefta-Gaub
f81adb8810 update packet versions 2014-01-22 09:48:19 -08:00
Brad Hefta-Gaub
1b5938d0af new toyball script that is DRY-er 2014-01-22 09:48:04 -08:00
Stephen Birarda
34629f3850 remove unused hiredis externals, closes #1612 2014-01-22 09:27:39 -08:00
Brad Hefta-Gaub
64940a04ff latest toyball script 2014-01-22 09:18:01 -08:00
Brad Hefta-Gaub
74fe9893ba make tipVelocity() world relative 2014-01-22 09:17:42 -08:00
Stephen Birarda
a5bac3d209 fix a couple of warnings by using QString for object name 2014-01-22 09:14:52 -08:00
Stephen Birarda
6b44172467 hook the user's avatar object into the Interface ScriptEngine 2014-01-22 09:13:25 -08:00
Stephen Birarda
98c25aa3ee put data-server hostname back to data.highfidelity.io 2014-01-22 09:10:27 -08:00
Philip Rosedale
6ba5daad0c better comments in script 2014-01-22 08:44:43 -08:00
Philip Rosedale
5d9cf23ac5 Added drumSticks example script 2014-01-22 08:38:45 -08:00
Brad Hefta-Gaub
fe5a8d9da2 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/shared/src/PacketHeaders.cpp
 2014-01-21 20:21:22 -08:00
Brad Hefta-Gaub
cefac50100 adding toyball script 2014-01-21 20:05:41 -08:00
Brad Hefta-Gaub
164e703dec tweaks to JS particle editing api 2014-01-21 20:05:00 -08:00
Andrzej Kapolka
0a3d6ae5e0 More work on metavoxel editing (grid, etc.) 2014-01-21 19:31:56 -08:00
Andrzej Kapolka
9f10a9b2c9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-21 17:28:10 -08:00
Philip Rosedale
70b3ea4482 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-21 17:24:51 -08:00
Andrzej Kapolka
7fb062cf84 Merge pull request #1608 from ey6es/master 
Compile fix (for me, anyway).
 2014-01-21 17:23:46 -08:00
Andrzej Kapolka
2651c06367 Compile fix (for me, anyway). 2014-01-21 17:21:57 -08:00
Andrzej Kapolka
d473b002a8 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-21 17:20:24 -08:00
Andrzej Kapolka
230b66680f More work on the editor. 2014-01-21 17:20:12 -08:00
Philip Rosedale
753a13dc0f Merge pull request #1604 from birarda/scripted-avatar 
initial hooks for scripted avatars with mesh and skeleton
 2014-01-21 17:15:22 -08:00
Stephen Birarda
8df40b5d60 clearly init the skeleton URL in profile 2014-01-21 17:07:40 -08:00
Stephen Birarda
f9b38af96f remove processing of Avatar URLs from AvatarMixer 2014-01-21 16:56:00 -08:00
Stephen Birarda
105fb42b34 rewrite mesh and skeleton requests from data-server 2014-01-21 16:46:04 -08:00
Brad Hefta-Gaub
eb1e72b838 fix a bug where x was only attribute being copied for vec3s WHT 2014-01-21 16:40:03 -08:00
Andrzej Kapolka
5b4447d0b9 More work on metavoxel editing. 2014-01-21 16:17:31 -08:00
Stephen Birarda
8e5d4b69f4 fix packet offset for owner UUID 2014-01-21 16:14:33 -08:00
Stephen Birarda
f13aa322fc resolve conflicts in merge with upstream/master 2014-01-21 16:01:12 -08:00
Stephen Birarda
417aa7ad59 re-expose an Avatar to the ScriptEngine 2014-01-21 15:59:55 -08:00
Brad Hefta-Gaub
90c841ff01 add findClosestParticle() to JS interface 2014-01-21 14:29:20 -08:00
Brad Hefta-Gaub
1c5e32fcb1 add example of new particle edit JS api 2014-01-21 14:08:19 -08:00
Brad Hefta-Gaub
03a9253748 remove usage of ParticleEditHandle from application 2014-01-21 14:07:46 -08:00
Brad Hefta-Gaub
278ca02595 remove debug code 2014-01-21 14:06:55 -08:00
Brad Hefta-Gaub
97b0ed2cc5 implemented support for PACKET_TYPE_PARTICLE_ERASE 2014-01-21 13:24:35 -08:00
Stephen Birarda
aa9f7ff31d hook the DataServerScriptingInterface to the ScriptEngine 2014-01-21 13:21:03 -08:00