Brad Davis
|
91906d619f
|
Removing unmatched QReadWriteLock::unlock() call
|
2015-03-18 22:32:06 -07:00 |
|
Sam Gateau
|
f874a3ae82
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-03-18 17:26:31 -07:00 |
|
Sam Gateau
|
b33ba64e05
|
trying to tweek the transform equation to find the intel bug
|
2015-03-18 17:20:27 -07:00 |
|
Seth Alves
|
f800b29682
|
Merge pull request #4474 from AndrewMeadows/thermonuclear
proper shape management for ConvexHull shapes
|
2015-03-18 17:01:58 -07:00 |
|
samcake
|
c0a66a05f4
|
Merge pull request #4463 from ZappoMan/LODTweaks
MVP Task - tweaks to automatic-LOD adjustments & Display warning when LOD is decreased
|
2015-03-18 16:55:39 -07:00 |
|
Andrew Meadows
|
c032b29633
|
proper shape management for ConvexHull shapes
|
2015-03-18 16:29:57 -07:00 |
|
samcake
|
0f22d64802
|
compilation on MacOSX
|
2015-03-18 16:28:42 -07:00 |
|
Sam Gateau
|
414315b6e0
|
Since glProgramUniform is not supported on MAc we need a workaround...
|
2015-03-18 16:15:06 -07:00 |
|
Sam Gateau
|
b5eb4a7f5b
|
Since glProgramUniform is not supported on MAc we need a workaround...
|
2015-03-18 16:12:47 -07:00 |
|
Sam Gateau
|
dc27bfb6ef
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-03-18 15:59:50 -07:00 |
|
Sam Gateau
|
0bd78be7f4
|
Transition model shaders to gpu:Shader
|
2015-03-18 15:57:01 -07:00 |
|
Seth Alves
|
4412ba916e
|
don't lock out someone from localhost, even if the maximum number of users are connected
|
2015-03-18 15:17:25 -07:00 |
|
Seth Alves
|
e2a104c38a
|
unjack AvatarData locks
|
2015-03-18 14:11:02 -07:00 |
|
Seth Alves
|
610607e8e6
|
optionally limit number of avatars that can connect
|
2015-03-18 14:08:53 -07:00 |
|
Seth Alves
|
feeabc7bc8
|
Merge branch 'master' of github.com:highfidelity/hifi into maximum-capacity
|
2015-03-18 13:44:12 -07:00 |
|
Andrew Meadows
|
a07be6ba9f
|
Merge pull request #4472 from sethalves/quiet-physics-log
quiet physics log spam
|
2015-03-18 13:41:23 -07:00 |
|
Seth Alves
|
405eceeda6
|
Merge branch 'master' of github.com:highfidelity/hifi into maximum-capacity
|
2015-03-18 13:26:46 -07:00 |
|
Seth Alves
|
dd97b54e52
|
quiet physics log spam
|
2015-03-18 13:22:29 -07:00 |
|
Seth Alves
|
1cab14064d
|
remove unneeded code, quiet some debug spew
|
2015-03-18 13:10:53 -07:00 |
|
Seth Alves
|
36e0a5afc5
|
cleanups
|
2015-03-18 13:04:27 -07:00 |
|
Seth Alves
|
b7a54e672d
|
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
|
2015-03-18 13:01:07 -07:00 |
|
Seth Alves
|
9161cc8b83
|
attempt to handle collision models in the same way as render models
|
2015-03-18 13:00:09 -07:00 |
|
Brad Davis
|
160f666d89
|
Merge branch 'master' into avatar
|
2015-03-18 12:55:56 -07:00 |
|
Andrew Meadows
|
517b2648ca
|
Merge pull request #4465 from sethalves/avatars-can-collide
One convex hull shape for models that provide decomposition data.
|
2015-03-18 12:52:52 -07:00 |
|
Brad Davis
|
0c465ce2b5
|
Merge pull request #4460 from ZappoMan/runJSFiles
MVP task - Allow a script to be added to a users "running script" from the marketplace
|
2015-03-18 12:52:44 -07:00 |
|
Brad Hefta-Gaub
|
6d0fbcfcd6
|
Merge pull request #4470 from jherico/logspam
Removing reported logspam from release builds
|
2015-03-18 12:49:52 -07:00 |
|
David Rowe
|
c114442325
|
Merge branch 'master' into 20399
|
2015-03-18 12:44:29 -07:00 |
|
David Rowe
|
648a2e3b1d
|
Set clip distance on rendering frustum rather than camera
This fixes wrong clipping distance used for rendering in FPV if also
have rear view mirror.
|
2015-03-18 12:43:49 -07:00 |
|
ZappoMan
|
8239a295cb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into LODTweaks
|
2015-03-18 11:54:05 -07:00 |
|
ZappoMan
|
a2e012f7a9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into runJSFiles
|
2015-03-18 11:53:19 -07:00 |
|
Stojce Slavkovski
|
00f1d96af5
|
Use existing house models
|
2015-03-18 19:30:08 +01:00 |
|
Atlante45
|
8b5ade10b8
|
Initial add of the Attribution property
|
2015-03-18 18:57:05 +01:00 |
|
Brad Davis
|
07ee350c09
|
Removing reported logspam from release builds
|
2015-03-18 10:24:53 -07:00 |
|
Stojce Slavkovski
|
879e3054d1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into 20397
|
2015-03-18 18:09:43 +01:00 |
|
samcake
|
948ced81ce
|
Merge pull request #4461 from Atlante45/fix_recordings
Fix recordings
|
2015-03-18 09:52:29 -07:00 |
|
Seth Alves
|
906f082a2a
|
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
|
2015-03-18 09:11:35 -07:00 |
|
Andrew Meadows
|
8eec83c144
|
comments and formatting
|
2015-03-17 22:28:38 -07:00 |
|
Brad Hefta-Gaub
|
53ae4b48bc
|
Merge pull request #4459 from ctrlaltdavid/20400
CR for 20400 - Name tags going through the head
|
2015-03-17 21:54:13 -07:00 |
|
Brad Hefta-Gaub
|
a5294ae3fa
|
Merge pull request #4436 from sethalves/persist-entities-as-json
Optionally persist entities as json
|
2015-03-17 21:53:17 -07:00 |
|
Seth Alves
|
2dd75fef2c
|
remove some unneeded Q_OBJECT macros, diff minimization
|
2015-03-17 19:12:26 -07:00 |
|
Seth Alves
|
f9be7dda36
|
bump shape stuff from ModelEntityItem down to RenderableModelEntityItem
|
2015-03-17 18:55:13 -07:00 |
|
Brad Hefta-Gaub
|
55d9560c9e
|
Merge pull request #4469 from jherico/frustumFetchCheck
Fix broken aspect ratio in mirror
|
2015-03-17 17:06:21 -07:00 |
|
Sam Gateau
|
5a40fcee17
|
set the defines for GPU profile correctly AGAIN
|
2015-03-17 16:51:59 -07:00 |
|
Brad Davis
|
1662230289
|
Adding some fixmes to the code, since globals are evil and such checks should be confined to debug mode only
|
2015-03-17 16:44:29 -07:00 |
|
Sam Gateau
|
74ae0c4a85
|
set the defines for GPU profile correctly
|
2015-03-17 16:35:32 -07:00 |
|
David Rowe
|
7b54443bda
|
Adjust clip distance as HMD head moves backwards
|
2015-03-17 16:33:20 -07:00 |
|
David Rowe
|
a04bd09b83
|
Set clip near distance per skeleton model if no separate head model
|
2015-03-17 16:32:59 -07:00 |
|
Brad Davis
|
e616308911
|
Adding runtime check to ensure that the correct frustum is fetched during rendering
|
2015-03-17 16:28:44 -07:00 |
|
Ryan Huffman
|
870f1112e4
|
Fix thrust not being applied w/ Physics + Avatar
|
2015-03-17 16:17:44 -07:00 |
|
Sam Gateau
|
76ac8d7eec
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
|
2015-03-17 16:15:59 -07:00 |
|