Stephen Birarda
|
2b0cfe3c67
|
resolve conflicts on merge with upstream master
|
2013-08-01 14:33:23 -07:00 |
|
Andrzej Kapolka
|
4ae4623315
|
These casts should fix the warnings on OS X.
|
2013-07-29 16:12:11 -07:00 |
|
Andrzej Kapolka
|
20360ad3e9
|
Make particle system update/render toggleable, fix GCC compile warnings.
|
2013-07-29 10:41:45 -07:00 |
|
Stephen Birarda
|
f8e7e1de66
|
modifications to hook shared classes to iOS
|
2013-07-24 13:05:02 -07:00 |
|
Stephen Birarda
|
1b48d4f0fc
|
revert removal of extraneous newlines
|
2013-07-16 12:46:32 -07:00 |
|
Stephen Birarda
|
89d3cfdb6f
|
remove now extraneous newlines after switch to QDebug
|
2013-07-16 11:16:51 -07:00 |
|
Stephen Birarda
|
afe49bc756
|
switch calls to printLog to QDebug
|
2013-07-16 11:07:22 -07:00 |
|
Stephen Birarda
|
211204e878
|
Merge remote-tracking branch 'upstream/master' into timestamps
|
2013-07-11 09:23:16 -07:00 |
|
Stephen Birarda
|
ca8f25955a
|
switch usec timestamps to uint64_t
|
2013-07-10 11:46:48 -07:00 |
|
ZappoMan
|
c795a37be2
|
tweak perfstats to not display WARNING! when caller asked it to always print (non-warning case)
|
2013-07-03 10:55:33 -07:00 |
|
Stephen Birarda
|
8fd6bc41aa
|
add copyright to PerfStat implementation file
|
2013-06-18 18:09:03 -07:00 |
|
Andrzej Kapolka
|
db729a04aa
|
Converted double timestamps to long long (64 bit integers), fixed bug with
updating agent timestamps.
|
2013-06-13 11:11:59 -07:00 |
|
tosh
|
a86b8a1d93
|
refactors logging
|
2013-05-21 01:00:10 +02:00 |
|
ZappoMan
|
7a5ce57b4e
|
added alwaysDisplay mode to PerformanceWarnings class
|
2013-05-08 12:01:55 -07:00 |
|
ZappoMan
|
c2588e0120
|
fixed CR issue
|
2013-05-06 16:42:12 -07:00 |
|
ZappoMan
|
239aa1ed49
|
some cleanup pre CR
|
2013-05-06 16:18:30 -07:00 |
|
ZappoMan
|
16b93f8c92
|
added PerformanceWarning class
|
2013-05-06 11:00:01 -07:00 |
|
tosh
|
bf5f54c9d0
|
integrates logging for 'avatars' library, fixes missig return in Log.cpp, adds _lib suffix for log callback namespaces and reverts voxels -> voxLib rename in main
|
2013-04-17 20:14:29 +02:00 |
|
tosh
|
e55863a662
|
integrates logging for 'shared' library
|
2013-04-17 19:46:00 +02:00 |
|
Stephen Birarda
|
67efc12e59
|
move shared to libraries, DRY library macro, rename libs
|
2013-04-12 12:38:34 -07:00 |
|