Brad Davis
|
d838b78df9
|
Merging from upstream
|
2015-03-04 21:53:31 -08:00 |
|
Stephen Birarda
|
0a74291377
|
Merge pull request #4373 from birarda/remove-xmpp
fix web chat link for IRC
|
2015-03-03 16:26:12 -08:00 |
|
Stephen Birarda
|
d3682b0297
|
fix web chat link for IRC
|
2015-03-03 16:03:47 -08:00 |
|
Brad Hefta-Gaub
|
fc048c3b03
|
Merge pull request #4368 from ctrlaltdavid/20377
CR for 20377
|
2015-03-03 15:51:42 -08:00 |
|
samcake
|
6b1f42df83
|
Merge pull request #4366 from ZappoMan/removeMetavoxels
remove metavoxels
|
2015-03-03 15:50:53 -08:00 |
|
Brad Hefta-Gaub
|
9649ed9936
|
Merge pull request #4371 from huffman/light-radius
Update Light to set direction when setting orientation
|
2015-03-03 15:50:04 -08:00 |
|
Clément Brisset
|
6cefa0d3fb
|
Merge pull request #4370 from birarda/remove-xmpp
remove xmpp chat from interface
|
2015-03-03 15:27:38 -08:00 |
|
Ryan Huffman
|
3fef8a1622
|
Update Light to set direction when setting orientation
|
2015-03-03 12:41:51 -08:00 |
|
Stephen Birarda
|
8f2dc7e38b
|
resolve conflicts on merge with upstream master
|
2015-03-03 12:22:25 -08:00 |
|
Stephen Birarda
|
a961cd8ff3
|
show link to IRC in place of Qxmpp removal
|
2015-03-03 12:17:35 -08:00 |
|
Brad Hefta-Gaub
|
b118912708
|
Merge pull request #4361 from samcake/temp0
evolve the Transform stack away from the legacy GL to the brand new shader way
|
2015-03-03 11:43:01 -08:00 |
|
Andrew Meadows
|
128eb1c48e
|
Merge pull request #4346 from birarda/master
handle bullet as multi-config on WIN32
|
2015-03-03 11:30:52 -08:00 |
|
Brad Hefta-Gaub
|
29340b6586
|
Merge pull request #4369 from ctrlaltdavid/20370
CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361
|
2015-03-03 11:17:31 -08:00 |
|
Sam Gateau
|
cad2184927
|
FIxing the compilation issue for linux
|
2015-03-03 11:09:11 -08:00 |
|
David Rowe
|
1b34b80b1a
|
Use BrowsC_U to control both brows' up and down
|
2015-03-03 11:05:59 -08:00 |
|
Brad Hefta-Gaub
|
b88d52a310
|
Merge pull request #4363 from huffman/block-restricted-users
Add permission-checking to edit entities
|
2015-03-03 11:04:46 -08:00 |
|
Sam Gateau
|
598b791aee
|
FIxing the compilation issue for linux
|
2015-03-03 11:01:47 -08:00 |
|
Sam Gateau
|
4619ba1f5b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
|
2015-03-03 10:56:04 -08:00 |
|
Clément Brisset
|
774f54a26b
|
Merge pull request #4352 from birarda/remove-prio
remove PrioVR integration
|
2015-03-03 10:47:02 -08:00 |
|
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 |
|
Stephen Birarda
|
5a601f3676
|
resolve conflicts on merge with upstream/master
|
2015-03-03 10:01: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 |
|
David Rowe
|
dd678dbc49
|
Use all DDE coefficients to achieve better face control
|
2015-03-02 19:05:13 -08:00 |
|
ZappoMan
|
5c3c94a618
|
remove metavoxels
|
2015-03-02 17:21:43 -08:00 |
|
Ryan Huffman
|
b370e025c9
|
Move EntityScriptingInterface instance to DependencyManager
|
2015-03-02 15:05:31 -08:00 |
|
Ryan Huffman
|
98e0f235cc
|
Merge branch 'master' of git://github.com/highfidelity/hifi into block-restricted-users
|
2015-03-02 14:47:26 -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
|
38a361dcf0
|
Remove class scope on _entityScriptingInterface property references
|
2015-03-02 11:32:07 -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
|
75a943386b
|
Remove nullptr comparison
|
2015-03-02 10:44:32 -08:00 |
|
Ryan Huffman
|
26e3b331ee
|
Update editEntities.js lock checking to use event instead of polling
|
2015-03-02 10:42:09 -08:00 |
|
Ryan Huffman
|
a443157dd7
|
Update ScriptEngine::entityScriptingInterface to be static pointer
Statically allocating the EntityScriptingInterface means we can't make
sure it is initialized AFTER NodeList has been initialized
|
2015-03-02 10:40:46 -08:00 |
|
Ryan Huffman
|
9a302eebed
|
Add Entities.canAdjustLocksChanged
|
2015-03-02 10:40:29 -08:00 |
|
Ryan Huffman
|
64cb517856
|
Add LimitedNodeList::canAdjustLocksChanged signal
|
2015-03-02 10:40:11 -08:00 |
|
Ryan Huffman
|
0638459052
|
Add permission-checking to edit entities
|
2015-03-02 09:51:41 -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 |
|