Bradley Austin Davis
1db4162371
Merge branch 'master' into plugins
2015-07-23 13:42:03 -04:00
Sam Gateau
7ac2030862
Preparing for first pr
2015-07-22 10:43:50 -07:00
Bradley Austin Davis
114ab9e47f
Merge branch 'master' into plugins
2015-07-22 11:47:56 -04:00
Brad Davis
5744200f64
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/MyAvatar.h
2015-07-20 19:21:02 -07:00
SamGondelman
a4cbb7f412
const references in glmhelpers
2015-07-20 17:30:23 -07:00
Anthony J. Thibault
80dea6831c
Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers
...
Conflicts:
interface/src/Application.cpp
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
2015-07-20 15:18:23 -07:00
Atlante45
8d6ff2d9f9
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 14:50:44 -07:00
Atlante45
59acfc9f47
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-20 13:51:51 -07:00
Stephen Birarda
0177513285
resolve conflicts on merge with upstream/master
2015-07-20 12:29:38 -07:00
Brad Davis
5159452335
Fixing invalid vector usage and strange picking crash
2015-07-19 23:03:46 -07:00
Brad Davis
c446bb307d
Adding convenience return *this to many transform methods
2015-07-18 16:56:32 -07:00
Brad Davis
d68618e206
Removing GL headers from most files, and some naked GL from application.cpp
2015-07-18 00:46:09 -07:00
Atlante45
256c786e28
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-17 17:59:19 -07:00
Stephen Birarda
f8c832e50b
resolve conflicts on merge with upstream master
2015-07-17 16:48:46 -07:00
Stephen Birarda
7d2495e289
set the generic thread priority once it's actually started
2015-07-17 09:24:00 -07:00
Anthony J. Thibault
e8da4b9586
merge with plugins, needs testing
2015-07-16 18:47:39 -07:00
Brad Davis
89faf85ad9
Working on text rendering overlays
2015-07-16 15:56:01 -07:00
Atlante45
b4121eb464
Remove unnecessary move
2015-07-16 13:14:17 -07:00
Stephen Birarda
61f23f6a5e
Merge branch 'master' of https://github.com/highfidelity/hifi into atp
2015-07-16 11:56:26 -07:00
ZappoMan
5165210e11
fix Sams comment about comments
2015-07-15 16:35:20 -07:00
Stephen Birarda
05dde9d8f5
resolve conflicts on merge with upstream/master
2015-07-15 16:18:47 -07:00
ZappoMan
d1e511efcb
more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl
2015-07-15 15:52:12 -07:00
samcake
9df26c8488
removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs
2015-07-15 00:24:43 -07:00
Anthony J. Thibault
dbc18ce51f
merge with plugins
2015-07-14 12:30:47 -07:00
Stephen Birarda
821c16cbc4
resolve conflicts on merge with uptream/master
2015-07-14 09:52:20 -07:00
Seth Alves
c17c9f1818
quiet compiler
2015-07-12 10:29:43 -07:00
Atlante45
80fe090a94
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
2015-07-10 20:20:03 -07:00
Brad Davis
c1b72db18d
Still trying to get jenkins builds to work
2015-07-10 16:00:51 -07:00
Brad Davis
2ce8dba819
Removing heap allocation from property flag parsing, adding some manual tests
2015-07-10 15:08:10 -07:00
Stephen Birarda
1b4e333c49
Merge pull request #3 from birarda/atp
...
initial networking API changes for new protocol
2015-07-09 16:51:37 -04:00
Stephen Birarda
2417981c9d
resolve conflicts on merge with clement/protocol
2015-07-09 13:27:59 -07:00
Stephen Birarda
893e1864fd
cleanup _newestEntryAtIndex calc in RBH insert
2015-07-09 13:22:41 -07:00
Atlante45
c0b8f83ca0
Better ring index compute
2015-07-09 13:22:09 -07:00
Stephen Birarda
14b73ae00f
remove qtimespan that isn't used anymore
2015-07-09 12:45:32 -07:00
Brad Hefta-Gaub
489a8b4b3d
Merge pull request #5285 from jherico/homer
...
Move log file writing to a separate thread
2015-07-09 12:22:13 -07:00
Brad Hefta-Gaub
fb07956689
Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix
...
fix for mirror rendering on windows
2015-07-09 08:38:55 -07:00
Stephen Birarda
19c5f0b67c
resolve conflicts on merge with upstream/master
2015-07-08 22:54:36 -07:00
Brad Davis
63dfd570f1
Adding priority support to GenericThread
2015-07-08 22:54:31 -07:00
Brad Davis
08d1364f81
Move file log persistence to a separate thread
2015-07-08 22:35:23 -07:00
Anthony J. Thibault
1be0e7ebc3
fix for mirror rendering on windows
...
* added preScale to Transform class.
* preScale by -1 about the xAxis instead of post scale.
I think this was working on Mac due to the different code paths in
GLBackendTransform::updateTransform for core vs legacy gl profile.
2015-07-08 21:33:27 -07:00
Brad Davis
f2beb79d23
Updating buffer parser to use new heapless API
2015-07-08 18:54:38 -07:00
Stephen Birarda
da3502eb6c
resolve conflicts on merge with upstream/master
2015-07-08 18:41:48 -07:00
Brad Davis
49a14e3446
Merge remote-tracking branch 'upstream/master' into entity_parsing
2015-07-08 18:37:41 -07:00
Brad Davis
625cc86f83
Merge pull request #5283 from ZappoMan/optimizeByteCountCoded
...
Optimize ByteCountCoded<> to not do extra heap allocations
2015-07-08 18:35:02 -07:00
ZappoMan
7790e35d24
added bytes consumed result to decode, and exit early after bytes consumed
2015-07-08 18:19:12 -07:00
Brad Davis
600e9cbf52
Fixing template specialization compilation error on gcc/clang
2015-07-08 18:17:03 -07:00
ZappoMan
c0cdf3256c
comment and dead code
2015-07-08 17:34:36 -07:00
ZappoMan
e885ac1821
improved performance of ByteCountCoding<> decode
2015-07-08 17:32:51 -07:00
Brad Davis
98e0688e98
Reducing heap allocation in network packet parsing
2015-07-08 17:21:38 -07:00
ZappoMan
6a9344a3f6
fix bug in old version of decode
2015-07-08 15:14:24 -07:00
