Howard Stearns
d0675c7f22
Side-effect new value before emit.
2015-07-02 09:56:02 -05:00
Howard Stearns
51782bd17d
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-29 09:30:44 -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
Howard Stearns
af4b804d37
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-27 12:50:13 -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
Howard Stearns
dc7360cdc2
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-27 08:37:30 -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
Seth Alves
8a6ab68eda
Merge pull request #5217 from ZappoMan/fixDeadlock
...
Fix for deadlock
2015-06-26 16:27:30 -07:00
Howard Stearns
9a04fdf10a
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-26 16:24:27 -07:00
Howard Stearns
98f165f2ae
Avatar collision sounds.
...
collisionsSoundURL can be set in preferences:
Currently defaults to https://s3.amazonaws.com/hifi-public/sounds/Collisions-hitsandslaps/airhockey_hit1.wav .
Can be empty, which means no sound, rather than restoring default.
MyAvatar.collisionSoundURL can read/written in scripts.
Preloads when set, so that it won't have to fetch on first collision.
Plays at start of collision only, with volume proportional to "velocity change"^2.
2015-06-26 16:23:16 -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
Stephen Birarda
c6df573933
fix some OS X warnings, add description to tooltip
2015-06-26 10:50:31 -07:00
Stephen Birarda
1a523297ba
Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo
2015-06-26 10:35:15 -07:00
Brad Davis
8dcd91fdab
Merge pull request #5192 from venkatn93/master
...
Hyperlink tooltip and address bar remodel
2015-06-26 10:28:52 -07:00
Niraj Venkat
b1c361b324
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-26 09:45:39 -07:00
Andrew Meadows
2974b44dcd
Merge pull request #5212 from sethalves/physics-lock-entity-tree
...
lock entity-tree during physics operations which access entity-tree
2015-06-26 09:45:06 -07:00
Stephen Birarda
a02fabf398
Merge remote-tracking branch 'nv/master' into hyperlink-photo
2015-06-26 09:30:05 -07:00
Stephen Birarda
81770cfeb2
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-06-26 08:49:20 -07:00
Seth Alves
015498a6e0
move function up so this builds in non-debug mode
2015-06-26 07:20:22 -07:00
Seth Alves
2682c4720d
fix alt-branch of ifdef
2015-06-26 07:04:10 -07:00
Howard Stearns
ce1e67b55a
Merge pull request #5179 from DaveDubUK/walk-1.25
...
walk.js version 1.25
2015-06-26 07:02:09 -07:00
Seth Alves
a0d77c061c
lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does
2015-06-26 07:00:28 -07:00
