Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
46652 commits 71 branches 56 tags 1.2 GiB
Commit graph

46652 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
73315e3390 Punctuation mode now works 2016-09-06 17:07:41 -07:00
Ken Cooke
b47000eab2 Added ARM NEON optimized audio sample rate conversion 2016-09-06 16:53:06 -07:00
Seth Alves
616b094111 experimenting with position of grab sphere 2016-09-06 16:16:09 -07:00
David Rowe
156866f835 Fix "has script" entities list icon 2016-09-07 11:12:04 +12:00
David Rowe
83593087b6 Resize table headers after filter value changed 2016-09-07 11:08:06 +12:00
Seth Alves
34e4b4ae19 move haptic-pulse for when grab-point enters a grabbable entity to the right section of code 2016-09-06 15:37:37 -07:00
Anthony J. Thibault
28162915fd Re-styled keyboard, now with working shift key 2016-09-06 15:21:58 -07:00
Seth Alves
215fd4ddfd fix grab-point sphere for right hand 2016-09-06 15:15:46 -07:00
David Rowe
f83599f855 Merge branch 'master' into 21040 2016-09-07 10:08:51 +12:00
Seth Alves
43c98b3f1e attempt to avoid a very-still far-grab leaving something non-dynamic in bullet upon release. adjust position of grab-point sphere 2016-09-06 14:42:53 -07:00
Chris Collins
9e7cd92a96 Merge pull request #8533 from sethalves/arrow-actions 
Joints for Controllers + Arrow action
 2016-09-06 13:46:33 -07:00
Anthony J. Thibault
71520a661a WIP checkpoint of keyboard shift key support 2016-09-06 13:39:07 -07:00
Atlante45
eb007b24cd Use invalid port to signal no value passed 2016-09-06 11:59:07 -07:00
Atlante45
12eb65c0c4 Make setSocketLocalPort invokable 2016-09-06 10:18:42 -07:00
Atlante45
9f07511fd8 Move setter to LimitedNodeList 2016-09-06 10:18:42 -07:00
Atlante45
bba5e46533 Don't reset the NodeList 2016-09-06 10:18:42 -07:00
Atlante45
fcf44911a3 Fix Windows warning 2016-09-06 10:18:42 -07:00
Atlante45
a8de6f0a57 Add settings to change local port 2016-09-06 10:18:42 -07:00
Atlante45
713be9fd73 Rename NLs nodeUpdated signal to nodeSocketUpdated 2016-09-06 10:16:00 -07:00
Atlante45
d938e518a0 Start new hole punch when the socket is updated 2016-09-06 10:16:00 -07:00
Seth Alves
37db1cba26 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-06 09:38:44 -07:00
Brad Hefta-Gaub
78cf81954c Merge pull request #8555 from jherico/thread_count 
Stuttering: global thread pool management
 2016-09-06 09:27:02 -07:00
Brad Hefta-Gaub
6259491d69 Merge pull request #8568 from jherico/texture_load_test 
Texture load profiling test
 2016-09-03 10:17:36 -07:00
Brad Hefta-Gaub
418495d2c5 Merge pull request #8546 from samcake/yellow 
Revert the sRGB pixel format by default
 2016-09-03 10:16:16 -07:00
Brad Hefta-Gaub
a51f66e9ff Merge pull request #8553 from zzmp/clean/audio-ring-buffer 
clean and comment AudioRingBuffer
 2016-09-02 20:16:06 -07:00
David Rowe
c44bd902c3 Display render info values only if provided 2016-09-03 13:07:40 +12:00
David Rowe
17d30796cc Use count of textures actually rendered 
Textures specified in model may be invalid and so not actually rendered.
 2016-09-03 13:07:00 +12:00
Brad Davis
13a4671705 Texture load profiling test 2016-09-02 17:45:26 -07:00
Anthony J. Thibault
787bb58c1a osx warning fix 2016-09-02 17:22:13 -07:00
Andrew Meadows
0a55afda69 Merge pull request #8554 from elisa-lj11/marketplaces_html 
Include a marketplace status bar and access to "marketplace" of marketplaces
 2016-09-02 17:12:05 -07:00
Anthony J. Thibault
9122a33fff only raise the webEntity virtual keyboard in HMD mode 2016-09-02 16:53:40 -07:00
elisa-lj11
2f07ba87af Renamed isZipped for more clarity on checking for non-fbx files 2016-09-02 16:48:55 -07:00
David Rowe
980df19db1 Merge branch 'master' into 21040 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
 2016-09-03 11:38:27 +12:00
Anthony J. Thibault
a54c3bf8c0 support for backspace, carriage return, space and period. 2016-09-02 16:23:46 -07:00
Ryan Downe Karpf
a96de7ffc1 Merge pull request #8566 from sethalves/fix-ac-agent-sees-others-redux 
Because hastily pressing merge on Friday afternoon is always a good idea
 2016-09-02 16:23:18 -07:00
Seth Alves
342f7edff3 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-02 16:12:41 -07:00
Seth Alves
b7da72cc46 try again on fix for ACs seeing other avatars 2016-09-02 16:06:51 -07:00
Seth Alves
884af4eb8e Merge pull request #8565 from highfidelity/revert-8563-fix-ac-agent-sees-others 
Revert "fill in linked node data for avatar identity packets, also"
 2016-09-02 16:01:05 -07:00
elisa-lj11
6721cc8dfb fixed return statement formatting 2016-09-02 15:48:47 -07:00
Seth Alves
b6ef6fec73 Revert "fill in linked node data for avatar identity packets, also" 2016-09-02 15:43:25 -07:00
Brad Davis
94210d2e69 Use dynamic count for global thread pool 2016-09-02 15:23:35 -07:00
Brad Hefta-Gaub
6e25c97eef Merge pull request #8564 from jherico/fix_rate_stats 
Updating stats display for threaded rendering
 2016-09-02 15:22:45 -07:00
elisa-lj11
18700d6397 narrowed filters for Clara website check 2016-09-02 15:18:13 -07:00
Seth Alves
c969230d83 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-09-02 15:11:27 -07:00
Seth Alves
b8b1127d55 merge from upstream 2016-09-02 15:11:21 -07:00
Ryan Downe Karpf
c923d06d97 Merge pull request #8563 from sethalves/fix-ac-agent-sees-others 
fill in linked node data for avatar identity packets, also
 2016-09-02 15:01:30 -07:00
Brad Davis
91bfa7677c Updating stats display for threaded rendering 2016-09-02 14:41:49 -07:00
Seth Alves
f34f0f51ec Merge branch 'master' of github.com:highfidelity/hifi into fix-ac-agent-sees-others 2016-09-02 13:57:10 -07:00
Seth Alves
014190a1bf fill in linked node data for avatar identity packets, also 2016-09-02 13:52:37 -07:00
Brad Hefta-Gaub
861cf468a3 Merge pull request #8547 from imgntn/save_default_scripts_settings 
Remember setting for 'debug defaultScripts.js'
 2016-09-02 13:08:19 -07:00