John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging
...
Quiet logging
2018-04-27 14:59:38 -07:00
John Conklin II
5a3f44fa15
Merge pull request #12965 from NissimHadar/bug12979
...
Fix for bug #12979 : Setting colors [0, 0, 254] from js api ends up as black color
2018-04-23 13:49:41 -07:00
John Conklin II
b3dbf7a025
Merge pull request #12943 from vladest/fix_spinbox
...
Fix SpinBox.
2018-04-23 13:02:01 -07:00
NissimHadar
ea6585a0b9
Corrected tosRGBFloat() computation.
2018-04-23 11:53:35 -07:00
MiladNazeri
3710ce593d
Merge pull request #12922 from ctrlaltdavid/21815
...
Controller API JSDoc
2018-04-21 10:44:05 -07:00
vladest
2e44220b80
Merge branch 'master' into fix_spinbox
2018-04-21 19:38:28 +02:00
MiladNazeri
080e26f408
Merge pull request #12952 from ctrlaltdavid/21851
...
Vec3 API JSDoc
2018-04-20 18:10:18 -07:00
Seth Alves
84e71a9bca
missed a file
2018-04-20 16:08:57 -07:00
Seth Alves
bec39369f7
remove some uncatagorized logging, suppress some categories by default
2018-04-20 16:08:57 -07:00
David Rowe
7087abd201
Merge branch 'master' into 21815
2018-04-21 10:49:56 +12:00
Simon Walton
9f9a68188d
Merge remote-tracking branch 'upstream/master' into short-id
2018-04-20 11:10:21 -07:00
David Rowe
0a7cccc3f7
Move Vec2 and Vec4 JSDoc
2018-04-20 12:47:53 +12:00
vladest
663af09605
Fix SpinBox. attempt 1
2018-04-19 20:43:48 +02:00
John Conklin II
cad4d45941
Merge pull request #12871 from Atlante45/fix/dead-octree-code
...
Remove dead Octree code
2018-04-19 09:58:20 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
...
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
Clement
2e8a6e1961
Remove more dead octree code
2018-04-17 18:21:51 -07:00
David Rowe
c1ede6ef58
Merge branch 'master' into 21815
...
# Conflicts:
# tools/jsdoc/plugins/hifi.js
2018-04-17 11:54:56 +12:00
David Rowe
9f83c606e9
Controller API JSDoc
2018-04-17 11:46:40 +12:00
Simon Walton
9b6306601a
Merge Clement's PR12700 diffs for early trace start
2018-04-10 13:13:46 -07:00
Simon Walton
f10bbce557
Squelch initialization warning
2018-04-04 18:32:40 -07:00
Simon Walton
d05f0600d4
Handle one-time messages outside LogHandler class
...
Also change to std::call_once for the file-scope message IDs.
2018-04-04 15:44:47 -07:00
Simon Walton
ce5f6da6ca
Restore setup of flush timer that was inadvertently lost
2018-04-04 14:43:26 -07:00
Simon Walton
ed3347a89b
Repeated logging - reviewer fixes
2018-04-04 14:11:10 -07:00
Simon Walton
692ccfc09b
Create HIFI_FCDEBUG(_ID) variants that require a category
...
Original macros use default settings.
2018-04-04 09:49:15 -07:00
Simon Walton
7d16ca9c1c
Remove uses of addRepeatedMessageRegex() and its implementation
...
Change to new log-message ID scheme.
2018-04-03 17:54:01 -07:00
Simon Walton
d4ab06b1d4
Move HIFI_FDEBUG macro to LogHandler.h
...
Not all uses of repeated log messages include NetworkLogging.h,
but if they use addRepeatedMessageRegex() they must include
LogHandler.h. Also add second macro for client-supplied
message ID.
2018-04-03 15:53:12 -07:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66
...
RC66 mergeback
2018-04-03 15:39:16 -07:00
Simon Walton
5b0bcd76e3
Repeated logging - Fixes and clean-up
2018-04-03 12:23:21 -07:00
Simon Walton
a7fc6a2991
Repeated logs - use #define to replace qCDebug
2018-04-03 10:44:53 -07:00
Simon Walton
6d078f41e7
Use unique IDs for log strings that should have repeats supressed
2018-04-02 17:32:18 -07:00
SamGondelman
afe39aba46
fix octal code char issue
2018-03-29 10:05:08 -07:00
Simon Walton
bed4033554
Local node IDs now working correctly
...
Move typedef to single location; fixes for replicated packets
(probably still not correct); reserve zero as local ID;
pass domain server's local ID in domain server list;
other tweaks.
2018-03-27 18:18:14 -07:00
Dante Ruiz
4d52caccde
making some more requested changes
2018-03-22 17:39:22 -07:00
Seth Alves
bea7ee42e2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-21 14:30:07 -07:00
John Conklin II
2d63afbe28
Merge pull request #12588 from SamGondelman/shapeTex
...
Materials on primitives
2018-03-21 12:08:24 -07:00
Seth Alves
bc527d5ae8
try again on expandToLocalDataAbsolutePath
2018-03-19 14:59:10 -07:00
Seth Alves
a623ba7499
expandToLocalDataAbsolutePath now expands to a file:// url rather than a qrc:// url
2018-03-19 13:48:31 -07:00
Seth Alves
af42b5e93f
trying to fix expandToLocalDataAbsolutePath
2018-03-19 09:42:03 -07:00
Seth Alves
e3022da787
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 09:34:38 -07:00
Seth Alves
2fd6bc4130
rename Mesh api getPos3 to getPos, deprecate but still support getPos3
2018-03-14 10:24:44 -07:00
Seth Alves
b39c7eadd2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-13 09:24:18 -07:00
Sam Gondelman
c59d29f4ee
Merge pull request #12623 from SamGondelman/android
...
Android: Fix corruption on startup
2018-03-12 15:03:07 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709
...
Entities API JSDoc
2018-03-12 14:40:09 -07:00
SamGondelman
9953e7051f
Merge remote-tracking branch 'upstream/master' into android
2018-03-12 14:15:31 -07:00
SamGondelman
4bef033d6f
cleanup, don't compress rcc file to fix corruption
2018-03-12 13:05:03 -07:00
Seth Alves
22f1ec5c82
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-10 14:49:25 -08:00
Simon Walton
cc166dbece
LogHandler regexps - use vector of values
2018-03-09 15:44:56 -08:00
Seth Alves
c781f88239
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-09 15:43:14 -08:00
Simon Walton
d4cf22fbaf
LogHandler class stores regexps - code tweaks
...
Code standard changes from review.
2018-03-09 15:29:10 -08:00
Simon Walton
4b27cd73ff
LogHandler class stores regexps rather than always recreating
...
General efficiency tweaks; move to C++11.
2018-03-09 15:29:09 -08:00
