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
Howard Stearns
642e569033
Uncomment code that was commented out to simplify debugging.
2015-08-20 17:38:49 -07:00
Howard Stearns
ea02583875
Cleanup.
2015-08-20 17:33:10 -07:00
Howard Stearns
7a79abd278
Merge branch 'master' of https://github.com/highfidelity/hifi into eye-correction
2015-08-20 16:54:52 -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
Howard Stearns
05f4145acb
Checkpoint. Working?
2015-08-20 16:28:40 -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
Stephen Birarda
1756e60647
complete test for ordered packets in udt-test target
2015-08-20 14:22:05 -07:00
Stephen Birarda
039e6121bc
add randomization of data for ordered test
2015-08-20 12:44:10 -07:00
Howard Stearns
f26849c7e1
Proper HMD scaling.
2015-08-20 12:34:50 -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
Thijs Wenker
7f5fc64f6c
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-20 21:09:22 +02:00
Ryan Huffman
0a290da529
Merge branch 'ordered-sending' into atp-server
2015-08-20 11:50:06 -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
Stephen Birarda
aac15e52bb
add explicit cast to double for uptime
2015-08-20 10:19: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
Stephen Birarda
08c810baad
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-08-20 10:04:56 -07:00
Stephen Birarda
74d6e5ba89
make sure LNL goes down before domain-server
2015-08-20 10:01:12 -07:00
ZappoMan
cd050b2e60
don't show hmd tools for direct mod HMDs
2015-08-20 09:53:58 -07:00
Ryan Huffman
bb15811f6b
Merge remote-tracking branch 'clement/protocol' into ordered-sending
2015-08-20 09:14:04 -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
Leonardo Murillo
129761c002
making qtimer interval a const
2015-08-20 08:10:19 -06:00
Leonardo Murillo
2c23dab2e7
More specific logging
2015-08-20 08:03:37 -06:00
Leonardo Murillo
f87f3eb033
Typo
2015-08-20 08:02:45 -06:00
Leonardo Murillo
2b26f302fd
Better handling of socket binding
2015-08-20 08:01:33 -06:00
Atlante45
f6854782a4
Debug/Lock cleanup
2015-08-20 14:57:35 +02:00
Atlante45
62c76d0332
registerListenerForTypes optimisations
2015-08-20 14:56:35 +02: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
Stephen Birarda
b386a95d08
fix sort for node uptime
2015-08-19 18:31:42 -07:00
Stephen Birarda
2738f65c10
have domain-server report non-skewed uptime
2015-08-19 18:23:11 -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
