Commit graph

48359 commits

Author SHA1 Message Date
Ryan Huffman
fee9dcc981 Update bow collision hull with a simpler one 2016-12-02 09:27:53 -08:00
Ryan Huffman
d051cef1a5 Remove bow/entity.json 2016-12-02 08:40:39 -08:00
Ryan Huffman
680596d808 Move bow to unpublishedScripts 2016-12-02 08:18:47 -08:00
Ryan Huffman
56386718d4 Add 'projectile' to name of arrow in bow.js 2016-12-02 08:18:25 -08:00
Ryan Huffman
5735dbec2d Add spawnBow.js 2016-11-30 13:58:56 -08:00
Ryan Huffman
58c232529b Add back manipulation of collidesWith in bow 2016-11-30 13:26:56 -08:00
Ryan Huffman
35bc962654 Remove commented out line in bow.js 2016-11-30 13:26:39 -08:00
Ryan Huffman
c990849bf8 Fix hand not being reenabled on unequip with bow 2016-11-29 14:37:09 -08:00
Ryan Huffman
09dd68ae37 Cleanup string in bow to only use 1 entity 2016-11-29 14:36:33 -08:00
Ryan Huffman
c06a3a3a11 Add state constants to bow 2016-11-29 14:36:02 -08:00
Ryan Huffman
25821eb01a Update paths in bow to be relative 2016-11-29 14:33:59 -08:00
Ryan Huffman
53a8a0e45b Update bow.js 2016-11-28 16:49:43 -08:00
Ryan Huffman
dcd52215d1 Add original version of bow 2016-11-28 12:07:14 -08:00
David Kelly
dcda5d50a0 Merge pull request from howard-stearns/animate-suggestions-when-available
animate suggestions when available
2016-11-22 09:24:48 -08:00
David Kelly
811fc0afbe Merge pull request from howard-stearns/location-cleanup
location cleanup to make people more aware of their sandbox placename
2016-11-21 17:33:34 -08:00
howard-stearns
81786bf819 animate suggestions when available 2016-11-21 16:46:10 -08:00
howard-stearns
2beed7e70b proper include_actions for 'places' tab. 2016-11-21 16:22:02 -08:00
Brad Hefta-Gaub
d93e1dd5d0 Merge pull request from huffman/fix/verbose-ac-searcher-logging
Add AC Audio searcher for tutorial
2016-11-21 14:30:50 -08:00
Brad Hefta-Gaub
abed723a01 Merge pull request from jherico/logspam
Reduce logspam, change some debug output to warning
2016-11-21 14:29:19 -08:00
howard-stearns
066a518142 expose metaverse url to javascript and use it rather than hardcoding 2016-11-21 13:07:38 -08:00
Brad Davis
728f8aa238 Reduce logspam, change some debug output to warning 2016-11-21 11:56:32 -08:00
howard-stearns
5b216578d7 Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup 2016-11-21 11:47:30 -08:00
Ryan Huffman
8e1f03db43 Add AC Audio searcher for tutorial 2016-11-21 11:34:49 -08:00
Brad Hefta-Gaub
ac6a1088f9 Merge pull request from ZappoMan/personalSpace
first cut at personal space feature
2016-11-19 16:57:33 -08:00
Brad Hefta-Gaub
fe709f51de personal space feature 2016-11-19 16:30:15 -08:00
Brad Hefta-Gaub
131ac5796b Merge pull request from jherico/fix_glow_line
Glow line replacement without geometry shader
2016-11-19 13:23:46 -08:00
Brad Davis
362976645b Fix HMD UI glow lines 2016-11-18 17:42:56 -08:00
Brad Davis
3074be7ad0 Glow line replacement without geometry shader 2016-11-18 17:42:55 -08:00
Chris Collins
e9563ef9af Merge pull request from birarda/mac-perms
add hardware address based permissions to domain-server
2016-11-18 17:28:11 -08:00
Brad Hefta-Gaub
3c60000a62 Merge pull request from sethalves/fix-polyvox-buffer-size
Fix polyvox buffer size
2016-11-18 17:26:36 -08:00
howard-stearns
da56457c4a Merge branch 'master' of https://github.com/highfidelity/hifi into location-cleanup 2016-11-18 17:13:32 -08:00
howard-stearns
f1806eb649 server protocols 2016-11-18 17:05:14 -08:00
Seth Alves
8ee1fac367 don't try to render until mesh is ready 2016-11-18 16:33:48 -08:00
Ryan Huffman
541ef21801 Merge pull request from Atlante45/edit-js
Turn Edit.js on when importing entities
2016-11-18 15:36:50 -08:00
Seth Alves
b2a28147c0 more time 2016-11-18 15:36:29 -08:00
Howard Stearns
1c4b2eba25 Merge pull request from zfox23/animated_snapshots
Animated GIF Snapshots
2016-11-18 15:32:03 -08:00
Seth Alves
47062d29f5 cleanups 2016-11-18 15:27:45 -08:00
Seth Alves
3278478a60 cleanups 2016-11-18 15:26:16 -08:00
Seth Alves
a66a1d392e hack to avoid crash 2016-11-18 15:24:19 -08:00
Zach Fox
3a5a9b359e Quick bugfix 2016-11-18 15:04:35 -08:00
Stephen Birarda
dec4ce79b2 fix comment in mac permission unpack 2016-11-18 14:42:29 -08:00
Stephen Birarda
143225a74c add MAC permission table to domain-server and leverage 2016-11-18 14:40:22 -08:00
Zach Fox
1e97a69b51 Massive performance improvements. 2016-11-18 14:39:30 -08:00
Zach Fox
7f4613f136 Add checkbox for GIF and length selector 2016-11-18 14:39:30 -08:00
Zach Fox
35d075a78f Fix notifications.js formatting 2016-11-18 14:39:30 -08:00
Zach Fox
20a2d1275a Bugfixes and GIF uploads workinggit add -A! 2016-11-18 14:39:30 -08:00
Zach Fox
2c0cfdf241 Fix build for real? 2016-11-18 14:39:30 -08:00
Zach Fox
ad5c3e6f15 Decrease animated snapshot resolution 2016-11-18 14:39:30 -08:00
Zach Fox
5e8afb04c7 Potentially fix OSX and Linux build errors? 2016-11-18 14:39:30 -08:00
Zach Fox
cc8bf0ce6e BUGS FIXED! getting super close... 2016-11-18 14:39:30 -08:00