Brad Davis
bb29127eff
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-28 23:14:41 -07:00
Andrew Meadows
fa49342f00
Merge pull request #5420 from bwent/solar-system
...
Example script solarsystem.js with orbiting satellite game
2015-07-28 15:06:23 -07:00
Philip Rosedale
cce6f15de2
Merge pull request #5443 from huffman/edit-camera-up
...
Update edit.js to swing up on activate so that it doesn't intersect with the avatar's head
2015-07-28 13:32:34 -07:00
bwent
1107742188
Clean up formatting for satellite.js
2015-07-28 13:01:20 -07:00
bwent
5272a1d6e7
refactoring variables and constants, fix update loop to continue over unlaunched satellites
2015-07-28 13:01:20 -07:00
bwent
e0d6609a99
resolve file path issue
2015-07-28 13:01:20 -07:00
bwent
ccb3d433af
Example script solarsystem.js with orbiting satellite game
2015-07-28 13:01:20 -07:00
Bradley Austin Davis
02998d81de
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-28 12:45:03 -07:00
Andrew Meadows
6e41a79551
Merge pull request #5360 from BingShearer/Leaves
...
New falling leaf script based on the existing rain.js
2015-07-28 10:08:16 -07:00
Brad Davis
a049b14d13
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-28 10:04:19 -07:00
Brad Hefta-Gaub
26111b9b80
Merge pull request #5365 from kevinmthomas-carpool/20485
...
20485
2015-07-28 09:59:43 -07:00
Brad Hefta-Gaub
d8c2b41655
Merge pull request #5428 from kevinmthomas-carpool/20628
...
CR for Job #20628 - JS Stream Player For Domain-Zone
2015-07-28 09:58:04 -07:00
Brad Hefta-Gaub
ee641335fa
Merge pull request #5421 from thoys/20552
...
CR for Job #20552 - Add the ability to modify the parameters of planky from a popup dialog
2015-07-28 09:57:22 -07:00
Brad Hefta-Gaub
6d1bfd8134
Merge pull request #5427 from kevinmthomas-carpool/20622
...
CR for Job #20622 - JS Stream Player
2015-07-28 09:56:39 -07:00
Bing Shearer
c46e73434c
Added small fix to error message code
2015-07-27 11:59:09 -07:00
Brad Hefta-Gaub
9783740b21
Merge pull request #5436 from huffman/edit-oob
...
Show an alert window when new objects would be out of bounds
2015-07-27 11:47:54 -07:00
Ryan Huffman
ceffbb6383
Update edit.js to show an alert window when new objects would be out of bounds
2015-07-27 11:41:53 -07:00
Bing Shearer
d54543e83c
Tidied up per Brad's request
2015-07-27 10:19:42 -07:00
Kevin M. Thomas
d17ddae537
Added .js file to examples/example/audio and added public bucket url functionality.
2015-07-27 12:14:50 -04:00
Anthony J. Thibault
5cc0b45850
Improved ParticleEffectEntityItem rendering and updates
...
* Created custom pipelines and shaders for untextured and textured
particle rendering.
* Created custom render payload for particles
* Moved all particle updates into simulation rather then render.
* Uses pendingChanges.updateItem lambda to update the playload with
new data for rendering.
* ParticleEffectEntityItem now updates its dimensions properly,
based on emitter properties.
* Bug fix for dt not accumulating properly, during gaps between updates.
now we just update all the time. (super cheap tho, if there are no particles
animating)
2015-07-26 17:21:17 -07:00
Kevin M. Thomas
ca8d0d5420
Added files to zone folder and made change to jstreamplayerdomain-zone.js to allow for zone entity data field to load a stream url rather than have it hard coded in the js file. This allows for many zones to be created and simply having to put a new stream url in each data field in each zone to work.
2015-07-25 07:56:57 -04:00
Kevin M. Thomas
7966f8c708
Merge branch 'master' of https://github.com/highfidelity/hifi into 20628
2015-07-24 15:45:02 -04:00
Kevin M. Thomas
d4d5c9f935
Created a folder in examples called "zones" then moved files to location.
2015-07-24 15:43:50 -04:00
Kevin M. Thomas
ddada17b08
move jsstreamplayer.html into example/html
...
move jssstreamplayer.js script into example/example/audio
2015-07-24 15:27:16 -04:00
Kevin M. Thomas
a6af80fa5c
Merge branch 'master' of https://github.com/highfidelity/hifi into 20622
2015-07-24 15:03:15 -04:00
Bradley Austin Davis
a60e669d3d
Merge branch 'master' into plugins
2015-07-24 13:38:18 -04:00
Philip Rosedale
f04291ef65
Merge pull request #5408 from thoys/20626
...
CR for Job #20626 - edit.js - entities list html - multi select using shift key / working delete key
2015-07-24 07:47:30 -07:00
Bradley Austin Davis
901dd77f05
Merge remote-tracking branch 'upstream/master' into plugins
2015-07-23 18:11:25 -04:00
Bradley Austin Davis
1db4162371
Merge branch 'master' into plugins
2015-07-23 13:42:03 -04:00
Ryan Huffman
c17a603714
Fix model entity not showing up in list on creation
2015-07-23 08:42:29 -07:00
Brad Davis
3407fd48a8
Merge pull request #5363 from PhilipRosedale/master
...
Birds will die if abandoned, ability to fly with birds
2015-07-22 14:13:27 -04:00
Bing Shearer
3cac781cdc
Fixed indentation and number formats, as well as streamlining calculation of leaf velocity to make it more readable.
2015-07-22 10:47:27 -07:00
Philip Rosedale
b7a4acaf87
changed to use new Vec3.toPolar() function
2015-07-22 10:06:08 -07:00
Bradley Austin Davis
114ab9e47f
Merge branch 'master' into plugins
2015-07-22 11:47:56 -04:00
Thijs Wenker
00fbe17b3c
Merge branch 'master' of https://github.com/worklist/hifi into 20552
2015-07-22 10:21:47 +02:00
Thijs Wenker
de116c4e3b
editMode on and off switch by clicking the COG, proper removal of planks when rows/columns removed
2015-07-22 10:21:13 +02:00
Kevin M. Thomas
ebe61b8c09
Merge branch 'master' of https://github.com/highfidelity/hifi into 20628
2015-07-21 18:15:19 -04:00
Kevin M. Thomas
75fa789b79
Changeable zone var declaration.
2015-07-21 18:13:26 -04:00
Kevin M. Thomas
cd58dc11ce
Initial file placement into job.
2015-07-21 18:10:13 -04:00
bwent
5a8106a049
fixes in edit.js UI
2015-07-21 13:15:24 -07:00
Philip Rosedale
6c51c9e950
added ability to follow/fly with the birds
2015-07-21 12:18:52 -07:00
bwent
89eed589e2
Add Vec3 function to convert vec3 to/from euler angles
2015-07-21 11:08:53 -07:00
Thijs Wenker
5d74858500
edit.js - entityList - delete key deletes entities, hold shift to select a group of entities, moved appending single entity to selection to ctrl key
2015-07-21 17:01:54 +02:00
Thijs Wenker
0d0f12164a
planky, enabling properties button
2015-07-21 16:57:02 +02:00
Anthony J. Thibault
17220542d8
Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers
...
Conflicts:
examples/example/games/sword.js
2015-07-20 15:22:19 -07:00
SamGondelman
4d3b08b5e3
modified sword.js to work with vive controllers
2015-07-20 14:52:49 -07:00
Kevin M. Thomas
2c088ec5a9
Updated overlay clearing functionality.
2015-07-20 14:21:42 -04:00
Kevin M. Thomas
d76d380512
Added jsstreamplayer.
2015-07-20 14:19:16 -04:00
Stephen Birarda
54f618a502
Merge pull request #5361 from huffman/users-setting
...
Update users.js to persist isMinimized value
2015-07-20 09:01:31 -07:00
Philip Rosedale
45a229494b
fix to correctly add to lifetime (it is always full lifetime since starting)
2015-07-20 08:40:12 -07:00
