Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-08 23:08:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
7250 commits 25 branches 0 tags 1.1 GiB
Commit graph

7250 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ZappoMan
9a5cc596b3 CR feedback 2013-10-30 16:57:32 -07:00
ZappoMan
256428c6ae CR feedback 2013-10-30 16:55:39 -07:00
ZappoMan
054f49808f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 
Conflicts:
	libraries/voxel-server-library/src/VoxelSendThread.cpp
 2013-10-30 16:48:50 -07:00
Andrzej Kapolka
cbcb137cb2 Merge pull request #1151 from ey6es/master 
If the skeleton has meshes, don't render the balls and sticks.
 2013-10-30 16:45:56 -07:00
Andrzej Kapolka
4ef3500096 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-30 16:45:09 -07:00
Andrzej Kapolka
9c5ebfcf77 If the skeleton has meshes, don't render the balls and sticks. 2013-10-30 16:44:40 -07:00
Philip Rosedale
1a62f724fb Merge pull request #1148 from ZappoMan/lod_slider 
LOD slider in client
 2013-10-30 16:39:32 -07:00
ZappoMan
ac236b9ed8 if LOD changes than don't consider WasInView on server 2013-10-30 16:26:42 -07:00
ZappoMan
606a6349c7 added abandoned voxels to stats, improved sizing behavior of voxel stats dialog 2013-10-30 15:28:44 -07:00
ZappoMan
2f1ecd8d1b improve voxel server's behavior when client is moving, dump out of view pending voxels 2013-10-30 15:12:04 -07:00
ZappoMan
14ddb89341 improve behavior of too more than _maxVoxels 2013-10-30 14:28:32 -07:00
ZappoMan
3f9631dd53 fix voxels as points menu to work correctly on startup 2013-10-30 14:14:34 -07:00
ZappoMan
0bbbd7efce fix Voxel Server Protocol menu options to work again 2013-10-30 14:00:56 -07:00
ZappoMan
3445a15d61 fix build buster 2013-10-30 12:35:42 -07:00
ZappoMan
d1fbe242ab Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:27:50 -07:00
Andrzej Kapolka
719a014118 Merge pull request #1149 from ey6es/master 
This should fix Stephen's crash on init.
 2013-10-30 12:27:17 -07:00
ZappoMan
e9d366fb80 Merge pull request #1147 from ey6es/ick 
Support for normap maps on loaded models.
 2013-10-30 12:26:56 -07:00
Andrzej Kapolka
d820611618 Looks like setCentralWidget is ending up calling the init functions in newer 
versions of Qt.  Initialize the network access manager before that happens.
 2013-10-30 12:25:43 -07:00
ZappoMan
375ef34bd5 Merge pull request #1141 from stojce/19447 
Code Review for Job #19447
 2013-10-30 12:23:32 -07:00
ZappoMan
98f09d7061 removed dead code 2013-10-30 12:21:05 -07:00
ZappoMan
e8f5c86c73 fix one call to calculateShouldRender() 2013-10-30 12:19:47 -07:00
ZappoMan
96870f5d66 removed debug 2013-10-30 12:15:16 -07:00
ZappoMan
3a6f8ea66b Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:04:52 -07:00
Andrzej Kapolka
a7ade142fd Merge branch 'master' of https://github.com/worklist/hifi into ick 2013-10-30 11:57:31 -07:00
Andrzej Kapolka
156b3dd2e6 Sign change. Forgot we flip the texture coordinates. 2013-10-30 11:55:22 -07:00
ZappoMan
dd7eb66cec adjustable LOD tweaks 2013-10-30 11:53:16 -07:00
ZappoMan
baafea05af make server resend scene when LOD changes 2013-10-30 11:22:38 -07:00
ZappoMan
580102bb38 more work on LOD slider 2013-10-30 11:01:37 -07:00
Andrzej Kapolka
06e050f1c1 Normal map support almost there. 2013-10-29 22:13:00 -07:00
Stephen Birarda
0ea60c1b0b Merge pull request #1146 from ZappoMan/stephens_requests 
added --getOctalCode to voxel edit so you can easily make jurisdictions from arbitrary voxels
 2013-10-29 16:57:52 -07:00
ZappoMan
c123e045ad added --getOctalCode to voxel edit 2013-10-29 16:42:41 -07:00
ZappoMan
32b1fb2e23 Merge pull request #1145 from birarda/assignment 
fix silent node removal thread join bug
 2013-10-29 16:35:41 -07:00
ZappoMan
75721eb7ba first cut at user adjustable LOD 2013-10-29 16:17:11 -07:00
ZappoMan
fbc3a4d2c1 first cut at user adjustable LOD 2013-10-29 16:16:58 -07:00