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

8887 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
88232f320c Merge pull request #1469 from birarda/kill-leap 
remove leap integration
 2014-01-09 19:40:58 -08:00
Brad Hefta-Gaub
e908121bcd fix bug in Octree server that wasn't properly surpressing duplicate packets 2014-01-09 19:13:17 -08:00
Brad Hefta-Gaub
5787d3d9e9 more cast coding standard fixes 2014-01-09 19:00:57 -08:00
Brad Hefta-Gaub
cdb4b8c5f3 Merge branch 'master' of git://github.com/worklist/hifi into local_voxel_cache 2014-01-09 18:52:34 -08:00
Leonardo Murillo
eb52ded4ad Styling + others 2014-01-09 20:34:02 -06:00
Leonardo Murillo
664a1a7677 Checkpoint 2014-01-09 20:12:39 -06:00
Brad Hefta-Gaub
5b14a4eed3 removed dead code 2014-01-09 14:52:40 -08:00
Brad Hefta-Gaub
6e95c52444 make local voxel cache properly switch to different cache file when switching domains 2014-01-09 14:51:04 -08:00
Leonardo Murillo
9dd37344b8 checkpoint 2014-01-09 16:14:51 -06:00
Brad Hefta-Gaub
c181d0a849 first cut at local voxel cache 2014-01-09 12:05:09 -08:00
Brad Hefta-Gaub
03794f7218 make casts float match coding standard 2014-01-09 10:07:51 -08:00
Lucas Crisman
e1aa74a5df equal sign key as shortcut for Reset Avatar Size 2014-01-09 15:00:55 -03:00
Leonardo Murillo
efb173e1d4 Preliminary update dialog work 2014-01-08 21:20:43 -06:00
Andrzej Kapolka
69ce7db072 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2014-01-08 11:58:41 -08:00
Leonardo Murillo
d44126ac33 Get version XML and store latest version as application property 2014-01-08 08:30:50 -06:00
Leonardo Murillo
251416ab0a Merge branch 'master' of github.com:/worklist/hifi 2014-01-07 14:39:18 -06:00
Philip Rosedale
596218a173 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-06 17:18:13 -08:00
Stephen Birarda
9e49f200a6 Merge pull request #1468 from ey6es/master 
Fix for "red ball" issue with no skeleton: use avatar position for head
 2014-01-06 16:15:44 -08:00
Andrzej Kapolka
8b2212b6cf Fix for "red ball" issue with no skeleton: use avatar position for head 
position.
 2014-01-06 12:08:42 -08:00
Andrzej Kapolka
3504cc6d5a More work on deltas. 2014-01-06 12:01:14 -08:00
Stephen Birarda
133ba3a230 remove Leap integration from CMakeLists 2014-01-06 11:13:19 -08:00
Stephen Birarda
9eb31b48cc remove the Leap integration 2014-01-06 11:09:59 -08:00
Leonardo Murillo
314c4ffcfa Using applicationVersion() instead of const wherever version is specified 2014-01-06 09:24:29 -06:00
Leonardo Murillo
ba79b1b329 Using BUILD_VERSION to setApplicationVersion 2014-01-06 09:18:10 -06:00
Andrzej Kapolka
31443e4f4e Working on delta encoding. 2014-01-05 22:07:38 -08:00
Philip Rosedale
dade5ec1d6 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-05 21:38:41 -08:00
Philip Rosedale
61d3f63f9c Merge pull request #1458 from birarda/master 
fix random UUID creation for injector, assume RAW passed to sound is 48Khz
 2014-01-05 21:37:47 -08:00
Stephen Birarda
32be6199fd fix reference to downloaded byte array samples 2014-01-05 17:41:33 -08:00
Stephen Birarda
a06f18328c add downsampling so RAW audio for sound assumed to be 48Khz 2014-01-05 17:40:37 -08:00
Stephen Birarda
5b272bfd6a fix random UUID creation for injected audio 2014-01-05 17:09:57 -08:00
Philip Rosedale
39beb36655 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-05 16:41:06 -08:00
Philip Rosedale
8efd09befa bullets smaller and slower 2014-01-05 16:40:02 -08:00
Philip Rosedale
7c97247a92 Merge pull request #1455 from ZappoMan/more_scripting 
change particle update to support full script engine
 2014-01-05 13:50:49 -08:00
Brad Hefta-Gaub
abf8e83c33 change Voxels JS interface to be more clear 2014-01-05 11:09:16 -08:00
Brad Hefta-Gaub
7ce774da70 change particle update to support full script engine 2014-01-05 10:39:58 -08:00
Philip Rosedale
909663fe96 Merge pull request #1454 from ZappoMan/bugfixes 
fixes to scriptable particle collisions
 2014-01-04 16:28:48 -08:00
Brad Hefta-Gaub
0252e7f95e use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces 2014-01-04 03:17:02 -08:00
Brad Hefta-Gaub
0df02618ee use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces 2014-01-04 03:16:47 -08:00
Brad Hefta-Gaub
3efc1ea410 Merge branch 'master' of git://github.com/worklist/hifi into bugfixes 2014-01-04 01:47:49 -08:00
Brad Hefta-Gaub
207ea30c6d fix delete problem with voxels 2014-01-04 01:10:48 -08:00
Philip Rosedale
607d8332e3 Merge pull request #1452 from ey6es/master 
First cut at orbit behavior (plus ray/capsule intersection test for avatar picking).
 2014-01-03 20:02:11 -08:00
Andrzej Kapolka
02adcbc309 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-03 18:17:20 -08:00
Andrzej Kapolka
5694a8480e Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2014-01-03 18:17:01 -08:00
Andrzej Kapolka
35009c384f Merge pull request #1453 from PhilipRosedale/master 
two new scripts:  Clap, PlaySound
 2014-01-03 18:16:52 -08:00
Andrzej Kapolka
060e6e32d8 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2014-01-03 18:11:23 -08:00
Brad Hefta-Gaub
e97e211bc4 quiet down some debugging 2014-01-03 18:10:30 -08:00
Andrzej Kapolka
e37203d833 The overloaded function should be const, true. 2014-01-03 17:59:15 -08:00
Philip Rosedale
a2c33aadba two script example files 2014-01-03 17:58:00 -08:00
Andrzej Kapolka
1bd069c4e2 Removed unused variable. 2014-01-03 17:56:55 -08:00
Andrzej Kapolka
2b15fdf78f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-03 17:49:34 -08:00