Commit graph

35302 commits

Author SHA1 Message Date
Stephen Birarda
fa4153d2e0 add a custom target to package up the console 2015-12-03 13:48:37 -08:00
Stephen Birarda
f3dd97cf6b add a packaging command for darwin, ignore results 2015-12-03 13:48:37 -08:00
Stephen Birarda
1ac40e4e89 Merge pull request #54 from huffman/console
Add support for starting/stopping interface
2015-12-03 13:47:13 -08:00
Ryan Huffman
edda1c6d1c Rename module process to hf-process 2015-12-03 13:39:41 -08:00
Ryan Huffman
a41f41a514 Move Process and ProcessGroup to process.js module 2015-12-03 13:37:21 -08:00
Ryan Huffman
1b85327e4a Merge branch 'console' of github.com:birarda/hifi into console 2015-12-03 13:27:14 -08:00
Ryan Huffman
9df201394a Add node version to main page 2015-12-03 13:25:44 -08:00
Ryan Huffman
ce0b5cd475 Add ProcessGroup for grouping server processes together 2015-12-03 13:25:05 -08:00
Ryan Huffman
a9de5d212d Add start/stop to processes 2015-12-03 13:24:39 -08:00
Stephen Birarda
accdad432b Merge pull request #53 from Atlante45/console
Add tray icon
2015-12-03 13:20:00 -08:00
Atlante45
a6387bfa76 Indentation 2015-12-03 12:45:47 -08:00
Atlante45
a40970fe5c Set app icon for Win/Linux 2015-12-03 12:24:21 -08:00
Atlante45
c0c66ce07c Update icons 2015-12-03 12:15:58 -08:00
Ryan Huffman
ad164d3093 Add support for starting/stopping interface 2015-12-03 09:29:21 -08:00
Atlante45
f4c3ff5e3b Set icon as high rez 2015-12-02 16:42:52 -08:00
Atlante45
c86ab074c4 Add tray icon 2015-12-02 15:36:40 -08:00
Stephen Birarda
73bedfcab1 add the packager and a start command 2015-12-02 13:50:50 -08:00
Stephen Birarda
67eb87a945 add the quick start index and main 2015-12-02 13:21:34 -08:00
Stephen Birarda
608d5cbfbe add a basic package.json for the HF console 2015-12-02 13:18:32 -08:00
Brad Hefta-Gaub
112cdaf028 Merge pull request #6512 from AndrewMeadows/remove-debug-cruft
remove debug option for disabling physics updates
2015-12-02 10:00:29 -08:00
Brad Hefta-Gaub
75a57c3cb8 Merge pull request #6500 from Atlante45/octree_crash
Octree crash fix
2015-12-02 09:59:56 -08:00
samcake
62c59c2d28 Merge pull request #6522 from ZappoMan/recording
fix PlayRecordingOnAC.js to use new API
2015-12-02 09:58:06 -08:00
Brad Hefta-Gaub
b6398a7930 fix PlayRecordingOnAC.js to use new API 2015-12-02 09:51:52 -08:00
Atlante45
c3e2d920ee Move timing at the top 2015-12-02 09:45:51 -08:00
Brad Hefta-Gaub
82d6718d8b Merge pull request #6510 from birarda/es-deadlock
fix infinite loop on shutdown in OctreeInboundPacketProcessor
2015-12-02 08:16:28 -08:00
Brad Hefta-Gaub
fd05bd23a0 Merge pull request #6521 from jherico/homer
Fixing avatar orientation in recordings
2015-12-01 22:09:45 -08:00
Brad Davis
9b6ec34f09 Fixing avatar orientation in recordings 2015-12-01 20:51:07 -08:00
Atlante45
0bc914bf19 Don't grab subTree outside lock 2015-12-01 19:33:44 -08:00
Philip Rosedale
e316f8dbb1 Merge pull request #6520 from imgntn/badpistol
Make pistol shoot differently and not alter controller mappings
2015-12-01 18:42:28 -08:00
James B. Pollack
e67f372bcf make pistol shoot differently and not alter controller mappings 2015-12-01 18:24:13 -08:00
James B. Pollack
1eca1540c6 Merge pull request #6519 from ericrius1/toyboxSounds
added collision sounds to flashlight, spraycan, and bow
2015-12-01 17:08:19 -08:00
James B. Pollack
560efe35f0 Merge pull request #6518 from ericrius1/disableGrabWithPistol
Disable grab while attachment version of pistol script is running
2015-12-01 17:07:36 -08:00
Eric Levin
34234da2d1 fixed spacing 2015-12-01 17:05:51 -08:00
ericrius1
40fb45c6d3 fixed accidental newline in handgrab 2015-12-01 17:04:10 -08:00
ericrius1
0fd1bdaec5 fixed accidental newline in handgrab 2015-12-01 17:03:11 -08:00
ericrius1
e4199439af added collision sounds to some toys 2015-12-01 17:00:43 -08:00
ericrius1
386afa272c disable grab while attachment version of pistol script is running 2015-12-01 16:50:09 -08:00
Eric Levin
948479b0e8 Merge pull request #6517 from imgntn/disable2hands
Support disabling both hands in handControllerGrab.js
2015-12-01 16:25:23 -08:00
James B. Pollack
aca0fa7beb support disabling both hands 2015-12-01 16:03:19 -08:00
James B. Pollack
52d6fdac1a Merge pull request #6487 from ctrlaltdavid/20740
Get the Leap Motion working again
2015-12-01 15:40:48 -08:00
Seth Alves
e0eae23dd3 Merge pull request #6515 from imgntn/personal_lasers
Personal lasers in handControllerGrab.js
2015-12-01 13:29:05 -08:00
James B. Pollack
780f93cfdb Merge pull request #6516 from imgntn/toytweaks
Reduce pistol volume
2015-12-01 13:16:39 -08:00
James B. Pollack
fb8316ff12 reduce pistol vol 2015-12-01 13:15:08 -08:00
James B. Pollack
3c8e31cd42 Merge pull request #6509 from ericrius1/toyboxFixes
Toybox Tweaking
2015-12-01 13:07:10 -08:00
James B. Pollack
b787e71587 Update doll.js 2015-12-01 13:06:30 -08:00
James B. Pollack
31d2f6463f cleanup 2015-12-01 13:03:51 -08:00
James B. Pollack
25422084b9 make it so that only you can see your beams until youre grabbing something 2015-12-01 13:02:40 -08:00
Anthony Thibault
dde971cb4f Merge pull request #6514 from howard-stearns/update-ScriptableAvatar
Update ScriptableAvatar
2015-12-01 12:44:04 -08:00
Howard Stearns
455927204e Merge pull request #6511 from hyperlogic/tony/avatar-sim-rate-display-fix
Avatar Sim Rate Display fix
2015-12-01 12:09:07 -08:00
Howard Stearns
8f7f3eed6e ScriptAvatar now gets the .fbx joints:
Because the joint mappings in the .fst can be wrong when the .fst isn't updated for quick changes in the .fbx.
  Because models now really need the preRotation, which is only in the avatar .fbx.
2015-12-01 11:52:42 -08:00