Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-28 02:30:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
33371 commits 71 branches 59 tags 1.2 GiB
Commit graph

33371 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
f68d897104 Merge pull request #6120 from jherico/marge 
Fixing a bug in the gitattributes file
 2015-10-19 20:16:23 -07:00
Brad Davis
380b10ab8d Fixing a bug in the gitattributes file 2015-10-19 19:32:27 -07:00
Clément Brisset
62923beef1 Merge pull request #6118 from ZappoMan/fixWarningsInMaster 
fix warning in master
 2015-10-19 18:23:30 -07:00
Brad Hefta-Gaub
9f17f10d6a fix warning in master 2015-10-19 17:56:38 -07:00
samcake
b977a094d3 Merge pull request #6115 from ZappoMan/fixLOD 
fix model LOD behavior
 2015-10-19 16:16:48 -07:00
Seth Alves
2b24ef2c83 Merge pull request #6114 from Atlante45/vhacd_fix 
Fix vhacd for models with quads
 2015-10-19 16:11:28 -07:00
Andrew Meadows
97b41957f7 Merge pull request #6113 from hyperlogic/tony/blender-fbx-fix 
Joint rotation fix for FBX files exported from Blender.
 2015-10-19 15:59:51 -07:00
Brad Hefta-Gaub
0b2bf8bda8 remove some dead code 2015-10-19 15:23:45 -07:00
Atlante45
47d8afa6a8 Fix vhacd for models with quads 2015-10-19 15:22:10 -07:00
Brad Hefta-Gaub
110adc5c22 fix model LOD behavior 2015-10-19 15:21:25 -07:00
Anthony J. Thibault
62c89eaf7d Joint rotation fix for FBX files exported from Blender. 
This isn't a great fix.  But it will at least allow people to export avatars from Blender.
 2015-10-19 13:49:13 -07:00
samcake
2cd6d7c8a5 Merge pull request #6110 from ZappoMan/textureMapHack 
ifdef out buggy texture map code
 2015-10-19 12:09:37 -07:00
Brad Hefta-Gaub
bddb0e1e7b ifdef out buggy texture map code 2015-10-19 09:43:08 -07:00
Brad Hefta-Gaub
c04cdc4964 Merge pull request #6109 from jherico/marge 
Fixing line endings and adding git attribute files
 2015-10-19 08:33:02 -07:00
Brad Davis
282cdadf63 Fixing line endings 2015-10-18 22:55:14 -07:00
Brad Davis
82c041d06a Adding git attributes file 2015-10-18 22:54:04 -07:00
Brad Hefta-Gaub
4289d54bd9 Merge pull request #6102 from Atlante45/master 
Fix particle bug by having lifetimes increase
 2015-10-17 12:21:47 -07:00
Ryan Huffman
29a29d997d Merge pull request #6100 from imgntn/edit_better 
[Scripts] Edit.js - Add color bars below XYZ inputs to indicate world axis
 2015-10-16 22:17:37 -07:00
Atlante45
1da68e0214 Fix particle bug by having lifetimes increase 2015-10-16 18:11:22 -07:00
Eric Levin
6738455a5a Merge pull request #6099 from ctrlaltdavid/20709 
QA for 20709 - Fix reading of QVector<float> from models files - polyline strokeWidths
 2015-10-16 17:12:18 -07:00
James B. Pollack
31cc451fd4 css cleanup 2015-10-16 16:42:29 -07:00
James B. Pollack
c6fcaf158b add color to more props 2015-10-16 16:15:20 -07:00
James B. Pollack
aa6aaf912e add color bars below position inputs 2015-10-16 16:07:20 -07:00
David Rowe
8c22db17cc Fix reading of QVector<float> from models files - polyline strokeWidths 2015-10-16 15:43:23 -07:00
Eric Levin
9a87f5c574 Merge pull request #6096 from imgntn/resetter_acs 
[Scripts] - Move resetting basketballs and targets to an AC script
 2015-10-16 12:18:15 -07:00
James B. Pollack
4b21bdf308 testing 2015-10-16 11:50:13 -07:00
Brad Hefta-Gaub
88a66d3c52 Merge pull request #6088 from hyperlogic/tony/regen-english-translation-strings 
Updated english translation file
 2015-10-16 10:59:26 -07:00
Seth Alves
8338491c3b Merge pull request #6095 from Atlante45/master 
Fix export bug
 2015-10-16 07:32:56 -07:00
Seth Alves
b18bb1e076 Merge pull request #6084 from AndrewMeadows/physics-cleanup 
move DIRTY_FLAGS out of EntityItem namespace
 2015-10-16 07:22:40 -07:00
Atlante45
a84fdecec9 Fix export bug 2015-10-15 18:43:32 -07:00
Brad Hefta-Gaub
26f82e899e Merge pull request #6079 from ericrius1/whiteboard 
Entity whitelist for raypicking and whiteboard painting example
 2015-10-15 17:50:35 -07:00
Brad Hefta-Gaub
c3ee419ad7 Merge pull request #6086 from imgntn/flashlight_life 
[Scripts] Add lifetime to lights created by flashlight
 2015-10-15 17:42:57 -07:00
ericrius1
97fe0170cb glowing box for black color 2015-10-15 17:09:41 -07:00
Stephen Birarda
e5825daa57 Merge pull request #6090 from ZappoMan/fixStat 
Add some additional stats for debugging edit lags
 2015-10-15 16:00:29 -07:00
Brad Hefta-Gaub
3718149157 include inbound queue PPS stats in server stats page 2015-10-15 15:49:12 -07:00
Ryan Huffman
421e2a6c21 Merge pull request #6078 from imgntn/top_tool_tabs 
Move  Edit.js Tool Window Tabs to the Top
 2015-10-15 15:40:42 -07:00
Brad Hefta-Gaub
e1570e3197 include inbound queue PPS stats in server stats page 2015-10-15 15:31:52 -07:00
Brad Hefta-Gaub
82a211174b added packet recieved,lost,recovered stats to detailed server stats page 2015-10-15 15:23:12 -07:00
James B. Pollack
aee11d4c06 cleanup merge 2015-10-15 15:05:34 -07:00
James B. Pollack
112007e5a9 cleanup 2015-10-15 14:58:05 -07:00
James B. Pollack
8b57b3c0ff fix memory leak 2015-10-15 14:13:07 -07:00
ericrius1
e8b6b32572 Remembering whiteboards last color between sessions 2015-10-15 14:12:15 -07:00
Andrew Meadows
3d17c57910 Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes 
Groundwork for hold action changes
 2015-10-15 13:30:02 -07:00
James B. Pollack
e63ed5cf84 Merge pull request #6087 from thoys/20708 
CR for Job #20708 - Script Editor Improvements
 2015-10-15 12:28:32 -07:00
Brad Hefta-Gaub
923e1ed208 add more processing stats 2015-10-15 12:21:36 -07:00
Brad Hefta-Gaub
93113af2d2 improve server error message for failed edit 2015-10-15 11:55:20 -07:00
Stephen Birarda
b6a2cc396c Merge pull request #6089 from ZappoMan/fixStat 
fix Queue OUT stat
 2015-10-15 11:53:34 -07:00
ericrius1
dc6875f5b5 Strokes moving forward to avoid zfighting and incorrect overlaps 2015-10-15 11:50:23 -07:00
Brad Hefta-Gaub
b7c40c2df1 fix Queue OUT stat 2015-10-15 11:41:04 -07:00
ericrius1
3b59bffb79 Deleting only strokes from the whiteboard where the erase button was clicked on 2015-10-15 11:38:18 -07:00