Stephen Birarda
|
03de43d451
|
simplify notifications.js after chat removal
|
2015-03-03 10:22:57 -08:00 |
|
Stephen Birarda
|
cf227b94de
|
remove global services example that leveraged xmpp
|
2015-03-03 10:17:53 -08:00 |
|
Stephen Birarda
|
a893f11ad7
|
remove load script from message that used xmpp
|
2015-03-03 10:17:29 -08:00 |
|
Stephen Birarda
|
27b9b345ca
|
remove ChatWindow includes from DialogsManager
|
2015-03-03 10:15:34 -08:00 |
|
Stephen Birarda
|
b270297406
|
remove a missed XmppClient include
|
2015-03-03 10:14:35 -08:00 |
|
Stephen Birarda
|
379914ce7d
|
modify BUILD for removal of qxmpp
|
2015-03-03 10:14:13 -08:00 |
|
Stephen Birarda
|
e43da00537
|
remove xmpp chat support
|
2015-03-03 10:13:41 -08:00 |
|
Stephen Birarda
|
eb8e8e9a62
|
Merge pull request #4356 from sethalves/domain-server-http-port-in-shmem
pass more localhost ports via shared memory
|
2015-03-03 10:05:24 -08:00 |
|
Clément Brisset
|
5ef86f88f5
|
Merge pull request #4364 from huffman/save-on-blur
Fix properties window changes not taking affect when losing focus
|
2015-03-03 08:35:49 -08:00 |
|
Philip Rosedale
|
c9f97b312e
|
Merge pull request #4365 from sethalves/log-only-once
Log message type just once
|
2015-03-02 20:38:54 -08:00 |
|
Seth Alves
|
bb7b132b78
|
Add a way to indicate that a specific message of a certain form should only be printed once. Different messages that match the same form will each be printed once.
|
2015-03-02 14:18:26 -08:00 |
|
Brad Hefta-Gaub
|
6d8ccfbc2a
|
Merge pull request #4357 from huffman/update-light-entity-properties
Update light entity properties
|
2015-03-02 13:51:48 -08:00 |
|
Ryan Huffman
|
f739bf2116
|
Fix properties window changes not taking affect when losing focus
|
2015-03-02 11:20:00 -08:00 |
|
Ryan Huffman
|
1a3eb68e2d
|
Update lightEntityItem old version handling to be more clear
|
2015-03-02 09:25:18 -08:00 |
|
Philip Rosedale
|
9af30a268c
|
Merge pull request #4362 from ZappoMan/fpsImprovements
Some Stats cleanup and minor FPS improvements
|
2015-03-01 22:29:18 -08:00 |
|
Brad Hefta-Gaub
|
f1f0878a3f
|
Merge pull request #4359 from huffman/fix-rotation-text
Update editEntities handles
|
2015-02-27 22:14:40 -08:00 |
|
Brad Hefta-Gaub
|
a2d8f89426
|
Merge pull request #4358 from huffman/handle-sigint
Add SIGINT handling to assignment-client
|
2015-02-27 22:13:10 -08:00 |
|
ZappoMan
|
a338d96b9d
|
only render the overlay if we're actually rendering the overlay
|
2015-02-27 18:00:51 -08:00 |
|
ZappoMan
|
9cc66f3da7
|
cleanup stats display behavior, reset default settings for timing details
|
2015-02-27 17:57:42 -08:00 |
|
Philip Rosedale
|
d123ad5b76
|
Merge pull request #4360 from ZappoMan/transparentRAWheightmaps
add support for transparency in RAW heightmaps
|
2015-02-27 16:39:39 -08:00 |
|
ZappoMan
|
31c96523fb
|
add support for transparency in RAW heightmaps
|
2015-02-27 15:57:46 -08:00 |
|
Ryan Huffman
|
a48c428f42
|
Update highlighted handle color
|
2015-02-27 15:29:00 -08:00 |
|
Ryan Huffman
|
dc2cb93cce
|
Add degrees symbol to rotation degrees text
|
2015-02-27 15:11:43 -08:00 |
|
Ryan Huffman
|
a0d9e92c64
|
Update size of rotation overlay
|
2015-02-27 15:11:23 -08:00 |
|
Ryan Huffman
|
4f4ab144b2
|
Update handle colors and up/down arrow image
|
2015-02-27 15:10:56 -08:00 |
|
Ryan Huffman
|
cd3281521c
|
Update size of rotation degrees text
|
2015-02-27 15:08:29 -08:00 |
|
Ryan Huffman
|
3ffd47a0b0
|
Update editEntities rotation arrows
|
2015-02-27 15:08:13 -08:00 |
|
Philip Rosedale
|
af9108c79f
|
Merge pull request #4338 from ctrlaltdavid/20368
DO NOT MERGE - QA for 20368
|
2015-02-27 14:16:55 -08:00 |
|
Ryan Huffman
|
11efcd70d8
|
Add SIGINT handling to assignment-client
|
2015-02-27 14:09:46 -08:00 |
|
Ryan Huffman
|
84691f922c
|
Remove old light color properties
|
2015-02-27 14:04:56 -08:00 |
|
Ryan Huffman
|
61bc32493f
|
Fix entity version name in LightEntityItem
|
2015-02-27 13:49:17 -08:00 |
|
Ryan Huffman
|
20f3d23ae7
|
Update editEntities to use new light properties
|
2015-02-27 13:46:26 -08:00 |
|
Ryan Huffman
|
a7f84bcd30
|
Update entity server version number
|
2015-02-27 13:46:04 -08:00 |
|
Ryan Huffman
|
093e5db90d
|
Update entity light properties to use new model
Rename constantAttenuation -> intensity
Rename diffuseColor -> color
Remove remaining attenuation and colors
|
2015-02-27 13:42:56 -08:00 |
|
Philip Rosedale
|
9eee213bce
|
Merge pull request #4353 from Atlante45/relax_face_tracker
Relax blendshapes
|
2015-02-27 13:36:22 -08:00 |
|
David Rowe
|
797b1649a6
|
Merge branch 'master' into 20368
Conflicts:
interface/src/devices/DdeFaceTracker.cpp
|
2015-02-27 12:48:21 -08:00 |
|
Ryan Huffman
|
5c9473cd24
|
Merge branch 'master' of github.com:highfidelity/hifi into update-light-entity-properties
Conflicts:
libraries/entities-renderer/src/RenderableLightEntityItem.cpp
|
2015-02-27 12:20:10 -08:00 |
|
Ryan Huffman
|
fdc1146339
|
Update RenderableLightEntityItem to use update light entity
|
2015-02-27 12:14:50 -08:00 |
|
Seth Alves
|
f54f41fcf0
|
fix typo
|
2015-02-27 11:36:45 -08:00 |
|
Philip Rosedale
|
7f915fbe79
|
Merge pull request #4354 from sethalves/assignment-client-dont-spam-log
add suppressions for log-spam caused by idle assignment-client
|
2015-02-27 11:26:29 -08:00 |
|
Seth Alves
|
ce3c8f87d9
|
Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem
|
2015-02-27 11:08:29 -08:00 |
|
Seth Alves
|
01cac7445a
|
add suppressions for log-spam caused by idle assignment-client
|
2015-02-27 10:58:04 -08:00 |
|
Brad Hefta-Gaub
|
addc729654
|
Merge pull request #4350 from huffman/multi-select
Multi select properties for edit entities
|
2015-02-27 10:54:42 -08:00 |
|
Brad Hefta-Gaub
|
08dc883b0e
|
Merge pull request #4351 from huffman/update-light-properties
Update light properties (primarily for editEntities.js)
|
2015-02-27 10:54:19 -08:00 |
|
Brad Hefta-Gaub
|
e78b2ced4a
|
Merge pull request #4349 from huffman/no-nearby-entities-msg
Add message to edit entities list for when no entities are nearby
|
2015-02-27 10:53:17 -08:00 |
|
Philip Rosedale
|
35205fbbf3
|
Merge pull request #4347 from samcake/temp1
Introducing the SunSkyStage
|
2015-02-27 10:37:02 -08:00 |
|
Atlante45
|
fa8e1549f6
|
Relax blendshapes
|
2015-02-27 19:33:01 +01:00 |
|
Seth Alves
|
48322cf222
|
Merge branch 'domain-server-http-port-in-shmem' of github.com:sethalves/hifi into domain-server-http-port-in-shmem
|
2015-02-27 10:20:40 -08:00 |
|
Seth Alves
|
fb4f2fe89c
|
Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem
|
2015-02-27 10:19:06 -08:00 |
|
Philip Rosedale
|
1663fcb489
|
Merge pull request #4348 from Atlante45/relax_face_tracker
Relax face tracker
|
2015-02-27 08:37:49 -08:00 |
|