Niraj Venkat
|
aa55de46c2
|
Drawing full bounding box
|
2015-06-30 16:09:45 -07:00 |
|
Niraj Venkat
|
2f2d5815db
|
Merge branch 'master' of https://github.com/highfidelity/hifi into stats
|
2015-06-30 14:13:03 -07:00 |
|
Niraj Venkat
|
0ea2774d6e
|
Merge branch 'yellow' of https://github.com/samcake/hifi into stats
|
2015-06-30 10:46:07 -07:00 |
|
Brad Hefta-Gaub
|
448a0f01b6
|
Merge pull request #5236 from howard-stearns/wantEditLogging-off-by-default
Want edit logging off by default
|
2015-06-30 09:30:33 -07:00 |
|
Ryan Huffman
|
abab284f38
|
Merge pull request #5235 from ericrius1/lineTransform
line entities can now be properly rotated using rotation property
|
2015-06-30 09:30:01 -07:00 |
|
Sam Gateau
|
20cb519c14
|
first draft at using the status of the item for representing stats and current data about it in the DrawStatus phase
|
2015-06-30 08:19:00 -07:00 |
|
Niraj Venkat
|
d7791982ac
|
Starting stats branch
|
2015-06-29 15:19:50 -07:00 |
|
Brad Davis
|
09f32f6839
|
Merge pull request #5234 from birarda/hyperlink-photo
styling changes in hyperlink tooltip
|
2015-06-29 12:38:46 -07:00 |
|
Howard Stearns
|
a736d0d901
|
Initial value false for domain-server wantEditLogging (used by assignment clients).
|
2015-06-29 11:33:55 -07:00 |
|
Howard Stearns
|
ebf9c3224a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into toolbar-auto-persist-as-percentage-of-screen
|
2015-06-29 11:32:16 -07:00 |
|
ericrius1
|
843ab6d5e3
|
line entities can now be properly rotated using rotation property
|
2015-06-29 11:08:09 -07:00 |
|
Stephen Birarda
|
3dc3d8b4c1
|
make the tooltip background darker
|
2015-06-29 11:05:59 -07:00 |
|
Stephen Birarda
|
133247ec6d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo
|
2015-06-29 10:57:16 -07:00 |
|
Stephen Birarda
|
f93ad34282
|
add spacing above and below tooltipPic
|
2015-06-29 10:57:09 -07:00 |
|
Brad Davis
|
5cfa22396c
|
Merge pull request #5219 from venkatn93/master
Changing tooltip reticle
|
2015-06-29 10:51:16 -07:00 |
|
Brad Hefta-Gaub
|
62b3ca936f
|
Merge pull request #5231 from ctrlaltdavid/fix-textoverlay-font
Fix text overlay font rendering
|
2015-06-28 09:06:12 -07:00 |
|
David Rowe
|
386b3d8ae3
|
Fix text overlay font rendering
Use the same font size as used in TextRenderer to avoid scaling issues.
|
2015-06-27 14:02:49 -07:00 |
|
Seth Alves
|
97cd5b8b99
|
Merge pull request #5223 from SamGondelman/cameraMode
misc. key binding/camera fixes
|
2015-06-27 10:55:34 -07:00 |
|
Seth Alves
|
b7da7374ba
|
Merge pull request #5227 from jherico/cursor_fix
Fixing always-on link cursor
|
2015-06-27 10:47:51 -07:00 |
|
Brad Hefta-Gaub
|
9b42221123
|
Merge pull request #5216 from ctrlaltdavid/comment-update
Improve entity properties list code comment
|
2015-06-26 22:21:39 -07:00 |
|
Brad Davis
|
e6fade8c13
|
Prevent tooltips from appearing with stale data
|
2015-06-26 18:16:56 -07:00 |
|
Brad Davis
|
3b987c1e73
|
Fixing always-on link cursor
|
2015-06-26 18:14:31 -07:00 |
|
Clément Brisset
|
252286bdc1
|
Merge pull request #5226 from Atlante45/html
Restore jquery
|
2015-06-26 18:00:04 -07:00 |
|
Atlante45
|
7aae36d73e
|
Restore jquery
|
2015-06-26 17:58:53 -07:00 |
|
Brad Hefta-Gaub
|
fbf2f51ded
|
Merge pull request #5224 from sethalves/fix-nan-in-vec3
don't try to convert a vec3 containing NaN to a script value
|
2015-06-26 17:55:38 -07:00 |
|
Seth Alves
|
0f3ac976c3
|
don't try to convert a vec3 containing NaN to a script value
|
2015-06-26 17:53:28 -07:00 |
|
Brad Hefta-Gaub
|
8ee0bd24fe
|
Merge pull request #5222 from birarda/ac-failover
add a forced failover for hanging STUN dns lookup
|
2015-06-26 17:40:11 -07:00 |
|
Stephen Birarda
|
8fd309027f
|
add a forced failover for hanging STUN dns lookup
|
2015-06-26 17:35:14 -07:00 |
|
Sam Gondelman
|
2f0fcba1eb
|
key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode
|
2015-06-26 17:28:02 -07:00 |
|
Brad Davis
|
84505c49c4
|
Merge pull request #5213 from birarda/hyperlink-photo
add photo replacement for hyperlinked places
|
2015-06-26 17:05:33 -07:00 |
|
Niraj Venkat
|
9101b4ad70
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-06-26 16:28:01 -07:00 |
|
Seth Alves
|
8a6ab68eda
|
Merge pull request #5217 from ZappoMan/fixDeadlock
Fix for deadlock
|
2015-06-26 16:27:30 -07:00 |
|
Niraj Venkat
|
fe8d539cf5
|
changing link icon
|
2015-06-26 16:27:04 -07:00 |
|
ZappoMan
|
f61581d29d
|
possible fix for deadlock
|
2015-06-26 15:42:04 -07:00 |
|
David Rowe
|
8d83e23bab
|
Improve entity properties list code comment
|
2015-06-26 15:37:16 -07:00 |
|
Stephen Birarda
|
ff33922716
|
handle conflicts on merge with upstream master
|
2015-06-26 15:33:35 -07:00 |
|
Stephen Birarda
|
5b660e8c91
|
Merge pull request #5214 from venkatn93/master
Changing formatting of tooltip
|
2015-06-26 18:27:59 -04:00 |
|
Seth Alves
|
50c0ee1f7e
|
Merge pull request #5215 from ZappoMan/repairBadFormat
repair bad ordering of PROP_SCRIPT_TIMESTAMP
|
2015-06-26 15:03:40 -07:00 |
|
ZappoMan
|
ccbc048f64
|
repair bad ordering of PROP_SCRIPT_TIMESTAMP
|
2015-06-26 14:59:40 -07:00 |
|
Niraj Venkat
|
87fce44271
|
Changing formatting of tooltip
|
2015-06-26 14:41:38 -07:00 |
|
Stephen Birarda
|
9b84eabd18
|
Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo
|
2015-06-26 14:40:01 -07:00 |
|
Stephen Birarda
|
a0df52e860
|
add note for UI link
|
2015-06-26 14:17:54 -07:00 |
|
Stephen Birarda
|
7e19a540fd
|
add the new placeholder image
|
2015-06-26 14:13:23 -07:00 |
|
Stephen Birarda
|
18e2b62ecc
|
initial image replacement for hyperlink preview
|
2015-06-26 14:12:26 -07:00 |
|
Philip Rosedale
|
c0e0982c2d
|
Merge pull request #5154 from ctrlaltdavid/20547
CR for #20547 - Add "reload" buttons for redownloading scripts
|
2015-06-26 13:57:14 -07:00 |
|
Niraj Venkat
|
55b23731e8
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2015-06-26 13:54:46 -07:00 |
|
David Rowe
|
1898c6bd55
|
Merge branch 'master' into 20547
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
|
2015-06-26 13:05:51 -07:00 |
|
Brad Hefta-Gaub
|
2c30711229
|
Merge pull request #5210 from bwent/faceCameraProp
Added faceCamera property for text entities
|
2015-06-26 12:29:25 -07:00 |
|
Clément Brisset
|
229b367186
|
Merge pull request #5211 from birarda/master
fix for audio-mixer shutdown on UNIX/OS X
|
2015-06-26 12:23:52 -07:00 |
|
Stephen Birarda
|
522b715628
|
remove comment, styling cleanup
|
2015-06-26 11:41:34 -07:00 |
|