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

7966 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
5458e7a555 Working on polymorphic attributes, average -> merge. 2013-12-16 12:05:16 -08:00
ZappoMan
f8830ed9b1 cleaned up hand target code a bit 2013-12-16 12:04:16 -08:00
Stephen Birarda
4e618fc307 Merge pull request #1378 from murillodigital/master 
Displaying build number in title and using proper cache path
 2013-12-16 12:01:26 -08:00
Stephen Birarda
1f9ca00317 drive input from buffer callback and output from network 2013-12-16 11:58:23 -08:00
Leonardo Murillo
4f1ff5b566 Using QStandardPaths for cache directory 2013-12-16 13:55:04 -06:00
ZappoMan
32c2aef29b temp remove debug verbosity 2013-12-16 11:36:19 -08:00
Leonardo Murillo
5ac125fdd8 Typo fix 2013-12-16 13:32:12 -06:00
Leonardo Murillo
06d14436bd Printing build version on title 2013-12-16 13:29:17 -06:00
ZappoMan
f9b7c23857 correct handleing of app shutdown and scripting enging termination 2013-12-16 11:26:30 -08:00
ZappoMan
af52be7860 tweaks to script engine shutdown behavior 2013-12-16 09:32:01 -08:00
ZappoMan
58350cf596 Merge pull request #1375 from murillodigital/master 
Including and printing Jenkins build job number
 2013-12-16 09:22:44 -08:00
ZappoMan
524a41468c multiple scripts running at same time, menu interface for scripts 2013-12-16 09:16:51 -08:00
Leonardo Murillo
7b9147fb6c Tidy up 2013-12-16 11:05:08 -06:00
Leonardo Murillo
3ca9cde500 Adding build sequence to Interface build 2013-12-16 11:03:49 -06:00
Philip Rosedale
893a3900d9 added palm collision sounds 2013-12-15 20:55:51 -08:00
Philip Rosedale
ce986c367e palms detect collision 2013-12-15 19:53:24 -08:00
ZappoMan
a220804fb0 properly connect signals and slots to shut down script properly, fix null termination in script file load 2013-12-14 14:23:33 -08:00
ZappoMan
dacaade9ed first cut at client scripts working 2013-12-14 13:54:25 -08:00
ZappoMan
c2d5accbc9 implement OctreeScriptingInterface base class to share common behavior for particle and voxel scripting 2013-12-14 13:25:33 -08:00
ZappoMan
6af9ae0e82 Merge pull request #1372 from PhilipRosedale/grabStepping 
Grab and move yourself around with button 4
 2013-12-14 11:36:46 -08:00
ZappoMan
e2fbb7beb4 first cut at splitting out scripting engine from agent to add to client 2013-12-14 08:14:38 -08:00
Philip Rosedale
21d7fe1277 Grab and move with button 4 2013-12-13 21:59:19 -08:00
ZappoMan
02d3d384ca added basic support for hit particles with the palm of the hand 2013-12-13 19:02:45 -08:00
Philip Rosedale
a04c544c17 Merge fixes 2013-12-13 16:35:11 -08:00
Philip Rosedale
b6ae9869c2 Merge pull request #1369 from ZappoMan/particle_voxel_collisions 
New Particle Features
 2013-12-13 15:46:00 -08:00
Andrzej Kapolka
c9b734dad3 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-13 15:28:03 -08:00
Andrzej Kapolka
931ac38bb2 Merge pull request #1370 from ey6es/master 
Fix for crash that Philip was seeing.
 2013-12-13 15:25:42 -08:00
Andrzej Kapolka
41fdbcb30f Fix for crash that Philip was seeing. 2013-12-13 15:25:03 -08:00
Philip Rosedale
1b1fdd3dc4 add menu option for sixense filter 2013-12-13 15:21:32 -08:00
Andrzej Kapolka
41c7b9ce29 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2013-12-13 15:00:05 -08:00
Andrzej Kapolka
50e4691568 Pointer attributes, cleanup. 2013-12-13 14:33:18 -08:00
ZappoMan
aaf4ff7dfc added lifetime to particles 2013-12-13 14:30:29 -08:00
ZappoMan
38d928fa4e make balls for both hands, allow you to change color, remove red wire simulation 2013-12-13 11:58:12 -08:00
Philip Rosedale
09258cb17b Merge branch 'master' of https://github.com/worklist/hifi 2013-12-13 10:38:21 -08:00
Philip Rosedale
d5c6612ec7 Merge pull request #1366 from ZappoMan/particle_voxel_collisions 
particle to particle collisions
 2013-12-13 10:37:27 -08:00
ZappoMan
7a4f9cf722 particle to particle collisions 2013-12-13 10:23:37 -08:00
Andrzej Kapolka
a10aca59f3 Visitor cleanup. 2013-12-12 18:29:23 -08:00
Philip Rosedale
caed884583 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-12 18:17:23 -08:00
Philip Rosedale
90832313e2 Merge pull request #1365 from ZappoMan/particle_voxel_collisions 
Particle voxel collisions
 2013-12-12 18:13:17 -08:00
ZappoMan
d5c6c60836 fix crash in collisions 2013-12-12 18:04:27 -08:00
Philip Rosedale
63243b2e14 merge fix 2013-12-12 17:58:37 -08:00
ZappoMan
51f07cad88 removed some debug 2013-12-12 17:56:56 -08:00
ZappoMan
f94e000e6b Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 2013-12-12 17:52:33 -08:00
ZappoMan
5830f1134e add particle collisions with voxels 2013-12-12 17:52:22 -08:00
Philip Rosedale
1c4f02d568 Merge pull request #1363 from ZappoMan/edit_particles 
Add shadows and only render local toy ball if one has been created
 2013-12-12 17:51:54 -08:00
Stephen Birarda
25b7065298 changes for broken test 2013-12-12 17:19:54 -08:00
Andrzej Kapolka
652248bf2b Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-12 16:56:15 -08:00
Andrzej Kapolka
5cdd36b95a Merge pull request #1364 from ey6es/master 
Fix for obnoxious C++0x warning in GCC.
 2013-12-12 16:47:16 -08:00
Andrzej Kapolka
17b2ee6984 Fix for obnoxious C++0x warning in GCC. 2013-12-12 16:46:17 -08:00
Andrzej Kapolka
c003a55c37 Diffuse lighting. 2013-12-12 16:19:05 -08:00