Andrew Meadows
d3f06af892
remove PhysicsEntity class
2015-08-27 18:22:12 -07:00
David Rowe
c9d799f5e0
Auto refresh entities list upon display of Entities tab
2015-08-27 13:32:00 -07:00
Seth Alves
e97e7de19c
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-27 13:19:15 -07:00
Howard Stearns
96c74ebbd5
Enable Rig Animations is now a developer menu item (rather than requiring javascript to set). Also turning it off resets you to bind pose and deliberately throws away old animations.
...
Default animations are the new ones for our standard T-pose. (Had been for the double-A pose fightbot.)
Rig state machine now does "backup", and doesn't apply strafe while turning.
2015-08-27 12:25:40 -07:00
Brad Hefta-Gaub
79a9694d4a
Merge pull request #5648 from ctrlaltdavid/20663
...
Clean Interface.ini after a crash
2015-08-27 10:52:25 -07:00
Brad Hefta-Gaub
176860c612
Merge pull request #5649 from larsnaesbye/master
...
Move i18n to own dir, update FA
2015-08-27 10:46:29 -07:00
Anthony J. Thibault
a04f356857
Merge branch 'master' into ajt/new-anim-system
2015-08-27 09:32:53 -07:00
Seth Alves
435863d1f0
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-26 17:33:59 -07:00
Anthony J. Thibault
b7a9b54628
Better AnimDebugDraw rendering
2015-08-26 16:42:08 -07:00
Brad Davis
270f2f7a3b
Fixing framerate limit, moving vsync to 2d plugin
2015-08-26 15:47:45 -07:00
Brad Davis
8cd13cad00
Merge pull request #5661 from sethalves/linux-memory-debugger
...
call setup_memory_debugger from common macros rather than from everywhere
2015-08-26 15:43:08 -07:00
Seth Alves
d2eb3108d5
Merge pull request #5644 from howard-stearns/eye-correction-application
...
eye correction correction
2015-08-26 14:46:48 -07:00
Seth Alves
696e34b996
Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox
2015-08-26 11:11:41 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Anthony J. Thibault
46c1e008bc
Merge branch 'master' into ajt/new-anim-system
2015-08-26 10:37:39 -07:00
Seth Alves
23dbbcc7bb
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-26 09:42:20 -07:00
Brad Hefta-Gaub
aa80fc9127
Merge pull request #5653 from jherico/homer
...
Remove items from the VR menu properly
2015-08-26 09:14:48 -07:00
Andrew Meadows
45c846572e
Merge pull request #5645 from jherico/maggie
...
Fixing problems reported by static analysis tool
2015-08-26 08:31:05 -07:00
Brad Hefta-Gaub
b19f1e0631
Merge pull request #5658 from ctrlaltdavid/20653
...
Add Desktop object to JavaScript with width and height properties
2015-08-25 23:18:20 -07:00
Brad Hefta-Gaub
1cd699de9d
Merge pull request #5657 from birarda/master
...
fix for 0 entity avg ping
2015-08-25 22:27:44 -07:00
Anthony J. Thibault
0c02a338f2
Added support for setting Variants in the json file.
...
For example: the avatar.json file was updated to use the "sine" Variant
to drive the Overlay alpha parameter.
2015-08-25 20:57:01 -07:00
Anthony J. Thibault
4abf0cbd63
AnimVariantMap is used in eval, MyAvatar loads avatar.json via url
2015-08-25 20:28:17 -07:00
Brad Davis
d311e4f2ea
Fixing problems reported by static analysis tool
2015-08-25 19:18:55 -07:00
Brad Davis
f176003dad
Fixing aspect ratio on stereo plugins
2015-08-25 19:05:31 -07:00
Brad Davis
0aaa07a2de
Remove items from the QML version of the menu when they are removed from the main menu
2015-08-25 19:05:29 -07:00
David Rowe
9d3d104ec3
Add Desktop object to JavaScript with width and height properties
2015-08-25 16:13:36 -07:00
David Rowe
1f541832b6
Reword dialog
2015-08-25 14:24:15 -07:00
Seth Alves
0708fabddf
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-25 13:13:55 -07:00
Stephen Birarda
6f14eb2206
fix for 0 entity avg ping
2015-08-25 12:35:34 -07:00
Anthony J. Thibault
496c706bba
Added AnimVariantMap argument to evaluate.
2015-08-25 11:59:24 -07:00
Howard Stearns
6508d5943a
textChanged has to do something
2015-08-25 11:29:27 -07:00
David Rowe
7c8ff4dcbd
If Interface.ini doesn't contain crash option value assume default
2015-08-25 11:07:55 -07:00
Howard Stearns
2ed6900c7e
Clear the brush, clear the cobwebs, and set the other orientations now that we're clear on what coordinate system we're in.
2015-08-25 09:55:04 -07:00
Seth Alves
91254245e4
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-24 20:21:24 -07:00
Brad Davis
f9f5743fd7
Merge pull request #5650 from ZappoMan/fixCrashInController
...
Fix a couple crashes in the Controller scripting interface
2015-08-24 18:49:50 -07:00
Brad Hefta-Gaub
34e32ddaeb
Merge pull request #5636 from howard-stearns/marketplace-avatars
...
marketplace avatars
2015-08-24 17:49:20 -07:00
Brad Hefta-Gaub
5ea6d2704a
Merge pull request #5628 from ctrlaltdavid/webwindow-external-links
...
Make WebWindow hyperlinks with target="_blank" open in user's browser
2015-08-24 17:45:35 -07:00
Lars Christensen
324f592719
updated FontAwesome to v4.4
2015-08-25 01:55:52 +02:00
David Rowe
b27d25b46e
Implement crash option that retains only login and avatar information
2015-08-24 16:41:25 -07:00
Lars Christensen
110ba131a6
moved translation efforts into subdir
2015-08-25 01:36:19 +02:00
Brad Hefta-Gaub
13a9dc4df2
cleanup controller interface, add getActionNames() and getDeviceNames()
2015-08-24 15:35:55 -07:00
Brad Davis
380b0cb23c
Removing tabs from our javascript and C++
2015-08-24 15:26:46 -07:00
Howard Stearns
476ca36460
final
2015-08-24 15:01:01 -07:00
Anthony J. Thibault
9457794d9e
fix whitespace offset due to merge conflict
2015-08-24 14:50:02 -07:00
Anthony J. Thibault
fa5256eefd
Merge branch 'master' into ajt/new-anim-system
2015-08-24 14:32:28 -07:00
David Rowe
110e7a773b
Implement crash option that deletes Interface.ini
2015-08-24 13:36:03 -07:00
David Rowe
f6cf77ae68
Add Developer > Display Crash Options menu item
...
Is enabled by default. Disabling it stops the display of the crash
handling options dialog at start-up.
2015-08-24 13:24:31 -07:00
David Rowe
9c782f6a6d
Display dialog of crash handling options at startup if Interface crashed
...
Default option and Esc continue without taking any action.
2015-08-24 12:45:35 -07:00
Howard Stearns
57e4ff182d
Merge branch 'master' of https://github.com/highfidelity/hifi into eye-correction-application
2015-08-24 11:27:52 -07:00
Howard Stearns
484db87abc
Set head pitch before making downstream eye corrections.
2015-08-24 11:10:29 -07:00
David Rowe
63ad972576
Write and delete "application is running" marker file
2015-08-24 11:09:41 -07:00
David Rowe
07c9a0e2bb
Add Developer > Crash Interface menu item
2015-08-24 10:48:58 -07:00
Brad Hefta-Gaub
275cdf9d8f
Merge pull request #5581 from larsnaesbye/master
...
Preliminary da_DK translation of Interface
2015-08-24 10:36:30 -07:00
Brad Davis
78a08ed7c7
Merge pull request #5641 from thoys/20660
...
CR for Job #20660 - Render the world Axis markers into negative space, add view option
2015-08-24 10:16:56 -07:00
Andrew Meadows
1d7d5071ae
Merge pull request #5633 from howard-stearns/restore-body-indicators
...
Restore body indicators (e.g., lookAt vectors).
2015-08-23 15:46:57 -07:00
Thijs Wenker
bbd6f25ff7
style fixes
2015-08-23 20:01:58 +02:00
Thijs Wenker
0f8cf80d45
Merge branch 'master' of https://github.com/worklist/hifi into 20660
2015-08-23 19:53:50 +02:00
Thijs Wenker
63f0173665
extend world boundaries
2015-08-23 19:52:29 +02:00
Brad Davis
b7237fb5ca
Fixing build problem with 3d connexion
2015-08-23 09:32:58 -07:00
Nex Pro
53a63fed79
Changed constants red, green, blue and grey to uppercase as per style guide.
2015-08-23 17:16:23 +01:00
Thijs Wenker
748625399e
"View -> World Axes" menu option
2015-08-23 17:59:58 +02:00
Thijs Wenker
b7f9bc13da
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-23 17:52:51 +02:00
Nex Pro
0ef2def56e
changed default DASH_LENGTH and GAP_LENGTH to 1.0f
2015-08-23 16:52:12 +01:00
Thijs Wenker
9de35511fc
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-23 17:50:28 +02:00
Nex Pro
3e8970cc1e
corrected declaration of float constants DASH_LENGTH and GAP_LENGTH as per style guide.
2015-08-23 16:49:39 +01:00
Thijs Wenker
90c8200d66
Merge branch '20660' of github.com:thoys/hifi into 20660
2015-08-23 17:44:43 +02:00
Nex Pro
ad315cf68a
Merge branch '20660' of github.com:thoys/hifi into 20660
...
Conflicts:
interface/src/Util.cpp
2015-08-23 16:30:46 +01:00
Nex Pro
1f08444369
Modified the world box to render axes in negative space
...
Also Modified renderDashedLine to accept params for dash len and gap len so we can display negative axes as dashed lines with 500mm dashes and gaps.
2015-08-23 16:21:20 +01:00
Brad Hefta-Gaub
53f9815f69
Merge pull request #5639 from jherico/maggie
...
Stereo rendering work
2015-08-22 20:48:54 -07:00
Brad Davis
d3135dcfa6
Stereo rendering work
2015-08-22 16:15:10 -07:00
Brad Hefta-Gaub
2bca05fb2e
Merge pull request #5629 from ctrlaltdavid/displayname-assert
...
More temporary logging to track down cause of assert
2015-08-22 15:48:58 -07:00
Ryan Huffman
e9517ef929
Merge pull request #5594 from thoys/20638
...
CR for Job #20638 - Scripting: WebSocket Implementation
2015-08-21 19:13:43 -07:00
Howard Stearns
74fd640f16
Restore the ability to change avatars from the edit.js marketplace button.
2015-08-21 16:49:07 -07:00
Howard Stearns
b579b996c3
There was a hidden (and inappropriate) dependency on face model loading.
2015-08-21 15:07:39 -07:00
Seth Alves
fdad8fc651
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-21 13:19:19 -07:00
David Rowe
6ee22055fa
More temporary logging to track down cause of assert
2015-08-21 12:48:08 -07:00
samcake
66087872a3
Merge pull request #5621 from highfidelity/stereo
...
New stereo rendering mechanism
2015-08-21 11:23:14 -07:00
Seth Alves
105470bf26
Merge branch 'master' of github.com:highfidelity/hifi into polyvox
2015-08-21 11:02:16 -07:00
Seth Alves
6db0442fda
allow for asynchronous building of collision shape
2015-08-21 10:48:26 -07:00
Thijs Wenker
fd82f05307
Merge branch 'master' of https://github.com/worklist/hifi into 20638
2015-08-21 19:29:38 +02:00
David Rowe
b1db7e5ed2
Make WebWindow hyperlinks with target="_blank" open in user's browser
2015-08-21 10:28:47 -07:00
Brad Davis
b8b0917d9d
Attempting to fix judder issues
2015-08-21 10:01:11 -07:00
ZappoMan
a0552050b0
set vsync on startup
2015-08-21 08:23:18 -07:00
Brad Davis
1e074ab81c
Remove superfluous clear
2015-08-21 00:29:28 -07:00
Brad Davis
cc037c8828
Fix culling calculations in HMD with new stereo mechanism
2015-08-21 00:29:27 -07:00
Brad Davis
476e5edb32
Fixing HMD wobble
2015-08-21 00:29:26 -07:00
Brad Davis
7fb491e48c
Cleanup plugin interface, break up oculus plugins
2015-08-21 00:29:25 -07:00
Brad Davis
76f236adf6
New stereo rendering implementation
2015-08-21 00:29:24 -07:00
Brad Davis
89d2fc35ff
Merge pull request #5613 from howard-stearns/eye-correction
...
HMD eye correction
2015-08-21 00:20:00 -07:00
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
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
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
