ZappoMan
|
333f323856
|
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDMode
|
2014-11-25 12:46:18 -08:00 |
|
ZappoMan
|
e9812d0608
|
added similarStrings() helper
|
2014-11-25 09:25:49 -08:00 |
|
Sam Gateau
|
1f22d5b493
|
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
|
2014-11-24 10:05:39 -08:00 |
|
Sam Gateau
|
87471df7a1
|
First version of the lighmap working
|
2014-11-21 18:08:34 -08:00 |
|
ZappoMan
|
bd2adf08e3
|
fix to drift in usecTimestampNow() caused when computer sleeps
|
2014-11-21 13:33:53 -08:00 |
|
Atlante45
|
ae3bcc8f06
|
No more .f
|
2014-11-19 16:53:39 -08:00 |
|
Stephen Birarda
|
8c65c6c1c8
|
fix comment for actual time format
|
2014-11-18 17:02:28 -08:00 |
|
Stephen Birarda
|
705d3da089
|
cleanup time in log prefix
|
2014-11-18 17:00:33 -08:00 |
|
Andrew Meadows
|
971804b98e
|
name change shinkIfNeeded() -> shrinkIfNeeded()
|
2014-11-17 16:14:49 -08:00 |
|
ZappoMan
|
4adb4787cd
|
added debugging of usecTimestampNow() in octree server to better understand flight times
|
2014-11-15 21:50:42 -08:00 |
|
Sam Gateau
|
0973d197cf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2014-11-14 12:25:00 -08:00 |
|
Stephen Birarda
|
86284036f1
|
put back timestamp in log
|
2014-11-14 10:35:13 -08:00 |
|
Sam Gateau
|
f09b58c255
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2014-11-14 10:05:01 -08:00 |
|
Sam Gateau
|
642f436fba
|
first draft of factorizing the rendering traversal for both sides in stereo
|
2014-11-14 09:56:36 -08:00 |
|
Brad Hefta-Gaub
|
27c37f3a4e
|
Merge pull request #3784 from ctrlaltdavid/20157
CR for Job #20157 - Enable "Get Overlay properties" from javascript
|
2014-11-13 20:43:38 -08:00 |
|
David Rowe
|
8076bfea72
|
Merge branch 'master' into 20157
Conflicts:
interface/src/ui/overlays/Text3DOverlay.cpp
|
2014-11-13 14:53:57 -08:00 |
|
Stephen Birarda
|
e10d132f75
|
avoid Qt QTimer thread bug by putting SoundCache on same thread
|
2014-11-13 14:47:28 -08:00 |
|
Sam Gateau
|
420118e9db
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2014-11-13 11:04:12 -08:00 |
|
Sam Gateau
|
7e2c4c0561
|
SImplified the Transform usage in the gpu::api, no more pointers, just values. Improved the Transform by compressing the memory footprint
|
2014-11-13 10:57:32 -08:00 |
|
ZappoMan
|
09a06c9d82
|
add debug streamer for xColor
|
2014-11-13 08:14:01 -08:00 |
|
David Rowe
|
fac6b6b426
|
Refactor QRect conversion to QScriptValue
|
2014-11-12 21:32:55 -08:00 |
|
Sam Gateau
|
b6c004c431
|
Fix syntax that doesn't compile on linux and used smart glm::max instruction
|
2014-11-12 17:16:43 -08:00 |
|
Sam Gateau
|
8fb04af59d
|
defined the ViewTransform as the matrix transforming from eye space to world space (the opposite of before this commit) since it seems a better design
|
2014-11-12 16:40:45 -08:00 |
|
Sam Gateau
|
e47524d70a
|
fix syntax and missing constant name
|
2014-11-12 10:41:50 -08:00 |
|
Sam Gateau
|
b716a512c6
|
Stable version of the Transform and usage for Model rendering with soimilar performances and same accuracy level
|
2014-11-12 00:26:44 -08:00 |
|
Sam Gateau
|
668c5e298d
|
clean up the Transform class and the rendering path in Model.cpp
|
2014-11-11 16:39:00 -08:00 |
|
Sam Gateau
|
ad51416c28
|
move the transform class files to the Shared library, still problem with negative scale composition
|
2014-11-11 09:54:35 -08:00 |
|
Stephen Birarda
|
9b2acadb4b
|
include c++ header for memset
|
2014-11-07 17:24:05 -08:00 |
|
Stephen Birarda
|
6a4808aac8
|
include string.h for memset usage
|
2014-11-07 17:22:54 -08:00 |
|
Stephen Birarda
|
2ca673175a
|
rename StdDev to StDev, patch its leak
|
2014-11-07 17:15:54 -08:00 |
|
Stephen Birarda
|
4fd22914c0
|
fix a leak in StdDev
|
2014-11-07 17:11:00 -08:00 |
|
Philip Rosedale
|
cdad40faec
|
Merge pull request #3736 from ZappoMan/entityBugs
reset the QElapsedTimer in usecTimestampNow() periodically to prevent error
|
2014-11-04 12:59:13 -08:00 |
|
ZappoMan
|
a89287e404
|
reset the QElapsedTimer in usecTimestampNow() periodically to prevent error
|
2014-11-04 11:01:37 -08:00 |
|
Stephen Birarda
|
8d6b041758
|
send a pick ray with HFActionEvent, not x,y
|
2014-11-04 10:01:25 -08:00 |
|
Stephen Birarda
|
6b922fc3e7
|
final tweak for linux unistd include
|
2014-10-30 10:03:36 -07:00 |
|
ZappoMan
|
c3d1d13fa9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes
|
2014-10-29 11:56:27 -07:00 |
|
Stephen Birarda
|
7f3482bbdd
|
swithc from elif to elsif
|
2014-10-29 10:53:34 -07:00 |
|
Stephen Birarda
|
03e1da0ba9
|
include unistd only on Q_OS_LINUX
|
2014-10-29 10:37:39 -07:00 |
|
ZappoMan
|
3e9bc23c2f
|
moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes
|
2014-10-29 10:19:04 -07:00 |
|
Andrew Meadows
|
c39b239f99
|
fix linux build for missing getpid()
|
2014-10-29 09:30:51 -07:00 |
|
Brad Hefta-Gaub
|
be65a798db
|
Merge pull request #3681 from birarda/verbose-log-silencer
logging tweaks to reduce spam from repeated log messages
|
2014-10-28 17:58:17 -07:00 |
|
Stephen Birarda
|
9af097967d
|
remove ctime since windows build did not fail without it
|
2014-10-28 15:56:30 -07:00 |
|
Stephen Birarda
|
992396ba63
|
add ctime for strftime call
|
2014-10-28 15:48:06 -07:00 |
|
Stephen Birarda
|
01de6305e9
|
add time header for date in log entry
|
2014-10-28 15:42:03 -07:00 |
|
Stephen Birarda
|
c4538836c1
|
always output the first matching repeated log message
|
2014-10-28 14:51:47 -07:00 |
|
Stephen Birarda
|
424793b905
|
complete output of suppressed repeated messages to log
|
2014-10-28 14:49:14 -07:00 |
|
Stephen Birarda
|
8e3102266a
|
use the LogHandler in Interface
|
2014-10-28 14:23:34 -07:00 |
|
Stephen Birarda
|
d3bbd251db
|
move Logging to LogHandler
|
2014-10-28 13:59:23 -07:00 |
|
Andrew Meadows
|
4c3cdf5b7a
|
move stuff out of shared and into physics library
|
2014-10-28 13:51:45 -07:00 |
|
Stephen Birarda
|
2711ff2b5f
|
move functionality from VerboseLoggingHelper into the Logging class
|
2014-10-28 13:48:53 -07:00 |
|