Brad Davis
c3991dbb8c
Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor
...
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
2015-08-20 23:57:16 -07:00
Brad Davis
1e5f9b0442
Merge pull request #5624 from PhilipRosedale/master
...
First pass, grenade and basketball toys.
2015-08-20 23:56:44 -07:00
Philip Rosedale
cee570d2b2
First pass at basketball, just appears in front of you with some reasonable values
2015-08-20 23:06:05 -07:00
Philip Rosedale
7284e3aa3c
added a little bit of spin, too.
2015-08-20 22:20:51 -07:00
Philip Rosedale
ef4ad3107e
First pass, grenade toy. Needs art.
2015-08-20 22:11:11 -07:00
Brad Davis
b635ddc7f9
Merge pull request #5623 from ZappoMan/fullScreenMenuFix
...
Hide Menubar on non-mac OS when going to fullscreen
2015-08-20 21:44:31 -07:00
ZappoMan
bd29fb2474
fix ifdef
2015-08-20 19:33:39 -07:00
ZappoMan
06b2a88fb6
toggle menu near top of window
2015-08-20 19:33:22 -07:00
ZappoMan
9f501d4d72
first cut at attempting to hide menu in full screen
2015-08-20 19:33:06 -07:00
Brad Davis
8c7711168c
Merge pull request #5603 from sethalves/linux-memory-debugger
...
memory debugging on linux
2015-08-20 19:19:24 -07:00
Anthony J. Thibault
1b3d7fabc8
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
...
* Removed validation logic from Resource class, Qt does this internally and is more
standards compliant. This should result in more accurate caching and faster resource
fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.
* NetworkGeometry now uses multiple Resource objects to download
the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
have to poll it to determine when loading is complete (except for textures *sigh*)
Some functionality was removed
* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.
* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
This can result in a pop when switching avatars, and there's no longer a default
if avatar loading fails.
2015-08-20 18:59:51 -07:00
Philip Rosedale
f2fd7dbd3c
Merge pull request #5617 from ctrlaltdavid/disable-eyelid-adjustment
...
Add menu item that disables adjusting eyelids to follow pupil
2015-08-20 16:44:11 -07:00
David Rowe
e9b3d48165
Add menu item that disables adjusting eyelids to follow pupil
...
Developer > Avatar > Disable Eyelid Adjustment
2015-08-20 16:10:31 -07:00
Brad Hefta-Gaub
6f3b34982e
Merge pull request #5614 from samcake/punk
...
Script improvments with render Engine debug.js
2015-08-20 15:00:16 -07:00
Howard Stearns
ce1cc83a9e
Merge pull request #5612 from birarda/audio-position-change
...
make sure .options works from scripted AudioInjector
2015-08-20 12:31:06 -07:00
Stephen Birarda
e93b360908
expose options property to AI script interface
2015-08-20 12:12:43 -07:00
Brad Hefta-Gaub
8d256a8e9c
Merge pull request #5611 from huffman/edit-bounds
...
Fix edit.js to warn when creating entities outside of positive world bounds
2015-08-20 11:46:18 -07:00
Sam Gateau
84d244ec52
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-08-20 11:33:18 -07:00
Ryan Huffman
f834418384
Fix edit.js to warn when creating entities outside of world bounds
2015-08-20 11:23:16 -07:00
Brad Davis
1cede8f88d
Merge pull request #5610 from ZappoMan/noDirectModeHMDTools
...
don't show hmd tools for direct mod HMDs
2015-08-20 11:05:04 -07:00
Brad Hefta-Gaub
0e506fa663
Merge pull request #5608 from jherico/marge
...
Add fullscreen menu item to 2D display plugin
2015-08-20 11:02:34 -07:00
Seth Alves
0ac885da80
fix when memory debugging message is printed
2015-08-20 10:17:13 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
ZappoMan
cd050b2e60
don't show hmd tools for direct mod HMDs
2015-08-20 09:53:58 -07:00
Andrew Meadows
48ff54300b
Merge pull request #5607 from jherico/maggie
...
Make sure that items added via plugins can be removed as well
2015-08-20 08:02:08 -07:00
Brad Davis
9faf452196
Make sure that items added via plugins can be removed as well
2015-08-20 00:32:25 -07:00
Brad Davis
002aea3333
Add fullscreen menu item to 2D display plugin
2015-08-20 00:30:44 -07:00
Brad Davis
ce781ba889
Merge pull request #5606 from ZappoMan/throttleIssue
...
fix throttled rendering for the 2D display plugin
2015-08-20 00:20:17 -07:00
ZappoMan
6a7f367e5f
fix throttled rendering for the 2D display plugin
2015-08-19 21:11:48 -07:00
Seth Alves
2056f588e3
if environment variable HIFI_MEMORY_DEBUGGING is defined when cmake is run, enable -fsanitize=address on linux
2015-08-19 18:03:16 -07:00
Philip Rosedale
c9bd1cc829
Merge pull request #5602 from ZappoMan/centerOrigin
...
fix create in negative space bug
2015-08-19 17:14:01 -07:00
ZappoMan
010a3d8220
fix create in negative space bug
2015-08-19 17:12:03 -07:00
Andrew Meadows
5a442bdb30
Merge pull request #5555 from ZappoMan/centerOrigin
...
Make domains 8x larger (2x in each dimension), with origin at center of buildable space
2015-08-19 15:59:04 -07:00
Seth Alves
9ab46d696d
Merge pull request #5601 from birarda/master
...
fix for Packet read in AvatarHashMap
2015-08-19 15:31:23 -07:00
Stephen Birarda
c8fbb64bbf
fix AvatarHashMap read due to COW
2015-08-19 14:36:16 -07:00
Stephen Birarda
6860f3d126
add readWithoutCopy for clarity in Packet read
2015-08-19 14:32:26 -07:00
Brad Hefta-Gaub
4696fc961a
Merge pull request #5599 from cozza13/20659
...
CR for Job #20659 - change default.js
2015-08-19 13:50:49 -07:00
Stephen Birarda
42a7262707
Merge pull request #5565 from murillodigital/node-version
...
DO NOT MERGE - Node versioning
2015-08-19 13:32:48 -07:00
Chris Collins
846ca3b86b
removed mouselook
...
removed mouselook
2015-08-19 12:58:26 -07:00
Chris Collins
9605294ea8
Removed HMDcontrol.js from default scripts
...
Removed HMDcontrol.js from default scripts. Will put back when
HMDcontrol is fixed
2015-08-19 12:55:52 -07:00
ZappoMan
92ae3e758c
restore DEFAULT_FAR_CLIP to 16km
2015-08-19 12:28:07 -07:00
ZappoMan
684ee3bdd0
Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin
2015-08-19 11:20:15 -07:00
Seth Alves
537b690d60
Merge pull request #5566 from howard-stearns/recapitate
...
Get rid of separate head/body avatar
2015-08-19 10:46:05 -07:00
Andrew Meadows
990dce6795
Merge pull request #5578 from sethalves/polyvox
...
Polyvox improvements
2015-08-19 10:31:13 -07:00
Brad Hefta-Gaub
f8bdfbb271
Merge pull request #5598 from howard-stearns/kill-render-assert
...
kill render assert
2015-08-19 10:30:25 -07:00
Howard Stearns
0a8c1846e9
This assert causes dev builds to fail when starting interface.
2015-08-19 10:24:31 -07:00
Brad Davis
9e54244101
Merge pull request #5597 from highfidelity/revert-5582-bart
...
Revert "Updating to the new version of the sixense library"
2015-08-19 09:45:15 -07:00
Brad Davis
aba7bebf6e
Revert "Updating to the new version of the sixense library"
2015-08-19 09:44:51 -07:00
Philip Rosedale
d9425100b6
Merge pull request #5595 from sethalves/fix-inviso-av
...
possible fix for invisible other's-avatar bug
2015-08-18 21:24:15 -07:00
Philip Rosedale
eef556eeb2
Merge pull request #5593 from thoys/20528
...
CR for Job #20528 - Tool window unavailable in Windows Client.
2015-08-18 21:23:14 -07:00
