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

42566 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
e8af41c6ab more CR feedback 2016-04-21 15:54:51 -07:00
Brad Hefta-Gaub
2abcc454b0 CR feedback 2016-04-21 15:48:18 -07:00
Brad Hefta-Gaub
f9c4959578 remove some debugging, tweak formatting 2016-04-21 09:53:00 -07:00
Brad Hefta-Gaub
ddf5b0f316 some debugging 2016-04-21 10:32:22 -07:00
Brad Hefta-Gaub
5244274ae4 fix warning 2016-04-20 19:06:31 -07:00
Brad Hefta-Gaub
248ac8d760 fix warning 2016-04-20 19:04:39 -07:00
Brad Hefta-Gaub
31f9d592e0 support for larger than 35 minute clock skew 2016-04-20 18:42:00 -07:00
Brad Hefta-Gaub
8631fa6cd3 Merge pull request #7715 from jherico/oculus_fix 
Fix test for specific Oculus version
 2016-04-19 19:08:19 -07:00
Brad Hefta-Gaub
58f489679e Merge pull request #7716 from AndrewMeadows/fix-linux-build 
fix linux build
 2016-04-19 19:01:04 -07:00
Brad Davis
888758fc21 Fix test for specific Oculus version 2016-04-19 18:13:12 -07:00
Andrew Meadows
a9cfb5bf16 fix linux build 2016-04-19 18:12:35 -07:00
Howard Stearns
cbb76013c4 Merge pull request #7710 from ZappoMan/LODtweaks 
tweaks to LOD behavior
 2016-04-19 13:50:21 -07:00
Ryan Huffman
c0a5c8bb18 Merge pull request #7678 from birarda/mixer-sleeps 
use a steady clock for mixer timings
 2016-04-19 12:59:53 -07:00
Ryan Huffman
92339bf5fc Merge pull request #7701 from birarda/udt-fixes 
use nextPacketTimestamp to catch up, not stay ahead
 2016-04-19 12:57:43 -07:00
Brad Hefta-Gaub
c7ecbb6b4b tweaks to LOD behavior 2016-04-19 11:19:28 -07:00
Howard Stearns
9ff9682b2a Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange 
Reset entities script engine on domain change
 2016-04-19 11:14:28 -07:00
Brad Davis
882267e08f Merge pull request #7709 from samcake/blue 
Introduce Shader Compilation versions
 2016-04-19 11:14:22 -07:00
Brad Hefta-Gaub
d88185eb6c Merge pull request #7703 from zzmp/fix/gl-qml 
Set GL in QML immediately
 2016-04-19 11:11:27 -07:00
Zach Pomerantz
fc61f85bf9 Merge pull request #7698 from hyperlogic/tony/avatar-on-load-complete-callback 
Added MyAvatar onLoadComplete Callback
 2016-04-19 10:36:20 -07:00
Brad Hefta-Gaub
5d550197bd Merge pull request #7697 from samcake/orange 
Introduce a simple state sort for drawing opaque items
 2016-04-19 08:41:49 -07:00
Brad Hefta-Gaub
d16750c590 Merge pull request #7681 from hyperlogic/tony/character-controller-leak-fix 
Memory leak on exit for CharacterController
 2016-04-19 07:51:08 -07:00
Brad Hefta-Gaub
c41b320d40 Merge pull request #7706 from zzmp/fix/text3d-font 
Fix text3d to allow transparent text
 2016-04-19 07:50:36 -07:00
Brad Hefta-Gaub
b0f3b24caa Merge pull request #7699 from OmegaHeron/gcc53 
Gcc53
 2016-04-19 07:34:24 -07:00
Brad Hefta-Gaub
8f19eba5c2 Merge pull request #7685 from zzmp/debug/sub 
Add sub to Debug Counter
 2016-04-19 07:27:49 -07:00
Brad Hefta-Gaub
523d365ce7 Merge pull request #7680 from Atlante45/fix/clear-atp-cache 
Don't use invalidated iterators
 2016-04-19 07:24:07 -07:00
Brad Hefta-Gaub
2780ade3bd Merge pull request #7686 from zzmp/clean/bufferview 
Consolidate BufferView ctors to cpp
 2016-04-19 07:21:57 -07:00
Brad Hefta-Gaub
49e0a649e9 Merge pull request #7695 from huffman/fix/installer-prompt-name 
Fix application names in installer prompt
 2016-04-19 07:20:21 -07:00
Brad Hefta-Gaub
8eff47f922 Merge pull request #7705 from hyperlogic/tony/avatar-attachment-lag-fix 
Fix for laggy avatar attachments
 2016-04-19 07:15:38 -07:00
Anthony Thibault
4708cc9400 Added license to disableAvatarAnimations.js 2016-04-18 19:42:05 -07:00
samcake
7c7cd6e9e5 Go simple with a a true map for the unifrom mappings 2016-04-18 19:05:49 -07:00
samcake
4bbe0ddc6d Go simple with a a true map for the unifrom mappings 2016-04-18 19:01:15 -07:00
samcake
85fd1dcb5b Merge branch 'master' of https://github.com/highfidelity/hifi into blue 2016-04-18 18:25:16 -07:00
samcake
cadb53b703 Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more 2016-04-18 18:24:27 -07:00
Omega Hereon [J.L.]
647e991b05 Merge remote-tracking branch 'upstream/master' into gcc53 2016-04-19 01:14:00 +00:00
Brad Hefta-Gaub
a572ac31dc Merge pull request #7704 from samcake/lemon 
Exposing the CPU TIming of the Render Jobs to the JS API
 2016-04-18 18:12:14 -07:00
Omega Hereon [J.L.]
64f6a59bb3 Merge remote-tracking branch 'upstream/master' into gcc53 2016-04-19 01:11:35 +00:00
Brad Hefta-Gaub
0ac9601ea7 Merge pull request #7690 from ZappoMan/improveHMD 
Introduce "recommended overlay rectangle" to display plugins
 2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub
5ae1e70197 Merge pull request #7689 from hyperlogic/tony/jasmine-avatar-unit-tests 
Added avatar unit tests
 2016-04-18 18:03:29 -07:00
Brad Hefta-Gaub
0a79b5dd69 Merge pull request #7707 from huffman/fix/osx-default-script-dir 
Remove fix for old QT file path bug in OSX
 2016-04-18 18:01:47 -07:00
Brad Hefta-Gaub
0e9bd9a776 Merge pull request #7682 from zzmp/clean/stars 
Cleanup stars to persist a single BufferView
 2016-04-18 17:59:48 -07:00
Brad Hefta-Gaub
f5cddc9962 fix the bug that Omega found 2016-04-18 17:26:12 -07:00
samcake
c6deff16d6 Resoving to master... 2016-04-18 17:24:55 -07:00
samcake
d25a366962 Resoving to master... 2016-04-18 17:23:57 -07:00
samcake
7951284e9c Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2016-04-18 16:54:17 -07:00
Stephen Birarda
93cf5a1035 fixes for CR comments 2016-04-18 16:53:02 -07:00
samcake
9087de22bd Fixing the extra spaces 2016-04-18 16:10:11 -07:00
Ryan Huffman
4e0ac2a4be Remove fix for old QT file path bug in OSX 2016-04-18 16:07:53 -07:00
Stephen Birarda
1d256be7ee fix random stats sending for AudioMixer clients 2016-04-18 16:04:20 -07:00
Stephen Birarda
33b46bd8e3 remove the billboard packet handling from AM 2016-04-18 16:02:46 -07:00
Zach Pomerantz
2d9dcc8595 Fix text3d to allow transparent text 2016-04-18 16:02:45 -07:00