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
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
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
Andrew Meadows
7a39bd5c81
remove tab whitespace
2018-03-09 08:35:18 -08:00
Andrew Meadows
7a19f48b9c
move rayHitsSphere logic to AABox method
2018-03-09 08:35:18 -08:00
Andrew Meadows
79b9fec900
add rayHitsSphere() util method
2018-03-09 08:35:18 -08:00
SamGondelman
96e48a0162
warnings
2018-03-07 13:50:51 -08:00
Dante Ruiz
8382d842e1
changing to resources path
2018-03-07 12:51:26 -08:00
SamGondelman
19e4fb2355
materials on primitives
2018-03-07 12:22:17 -08:00
David Rowe
a62b6b7150
Merge branch 'master' into 21709
2018-03-07 17:34:53 +13:00
David Rowe
eeb7f5ca8d
Doc review
2018-03-07 17:29:39 +13:00
Seth Alves
45157a16f2
merge from upstream
2018-03-02 09:57:27 -08:00
David Rowe
f9086e31de
Deprecate Entities.getMeshes() in favor of using the new Graphics API
2018-03-01 10:08:50 +13:00
David Rowe
a782b6779a
Merge branch 'master' into 21709
...
# Conflicts:
# interface/src/ui/overlays/Overlays.h
# interface/src/ui/overlays/Shape3DOverlay.cpp
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/EntityScriptingInterface.h
2018-02-28 12:42:05 +13:00
Seth Alves
a44ddbbc26
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-27 14:09:05 -08:00
Brad Davis
136ced98c3
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-27 13:44:00 -08:00
Stephen Birarda
9cc348ef27
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-27 09:59:37 -08:00
Seth Alves
636c271dc3
merge from upstream
2018-02-27 09:21:08 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting
...
Leopoly_Phase1_010 Graphics Scripting
2018-02-27 07:53:25 -08:00
John Conklin II
25144f0fec
Merge pull request #12456 from Atlante45/fix/min-spec-crash
...
Fix crash when passing --checkMinSpec flag
2018-02-26 17:35:46 -08:00
Stephen Birarda
7e3d4d7503
Merge pull request #12506 from birarda/feat/content-settings
...
merge upstream/master into upstream/feat/content-settings
2018-02-26 18:08:58 -07:00
Stephen Birarda
aa7bd2066a
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-26 17:02:00 -08:00
Atlante45
2a204533f4
Add comments to startup processes
2018-02-26 16:25:41 -08:00
Seth Alves
666fa77be2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-26 13:53:20 -08:00
Ryan Huffman
dbfbee5406
CR
2018-02-26 13:53:20 -08:00
Brad Davis
b9387f2a21
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-26 13:18:14 -08:00
Anthony J. Thibault
c8af9c6f04
Missing EPSILON
2018-02-26 10:05:15 -08:00
