Andrew Meadows
|
a7dbd6779f
|
Merge pull request #4467 from huffman/avatar-thrust
Fix thrust not being applied w/ Physics + Avatar
|
2015-03-19 16:40:10 -07:00 |
|
Brad Hefta-Gaub
|
46fb9cd615
|
Merge pull request #4471 from sethalves/avatars-can-collide
Avatars can collide redux
|
2015-03-19 16:31:26 -07:00 |
|
Seth Alves
|
1db9a9ef46
|
use .isEmpty on urls rather than convert them to strings and compare to empty string
|
2015-03-19 15:48:48 -07:00 |
|
Seth Alves
|
efb7fd6636
|
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
|
2015-03-19 15:47:04 -07:00 |
|
Seth Alves
|
0dc61ce3b8
|
Merge pull request #4477 from ZappoMan/dragDropLinkAvatars
MVP Task: Support for Drag/Drop link avatars
|
2015-03-19 15:29:55 -07:00 |
|
ZappoMan
|
5f825211df
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dragDropLinkAvatars
|
2015-03-19 15:12:06 -07:00 |
|
ZappoMan
|
24132968fe
|
oops
|
2015-03-19 12:41:44 -07:00 |
|
ZappoMan
|
26670f9e41
|
remove unneeded debug
|
2015-03-19 12:15:12 -07:00 |
|
ZappoMan
|
c5314aceac
|
more DRYing up of code
|
2015-03-19 11:57:57 -07:00 |
|
ZappoMan
|
5814a14152
|
removed dead code
|
2015-03-19 11:42:00 -07:00 |
|
ZappoMan
|
e6cefa946c
|
more DRYing of code
|
2015-03-19 11:41:03 -07:00 |
|
ZappoMan
|
3c41ecd091
|
cleanup accepted files implementation
|
2015-03-19 11:29:41 -07:00 |
|
Seth Alves
|
8eedab72b3
|
remove some unneeded asserts
|
2015-03-19 09:15:57 -07:00 |
|
Seth Alves
|
480eae7317
|
Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide
|
2015-03-19 09:14:26 -07:00 |
|
ZappoMan
|
8e0141b8e9
|
first cut at fst drag/drop support
|
2015-03-19 08:48:13 -07:00 |
|
Seth Alves
|
ed63e339bc
|
Merge pull request #4475 from jherico/deadlock
Removing unmatched QReadWriteLock::unlock() call
|
2015-03-19 06:54:41 -07:00 |
|
Brad Davis
|
7d73a0317d
|
Merge pull request #4473 from sethalves/maximum-capacity
Maximum capacity
|
2015-03-18 22:43:17 -07:00 |
|
Brad Davis
|
91906d619f
|
Removing unmatched QReadWriteLock::unlock() call
|
2015-03-18 22:32:06 -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 |
|
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 |
|
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 |
|
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 |
|
Brad Davis
|
07ee350c09
|
Removing reported logspam from release builds
|
2015-03-18 10:24:53 -07: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 |
|
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 |
|
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 |
|
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 |
|
Seth Alves
|
3a126d4840
|
ModelEntityItem doesn't need to be a QObject
|
2015-03-17 16:15:55 -07:00 |
|
Brad Davis
|
895a0d7b85
|
Correcting frustum usage by the avatar renderer that was causing aspect ratio problem
|
2015-03-17 16:14:35 -07:00 |
|