Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 08:03:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
31013 commits 76 branches 59 tags 1.2 GiB
Commit graph

13852 commits

Author SHA1 Message Date
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
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
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
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
Howard Stearns
f26849c7e1 Proper HMD scaling. 2015-08-20 12:34:50 -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
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
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
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
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
Stephen Birarda
42a7262707 Merge pull request #5565 from murillodigital/node-version 
DO NOT MERGE - Node versioning
 2015-08-19 13:32:48 -07:00
Ryan Huffman
5884fcb17b Merge branch 'ordered-sending' into atp-server 2015-08-19 12:23:31 -07:00
Thijs Wenker
fd7d186ffb Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-19 20:23:45 +02: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
Thijs Wenker
9af7205672 Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-19 16:49:39 +02: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
Seth Alves
940390ee46 make enable-avatar-collisions menu item work again 2015-08-18 19:31:05 -07:00
Seth Alves
5fcbd37e43 possible fix for invisible other's-avatar bug 2015-08-18 15:45:17 -07:00
Brad Hefta-Gaub
a00eb0ca5d Merge pull request #5592 from jherico/homer 
Remove keyboard focus highlight on delete entity
 2015-08-18 15:25:52 -07:00
Brad Davis
944734fed2 Remove focus highlight on delete entity 2015-08-18 13:59:39 -07:00
Brad Hefta-Gaub
5c1364ca2a Merge pull request #5590 from ctrlaltdavid/20649 
Add further temporary debug for tracking down invalid scale value assert
 2015-08-18 13:31:23 -07:00
Stephen Birarda
fd43c48eac resolve conflicts on merge with birarda/protocol 2015-08-18 11:48:36 -07:00
Stephen Birarda
0f77ab8611 resolve conflicts on merge with upstream/master 2015-08-18 11:45:55 -07:00
David Rowe
00aa336a2b Add further temporary debug for tracking down invalid scale value assert 2015-08-18 10:01:00 -07:00
Thijs Wenker
44399da41c Removed the minimize button from the tool window. Close it to hide it. Fixes bug where ToolWindow hides forever. 2015-08-18 14:54:21 +02:00
Seth Alves
e29bb9183b minimize diff 2015-08-18 02:08:21 -07:00
Seth Alves
8435550fe9 only update simRate once per second 2015-08-18 02:05:50 -07:00
Seth Alves
551f0aaba3 show how many times per second Application::idle is called 2015-08-18 01:41:17 -07:00
Brad Davis
3cbbb5fb79 Fix crash on mouse click 2015-08-18 00:05:02 -07:00
ZappoMan
5715042102 Merge branch 'master' of https://github.com/highfidelity/hifi into centerOrigin 2015-08-17 21:53:45 -07:00
Brad Davis
cb5f80bf78 Add highlighting of keyboard focused items 2015-08-17 17:11:26 -07:00
Brad Davis
5d65937120 Merge pull request #5583 from ZappoMan/clickToFocusWebEntity 
make web entity focus click based
 2015-08-17 16:57:39 -07:00
Philip Rosedale
01108bdf6b Merge pull request #5573 from howard-stearns/sync-eyes-and-vectors 
Synchronize eye joint and debugging vectors
 2015-08-17 16:56:01 -07:00
ZappoMan
49cf29ce8f cleanup debugging and dead code 2015-08-17 15:57:20 -07:00
ZappoMan
47b0e2fda6 more hacking on click to focus 2015-08-17 14:02:24 -07:00
ZappoMan
b7d9dc444b more work on clicking focus 2015-08-17 13:06:32 -07:00
Seth Alves
296a6b1cb8 re-enabled ctrlaltdavid's eye calibration code 2015-08-17 12:20:46 -07:00
Howard Stearns
941b966dc7 Force eyeball update even when not looking at me. 2015-08-17 11:57:08 -07:00
ZappoMan
8cf450cb67 first cut at making focus click based 2015-08-17 11:41:54 -07:00
lanac
e78d763f85 shell for Danish translation of Interface 2015-08-17 12:53:57 +02:00
Thijs Wenker
229b7ae128 Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-15 21:51:16 +02:00
Brad Hefta-Gaub
494fd6035a Merge pull request #5569 from ctrlaltdavid/webwindow-extras 
Add size and position properties, methods, and events to WebWindow
 2015-08-15 11:23:59 -07:00
Brad Davis
9706a44ca1 Merge pull request #5571 from ZappoMan/hmdToolsRedux 
remove HMD Tools as menu item, automatically hide/show it when display plugin is an hmd
 2015-08-14 20:11:27 -07:00