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 |
|
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 |
|
ericrius1
|
4de951242c
|
eraser positioned correctly
|
2016-02-25 14:54:34 -08:00 |
|
ericrius1
|
22a5f3dcc0
|
wait even longer
|
2016-02-25 14:28:48 -08:00 |
|
ericrius1
|
338427ed3e
|
wait longer before sending message
|
2016-02-25 14:28:35 -08:00 |
|
ericrius1
|
e9ad06fca7
|
removed query string
|
2016-02-25 14:25:12 -08:00 |
|
ericrius1
|
ef85d0451a
|
removed files that shouldn't be there
|
2016-02-25 14:24:06 -08:00 |
|
ericrius1
|
21808242ba
|
stashin
|
2016-02-25 14:20:13 -08:00 |
|
samcake
|
610189ded3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-02-25 14:14:04 -08:00 |
|
samcake
|
96fb9c4466
|
cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures
|
2016-02-25 14:13:35 -08:00 |
|
Seth Alves
|
b253cd53b9
|
Merge pull request #7190 from ericrius1/playaFireworks
Playa fireworks
|
2016-02-25 14:02:25 -08:00 |
|
Eric Levin
|
4d27d5c9f2
|
Update fireworksLaunchButtonEntityScript.js
|
2016-02-25 13:45:08 -08:00 |
|
Seth Alves
|
6dafc654eb
|
only update heartbeat in userData of grabbed entity every 5 seconds
|
2016-02-25 13:19:56 -08:00 |
|
ericrius1
|
98cf784c6f
|
more smoke fading
|
2016-02-25 10:32:21 -08:00 |
|
Zach Pomerantz
|
32ce7c6eab
|
Rename light surfaceRadius->falloffRadius
|
2016-02-25 10:02:33 -08:00 |
|
ericrius1
|
54ee3d347c
|
more velocity
|
2016-02-25 09:53:17 -08:00 |
|
ericrius1
|
f12acfb7f3
|
simplfied
|
2016-02-25 09:49:44 -08:00 |
|
ericrius1
|
d4d5aed518
|
smoke tweaks
|
2016-02-25 09:44:48 -08:00 |
|
ericrius1
|
9a108c298f
|
smoke tweaks
|
2016-02-25 09:34:22 -08:00 |
|
Howard Stearns
|
077d331004
|
whitespace
|
2016-02-25 09:34:07 -08:00 |
|
ericrius1
|
728612f9a7
|
far trigger launches fireworks
|
2016-02-25 09:26:37 -08:00 |
|
ericrius1
|
8f914c6673
|
removed query string on entity script
|
2016-02-24 20:08:35 -08:00 |
|
ericrius1
|
ad49bcda72
|
lowered num fireworks
|
2016-02-24 18:29:44 -08:00 |
|
ericrius1
|
7cb57aa067
|
alpha tweaks
|
2016-02-24 18:15:34 -08:00 |
|
ericrius1
|
a1eab365ce
|
added name to launch pad
|
2016-02-24 18:11:08 -08:00 |
|
ericrius1
|
29c4ac83c0
|
can set launch position in userdata
|
2016-02-24 18:00:57 -08:00 |
|
ericrius1
|
857ccc7409
|
move sound with thing
|
2016-02-24 17:53:46 -08:00 |
|
samcake
|
ae6e625894
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-02-24 17:30:40 -08:00 |
|
samcake
|
a0d7ce145e
|
Adding support for emissive and occlusion maps, on to pr land
|
2016-02-24 17:30:29 -08:00 |
|
Chris Collins
|
f6a6560b86
|
Merge pull request #7175 from sethalves/grab-clean-up-abandoned
grab script cleans up abandoned grabs
|
2016-02-24 17:20:46 -08:00 |
|
ericrius1
|
08e7adc518
|
tweaks
|
2016-02-24 17:08:12 -08:00 |
|
ericrius1
|
45e8287d1d
|
particle trail in right spot
|
2016-02-24 16:55:31 -08:00 |
|
ericrius1
|
c26ad2b9d0
|
relative smoke trail
|
2016-02-24 16:52:02 -08:00 |
|
ericrius1
|
fdb5d33866
|
MORE RANDOM YAHH
|
2016-02-24 16:42:24 -08:00 |
|
ericrius1
|
208096f2e0
|
fireworks but no smoke
|
2016-02-24 16:36:54 -08:00 |
|
ericrius1
|
769a5ecca9
|
tweaks
|
2016-02-24 16:33:28 -08:00 |
|
ericrius1
|
0a6a35ddd8
|
need multiple explosions at once
|
2016-02-24 16:30:29 -08:00 |
|
Howard Stearns
|
274f72af52
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ac-sound-searcher-update
|
2016-02-24 16:28:52 -08:00 |
|
Howard Stearns
|
90b5cdb30f
|
Fix bug. Annotate.
|
2016-02-24 16:27:46 -08:00 |
|
Zach Pomerantz
|
c2ed5e5474
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
|
2016-02-24 16:24:09 -08:00 |
|
ericrius1
|
0499334938
|
toadd: different colors for fireworks
|
2016-02-24 16:14:46 -08:00 |
|
ericrius1
|
dea41edf9c
|
tweaks
|
2016-02-24 16:01:38 -08:00 |
|
ericrius1
|
e245ad93d6
|
smoke and fire
|
2016-02-24 15:58:09 -08:00 |
|
Brad Hefta-Gaub
|
9273238b53
|
Merge pull request #7178 from Nex-Pro/20807
CR for Job #20807 - Fix vertically mirrored particles.
|
2016-02-24 13:43:40 -08:00 |
|
ericrius1
|
5520094bac
|
exploding fireworks
|
2016-02-24 12:29:54 -08:00 |
|
ericrius1
|
8b07bd00f8
|
basic firework
|
2016-02-24 11:05:02 -08:00 |
|
ericrius1
|
67ec1732b3
|
increased eraser range
|
2016-02-23 18:46:38 -08:00 |
|
ericrius1
|
0ff8201994
|
fixed line gaps
|
2016-02-23 18:45:41 -08:00 |
|
Howard Stearns
|
d1088031bf
|
Longer gap, as an experiment.
|
2016-02-23 18:13:40 -08:00 |
|
ericrius1
|
045d542f11
|
lines no longer disapear after drawing for a while
|
2016-02-23 18:03:38 -08:00 |
|
Clément Brisset
|
8e8e23452f
|
Merge pull request #7156 from ZappoMan/depthReticleWork
Depth reticle work
|
2016-02-23 17:54:35 -08:00 |
|
Nex Pro
|
6403bb60a5
|
added particleOrientationTest.js for testing.
|
2016-02-24 01:20:49 +00:00 |
|
ericrius1
|
0b569a0fab
|
only show overlay if within painting range
|
2016-02-23 16:49:03 -08:00 |
|
Seth Alves
|
7fb67e487e
|
when releasing a near-grab, zero velocity if there is another grab, regardless of the isInitialGrab flag
|
2016-02-23 16:47:05 -08:00 |
|
Seth Alves
|
efca6ecb1d
|
remove debug print
|
2016-02-23 16:37:08 -08:00 |
|
Seth Alves
|
acd2caf26c
|
handle case where user grab data didn't have a heartbeat
|
2016-02-23 16:35:20 -08:00 |
|
ericrius1
|
cf88421cf5
|
plant and pot are separated for raycasting purposes
|
2016-02-23 16:30:53 -08:00 |
|
Howard Stearns
|
4bb76d6a20
|
Update sound searcher and spawner for load handling.
|
2016-02-23 16:26:47 -08:00 |
|
Seth Alves
|
0e028fbac8
|
keep a heart-beat timestamp in userData of grabbed entities. if grabbing something with an out-of-date heartbeat, reset it before grabbing
|
2016-02-23 16:21:41 -08:00 |
|
ericrius1
|
da5f4b16e9
|
Merge branch 'master' into growingPlant
|
2016-02-23 15:12:33 -08:00 |
|
ericrius1
|
d1d4a9d6b1
|
adjusted surface position
|
2016-02-23 14:48:45 -08:00 |
|
ericrius1
|
5e0de4bdee
|
tweaks
|
2016-02-23 12:16:22 -08:00 |
|
ericrius1
|
4b45fd2d4d
|
Merge branch 'master' into whiteboardV2
|
2016-02-23 12:15:59 -08:00 |
|
ericrius1
|
a2ece772ef
|
refactor for laser pointer
|
2016-02-23 12:08:51 -08:00 |
|
Clément Brisset
|
f82e5e2cd6
|
Merge pull request #7166 from ericrius1/editFix
Fixed bug with parsing numbers for edit js
|
2016-02-23 11:57:19 -08:00 |
|
ericrius1
|
8d058c2bb3
|
eraser working
|
2016-02-23 11:53:27 -08:00 |
|
ericrius1
|
20fd79fc43
|
Lines markers
|
2016-02-23 11:25:46 -08:00 |
|
Brad Hefta-Gaub
|
a71a78b2d3
|
add comments and license header to reticleDepth.js
|
2016-02-23 11:22:24 -08:00 |
|
samcake
|
5e38aee0ba
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-02-23 11:21:00 -08:00 |
|
ericrius1
|
6682b9bd58
|
eraser is spawing
|
2016-02-23 10:36:17 -08:00 |
|
Brad Hefta-Gaub
|
8117d51324
|
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
|
2016-02-23 10:21:10 -08:00 |
|
ericrius1
|
81ed89531d
|
whiteboard surface parented to whiteboard
|
2016-02-23 10:11:13 -08:00 |
|
ericrius1
|
b5ec79fd6d
|
marker only draws when equipped and held down
|
2016-02-23 09:53:20 -08:00 |
|
samcake
|
9d0803e6b8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-02-23 09:33:54 -08:00 |
|
ericrius1
|
749f4478ab
|
Fixed bug with parsing numbers for editjs
|
2016-02-23 09:33:37 -08:00 |
|
ericrius1
|
69dc9ef68f
|
added lifetime
|
2016-02-23 09:06:35 -08:00 |
|
Zach Pomerantz
|
2534bb14f3
|
Amend entityProperties for fixed-dec light values
|
2016-02-22 19:27:36 -08:00 |
|
Seth Alves
|
23b204c0c6
|
fix logic that checks getEntityProperties return value
|
2016-02-22 19:03:12 -08:00 |
|
Zach Pomerantz
|
dacf9f7123
|
Rm extra " in entityProperties
|
2016-02-22 15:18:45 -08:00 |
|
Zach Pomerantz
|
77ad4039bc
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity
|
2016-02-22 15:11:12 -08:00 |
|
Zach Pomerantz
|
868e2ec961
|
Use "number" in entityProperties
|
2016-02-22 15:07:10 -08:00 |
|
Zach Pomerantz
|
1506686b79
|
Expose light surface to entityProperties
|
2016-02-22 15:07:09 -08:00 |
|
James B. Pollack
|
6b14fa8dcb
|
Merge branch 'master' into cellscience
|
2016-02-22 14:25:22 -08:00 |
|
Seth Alves
|
f113a83c5b
|
merge from upstream
|
2016-02-22 14:02:38 -08:00 |
|
Seth Alves
|
c470649076
|
don't crash if entity vanishes while doing touch test
|
2016-02-22 14:00:01 -08:00 |
|
Seth Alves
|
8a3b233659
|
don't crash if entity vanishes while doing touch test
|
2016-02-22 13:58:07 -08:00 |
|
Brad Hefta-Gaub
|
3f7a2eb10a
|
add support in depthReticle.js to set depth to overlay depth when you're over a 2D overlay
|
2016-02-22 13:54:46 -08:00 |
|
Brad Hefta-Gaub
|
54b21abf02
|
remove editWithHacks and move to more generic depthReticle
|
2016-02-22 13:32:19 -08:00 |
|
Brad Hefta-Gaub
|
fc002df5e7
|
implement Reticle.depth using the apparent 3D look at logic instead
|
2016-02-22 13:24:14 -08:00 |
|
Ryan Huffman
|
e6ccf501fa
|
Merge pull request #7135 from zzmp/fix/grid
Update renderGrid to use a shader, and fix grid edit tools
|
2016-02-22 12:58:23 -08:00 |
|
Brad Hefta-Gaub
|
715355464f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into depthReticleWork
|
2016-02-22 12:52:56 -08:00 |
|
Chris Collins
|
f24e4bc6b1
|
Merge pull request #7152 from sethalves/fix-touch
fix grab-script touch
|
2016-02-22 09:58:29 -08:00 |
|
Brad Hefta-Gaub
|
3f03678d02
|
add version of edit that sets reticle depth
|
2016-02-22 09:27:27 -08:00 |
|
samcake
|
377ee5a486
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-02-22 09:23:14 -08:00 |
|
Brad Hefta-Gaub
|
cbe80bffd6
|
go into away mode if you the HMD loses mouse capture
|
2016-02-21 12:57:14 -08:00 |
|
Seth Alves
|
5f79500e4d
|
fix grab-script touch
|
2016-02-21 09:37:43 -08:00 |
|
Brad Hefta-Gaub
|
1a4591db58
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
|
2016-02-21 09:30:41 -08:00 |
|
samcake
|
9b2a90b430
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-02-19 19:50:02 -08:00 |
|
samcake
|
39a7852979
|
MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders
|
2016-02-19 18:43:07 -08:00 |
|
Brad Hefta-Gaub
|
2810be8787
|
fix scripts to use new API
|
2016-02-19 17:57:49 -08:00 |
|
ericrius1
|
ec36995908
|
moar whiteboard logging removal
|
2016-02-19 17:36:02 -08:00 |
|
ericrius1
|
6fe9730897
|
all three markers
|
2016-02-19 17:33:54 -08:00 |
|
ericrius1
|
68e289b433
|
Fixed bug where spawning one marker would destroy the other
|
2016-02-19 17:32:33 -08:00 |
|
Zach Pomerantz
|
c9362a4073
|
Set grid major div min to 1
|
2016-02-19 15:58:08 -08:00 |
|
ericrius1
|
756b7e223d
|
need to figure out why only one marker working
|
2016-02-19 15:56:12 -08:00 |
|
Zach Pomerantz
|
5d78867197
|
Set grid height via global y-coord
|
2016-02-19 15:41:38 -08:00 |
|
Zach Pomerantz
|
d74aa4f14d
|
Rm extra , in gridControls
|
2016-02-19 14:54:19 -08:00 |
|
Howard Stearns
|
1d84bd17da
|
Merge pull request #7134 from ericrius1/acInjectors
Injector Load Test script
|
2016-02-19 14:41:11 -08:00 |
|
ericrius1
|
9ae1ccee50
|
passing marker color accross
|
2016-02-19 14:15:55 -08:00 |
|
ericrius1
|
40176b0424
|
no gaps
|
2016-02-19 14:06:55 -08:00 |
|
Zach Pomerantz
|
fd6aa9a78b
|
Add layering to renderGrid, draw edit grid not layered
|
2016-02-19 13:57:32 -08:00 |
|
ericrius1
|
e4508e1d34
|
added comment and name
|
2016-02-19 12:06:08 -08:00 |
|
ericrius1
|
0564cd8145
|
returning if less than min distance
|
2016-02-19 12:02:34 -08:00 |
|
ericrius1
|
9a8b76df47
|
no more zfighting
|
2016-02-19 11:32:13 -08:00 |
|
ericrius1
|
94bf15f328
|
need to fix zfighting
|
2016-02-19 11:21:17 -08:00 |
|
ericrius1
|
b58026bf4b
|
max points
|
2016-02-19 11:04:17 -08:00 |
|
ericrius1
|
ddce8d5a3a
|
Marker basics working, now just need to tweak
|
2016-02-19 10:59:05 -08:00 |
|
ericrius1
|
8e9cd3ae2a
|
passing whiteboard in to marker
|
2016-02-19 10:38:13 -08:00 |
|
samcake
|
04543e7b0e
|
Merge pull request #7138 from zzmp/fix/render-debug
Update render/debug.js
|
2016-02-19 10:10:43 -08:00 |
|
ericrius1
|
6765973a4a
|
correct positioning on equip
|
2016-02-19 09:56:30 -08:00 |
|
ericrius1
|
f4ee9acb9c
|
intersecting
|
2016-02-19 09:49:22 -08:00 |
|
samcake
|
d7b3945c4a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2016-02-19 09:29:23 -08:00 |
|
Ryan Huffman
|
69a953725e
|
Merge pull request #7132 from imgntn/edit-precision-things
Revert step size change in edit.js
|
2016-02-19 08:20:04 -08:00 |
|
Brad Hefta-Gaub
|
d1e1067e5a
|
allow hydra mouse to know the correct size of screen to target
|
2016-02-18 22:30:31 -08:00 |
|
samcake
|
903824809c
|
trying to have better support for the materials
|
2016-02-18 18:33:32 -08:00 |
|
Zach Pomerantz
|
2dd1cf2f15
|
Update Render.fromJSON to Render.load
|
2016-02-18 18:21:26 -08:00 |
|
ericrius1
|
33a232edde
|
got rid of magic numbers
|
2016-02-18 18:17:37 -08:00 |
|
Zach Pomerantz
|
981d4d37ca
|
Update render/debug.js
- Add a toggle for the entire UI
- Set items sliders minimums to -1
- Fix off-by-one with debug buffer radios
|
2016-02-18 17:45:55 -08:00 |
|
ericrius1
|
d0660fc90a
|
logging
|
2016-02-18 16:17:22 -08:00 |
|
ericrius1
|
bc0216633e
|
more logging
|
2016-02-18 16:10:12 -08:00 |
|
ericrius1
|
c3a687e294
|
ac test
|
2016-02-18 16:06:53 -08:00 |
|
Zach Pomerantz
|
b68213f9bf
|
Reintroduce grid to edit.js
|
2016-02-18 15:48:25 -08:00 |
|
ericrius1
|
b0664b587f
|
bumped injector count
|
2016-02-18 15:39:38 -08:00 |
|
ericrius1
|
39d4fbf19d
|
refactoring
|
2016-02-18 15:23:32 -08:00 |
|
James B. Pollack
|
f5ad297986
|
Merge branch 'master' into cellscience
|
2016-02-18 12:43:39 -08:00 |
|
ericrius1
|
efbb5ec967
|
updated test
|
2016-02-18 12:14:30 -08:00 |
|
ericrius1
|
ec1c7925c0
|
updated logging
|
2016-02-18 12:02:22 -08:00 |
|
ericrius1
|
1d9b3fadaf
|
more logging
|
2016-02-18 12:00:24 -08:00 |
|
ericrius1
|
eabeb98076
|
injector load
|
2016-02-18 11:50:26 -08:00 |
|
Brad Hefta-Gaub
|
0467930c57
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
Conflicts:
examples/controllers/handControllerGrab.js
|
2016-02-18 10:30:43 -08:00 |
|
Chris Collins
|
e3ae2baa7b
|
Merge pull request #7123 from ericrius1/editProps
added collidesWith property to entities list
|
2016-02-18 09:11:18 -08:00 |
|
James B. Pollack
|
acaa824cb5
|
but only position
|
2016-02-18 09:00:39 -08:00 |
|
James B. Pollack
|
e6662edcb4
|
revert step size change
|
2016-02-18 08:57:06 -08:00 |
|
ericrius1
|
5f5af9c6a0
|
fixed edit bug
|
2016-02-17 17:45:57 -08:00 |
|
ericrius1
|
728e8c763d
|
ray cast
|
2016-02-17 17:30:01 -08:00 |
|
ericrius1
|
7f23ee04be
|
basic marker entity script
|
2016-02-17 17:16:43 -08:00 |
|
James B. Pollack
|
89039747a2
|
Update entityProperties.html
lowercase 'static' like other props
|
2016-02-17 16:22:14 -08:00 |
|
ericrius1
|
df84a166e4
|
spawning marker tips- parenting to markers
|
2016-02-17 15:08:42 -08:00 |
|
ericrius1
|
073661b78d
|
markers in right spot
|
2016-02-17 14:25:21 -08:00 |
|
ericrius1
|
9e8d123b16
|
spawning marker and whiteboard correctly
|
2016-02-17 13:58:04 -08:00 |
|
ericrius1
|
bb2fd0072c
|
collision hull
|
2016-02-17 13:41:58 -08:00 |
|
ericrius1
|
bfc619497e
|
spawning model
|
2016-02-17 13:33:19 -08:00 |
|
ericrius1
|
19cd3ec152
|
checkboxes working
|
2016-02-17 13:12:17 -08:00 |
|
Seth Alves
|
64e50c5329
|
keep search-line from freezing during a far-trigger
|
2016-02-17 12:35:23 -08:00 |
|
Seth Alves
|
69caf1df4d
|
fix far-trigger
|
2016-02-17 12:04:25 -08:00 |
|
ericrius1
|
94fdf6b091
|
checkboxes working
|
2016-02-17 11:59:14 -08:00 |
|
ericrius1
|
f85916e808
|
checkbox keeps getting checked...
|
2016-02-17 10:27:53 -08:00 |
|
ericrius1
|
0f8f67ef0b
|
removing dynamic. need to add others
|
2016-02-16 19:34:32 -08:00 |
|
James B. Pollack
|
f2445e81e0
|
Merge pull request #7110 from ericrius1/particlesInEdit2
Particles in edit
|
2016-02-16 18:33:01 -08:00 |
|
ericrius1
|
168fb67d67
|
making collidesWith a checkbox
|
2016-02-16 18:19:12 -08:00 |
|
ericrius1
|
ce2d76d3f3
|
made export settings a text area
|
2016-02-16 17:57:09 -08:00 |
|
ericrius1
|
7a3443968d
|
added collides with property
|
2016-02-16 15:55:11 -08:00 |
|
ericrius1
|
c43500f38a
|
added textures field to particle explorer
|
2016-02-16 15:36:03 -08:00 |
|
ericrius1
|
023fd0607d
|
added alpha start
|
2016-02-16 15:29:42 -08:00 |
|
ericrius1
|
d9d0e78dc5
|
button close
|
2016-02-16 15:21:18 -08:00 |
|
Chris Collins
|
05b9d88f08
|
Merge pull request #7108 from imgntn/moreprecision
More precision for edit.js
|
2016-02-16 15:03:10 -08:00 |
|
ericrius1
|
bf21bc2d48
|
reworked exporting properties
|
2016-02-16 14:06:02 -08:00 |
|
ericrius1
|
ad43e4ff6d
|
Fixed multiple particle tabs appearing
|
2016-02-16 12:56:34 -08:00 |
|
Brad Hefta-Gaub
|
a25581c656
|
clean up reticle scripting to be exposed through Reticle object (implemented int ApplicationCompositor)
|
2016-02-16 12:11:58 -08:00 |
|
ericrius1
|
46907f446b
|
Listening for page loaded event instead of set timeout === less lag
|
2016-02-16 11:42:01 -08:00 |
|
ericrius1
|
46679b29f7
|
particle tab deleted when particle system deleted
|
2016-02-16 11:11:58 -08:00 |
|
ericrius1
|
1ad4d64748
|
removed tween
|
2016-02-16 10:32:24 -08:00 |
|
ericrius1
|
bc6e806ef2
|
removed tween
|
2016-02-16 10:23:22 -08:00 |
|
Andrew Meadows
|
f932999b2c
|
Merge pull request #7113 from zzmp/rm/draw-on-hud
Remove drawOnHUD property from 3d overlays
|
2016-02-16 09:44:05 -08:00 |
|
Andrew Meadows
|
7dbb42c339
|
Merge pull request #7109 from zzmp/fix/edit-image-color
Remove image color in edit.js
|
2016-02-16 09:27:06 -08:00 |
|
ericrius1
|
f8c846f5d1
|
got rid of query string
|
2016-02-15 18:53:41 -08:00 |
|
ericrius1
|
d00b650ee2
|
Water sounds
|
2016-02-15 18:41:56 -08:00 |
|
ericrius1
|
b245499d53
|
near trigger
|
2016-02-15 18:30:36 -08:00 |
|
ericrius1
|
f61aea1c9b
|
adding trigger
|
2016-02-15 18:18:58 -08:00 |
|
ericrius1
|
a5d4ec15ab
|
watering on and off
|
2016-02-15 18:00:06 -08:00 |
|
ericrius1
|
f97eafc4ee
|
hooking up water to hose
|
2016-02-15 16:40:03 -08:00 |
|
ericrius1
|
236ff068e2
|
hose in
|
2016-02-15 16:16:31 -08:00 |
|
ericrius1
|
a12886eebd
|
growing stuff
|
2016-02-15 15:57:07 -08:00 |
|
ericrius1
|
03ca41c0c2
|
each flower needs to be its own object
|
2016-02-15 15:43:44 -08:00 |
|
ericrius1
|
969ae2e07b
|
cactus getting watered
|
2016-02-15 15:26:58 -08:00 |
|
ericrius1
|
678caef9c6
|
flowers ready to be grown through watering
|
2016-02-15 15:16:49 -08:00 |
|
ericrius1
|
13a8557f03
|
basic architecture for watering plants set up
|
2016-02-15 15:12:15 -08:00 |
|
Zach Pomerantz
|
8c01d5f82b
|
Remove camera tool's 3d hud overlays
|
2016-02-15 14:03:57 -08:00 |
|
Chris Collins
|
bf52d30216
|
Merge pull request #7107 from ericrius1/spraypaintFix
Fix for spraypaint orientation
|
2016-02-15 13:45:12 -08:00 |
|
ericrius1
|
f98941e80f
|
switching between particle entities
|
2016-02-15 12:52:05 -08:00 |
|
ericrius1
|
85d8fc2944
|
particle image
|
2016-02-15 11:56:41 -08:00 |
|
Zach Pomerantz
|
b8e8859761
|
Remove image color in edit.js
This removes the warning generated by ImageOverlay.qml
for the unhandled property, color.
|
2016-02-15 11:51:11 -08:00 |
|
James B. Pollack
|
72186f916c
|
more precision
|
2016-02-15 11:35:28 -08:00 |
|
ericrius1
|
80a368933f
|
Fix for spraypaint orientation
|
2016-02-15 11:13:06 -08:00 |
|
ericrius1
|
3adc88aa70
|
need to fix icon
|
2016-02-15 11:11:23 -08:00 |
|
ericrius1
|
e4d4044a2b
|
particleExplorer works in edit tab
|
2016-02-15 09:41:47 -08:00 |
|
samcake
|
545f276fdf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-02-15 09:29:00 -08:00 |
|
ericrius1
|
b92c5555fe
|
Merge branch 'master' into particlesInEdit2
|
2016-02-15 09:14:37 -08:00 |
|
ericrius1
|
3d939a7c23
|
twerkin
|
2016-02-15 09:07:16 -08:00 |
|
Brad Hefta-Gaub
|
376c23f1a3
|
Merge pull request #7100 from imgntn/edit_props
Hide hyperlink property for web entities
|
2016-02-12 18:29:35 -08:00 |
|
Brad Davis
|
b5cba79f0c
|
Merge pull request #7095 from ZappoMan/hmdHacking
Various bug fixes in related to HMD overlay support
|
2016-02-12 17:50:42 -08:00 |
|
Brad Hefta-Gaub
|
48fe638312
|
Merge pull request #7104 from howard-stearns/update-orbitingSound
update-orbitingSound.js
|
2016-02-12 17:44:47 -08:00 |
|
Howard Stearns
|
9a3972c43f
|
wait for sound to download
|
2016-02-12 17:42:44 -08:00 |
|
Brad Hefta-Gaub
|
d85a8a4fb9
|
Merge pull request #7103 from jherico/render-rate
Don't drop to half the vsync rate when we can't keep up
|
2016-02-12 17:11:03 -08:00 |
|
Brad Hefta-Gaub
|
df6437236e
|
some CR feedback
|
2016-02-12 16:13:12 -08:00 |
|
Howard Stearns
|
25671fbefe
|
Update orbitingSound.js to use a sample file that exists and setOptions function.
|
2016-02-12 16:01:23 -08:00 |
|
Brad Davis
|
908e153c36
|
Don't drop to half the vsync rate when we can't keep up
|
2016-02-12 15:57:27 -08:00 |
|
ericrius1
|
2c895151f6
|
multiple flowers blooming
|
2016-02-12 15:32:07 -08:00 |
|
samcake
|
e3307d91ad
|
Fix the debugging tool to be able to freeze the frustum for scene fetch and culling
|
2016-02-12 14:59:43 -08:00 |
|
ericrius1
|
b5cc022df0
|
blooming flowers
|
2016-02-12 14:58:31 -08:00 |
|