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

6028 commits

This branch
This branch
All branches
Author SHA1 Message Date
atlante45
9ae7fab95f Merge branch 'master' of https://github.com/worklist/hifi into add_fs_data_in_head_data 2013-09-13 14:59:17 -07:00
atlante45
8f27d22f7b Put _isFaceshiftConnected in a bit set 2013-09-13 14:57:30 -07:00
ZappoMan
5e143f17a8 Merge pull request #936 from LionTurtle/master 
Change nudge UI to be more consistent with classic editing UI.
 2013-09-13 14:11:32 -07:00
LionTurtle
67bbcc4d9b Put upper bound on increasing nudge precision (i.e. making the nudge 
less precise).
 2013-09-13 14:08:21 -07:00
LionTurtle
86d1666d6a Add ifdef for OS X to show delete hotkey in edit menu 2013-09-13 13:49:19 -07:00
LionTurtle
0251349221 Change nudge UI to be more consistent with classic editing UI. 
Add menu option for Delete and fix delete for VoxelSelectMode.
 2013-09-13 13:41:26 -07:00
atlante45
c2502d03db Merge branch 'master' of https://github.com/worklist/hifi into add_fs_data_in_head_data 2013-09-13 13:25:41 -07:00
Stephen Birarda
803a002a39 Merge pull request #935 from birarda/assignment 
remove JS includes from net for fully local DS
 2013-09-13 12:50:58 -07:00
Stephen Birarda
83ed162d49 include jquery and remove javascript includes from net 2013-09-13 12:42:14 -07:00
Stephen Birarda
d66e560842 Merge pull request #934 from birarda/assignment 
simple fix to fix path for javascript save
 2013-09-13 12:20:37 -07:00
Stephen Birarda
fef54728ca fix path for javascript save 2013-09-13 12:12:20 -07:00
ZappoMan
bc95f94157 Merge pull request #933 from birarda/assignment 
add handling of Agent assignments to Assignment, DS, AC
 2013-09-13 11:27:36 -07:00
Stephen Birarda
5ac694224e remove extra space at the top of AudioMixer 2013-09-13 11:24:56 -07:00
Stephen Birarda
c40e848220 move DS web to resources for deploys 2013-09-13 11:21:03 -07:00
atlante45
7ae1f649c9 changed packet format 2013-09-13 11:17:55 -07:00
Stephen Birarda
d089991237 add handling of Agent assignments to Assignment, DS, AC 2013-09-13 11:14:00 -07:00
ZappoMan
e6f708d035 Merge pull request #932 from LionTurtle/master 
Fix sign error in nudge code that made nudging in the negative Z direction buggy.
 2013-09-13 10:54:34 -07:00
LionTurtle
6f8ab7a6c6 Fix sign error in nudge code that made nudging in the negative Z 
direction buggy.
 2013-09-13 10:50:29 -07:00
atlante45
74e929100a Merge branch 'master' of https://github.com/worklist/hifi into add_fs_data_in_head_data 2013-09-13 10:44:21 -07:00
ZappoMan
3441199f0b Merge pull request #930 from LionTurtle/master 
Fix for copy/cut/paste single voxel leaves.
 2013-09-13 09:18:46 -07:00
Stephen Birarda
dab1f82705 Merge pull request #929 from birarda/master 
two small assignment changes
 2013-09-12 18:21:01 -07:00
atlante45
87b4528e2c removed unmeant committed files 2013-09-12 17:54:57 -07:00
atlante45
7cd2f2b06b send faceshift data to avatar mixer 2013-09-12 17:41:26 -07:00
LionTurtle
99db8491ef Get rid of qDebug statements in VoxelTree.cpp. 2013-09-12 17:41:02 -07:00
LionTurtle
71d5f3d2d8 Fix for copy/cut/paste single voxel leaves. 2013-09-12 17:38:16 -07:00
Stephen Birarda
8d7b4ab321 add debugging for assignment send and remove a useless cast 2013-09-12 17:37:37 -07:00
ZappoMan
11cc79fd41 Merge pull request #928 from birarda/assignment 
couple of bugfixes for local stack assignment, UUID created with assignment
 2013-09-12 17:11:45 -07:00
Stephen Birarda
49b72370be fix UUID getter to match the private variable 2013-09-12 17:08:06 -07:00
Stephen Birarda
f878b17798 fix DS reply to node on same box to remove check in AC 2013-09-12 17:03:05 -07:00
Stephen Birarda
cd12fb2cc6 remove local directive for domain-server in README 2013-09-12 16:49:11 -07:00
Stephen Birarda
2578516940 talk to AC on loopback when on same node 2013-09-12 16:47:06 -07:00
Stephen Birarda
0d69e1cce0 expand the same host comparison to check 127.0.0.1 2013-09-12 16:31:43 -07:00
Stephen Birarda
81e0be7f85 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-12 16:19:02 -07:00
Stephen Birarda
25cd800ab4 create a UUID with assignments, store JS for script 2013-09-12 16:18:53 -07:00
Grayson Stebbins
db86e6c090 Merge pull request #927 from birarda/master 
README touchups for local stack
 2013-09-12 16:07:47 -07:00
Stephen Birarda
97d00aab03 more touchup to readme for assigned local stack 2013-09-12 16:04:04 -07:00
Stephen Birarda
5e5e2b3bab add some more clarity for unix makefiles 2013-09-12 12:16:02 -07:00
Stephen Birarda
f72742710f touchup the README for new local stack 2013-09-12 11:09:36 -07:00
ZappoMan
53e189e95b Merge pull request #925 from LionTurtle/master 
Add limit to nudge precision. Fix bugs in certain nudge scenarios. Fix rendering of nudge guide.
 2013-09-11 18:46:54 -07:00
LionTurtle
bb1feab661 Merge remote-tracking branch 'upstream/master' 2013-09-11 16:45:29 -07:00
LionTurtle
cef4837654 Fix voxel erase bug in nudge code. Fix rendering of nudge guide. 2013-09-11 16:43:50 -07:00
ZappoMan
eaa1596a78 Merge pull request #923 from birarda/domain-web-server 
add a mongoose webserver to the domain-server
 2013-09-11 15:07:39 -07:00
Stephen Birarda
d3c58b2fe1 Merge branch 'master' of github.com:worklist/hifi into domain-web-server 2013-09-11 14:58:24 -07:00
ZappoMan
33cfd3a961 Merge pull request #922 from birarda/assignment 
rename direction to command for assignment
 2013-09-11 14:57:46 -07:00
Stephen Birarda
0fd2341c7e Merge branch 'assignment' into domain-web-server 2013-09-11 14:52:40 -07:00
Stephen Birarda
7fb73fc040 remove one of birarda's infamous Gs 2013-09-11 14:52:18 -07:00
Stephen Birarda
3dd0b40776 Merge branch 'assignment' into domain-web-server 2013-09-11 14:49:28 -07:00
Stephen Birarda
129c120989 fix deque include for assignment-server 2013-09-11 14:49:16 -07:00
Stephen Birarda
4ebac574ac fix deque include for domain-server 2013-09-11 14:48:51 -07:00
Stephen Birarda
36b2381d79 Merge branch 'assignment' into domain-web-server 2013-09-11 14:47:26 -07:00