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

5662 commits

Author SHA1 Message Date
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
Brad Hefta-Gaub
ae824bb180 Merge pull request #7173 from ericrius1/whiteboardV2 
Whiteboard using markers and erasers
 2016-03-01 09:12:16 -08:00
Brad Hefta-Gaub
52c38e56a4 make the HMD away overlay 3d 2016-02-29 21:25:25 -08:00
Brad Hefta-Gaub
501d23021f slight improvement to Away to have the paused overlay follow your view in HMD 2016-02-29 20:53:18 -08:00
Brad Hefta-Gaub
95c92f7a27 tweak depthReticle to work better with away 2016-02-29 20:35:25 -08:00
Brad Hefta-Gaub
a3f4dbddcf Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 2016-02-29 20:23:14 -08:00
Brad Hefta-Gaub
2c3fdc995f Away improvements 2016-02-29 20:23:06 -08:00
samcake
e72035ee3d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-29 18:55:30 -08:00
ericrius1
cf891ef5d9 ray casting works 2016-02-29 18:22:12 -08:00
Howard Stearns
c0eef51d41 Merge pull request #7222 from ZappoMan/depthReticleWork 
more reticle improvements
 2016-02-29 17:42:03 -08:00
PhilipRosedale
efe53c1a85 actually don't add to default yet 2016-02-29 17:12:43 -08:00
ericrius1
def0df9bff intersection with growable object 2016-02-29 16:59:03 -08:00
PhilipRosedale
b89b6be210 look for hydra first 2016-02-29 16:45:00 -08:00
PhilipRosedale
86249cc9db add hand controller mouse to default scripts 2016-02-29 16:23:03 -08:00
PhilipRosedale
0e17506137 hand controller doesn't take mouse if set down, renamed file. 2016-02-29 16:21:06 -08:00
Eric Levin
33fe2e9b36 Update markerEntityScript.js 2016-02-29 16:11:08 -08:00
ericrius1
0d9a8b22c8 water flowing in ray direction 2016-02-29 15:48:56 -08:00
ericrius1
b301b71c7d cast ray from spout in its direction 2016-02-29 15:06:28 -08:00
Brad Hefta-Gaub
dc4c4e8c94 some tweaks to auto-hide 2016-02-29 14:24:43 -08:00
Seth Alves
0268ca0888 Merge pull request #7219 from PhilipRosedale/editFix2 
More accurate X/Z movement with edit.js
 2016-02-29 13:23:02 -08:00
Brad Hefta-Gaub
bd80ecd4dc Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork 2016-02-29 13:17:24 -08:00
Philip Rosedale
3eabf0d451 Merge pull request #7209 from sethalves/auto-unhook-stuck-to-hand 
when trigger is squeezed, check for things stuck to hand and unhook them
 2016-02-29 12:59:02 -08:00
ericrius1
03ae48d465 going to find water spout from water can 2016-02-29 11:53:26 -08:00
ericrius1
00dcddd838 changed to water spout entity script 2016-02-29 11:44:33 -08:00
ericrius1
2cd8e088f5 water pouring out of can linked to angle can is held 2016-02-29 10:36:32 -08:00
PhilipRosedale
42f6ede43c azimuth = elevation, duh 2016-02-29 10:22:24 -08:00
PhilipRosedale
d1bc31afb6 azimuth function is really just a ratio 2016-02-29 10:16:34 -08:00
PhilipRosedale
08eacc436f Fixed rayPlane test again 2016-02-29 10:13:01 -08:00
ericrius1
b7e80b03ae Merge branch 'master' into growingPlant 2016-02-29 10:10:25 -08:00
samcake
4bec6ddf52 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-29 09:20:37 -08:00
Brad Hefta-Gaub
4009f03c38 move autohide/show behavior to depthReticle, make it a default script 2016-02-29 08:38:53 -08:00
PhilipRosedale
cee79c8274 Fixed bug in rayPlane test 2016-02-28 15:44:23 -08:00
Brad Hefta-Gaub
8de4a59078 add support for auto-hide reticle and seek lookat on auto-show of reticle 2016-02-28 13:06:49 -08:00
Brad Davis
d932cb7578 Merge pull request #7212 from ZappoMan/depthReticleWork 
add fade between depths in depth reticle
 2016-02-28 12:49:47 -08:00
PhilipRosedale
e9aed83920 suppress debug messages 2016-02-28 12:41:40 -08:00
Seth Alves
5bf8670bc2 fix SpatiallyNestable::getChildren 2016-02-28 12:16:41 -08:00
PhilipRosedale
1d681a2461 Add angular size and azimuth limits to object XZ translation 2016-02-28 12:00:13 -08:00
Brad Hefta-Gaub
e403c990d9 make fade non-linear 2016-02-27 17:13:09 -08:00
PhilipRosedale
47504a068e remove unused code 2016-02-26 16:58:38 -08:00
PhilipRosedale
7fd88793dc drag relative to plane where pointer collided selection box 2016-02-26 16:58:17 -08:00
Brad Hefta-Gaub
70614aba90 Merge pull request #7184 from imgntn/cellscience 
Cellscience Updates
 2016-02-26 16:53:00 -08:00
ericrius1
5762c33cfe strokes are now parented to whiteboard surface 2016-02-26 15:07:22 -08:00
ericrius1
d0752143dc markers and eraser reset to original positions after being dropped 2016-02-26 14:49:48 -08:00
ericrius1
48f03ba476 markers resetting 2016-02-26 14:29:43 -08:00
ericrius1
a544ffc942 not emitting right now 2016-02-26 14:20:40 -08:00
ericrius1
0015e28b95 particle tweaks 2016-02-26 14:14:39 -08:00
ericrius1
e83c1f71a6 front and back 2016-02-26 12:17:46 -08:00
ericrius1
ed9f279a63 moved whiteboard Surface up 2016-02-26 12:12:27 -08:00
ericrius1
df3e26edd5 calligraphy 2016-02-26 12:05:30 -08:00
Brad Hefta-Gaub
6d9c585604 add fade between depths in depth reticle 2016-02-26 12:01:59 -08:00
ericrius1
6e0ddb3918 really fixed rotation 2016-02-26 11:48:15 -08:00
ericrius1
1542b9da12 rotation works right now 2016-02-26 11:33:59 -08:00
ericrius1
c81f3256dd rotation 2016-02-26 10:58:22 -08:00
Seth Alves
5594f1e4e5 if equipped entity vanishes, reset grab state 2016-02-26 10:27:34 -08:00
ericrius1
25a2d1eb93 fixed rotation 2016-02-26 10:14:27 -08:00
Seth Alves
6c9cf386a6 when trigger is squeezed, check for things stuck to hand and unhook them 2016-02-26 10:14:09 -08:00
ericrius1
b70d96ea96 Merge branch 'master' into whiteboardV2 2016-02-26 09:17:43 -08:00
ericrius1
d65479be77 Merge branch 'master' into growingPlant 2016-02-26 08:55:21 -08:00
samcake
3ee6f9d6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-25 23:48:53 -08:00
Andrew Meadows
ef433c0e01 legacy support for EntityViewer.setKeyholeRadius() 2016-02-25 22:24:37 -08:00
ericrius1
0ce4385554 no offset increment 2016-02-25 18:22:54 -08:00
ericrius1
4d2a65926c test 2016-02-25 18:06:13 -08:00
Brad Hefta-Gaub
25634ea0ca Merge pull request #7204 from PhilipRosedale/betterLeap 
Leap Motion can near grab entities
 2016-02-25 17:48:56 -08:00
PhilipRosedale
4845de68dd fixed typo 2016-02-25 17:29:53 -08:00
PhilipRosedale
0cc1c930c5 mapped finger curl to trigger value 2016-02-25 17:04:46 -08:00
ericrius1
0602bf7f1a logging 2016-02-25 16:20:35 -08:00
Philip Rosedale
86d6d255fa Merge pull request #7199 from sethalves/fix-grab-heartbeat 
only update heartbeat in userData of grabbed entity every 5 seconds
 2016-02-25 16:17:11 -08:00
ericrius1
a79d334bed no query string 2016-02-25 16:12:34 -08:00
Brad Hefta-Gaub
82cbf19bca Merge pull request #7078 from zzmp/fix/light-intensity 
Reimplement light attenuation for spot and point lights
 2016-02-25 16:08:28 -08:00
ericrius1
668894b3e0 should work multiuser now 2016-02-25 16:05:03 -08:00
ericrius1
24bf4f851f can erase any stroke at any time 2016-02-25 15:23:02 -08:00
Brad Hefta-Gaub
9e2d326b30 Merge pull request #7177 from howard-stearns/ac-sound-searcher-update 
Update sound searcher and spawner for load handling.
 2016-02-25 15:10:42 -08:00
ericrius1
ddae2d4f74 only erase stroke map on release and preload 2016-02-25 15:00:54 -08:00