Brad Hefta-Gaub
|
c9dd96c98d
|
Merge pull request #4389 from birarda/master
render application overlay only if enabled
|
2015-03-06 17:06:05 -08:00 |
|
Brad Hefta-Gaub
|
fd6f8c7792
|
Merge pull request #4382 from huffman/import-export
Improvements to Import/Export entities
|
2015-03-06 16:31:57 -08:00 |
|
Stephen Birarda
|
a4963f1895
|
render application overlay only if enabled
|
2015-03-06 15:22:25 -08:00 |
|
Stephen Birarda
|
8eb93c2e01
|
Merge pull request #4388 from highfidelity/problem-patch-1
Update to .com instead of .io in Welcome dialog
|
2015-03-06 15:19:15 -08:00 |
|
Grayson Stebbins
|
7c78e598b8
|
Update to .com instead of .io in Welcome dialog
|
2015-03-06 15:15:48 -08:00 |
|
Brad Hefta-Gaub
|
00b731a868
|
Merge pull request #4372 from sethalves/fix-assignment-client-monitor
pass -t to children even if run in parent mode. monitor (parent) only i...
|
2015-03-06 12:08:32 -08:00 |
|
Philip Rosedale
|
6137ad90b6
|
Merge pull request #4385 from huffman/edit-slow
Fix editEntities.js being very slow for some users
|
2015-03-06 12:07:04 -08:00 |
|
Ryan Huffman
|
b3631de93c
|
Remove print statements from entityList.js
|
2015-03-06 12:03:36 -08:00 |
|
Clément Brisset
|
aed208a339
|
Merge pull request #4383 from huffman/fix-script-editor-icons
Fix issue with Script Editor icons not showing up on first show
|
2015-03-06 06:02:50 -08:00 |
|
Ryan Huffman
|
299035bc85
|
Move script editor show() call to DialogsManager
|
2015-03-05 15:05:17 -08:00 |
|
Ryan Huffman
|
9247ccd7b3
|
Remove ExportMenu.js and ModelImporter.js
|
2015-03-05 13:55:22 -08:00 |
|
Ryan Huffman
|
08b905095d
|
Remove Paste Models and rename Import/Export to Entities
|
2015-03-05 13:54:27 -08:00 |
|
Ryan Huffman
|
a2617b2c96
|
Update editEntities import/export
|
2015-03-05 13:52:59 -08:00 |
|
Ryan Huffman
|
03c03a20f9
|
Update pasteEntities to use vec3
|
2015-03-05 13:52:30 -08:00 |
|
Ryan Huffman
|
6848025504
|
Add exporting by entity ID to Application
|
2015-03-05 13:36:16 -08:00 |
|
Ryan Huffman
|
71768ef275
|
Return entity IDs on paste
|
2015-03-05 12:36:45 -08:00 |
|
Ryan Huffman
|
a922619ebc
|
Add Clipboard.exportEntities that takes a list of entity IDs
|
2015-03-05 12:36:10 -08:00 |
|
Ryan Huffman
|
2c68d56059
|
Update Entity::sendEntities to return new entity ids
|
2015-03-05 12:34:05 -08:00 |
|
Seth Alves
|
ef66182ce7
|
Merge pull request #4379 from AndrewMeadows/thermonuclear
fix dark lighting and missing avatars on linux
|
2015-03-04 19:00:54 -08:00 |
|
Andrew Meadows
|
d7eaa68193
|
Merge pull request #4378 from ZappoMan/fixEntitiyImportExport
fix bug in export
|
2015-03-04 17:25:27 -08:00 |
|
Andrew Meadows
|
c3a4e5d94b
|
fix dark lighting and missing avatars on linux
|
2015-03-04 16:52:27 -08:00 |
|
ZappoMan
|
e99ffb8307
|
fix bug in export
|
2015-03-04 16:29:34 -08:00 |
|
Seth Alves
|
440a4378dd
|
Merge pull request #4376 from ZappoMan/removeMetavoxels
don't add old metavoxels assignment to default assignments
|
2015-03-04 15:08:15 -08:00 |
|
ZappoMan
|
05640290da
|
don't add old metavoxels assignment to default assignments
|
2015-03-04 14:41:28 -08:00 |
|
Clément Brisset
|
da6db93508
|
Merge pull request #4375 from ctrlaltdavid/20370
More parentheses to address Xcode compiler warnings
|
2015-03-04 10:06:54 -08:00 |
|
David Rowe
|
4c959e8d82
|
More parentheses to address Xcode compiler warnings
|
2015-03-04 09:17:19 -08:00 |
|
Chris Collins
|
90c5595bc6
|
Merge pull request #4374 from birarda/master
fix for localhost domain-server port check
|
2015-03-03 23:31:49 -08:00 |
|
Stephen Birarda
|
3005f74411
|
fix localhost port check to not kill user lookup
|
2015-03-03 23:11:02 -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 |
|
Seth Alves
|
8affca6120
|
pass -t to children even if run in parent mode. monitor (parent) only interacts with its own children
|
2015-03-03 14:58:53 -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 |
|