Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 11:49:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
41007 commits 76 branches 59 tags 1.2 GiB
Commit graph

5773 commits

Author SHA1 Message Date
Brad Hefta-Gaub
447918d148 Merge pull request #7348 from hyperlogic/tony/cppcheck-fixes 
Avatar & Animation cppcheck static analysis fixes
 2016-03-14 18:58:25 -07:00
Zach Pomerantz
0ea70f234f Add bg gpu timer display 2016-03-14 17:53:48 -07:00
Clément Brisset
e38c08ebd9 Merge pull request #7335 from imgntn/photosphere 
Add Photo Sphere Example
 2016-03-14 16:56:17 -07:00
Ryan Huffman
850fb51f72 Fix keylight direction naming and usage 2016-03-14 14:45:00 -07:00
Seth Alves
d811c4f6b5 dynamic is the same as grabbable-by-default 2016-03-14 11:39:56 -07:00
Seth Alves
1f8a55da3a dynamic is the same as grabbable-by-default 2016-03-14 11:36:44 -07:00
Chris Collins
e577658315 Merge pull request #7333 from PhilipRosedale/testSound 
playTestSound.js - better clip for testing/showing audio
 2016-03-14 08:44:28 -07:00
Anthony Thibault
1e94d9bdf5 interface/src/avatar: cppcheck fixes 2016-03-13 18:56:15 -07:00
Brad Davis
798d2a73db Merge pull request #7326 from ZappoMan/toggleOverlay 
Various Overlay, Menu, and Away Mode bug fixes
 2016-03-13 11:44:19 -07:00
James B. Pollack
96bc17cd5e Update photo_sphere.js 2016-03-12 16:01:10 -08:00
Seth Alves
cca4a93b2b don't full up userData with default grabbable data 2016-03-12 14:09:52 -08:00
Seth Alves
be51040420 grabbable controlls are working 2016-03-12 13:20:04 -08:00
Seth Alves
f1992af38e started to add grabbable psuedo properties to edit.js 2016-03-12 13:20:00 -08:00
James B. Pollack
b0109133c0 add git handle 2016-03-11 22:02:49 -08:00
James B. Pollack
cecebc9ae4 add example 2016-03-11 22:01:01 -08:00
PhilipRosedale
9823ecffa7 new test sound script 2016-03-11 17:00:44 -08:00
Brad Hefta-Gaub
6083706151 CR feedback 2016-03-11 16:47:16 -08:00
Brad Hefta-Gaub
082bb8c4b8 auto-show reticle on mouse click 2016-03-11 12:49:42 -08:00
Brad Hefta-Gaub
e341419090 enter away mode when you remove the Vive HMD 2016-03-11 11:56:39 -08:00
Brad Hefta-Gaub
d32611a7f9 make away show overlays if they are hidden when you enter away 2016-03-11 11:45:52 -08:00
Brad Hefta-Gaub
d1c024fb39 Merge pull request #7286 from zzmp/fix/skybox-tex 
Clean up skybox rendering
 2016-03-11 08:50:23 -08:00
Brad Hefta-Gaub
d8d500c318 Merge pull request #7291 from ericrius1/uniformBugRepro 
Rapid uniform change test
 2016-03-11 08:45:52 -08:00
Zach Pomerantz
25607709a5 Add test for skybox 2016-03-10 22:52:07 -08:00
James B. Pollack
aa884d9e3b spatial 2016-03-10 22:45:44 -08:00
ericrius1
f3c9b49262 Merge remote-tracking branch 'upstream/master' 2016-03-10 13:50:57 -08:00
Brad Hefta-Gaub
509abbf1d4 remove inspect.js from default scripts 2016-03-10 13:31:27 -08:00
ericrius1
5ba96cb07c removed print statements 2016-03-10 12:47:31 -08:00
Brad Hefta-Gaub
6ed1ad10a1 remove hmdDefaults and hmdControls scripts, since they are borked 2016-03-10 12:12:24 -08:00
ericrius1
8fe926e535 added print statements 2016-03-10 11:41:12 -08:00
ericrius1
2af4dd90e1 updated shader links to be s3 2016-03-10 11:40:09 -08:00
Zach Pomerantz
f37049059e Finish name changes for rapidProceduralChange 2016-03-10 10:19:52 -08:00
Brad Hefta-Gaub
1547fc15aa Merge pull request #7305 from PhilipRosedale/editHandles 
Adjust edit handle sizes
 2016-03-10 09:46:43 -08:00
Zach Pomerantz
3cd0f0d237 Drive skybox off of timer 2016-03-09 19:34:48 -08:00
Zach Pomerantz
d89d89fd08 Add all entities and skybox 2016-03-09 18:35:03 -08:00
PhilipRosedale
c11487735f Adjust grab handle sizes 2016-03-09 17:46:38 -08:00
PhilipRosedale
6017db0f31 Adjust grab handle sizes 2016-03-09 17:43:44 -08:00
Chris Collins
ddb09ec222 Merge pull request #7285 from hyperlogic/tony/hand-controller-move-improvements 
Hand controller mouse improvements
 2016-03-09 16:34:35 -08:00
Seth Alves
fbbc27213d Merge pull request #7287 from PhilipRosedale/fireflies 
Fireflies
 2016-03-09 15:20:27 -08:00
James B. Pollack
7c44556234 Merge pull request #7301 from ericrius1/growingPlant 
Remove prematurely added VRVJ folder from examples folder
 2016-03-09 15:17:17 -08:00
ericrius1
05d26be300 delete file 2016-03-09 15:15:20 -08:00
ericrius1
7b20fdcc1a add file before delete 2016-03-09 15:14:51 -08:00
ericrius1
974189b546 deleted cartridge spawner 2016-03-09 15:10:35 -08:00
PhilipRosedale
5230d3a705 Added header 2016-03-09 14:45:26 -08:00
Seth Alves
143d8a0929 Merge pull request #7267 from ericrius1/growingPlant 
Plant that blooms flowers when it is watered by a water can
 2016-03-09 11:28:38 -08:00
ericrius1
c59a58a833 changing color of visual component to match sound cartridge 2016-03-09 11:22:47 -08:00
ericrius1
d65dcf7142 no more velocity 2016-03-09 11:11:20 -08:00
ericrius1
170dd418f8 chaged shader link 2016-03-09 10:35:11 -08:00
ericrius1
1a09c5d19f test script for uniform change 2016-03-09 10:33:18 -08:00
Anthony J. Thibault
e1a3c5b618 Fix for vertical pitch offset. 
Also, added hysteresis to the controller selection, to prevent flapping back and forth between controllers when they are at rest.
 2016-03-09 10:31:58 -08:00
ericrius1
8903a61c6e basic shader 2016-03-09 10:24:46 -08:00
ericrius1
41df11f614 spacing 2016-03-09 09:55:15 -08:00
PhilipRosedale
4728eeb862 less of them 2016-03-08 20:22:29 -08:00
PhilipRosedale
5487c4cdab Firefly script 2016-03-08 19:42:11 -08:00
ericrius1
deb2c5af63 parenting visual to sound entity 2016-03-08 18:30:27 -08:00
Anthony J. Thibault
deb17e1f93 Merge branch 'master' into tony/hand-controller-move-improvements 2016-03-08 17:45:50 -08:00
Anthony J. Thibault
f82dc4569e handControllerMouse.js: removed non-uniform scaling. 
If your controller moves in a circle, the mouse pointer should as well.
 2016-03-08 15:59:17 -08:00
Anthony J. Thibault
ce5d83d551 handConttollerMouse.js: improved comments 2016-03-08 15:32:12 -08:00
Anthony J. Thibault
27fb7a3143 handControllerMouse: improve determination of which controller is moving the most 
That controller will have exclusive control of the mouse reticle.
 2016-03-08 15:14:37 -08:00
Brad Hefta-Gaub
d879300413 Merge pull request #7277 from sethalves/edit-vs-mouse-grab 
Edit vs mouse grab
 2016-03-08 14:19:40 -08:00
Seth Alves
40bc66c154 Merge pull request #7272 from imgntn/shapetype 
"Collision Shape Type" in edit.js instead of "Shape Type"
 2016-03-08 11:34:42 -08:00
ericrius1
9edc8aa5aa searching for name 2016-03-08 11:34:00 -08:00
ericrius1
503d2874ab initial vr vj set up 2016-03-08 10:59:01 -08:00
Seth Alves
04e36f925a use local message 2016-03-08 10:30:49 -08:00
Seth Alves
0b6f52f508 use local messaging to disable mouse-grab when edit.js is active 2016-03-08 10:27:34 -08:00
James B. Pollack
9db528d7a3 Merge pull request #7273 from imgntn/nomarketplaceinfo 
DIsable Right Click Marketplace Info for now from edit.js
 2016-03-08 09:08:29 -08:00
James B. Pollack
482964d8ad hide this for now 2016-03-07 20:37:14 -08:00
James B. Pollack
8381b1d2fd collision shape type 2016-03-07 20:21:14 -08:00
Anthony J. Thibault
26b4c904f3 handControllerMouse.js: transform hand controllers into sensor frame 2016-03-07 18:42:52 -08:00
ericrius1
7b69aa375e moved plant to home folder 2016-03-07 18:18:38 -08:00
James B. Pollack
fbe640e351 the model was different so adjust things 2016-03-07 16:38:15 -08:00
Anthony J. Thibault
0d62b10a8f Added Mat4 support to script 
Also, hooked up MyAvatar.sensorToWorldMatrix access to script.
 2016-03-07 16:16:14 -08:00
ericrius1
d4bc83f408 cleanup and bug fixes 2016-03-07 16:16:06 -08:00
Andrew Meadows
dfe0575237 Merge pull request #7260 from imgntn/newponggun 
New Ping Pong Gun Model
 2016-03-07 15:51:59 -08:00
ericrius1
3dc39600cd stop pouring on release 2016-03-07 15:32:40 -08:00
ericrius1
b9bd4cae93 better water effect 2016-03-07 14:58:59 -08:00
James B. Pollack
2d554f4b40 Merge pull request #7249 from ericrius1/playaFireworks 
Playa fireworks and associated tutorial
 2016-03-07 14:32:06 -08:00
ericrius1
ca747bb4e9 fixed dates 2016-03-07 14:29:17 -08:00
James B. Pollack
567039ef82 Update createPingPongGun.js 2016-03-07 14:28:16 -08:00
ericrius1
caca60c039 added headers to tutorial code 2016-03-07 14:09:21 -08:00
ericrius1
cdd4fdb03e slower growth 2016-03-07 14:04:45 -08:00
Seth Alves
e8001d0346 Merge pull request #7264 from imgntn/flashlightbrightfix 
Make the flashlight brighter
 2016-03-07 14:04:02 -08:00
James B. Pollack
9cd0762040 brighter 2016-03-07 12:26:21 -08:00
James B. Pollack
247ebb380b Merge pull request #7253 from hyperlogic/tony/distance-holding-fixes 
HandControllerGrab: fixes for distance holding
 2016-03-07 12:12:58 -08:00
Anthony Thibault
b096e062e6 Merge pull request #7250 from ZappoMan/smallFix 
fix a couple bugs in this script
 2016-03-07 09:13:58 -08:00
Chris Collins
86f60671a7 Merge pull request #7254 from ZappoMan/hackathonMusicPlayer 
Music Player
 2016-03-07 09:01:58 -08:00
James B. Pollack
830a61b874 update 2016-03-06 15:04:47 -08:00
James B. Pollack
9a860bd31a update ping pong gun model url 2016-03-06 15:01:35 -08:00
Brad Hefta-Gaub
78b608b970 Merge pull request #7225 from PhilipRosedale/hydraReticle 
Hand controller drives mouse, does not take over if set down
 2016-03-06 13:33:02 -08:00
Brad Hefta-Gaub
168fd2d72f read playlist URL from userData 2016-03-05 01:07:20 -08:00
Brad Hefta-Gaub
2f92a4cccd first cut at music player 2016-03-05 00:45:25 -08:00
Anthony J. Thibault
076b0b42d7 HandControllerGrab: fixes for distance holding 
Because controller poses are in avatar space, there is no need
to apply delta avatar position changes and rotation changes.
 2016-03-04 20:36:32 -08:00
ericrius1
65c8f7cc45 flowers growing 2016-03-04 17:55:45 -08:00
ericrius1
3ad2d1aa9b flowers spawning and growing correctly 2016-03-04 17:32:29 -08:00
ericrius1
ef437b7f99 flowers staying in place 2016-03-04 16:48:55 -08:00
PhilipRosedale
87e7dd9ce3 add vive button mapping 2016-03-04 16:16:05 -08:00
ericrius1
17dec9446a flowers are growing when watered 2016-03-04 16:15:37 -08:00
Brad Hefta-Gaub
6d56a0d051 more CR feedback 2016-03-04 15:55:08 -08:00
Brad Hefta-Gaub
2b4d206eca more CR feedback 2016-03-04 15:54:28 -08:00
Brad Hefta-Gaub
e776bf5819 CR feedback 2016-03-04 15:47:50 -08:00
Brad Hefta-Gaub
d8e7c60ce0 CR feedback 2016-03-04 15:47:25 -08:00