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

8887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
8287cb139c Merge pull request #1166 from birarda/assignment 
fix domain-server handling of multiple instance agent scripts
 2013-10-31 20:12:57 -07:00
Stephen Birarda
d01feedb5a decrement number of instances on addressable instance of deployable assignment 2013-10-31 17:45:55 -07:00
Andrzej Kapolka
4a011e0624 Pull out the weight access. 2013-10-31 17:10:35 -07:00
Andrzej Kapolka
12374c2cc4 Allow more clusters per mesh. 2013-10-31 17:01:00 -07:00
Andrzej Kapolka
fdc44f5ec4 Have the hand fall to the side when the mouse is hidden. 2013-10-31 16:06:42 -07:00
Andrzej Kapolka
1809c525f4 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 15:39:39 -07:00
Stephen Birarda
36f4e148dc Merge pull request #1165 from birarda/assignment 
fix broken build in Skeleton merge
 2013-10-31 15:39:00 -07:00
Stephen Birarda
ddcaa513a1 fix broken build from merge in Skeleton 2013-10-31 15:38:00 -07:00
Andrzej Kapolka
b3b4c6e397 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 15:20:05 -07:00
Ryan
4db3d9606f Merge remote-tracking branch 'origin/master' 2013-10-31 14:55:00 -07:00
Andrzej Kapolka
70485a0ba9 Fix for meshes with no texture coordinates. 2013-10-31 14:52:36 -07:00
Andrzej Kapolka
55de8ceb85 Use blue default texture when we fail to load a normal map. 2013-10-31 14:46:51 -07:00
Andrzej Kapolka
070e755368 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 14:26:38 -07:00
Andrzej Kapolka
1a532be845 Smooth the normals. 2013-10-31 14:26:06 -07:00
Stephen Birarda
1db19da989 Merge pull request #1163 from birarda/assignment 
use default to catch unknown Qt message types
 2013-10-31 14:17:05 -07:00
Stephen Birarda
5b505bcc95 just use default to catch unknown Qt message types 2013-10-31 14:16:30 -07:00
Stephen Birarda
2c07e87cc8 Merge pull request #1162 from birarda/assignment 
fix for some new warnings in qt 5.2
 2013-10-31 14:11:38 -07:00
Stephen Birarda
307c1be4b7 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-31 14:10:53 -07:00
Stephen Birarda
bfe7c82232 add default and QtTraceMsg to switch to avoid warnings 2013-10-31 14:10:08 -07:00
ZappoMan
cfbb63f9e8 Merge pull request #1161 from birarda/assignment 
activate public socket for nodes who send data
 2013-10-31 14:08:42 -07:00
Stephen Birarda
891648b3ca Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-31 14:04:51 -07:00
Stephen Birarda
435a450cd7 Merge pull request #1160 from ZappoMan/bugfixes 
added menu item to enable extra debugging to help debug hq VS issue
 2013-10-31 14:01:55 -07:00
ZappoMan
848e78aded CR feedback 2013-10-31 13:58:12 -07:00
Stephen Birarda
9e3de05e97 activate public socket if a node sends data to VS and AM 2013-10-31 13:55:26 -07:00
ZappoMan
a04cd8e95c added menu item to enable extra debugging to help debug hq VS issue 2013-10-31 13:54:10 -07:00
Andrzej Kapolka
a15bff3857 Closer to mesh fix. 2013-10-31 13:49:06 -07:00
Andrzej Kapolka
09babeca5d Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 12:44:07 -07:00
Stephen Birarda
6a20490e4f Merge pull request #1159 from ZappoMan/bugfixes 
added more logging
 2013-10-31 12:43:16 -07:00
Andrzej Kapolka
06713a44bf Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 12:42:05 -07:00
Andrzej Kapolka
bc796c63e3 Working on mesh fix. 2013-10-31 12:41:40 -07:00
ZappoMan
db08b20405 added more logging 2013-10-31 12:36:48 -07:00
Stephen Birarda
58c3a40de1 Merge pull request #1158 from ZappoMan/bugfixes 
fix to how voxel servers are queried when they have no known jurisdiction
 2013-10-31 12:22:55 -07:00
ZappoMan
42b44064d3 CR feedback 2013-10-31 12:19:18 -07:00
ZappoMan
724ac4888f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-10-31 12:13:04 -07:00
ZappoMan
70dfd55ceb Merge pull request #1157 from birarda/assignment 
finally fix the dialog mouselook bug
 2013-10-31 12:09:27 -07:00
ZappoMan
af1047f5e0 fix to how voxel servers are queried when they have no known jurisdiction 2013-10-31 12:06:18 -07:00
Stephen Birarda
7b9eb55bda fix the dialog mouselook bug 2013-10-31 11:32:19 -07:00
Stephen Birarda
c70d0c3d88 Merge pull request #1156 from birarda/assignment 
fix scripted assignment delete before it is sent out
 2013-10-31 10:18:18 -07:00
Stephen Birarda
21fe7e6fe0 don't delete last scripted assignment before it is sent out 2013-10-31 10:10:49 -07:00
Leonardo Murillo
0431c7fb64 Merge pull request #1155 from birarda/assignment 
update to latest civetweb from source
 2013-10-31 09:25:42 -07:00
Stephen Birarda
e0e13fe2ed create a copy of document root string 2013-10-31 09:17:17 -07:00
Stephen Birarda
d67a2e6ea5 update to latest civetweb from source 2013-10-31 09:11:49 -07:00
Ryan
8b781bf9cd Merge remote-tracking branch 'origin/master' 2013-10-31 08:59:09 -07:00
Ryan
1279f3c3bb Made the stick and ball radius much smaller so they don’t break through the new meshes. 2013-10-31 08:55:37 -07:00
Philip Rosedale
edf36f2a9e Merge pull request #1142 from lordwaym/starfield-fix 
Starfield fix and Milky Way
 2013-10-30 21:58:03 -07:00
Stephen Birarda
ee39898891 Merge pull request #1153 from birarda/assignment 
fix a broken domain-server build
 2013-10-30 18:12:21 -07:00
Stephen Birarda
6014c833ed fix a broken build in the domain-server 2013-10-30 18:11:36 -07:00
Stephen Birarda
a027a96433 Merge pull request #1152 from birarda/assignment 
add debug for DS document root
 2013-10-30 18:02:36 -07:00
Stephen Birarda
5814f9ea81 add debug to see document root on DS relaunch 2013-10-30 18:02:13 -07:00
Philip Rosedale
e47f433444 Merge pull request #1150 from ZappoMan/bugfixes 
Several Bug Fixes and Improvements
 2013-10-30 17:02:54 -07:00