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

6082 commits

This branch
This branch
All branches
Author SHA1 Message Date
atlante45
2b64e4553f Hopefully the final fix to all those merges 2013-09-14 14:48:28 -07:00
atlante45
494242f363 Merge branch 'perlin_face' of https://github.com/Atlante45/hifi into perlin_face 2013-09-14 14:47:13 -07:00
atlante45
451979bdee Fixed bad merges 2013-09-14 14:46:35 -07:00
atlante45
4bf6a00392 Fixed bad merges 2013-09-14 14:45:37 -07:00
atlante45
ac0ee6c7d6 another merge commit 2013-09-14 14:41:03 -07:00
ZappoMan
facd60799e Merge pull request #931 from Atlante45/add_fs_data_in_head_data 
Add fs data in head data
 2013-09-14 14:04:37 -07:00
ZappoMan
2d545c8adb Merge pull request #924 from stojce/19418 
Code Review for Job #19418
 2013-09-14 14:00:09 -07:00
stojce
316f8a0345 Brace placement fix 2013-09-14 08:39:21 +02:00
atlante45
d6981bfa20 Andrejz Faceshift modif merge 2013-09-13 18:18:41 -07:00
ZappoMan
420f1622d5 Merge pull request #937 from LionTurtle/master 
Use WASD to move nudge guide instead of mouse.
 2013-09-13 18:17:23 -07:00
LionTurtle
6613ad0591 Arrow keys now also control nudge guide. Avatar position is now fixed 
during nudge.
 2013-09-13 18:10:52 -07:00
LionTurtle
394e660ac3 Use WASD to move nudge guide instead of mouse. 
Nudge can be completed with return/enter key now.
Nudge is now accessible in any voxelEditMode.
 2013-09-13 17:51:10 -07:00
atlante45
fe12437da9 Fixed double declaration in broadcastData 2013-09-13 16:46:48 -07:00
atlante45
7a2a79f6f5 Temp code for Brad to look at 2013-09-13 15:17:17 -07:00
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
atlante45
683cfd6c8b Fixed Eye Open 2013-09-13 11:21:13 -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
stojce
4b993ec931 CR fixes 2013-09-13 20:10:27 +02: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