Commit graph

38274 commits

Author SHA1 Message Date
Stephen Birarda
e69424e155 add parentheses to old style signal 2016-01-20 09:27:47 -08:00
Ryan Huffman
2ead8c6f28 Update mkdir call to use mkdirp 2016-01-20 09:26:54 -08:00
samcake
379c882834 Debugging the darkness and pointing out bugs 2016-01-20 02:03:09 -08:00
Brad Hefta-Gaub
4ea5c11b73 Merge pull request #6862 from ctrlaltdavid/20783
Make running scripts list scrollable with scroll bar
2016-01-19 23:29:37 -08:00
Brad Hefta-Gaub
11c30302b2 Merge pull request #6868 from jherico/update_dialog
Prevent update dialog from becoming locked
2016-01-19 23:08:40 -08:00
Brad Davis
d97f930dc9 Prevent update dialog from becoming locked 2016-01-19 22:33:00 -08:00
Stephen Birarda
e3df02e589 fix parenting of single shot timer 2016-01-19 20:51:33 -08:00
Stephen Birarda
60bf617ea1 allow STUN to succeed started late or immediately 2016-01-19 20:41:39 -08:00
Andrew Meadows
a92c512c17 move collision group/mask calculus into EntityItem 2016-01-19 19:52:08 -08:00
Howard Stearns
730640068c Merge pull request #6865 from ZappoMan/fixPrematureQuery
fix premature octree query before preferences are loaded
2016-01-19 19:32:34 -08:00
Anthony Thibault
42ac96607a Merge pull request #6864 from sethalves/js-list-entity-joint-names
expose getJointNames for entities to js
2016-01-19 18:59:47 -08:00
samcake
c5c51f2af2 Make sure the resolution level for ao is correct 2016-01-19 18:57:03 -08:00
Stephen Birarda
687836ff96 use quoted path on windows for spaced paths 2016-01-19 18:56:04 -08:00
Stephen Birarda
8ae07e49d7 fix build info path on OS X 2016-01-19 18:40:30 -08:00
Zach Pomerantz
3445b7fd2c Fix orientation aligned with Y 2016-01-19 18:39:34 -08:00
ericrius1
a16b267b24 Merge branch 'master' into droplets 2016-01-19 18:27:40 -08:00
ericrius1
4e052dca61 color cloud adjustment 2016-01-19 18:26:32 -08:00
samcake
dc40337dc1 Adjusting default settings 2016-01-19 18:02:47 -08:00
samcake
584d50b594 Experimenting with AO on the lightmaped surface 2016-01-19 17:56:07 -08:00
Stephen Birarda
9054c5f3e9 fix for build-info path on windows 2016-01-19 17:51:32 -08:00
Stephen Birarda
e5d47f3379 fix for accidental filtering of stun packets 2016-01-19 17:26:41 -08:00
ericrius1
d2a815176b lightning strikes 2016-01-19 17:09:39 -08:00
Stephen Birarda
0d80e9dc1f setup ice heartbeat if auto networking enabled 2016-01-19 16:42:57 -08:00
Ryan Huffman
6d396ce9b3 Move to Raleway font for server console 2016-01-19 16:41:02 -08:00
Stephen Birarda
9962eb2315 remove ProximaNova from repository 2016-01-19 16:28:53 -08:00
Stephen Birarda
8bc063e758 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-19 16:21:19 -08:00
Stephen Birarda
be377c7b32 rename the console targets to server-console 2016-01-19 16:15:01 -08:00
Stephen Birarda
8b429d5b47 rename console directory to server-console 2016-01-19 16:11:08 -08:00
Ryan Huffman
f22ee1925d Merge pull request #69 from huffman/console-post-demo
Console post demo
2016-01-19 16:08:21 -08:00
Stephen Birarda
de1355dab9 add comment to window-all-closed empty callback 2016-01-19 16:07:09 -08:00
Stephen Birarda
e3d58ad845 change application data to Server Console 2016-01-19 16:07:08 -08:00
Stephen Birarda
1184660909 fix path in server-console for AC data directory 2016-01-19 16:07:08 -08:00
Stephen Birarda
00eefa3ad1 remove commented line from log.js 2016-01-19 16:04:46 -08:00
Stephen Birarda
a64305c993 fix for indentation in log.js 2016-01-19 16:04:46 -08:00
Stephen Birarda
413d382234 remove commented console log 2016-01-19 16:04:46 -08:00
Stephen Birarda
fcf1cdefa0 fix indentation in log html 2016-01-19 16:04:45 -08:00
Stephen Birarda
33923805e0 remove logging of updater state update 2016-01-19 16:04:45 -08:00
Stephen Birarda
e2ee5fa380 fix indentation in downloader html 2016-01-19 16:04:44 -08:00
Stephen Birarda
39237707a4 remove detection of stack manager content 2016-01-19 16:04:44 -08:00
Stephen Birarda
dfdea79525 put npm install command in hidden folder 2016-01-19 16:04:44 -08:00
Stephen Birarda
b233f2710e call fixup_interface only on OS X 2016-01-19 16:04:43 -08:00
Stephen Birarda
86e2572001 rename target folder for console to Server Console 2016-01-19 16:04:43 -08:00
Stephen Birarda
89386e9dca use CONSOLE_EXEC_NAME shortcut for name 2016-01-19 16:04:43 -08:00
Stephen Birarda
974a899328 clean unused vars and spacing 2016-01-19 16:04:42 -08:00
Stephen Birarda
4feb79cff4 fix message for no code signing on production 2016-01-19 16:04:42 -08:00
Stephen Birarda
8c400f1c5f shorten up GenerateInstallers macro 2016-01-19 16:04:42 -08:00
Stephen Birarda
fdda93a62d set the build version on assignment-client 2016-01-19 16:04:41 -08:00
ericrius1
713496a8a0 lightning strikes 2016-01-19 16:02:41 -08:00
Seth Alves
28d673cb97 try again to make this thread safe 2016-01-19 16:00:02 -08:00
Seth Alves
0064ee6ab2 try again to make this thread safe 2016-01-19 15:55:56 -08:00