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

5805 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
b88c74c1a1 remove the mongoose webserver 2013-09-05 16:25:42 -07:00
Stephen Birarda
8dad031c9a add mongoose for demo webserver for DS 2013-09-05 15:27:34 -07:00
Stephen Birarda
17727576d8 remove the avatar-mixer target from root CMakeLists 2013-09-05 14:03:34 -07:00
Stephen Birarda
8b601cac0a moved the AvatarMixer to a class the assignment-client can handle 2013-09-05 14:01:05 -07:00
Stephen Birarda
9dc3ddc84a a temporary hack to make sure the domain-server address is IPv4 2013-09-05 13:46:57 -07:00
Stephen Birarda
d5e807ca8e change the default domain server port for ec2 assignment client 2013-09-05 12:13:15 -07:00
Stephen Birarda
bd409abd1f switch assignment server back to ec2 2013-09-05 10:46:20 -07:00
Stephen Birarda
609c48214f Revert "temporary removal of QtScript dependency for build on ec2 box" 
This reverts commit f29f8701a1.
 2013-09-04 16:22:51 -07:00
Stephen Birarda
f29f8701a1 temporary removal of QtScript dependency for build on ec2 box 2013-09-04 16:20:19 -07:00
Stephen Birarda
2846d170f7 change default NodeList port to 0 for ephemeral 2013-09-04 16:16:03 -07:00
Stephen Birarda
77dcebd51f correct pool comparison for assignment distribution 2013-09-04 15:32:01 -07:00
Stephen Birarda
2c32a1a048 correct handling of IPv6, fix offsets for packet reading 2013-09-04 15:21:20 -07:00
Stephen Birarda
a7f7dbcb31 confirm assignment pool match before deploying assignment 2013-09-04 13:19:49 -07:00
Stephen Birarda
6e736ff9ed correct assignment packing when there is no pool 2013-09-04 13:14:41 -07:00
Stephen Birarda
fa7f183930 add a domain socket to assignments 2013-09-04 13:00:23 -07:00
Stephen Birarda
94367dd7c7 use QDebug << operator for assignment debug 2013-09-04 12:28:33 -07:00
Stephen Birarda
36c2f42b5c correct copying of assignment pool across targets 2013-09-04 11:50:39 -07:00
Stephen Birarda
ebc7de3a90 add methods for packing and unpacking of Assignments 2013-09-04 11:37:11 -07:00
Stephen Birarda
9260bee653 add assignment pool passing to DS, cleanup in AS 2013-09-04 11:13:37 -07:00
Stephen Birarda
bc5ad37395 allow passing of pool to assignment-client via cl param 2013-09-04 11:00:59 -07:00
Stephen Birarda
29e5eda358 add notion of pool and direction to Assignment class 2013-09-04 10:43:16 -07:00
Stephen Birarda
f485814a42 keep more than one assignment in the queue 2013-09-04 10:14:53 -07:00
Stephen Birarda
94740eed60 remove the audio-mixer target 2013-09-04 10:11:26 -07:00
Stephen Birarda
b64e3dd82f Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-04 10:07:02 -07:00
Andrzej Kapolka
f0bb42a988 Merge pull request #899 from ey6es/master 
Fix for compile warnings on Linux: check return values on read/write.
 2013-09-03 10:47:36 -07:00
Andrzej Kapolka
843d5656bd Fix for compile warnings on Linux: check return values on read/write. 2013-09-03 10:45:33 -07:00
Andrzej Kapolka
2aaff63b32 Merge pull request #896 from Atlante45/some_more_work_on_imports 
Some more work on imports
 2013-09-03 10:37:30 -07:00
atlante45
15a3a8d252 Some more code reformatting. 2013-09-03 10:32:38 -07:00
atlante45
26691118de Some code reformatting. 2013-09-03 10:30:46 -07:00
atlante45
38133ac6f2 Merge branch 'master' of https://github.com/worklist/hifi into some_more_work_on_imports 2013-09-03 10:16:44 -07:00
Andrzej Kapolka
4d8a540116 Merge pull request #898 from Atlante45/master 
Fixed png bug
 2013-08-30 17:38:10 -07:00
atlante45
66425763b8 Revert "Fixed glBuffers not deleted in VoxelSystem" 
This reverts commit 9224bca88b.
 2013-08-30 16:01:18 -07:00
atlante45
0068b838b2 Fixed importer crashing on non ARGB32 png. 2013-08-30 15:56:28 -07:00
atlante45
1bc1998023 Merge branch 'master' of https://github.com/worklist/hifi 2013-08-30 15:55:04 -07:00
atlante45
77799fce54 Merge branch 'master' of https://github.com/worklist/hifi into some_more_work_on_imports 2013-08-30 15:28:33 -07:00
atlante45
229821e211 Removed frustum display in preview mode 2013-08-30 15:28:10 -07:00
atlante45
f21a2798ff Fixed _sharedVoxelSystemTree deleted twice 2013-08-30 10:37:55 -07:00
Stephen Birarda
37e6b32741 Merge pull request #895 from birarda/master 
display the hand in first person
 2013-08-30 10:29:16 -07:00
Stephen Birarda
b46bd1fd41 display the Avatar's hand in first person 2013-08-30 10:28:30 -07:00
atlante45
fc991bf1ac Some code reformating 2013-08-29 18:11:16 -07:00
atlante45
1dc8d8dd0c Added LOD to preview + Shared voxelSystem for reduced memory consumption 2013-08-29 17:59:36 -07:00
atlante45
7d9d36a66e Merge branch 'master' of https://github.com/worklist/hifi into some_more_work_on_imports 2013-08-29 11:23:06 -07:00
ZappoMan
d2de76d5c3 Merge pull request #892 from birarda/master 
require Qt5Script for avatars library
 2013-08-28 11:12:10 -07:00
Stephen Birarda
24a43c050c require Qt5Script for avatars library 2013-08-28 10:55:38 -07:00
Andrzej Kapolka
e124c164c1 Merge pull request #891 from ZappoMan/large_tree_scale 
Add "Go To Domain" and "Go To Location" to file menu
 2013-08-27 12:51:14 -07:00
ZappoMan
a3bf373ffa revert TREE_SCALE and VOXEL_SCALE_SIZE for now 2013-08-27 11:41:22 -07:00
ZappoMan
0df11124b3 tweak to how activateWindow() is called after dialog boxes 2013-08-26 14:24:42 -07:00
ZappoMan
943e1f9110 added Go To Domain, Go To Location, and tweaks to TREE_SCALE settings 2013-08-26 14:06:23 -07:00
ZappoMan
b870101d02 Merge pull request #890 from ZappoMan/master 
Update README to include details on running local domain, formated 80 char line wrap.
 2013-08-26 10:42:42 -07:00
ZappoMan
5cd085dae5 updated README to include details on running local domain 2013-08-26 10:41:10 -07:00