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
41072 commits 76 branches 59 tags 1.2 GiB
Commit graph

5734 commits

Author SHA1 Message Date
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
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
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
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
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
Brad Hefta-Gaub
3f85daf276 Merge branch 'master' of https://github.com/highfidelity/hifi into hackathonLightening 2016-03-04 15:31:32 -08:00
Brad Hefta-Gaub
add7f54af3 remove debug line 2016-03-04 15:29:32 -08:00
Brad Hefta-Gaub
21b66354ef remove debug line 2016-03-04 15:28:49 -08:00
Brad Hefta-Gaub
c9cd8eeba6 fix a couple bugs 2016-03-04 15:27:43 -08:00
Philip Rosedale
cb8e2b7018 Merge pull request #7246 from AndrewMeadows/stable-ik 
recover stability of arm IK
 2016-03-04 14:38:59 -08:00
Atlante45
3a5165ab66 Add json import for game entity 2016-03-04 11:54:03 -08:00
Atlante45
ab5a29b076 Bit of cleanup 2016-03-04 11:50:12 -08:00
PhilipRosedale
e01524abbe fix for clicking 2016-03-04 11:24:35 -08:00
Andrew Meadows
9bf4a30a23 fix typo in example script 2016-03-04 10:57:06 -08:00
Atlante45
f62a3ed8f6 Remove tabs 2016-03-04 10:46:30 -08:00
Atlante45
0364703f86 Move script to toybox 2016-03-03 17:29:11 -08:00
Atlante45
10d55666f2 Changed coin value 2016-03-03 12:23:50 -08:00
Atlante45
b00ff7a81c Display score and save high scores 2016-03-03 12:19:01 -08:00
Atlante45
d1f7cf6387 Added freeze on loss and points architecture 2016-03-03 10:51:37 -08:00
Atlante45
442bd22f46 New sounds + coins!!! 2016-03-03 09:56:11 -08:00
Atlante45
f582222389 Couple additional features 2016-03-03 03:24:12 -08:00
Brad Hefta-Gaub
a752f55deb example of a rainy day/night zone 2016-03-03 02:25:41 -08:00
Atlante45
d5d5eaaf9c Fix cooldown 2016-03-02 23:42:27 -08:00
Atlante45
bef2885957 Couple bounding box fixes 2016-03-02 22:25:30 -08:00
Atlante45
21b3f88dee Scale up/Add avatar rotation/Cleanup 2016-03-02 21:59:40 -08:00
Atlante45
cf52aeeed2 Use correctly resized avatar model with fly animation 2016-03-02 20:40:25 -08:00
Atlante45
48fe9b343e Couple trigger value fixes 2016-03-02 18:20:18 -08:00
Atlante45
811ed91e02 Port to entity script 2016-03-02 18:02:57 -08:00
Atlante45
553300a783 Added a pipe on the top, randomized the height 2016-03-02 17:37:26 -08:00
Atlante45
dc1acd7a5b Give pipes their own class 2016-03-02 16:40:53 -08:00
Atlante45
247f1ef0e8 Make Bird its own Class 2016-03-02 16:07:32 -08:00
Atlante45
6ae27fe1f9 More flappy bird work 2016-03-02 15:53:13 -08:00
Atlante45
3ef4e45dae Flappy bird first draft 2016-03-02 10:36:28 -08:00
ericrius1
8df0ed679d Merge remote-tracking branch 'upstream/master' into growingPlant 2016-03-02 08:47:29 -08:00
Brad Hefta-Gaub
cfce5af8d4 Merge pull request #7191 from samcake/orange 
Better Shading Model and support fr Stingray material
 2016-03-01 18:24:09 -08:00
samcake
16ac69315f Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture 2016-03-01 16:38:02 -08:00
ericrius1
2029532070 chapter 3 2016-03-01 15:44:20 -08:00
Brad Hefta-Gaub
77b371e375 fix away state when starting in HMD 2016-03-01 15:00:19 -08:00
ericrius1
7179960bbf chapter 2 2016-03-01 14:18:38 -08:00
ericrius1
bc7d7a3dae adding chapters 2016-03-01 12:43:06 -08:00
Andrew Meadows
c1b3858193 Merge pull request #7228 from ZappoMan/hmdHacking 
HMD and Away improvements
 2016-03-01 11:48:09 -08:00
samcake
7120b64a33 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-03-01 10:53:40 -08:00
samcake
89920370db A bunch of typo fixes after review 2016-03-01 10:53:08 -08:00
Brad Hefta-Gaub
ba7b5c6e23 some improvements 2016-03-01 10:43:49 -08:00