Chris Collins
9bd9de5710
Merge pull request #7636 from samcake/red
...
Stereo drawcall amplification
2016-04-22 15:46:18 -07:00
Brad Hefta-Gaub
f4e4f217e8
Merge pull request #7642 from ctrlaltdavid/20872
...
Further restyling of edit.js
2016-04-22 13:46:26 -07:00
Brad Hefta-Gaub
79a1e6264e
Merge pull request #7714 from hyperlogic/tony/default-anims-are-local
...
Avatar animations are now stored locally
2016-04-22 13:44:30 -07:00
Brad Hefta-Gaub
c410242fb2
Merge pull request #7688 from jherico/texture_derez
...
Reducing GPU texture memory footprint
2016-04-22 13:20:54 -07:00
Brad Hefta-Gaub
de17834dd1
Merge pull request #7740 from ctrlaltdavid/20887
...
Don't display "Reveal Scripts Folder" control in HMD mode
2016-04-22 13:04:07 -07:00
David Rowe
7b9e6b52fb
Merge branch 'master' into 20872
...
Conflicts:
interface/resources/qml/hifi/dialogs/RunningScripts.qml
2016-04-22 13:19:47 +12:00
David Rowe
a7b82e8cae
Decouple ui and shared libraries
2016-04-22 12:58:47 +12:00
David Rowe
266e4c998b
Don't show "Reveal Scripts Folder" link when open Running Scripts in HMD
2016-04-22 12:29:22 +12:00
Andrew Meadows
c35ddccba1
Merge pull request #7718 from zzmp/fix/release-motion-states
...
Remove myAvatar motion states on shutdown
2016-04-21 17:11:25 -07:00
Brad Hefta-Gaub
0f966e934e
Merge pull request #7728 from ctrlaltdavid/20887
...
Add link in Running Scripts that opens scripts folder
2016-04-21 16:01:52 -07:00
Brad Hefta-Gaub
d87d631871
Merge pull request #7708 from zzmp/feat/render-rates
...
Add renderRates.js to visualize rates over time
2016-04-21 15:59:58 -07:00
Brad Davis
6c30194916
Support lowering the minimum mip of a texture at runtime
2016-04-21 14:46:12 -07:00
David Rowe
6c5335cfa7
Replace button with icon and text
2016-04-21 15:17:06 +12:00
David Rowe
9c9bca546c
Add button that opens scripts directory window
2016-04-21 11:52:03 +12:00
Zach Pomerantz
2c7cf3ea83
Fix RateScriptingInterface headers
2016-04-20 14:32:25 -07:00
David Rowe
6e8b535e80
Merge branch 'master' into 20872
2016-04-21 09:19:00 +12:00
Zach Pomerantz
ad225b3aed
Fix RatesScriptingInterface ctor
2016-04-20 13:58:06 -07:00
Zach Pomerantz
1fe12e7029
Mv Rates to RatesScriptingInterface.h
2016-04-20 13:26:23 -07:00
Anthony J. Thibault
506033a5d8
Remove old avatar-animation.json
2016-04-19 16:14:26 -07:00
Anthony J. Thibault
8e5785cdf8
Avatar animations are now stored locally
...
Improves FTUE, by no longer going over the network to download default avatar animations.
This also includes support for relative animation urls within the animation.json
2016-04-19 16:11:14 -07:00
Zach Pomerantz
4dacb04ee1
Rm myAvatar motion states on shutdown
2016-04-19 16:01:55 -07:00
David Rowe
54b032f612
Merge branch 'master' into 20872
2016-04-20 08:51:53 +12:00
Howard Stearns
cbb76013c4
Merge pull request #7710 from ZappoMan/LODtweaks
...
tweaks to LOD behavior
2016-04-19 13:50:21 -07:00
samcake
3dad4f576e
Merging with master
2016-04-19 11:59:44 -07:00
Brad Hefta-Gaub
c7ecbb6b4b
tweaks to LOD behavior
2016-04-19 11:19:28 -07:00
Howard Stearns
9ff9682b2a
Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange
...
Reset entities script engine on domain change
2016-04-19 11:14:28 -07:00
samcake
a997f9bb1b
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-04-19 10:49:53 -07:00
Zach Pomerantz
fc61f85bf9
Merge pull request #7698 from hyperlogic/tony/avatar-on-load-complete-callback
...
Added MyAvatar onLoadComplete Callback
2016-04-19 10:36:20 -07:00
samcake
265f6f1275
Updating & Merging with master
2016-04-19 10:05:44 -07:00
Brad Hefta-Gaub
8eff47f922
Merge pull request #7705 from hyperlogic/tony/avatar-attachment-lag-fix
...
Fix for laggy avatar attachments
2016-04-19 07:15:38 -07:00
Brad Hefta-Gaub
0ac9601ea7
Merge pull request #7690 from ZappoMan/improveHMD
...
Introduce "recommended overlay rectangle" to display plugins
2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
0a79b5dd69
Merge pull request #7707 from huffman/fix/osx-default-script-dir
...
Remove fix for old QT file path bug in OSX
2016-04-18 18:01:47 -07:00
Brad Hefta-Gaub
0e9bd9a776
Merge pull request #7682 from zzmp/clean/stars
...
Cleanup stars to persist a single BufferView
2016-04-18 17:59:48 -07:00
David Rowe
47b4c36546
Merge branch 'master' into 20872
2016-04-19 12:56:55 +12:00
Zach Pomerantz
f48541961d
Expose Rates to JS/QML
2016-04-18 17:43:34 -07:00
Brad Hefta-Gaub
f5cddc9962
fix the bug that Omega found
2016-04-18 17:26:12 -07:00
Ryan Huffman
4e0ac2a4be
Remove fix for old QT file path bug in OSX
2016-04-18 16:07:53 -07:00
Brad Hefta-Gaub
01907f181f
Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD
2016-04-18 16:01:42 -07:00
Seth Alves
3298883774
Merge pull request #7702 from zzmp/fix/clear-octree-on-exit
...
Clear entities and avatars on exit
2016-04-18 15:48:35 -07:00
Anthony J. Thibault
279e77f523
updated comment
2016-04-18 15:18:08 -07:00
samcake
dccf549118
Merge pull request #7676 from jherico/perf_testing
...
Manually generate mipmaps for textures while loading
2016-04-18 15:09:12 -07:00
Zach Pomerantz
146ea066db
Update AvatarManager.cpp
2016-04-18 14:53:04 -07:00
Anthony J. Thibault
544928b46e
MyAvatar: fix for laggy avatar attachments
2016-04-18 14:51:33 -07:00
Zach Pomerantz
c9dc642d76
Fix type in AvatarManager::clearAllAvatars
2016-04-18 14:48:24 -07:00
Zach Pomerantz
c87eec4182
Fix typo in AvatarManager::clearAllAvatars
2016-04-18 14:45:33 -07:00
Zach Pomerantz
790e325248
Clear entities and avatars on exit
2016-04-18 14:31:16 -07:00
Anthony J. Thibault
dc92ccc2b2
MyAvatar: Removed unnecessary slot.
2016-04-18 13:19:49 -07:00
Brad Hefta-Gaub
374ba10524
more CR feedback
2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e
CR feedback
2016-04-18 12:13:21 -07:00
Anthony J. Thibault
1682598be7
Added onLoadComplete signal to MyAvatar
...
This can be used in javaScript to detect when the model has finished loading because the url has changed or the model has been reset.
2016-04-18 11:37:02 -07:00
