ZappoMan
|
1a463a0256
|
more work on improved avatar UI adding model names and backward compatible support
|
2015-04-03 17:03:22 -07:00 |
|
ZappoMan
|
aaf191b6dc
|
first cut at new avatar preferences UI
|
2015-04-03 14:31:43 -07:00 |
|
Andrew Meadows
|
88ee1c313a
|
Merge pull request #4583 from huffman/fix-script-editor-icons
Update script editor to set icons programatically
|
2015-04-03 09:31:58 -07:00 |
|
Ryan Huffman
|
df5a03b447
|
Update script editor to set icons programatically
|
2015-04-02 09:10:47 -07:00 |
|
Stephen Birarda
|
526c9217a1
|
fix signup link from login dialog
|
2015-04-01 14:43:56 -07:00 |
|
ZappoMan
|
da9a8e8a97
|
CR feedback
|
2015-04-01 09:27:58 -07:00 |
|
ZappoMan
|
827e37b920
|
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI
|
2015-04-01 09:09:50 -07:00 |
|
Stojce Slavkovski
|
8514a39812
|
Use constants for URLs
|
2015-04-01 07:24:16 +02:00 |
|
Stephen Birarda
|
61806935bb
|
add a networking constants class with metaverse URL
|
2015-03-31 16:40:21 -07:00 |
|
ZappoMan
|
d68143675a
|
first simple pass at using marketplace windows in preferences
|
2015-03-31 16:24:27 -07:00 |
|
Philip Rosedale
|
5325478940
|
Merge pull request #4528 from ZappoMan/avatarUI
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
|
2015-03-30 21:31:22 -07:00 |
|
Seth Alves
|
fc1e45fc58
|
valgrind says this is used before it's initialized
|
2015-03-28 17:10:46 -07:00 |
|
ZappoMan
|
baa2f947e5
|
classifying FSTReader and moving ModelType into that class
|
2015-03-27 16:30:00 -07:00 |
|
ZappoMan
|
6189926105
|
add type hint to FST in model packager
|
2015-03-27 13:23:29 -07:00 |
|
ZappoMan
|
6cff99f9d6
|
menu and display tweaks
|
2015-03-26 16:36:46 -07:00 |
|
Leonardo Murillo
|
c3c1d4a5ae
|
Switching to .com
|
2015-03-25 12:36:37 -06:00 |
|
ZappoMan
|
b67cf3af24
|
more tweaks to LOD tools dialog
|
2015-03-24 14:33:06 -07:00 |
|
ZappoMan
|
f43b8bbe8e
|
make AvatarLODMultiplier based on octreeSizeScale
|
2015-03-24 13:59:46 -07:00 |
|
ZappoMan
|
619428c325
|
move LOD FPS settings to Preferences
|
2015-03-24 13:32:22 -07:00 |
|
ZappoMan
|
fa122a227b
|
tweaks to the LOD Tools UI
|
2015-03-23 16:44:07 -07:00 |
|
ZappoMan
|
e6cefa946c
|
more DRYing of code
|
2015-03-19 11:41:03 -07:00 |
|
ZappoMan
|
3c41ecd091
|
cleanup accepted files implementation
|
2015-03-19 11:29:41 -07:00 |
|
ZappoMan
|
8e0141b8e9
|
first cut at fst drag/drop support
|
2015-03-19 08:48:13 -07:00 |
|
ZappoMan
|
a2e012f7a9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into runJSFiles
|
2015-03-18 11:53:19 -07:00 |
|
Brad Davis
|
e616308911
|
Adding runtime check to ensure that the correct frustum is fetched during rendering
|
2015-03-17 16:28:44 -07:00 |
|
ZappoMan
|
749bc1ee9b
|
support for loading of JS files by drag, web page urls, and openfile events
|
2015-03-17 08:38:39 -07:00 |
|
Seth Alves
|
bfa38521ed
|
linux desktops are often configured as point-to-focus. don't autohide tools window on linux
|
2015-03-15 07:59:32 -07:00 |
|
Stephen Birarda
|
dcff4f5956
|
use HIGH_FIDELITY_USER_AGENT for DataWebPage
|
2015-03-13 18:25:17 -07:00 |
|
Stephen Birarda
|
859f81cdd7
|
some & squishes missed in review
|
2015-03-13 18:12:31 -07:00 |
|
Stephen Birarda
|
641581a825
|
Merge pull request #4446 from huffman/marketplace-window
Marketplace window
|
2015-03-13 17:51:44 -07:00 |
|
Ryan Huffman
|
235b5d77ae
|
Add missing include to DataWebPage
|
2015-03-13 17:38:36 -07:00 |
|
Ryan Huffman
|
47e63719ee
|
Handle svo request in DataWebPage as import requests
|
2015-03-13 17:35:33 -07:00 |
|
Ryan Huffman
|
1193d86d7b
|
Update webwindow to use datawebview
|
2015-03-13 16:39:25 -07:00 |
|
Ryan Huffman
|
ebf70f818a
|
Merge branch 'master' of git://github.com/highfidelity/hifi into edit-light-2
Conflicts:
examples/editEntities.js
|
2015-03-12 11:39:26 -07:00 |
|
Atlante45
|
bcfd4b50be
|
Merge branch 'master' of https://github.com/highfidelity/hifi into package_models
|
2015-03-12 14:18:37 +01:00 |
|
ZappoMan
|
e87e0a1e0b
|
some cleanup of dead code related to timers
|
2015-03-11 16:27:04 -07:00 |
|
Clément Brisset
|
885e6206e9
|
Merge pull request #4420 from ctrlaltdavid/20394
CR for Job #20394 - Build friends.js v1
|
2015-03-11 11:17:04 -07:00 |
|
Atlante45
|
a949af3296
|
Merge branch 'master' of https://github.com/highfidelity/hifi into upload_thumbnail
|
2015-03-11 14:09:32 +01:00 |
|
Stephen Birarda
|
931a234ba7
|
fix reset for close button SVG in LoginDialog
|
2015-03-10 18:08:19 -07:00 |
|
Ryan Huffman
|
36c14de250
|
Add rotation to facingAvatar billboard overlays
|
2015-03-10 13:11:39 -07:00 |
|
David Rowe
|
abb62fd8f9
|
Fix typo found in passing
|
2015-03-10 10:57:48 -07:00 |
|
Atlante45
|
f1460e5c5b
|
Fixed missing forward declaration
|
2015-03-10 11:50:49 +01:00 |
|
Brad Hefta-Gaub
|
750f8a09fa
|
Merge pull request #4394 from AndrewMeadows/isentropic
EntityItem now stores position in meters and angular velocity in radians/sec
|
2015-03-09 12:47:00 -07:00 |
|
Andrew Meadows
|
51d05cc43e
|
merge upstream/master into andrew/isentropic
Conflicts:
libraries/networking/src/PacketHeaders.cpp
|
2015-03-09 08:51:49 -07:00 |
|
Atlante45
|
61649ee0a5
|
Fix dialog labels
|
2015-03-09 13:42:14 +01:00 |
|
Brad Hefta-Gaub
|
21cd7e36e0
|
Merge pull request #4381 from Atlante45/disk_cache
Disk cache tweaks
|
2015-03-08 11:40:40 -07:00 |
|
Andrew Meadows
|
021510ae68
|
merge upstream/master into andrew/isentropic
|
2015-03-06 15:38:10 -08:00 |
|
Andrew Meadows
|
373be95297
|
entity cubes are in meters
|
2015-03-06 15:32:03 -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 |
|