Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 03:43:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30666 commits 76 branches 59 tags 1.2 GiB
Commit graph

3002 commits

Author SHA1 Message Date
James Pollack
8f77c0b61c Update wand to use relative paths, remove some unused position tracking methods, remove cache busting from model file paths 2015-09-10 09:58:31 -07:00
James Pollack
da90b7ff08 remove logging around bubble leave entity 2015-09-09 09:53:47 -07:00
James Pollack
0ac4da285c Update bubblewand to not use overlays by default. 2015-09-09 09:48:39 -07:00
James Pollack
66b6d5178f Cleanup wand when createWand.js script ends 2015-09-08 17:25:39 -07:00
Brad Hefta-Gaub
1df3a8f814 Merge pull request #5727 from jherico/marge 
Procedural rendering for box & sphere entities
 2015-09-05 12:43:21 -07:00
Brad Davis
d8e5945d14 Removing procedural edit work in progress for now 2015-09-05 12:17:36 -07:00
Brad Davis
e8435b6218 Procedural rendering for box entities 2015-09-05 12:10:45 -07:00
Brad Hefta-Gaub
50e6d2f769 Merge pull request #5712 from highfidelity/bubblewand 
wand.js + bubble.js = bubblewand
 2015-09-04 20:07:22 -07:00
Brad Hefta-Gaub
7b4e69a92d Merge pull request #5698 from Nex-Pro/20657 
CR for Job #20657 - Entities list trouble past 100 entities
 2015-09-04 20:06:33 -07:00
Brad Hefta-Gaub
10585a1b30 have breakdance entity script use the model and location of the entity 2015-09-04 16:20:12 -07:00
James Pollack
5684e13400 updates for cleaner PR 2015-09-04 15:49:12 -07:00
Seth Alves
7d2bdb3689 Merge pull request #5719 from ericrius1/spraypaint 
added spraypaint-can entity script
 2015-09-04 11:27:52 -07:00
ericrius1
f48cfa1208 added spawner script for spray paint toy 2015-09-04 10:36:14 -07:00
Andrew Meadows
5d40517edd Merge pull request #5706 from sethalves/polyvox-again 
Polyvox improvements
 2015-09-04 10:32:36 -07:00
ericrius1
878d42a8d0 added spraypaint can entity script 2015-09-04 10:30:12 -07:00
Brad Hefta-Gaub
143376f501 Merge pull request #5718 from jherico/homer 
Magballs: Cleaning up some debugging spew and fixing UI HTML paths
 2015-09-04 10:01:01 -07:00
Brad Davis
80f2ecbab6 Cleaning up some debugging spew and fixing UI HTML paths 2015-09-04 09:59:42 -07:00
Brad Davis
3573fe8d11 Merge pull request #5717 from ZappoMan/breakDanceEntityScript 
add breakdance game as entity script that works with hydra grab
 2015-09-04 09:49:54 -07:00
Brad Hefta-Gaub
895028134b add breakdance game as entity script that works with hydra grab 2015-09-04 09:40:09 -07:00
Seth Alves
72322c0270 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-04 09:12:32 -07:00
James B. Pollack
a9ad18ec80 cleanup, comments, and consolidation. 2015-09-03 20:42:56 -07:00
Brad Davis
c8069ba73c Working on magballs polish 2015-09-03 20:09:54 -07:00
James Pollack
1e9bac8dee add create wand script, add offset to bubble spawn point so that it is at the end of the wand 2015-09-03 17:42:41 -07:00
James Pollack
cf0d236174 silence logging statements for now 2015-09-03 16:50:37 -07:00
James Pollack
80c18c227e Attach the wand.js script to an entity and then move it around to make bubbles. Customize bubble behavior with bubble.js - make sure to update the path reference in wand.js 2015-09-03 16:42:14 -07:00
Seth Alves
e12b7807ad merge from upstream 2015-09-03 16:36:04 -07:00
Brad Davis
a8b5336e02 Merge pull request #5709 from ZappoMan/breakdanceToy 
next wave of breakdance work
 2015-09-03 14:55:04 -07:00
Brad Hefta-Gaub
44c554895d next wave of breakdance work 2015-09-03 14:33:25 -07:00
ericrius1
ebe5818c84 relative path 2015-09-03 14:09:01 -07:00
ericrius1
fa42334430 added userData manipulations to grab script 2015-09-03 11:30:44 -07:00
Seth Alves
07b241c778 code review 2015-09-03 11:05:44 -07:00
Seth Alves
bb96ad1346 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-03 09:38:58 -07:00
Brad Hefta-Gaub
e6f43d3dd7 Merge pull request #5702 from ericrius1/newGrab 
update hydra grab to grab near and far objects, and removed grabbing…
 2015-09-02 18:43:41 -07:00
Brad Davis
5717b77837 Updating magballs to omnitool 2015-09-02 18:14:21 -07:00
Brad Davis
ea415071b4 OmniTool first pass 2015-09-02 18:14:13 -07:00
ericrius1
d303c7e119 only add actions to physical objects 2015-09-02 16:45:50 -07:00
Seth Alves
2e880e9aab change how pick-ray direction is calculated 2015-09-02 16:29:15 -07:00
Brad Davis
849249d7fe Fixing colors 
Conflicts:
	examples/toys/magBalls/handController.js
 2015-09-02 15:56:38 -07:00
ericrius1
1e6198cf59 update dhydra grab to grab near and far objects, and removed grabbing logic from toybox.js 2015-09-02 11:29:37 -07:00
Seth Alves
f54d924f4a make sure intersected entity is in the list of possible polyvoxes to adjust 2015-09-02 09:29:51 -07:00
Seth Alves
3963035599 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-01 21:08:23 -07:00
Seth Alves
8608e4f2b0 small bug-fixes 2015-09-01 16:51:55 -07:00
Seth Alves
4ab8ac29b9 make terrain a doubly linked list 2015-09-01 15:23:47 -07:00
Ryan Downe Karpf
f0d69b1cdd Merge pull request #5665 from ctrlaltdavid/20664 
Add search radius field to entities list
 2015-09-01 14:39:53 -07:00
Seth Alves
ca1602e443 if avatar is already standing on a terrain-polyvox, try creating a new one where they are facing 2015-09-01 11:09:46 -07:00
Seth Alves
0dfe6e8054 Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again 2015-09-01 09:13:43 -07:00
Seth Alves
4cbfe96b70 allow a sphere set/clear to affect more than one polyvox at a time 2015-08-31 18:16:32 -07:00
Seth Alves
6096c20db0 allow adding and deleting spheres 2015-08-31 18:00:31 -07:00
David Rowe
e2ee074b7a Entity search uses radius, not diameter 2015-08-31 13:51:03 -07:00
Andrew Meadows
5a67865d74 Merge pull request #5679 from jherico/apu 
Magnetic sticks and balls, rough draft
 2015-08-31 13:17:29 -07:00