Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 18:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
4196 commits 71 branches 56 tags 1.2 GiB
Commit graph

4196 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
26a2b4672b change NODE_TYPE_ASSIGNEE to NODE_TYPE_UNASSIGNED 2013-07-08 17:21:39 -07:00
Stephen Birarda
ddc684be49 put back sendAssignmentRequest method removed in merge 2013-07-08 17:14:39 -07:00
Stephen Birarda
32b2c231e5 add a node type for assignees 2013-07-08 17:05:32 -07:00
Stephen Birarda
4c27f08f1d don't specify git as source for local change testing 2013-07-08 16:53:20 -07:00
Stephen Birarda
b5a47cddc0 have stubbed Operative check in with DS 2013-07-08 16:48:53 -07:00
Stephen Birarda
6a253f78d1 basic version of operative run to loop and fly the bird 2013-07-08 16:39:48 -07:00
Stephen Birarda
a6894db83a resolve conflicts on merge with upstream/master 2013-07-08 16:22:27 -07:00
Stephen Birarda
c2ad02def2 Merge pull request #625 from PhilipRosedale/master 
Tuned smooth gyro look to feel better
 2013-07-08 15:55:52 -07:00
ZappoMan
195d926fde Merge pull request #626 from tschw/19376 
Code Review for Job #19376
 2013-07-08 10:46:02 -07:00
tosh
c2e2ff0ffe changes broadcast function in Application to use a different name but the same signature as in NodeList 2013-07-05 14:16:50 +02:00
tosh
2da132be65 upstream merge 2013-07-04 21:21:11 +02:00
tosh
689794259d Merge branch 'master' of git://github.com/worklist/hifi into 19376 
Conflicts:
	interface/src/Application.cpp
 2013-07-04 21:20:36 +02:00
Philip Rosedale
d70eb38542 Properly make the goHome() function in slot group 2013-07-03 23:43:53 -07:00
Philip Rosedale
5df09b2932 remove debugging printf 2013-07-03 23:20:55 -07:00
Philip Rosedale
0f312d4c9b Tuned smooth gyro look values to feel better. 2013-07-03 23:17:43 -07:00
Philip Rosedale
92cec4cfa0 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-03 22:55:09 -07:00
Philip Rosedale
2de6d3eb6a Make 'Go Home' an option from the options because it conflicts with 'G' for gravity on/off 2013-07-03 22:55:01 -07:00
Stephen Birarda
ab249d6c78 Merge pull request #624 from ey6es/master 
Per Ryan's request, use 15 blinks per minute as a baseline/maximum frequency.
 2013-07-03 17:33:31 -07:00
Andrzej Kapolka
43258f9dcd Use 15 blinks per minute as a base/maximum frequency. 2013-07-03 17:12:43 -07:00
Andrzej Kapolka
b7e9173796 Merge branch 'master' of https://github.com/worklist/hifi 2013-07-03 17:10:56 -07:00
ZappoMan
1c143f4b1d Merge pull request #616 from birarda/node 
your agents are now nodes
 2013-07-03 15:27:58 -07:00
Stephen Birarda
0b4348812c agentData to nodeData in voxel-server 2013-07-03 15:22:28 -07:00
Stephen Birarda
0be42698b5 resolve conflicts on merge with upstream master 2013-07-03 15:12:50 -07:00
Stephen Birarda
c8b86c651f Merge pull request #622 from birarda/master 
remove an extra g
 2013-07-03 15:06:23 -07:00
Stephen Birarda
8a4dc8446b what is July 3rdg 2013-07-03 15:05:51 -07:00
ZappoMan
f0fdacbba8 Merge pull request #621 from birarda/master 
remove pre-build fervor error, comment out process event bug
 2013-07-03 15:05:46 -07:00
Stephen Birarda
b14fd1ea68 Merge pull request #619 from ZappoMan/bug_fixes 
Some small bug fixes to voxel server sending
 2013-07-03 14:53:24 -07:00
ZappoMan
430c70875d tweaks to debug messages 
(cherry picked from commit 873144ded3)
 2013-07-03 14:44:33 -07:00
ZappoMan
2fffb15d94 CR feedback 2013-07-03 14:43:01 -07:00
Stephen Birarda
e85e49ef3b add a comment to disable of processEvents 2013-07-03 14:31:28 -07:00
Stephen Birarda
c44e231ab5 Merge pull request #620 from machinelevel/dev4 
[trivial] small bracket fix per request in https://github.com/worklist/h...
 2013-07-03 14:29:59 -07:00
Stephen Birarda
0e68942674 comment out processEvents to remove event receipt bug 2013-07-03 14:27:07 -07:00
Stephen Birarda
23e1fab9be Merge branch 'master' of github.com:worklist/hifi 2013-07-03 14:13:37 -07:00
Philip Rosedale
04a28d3ab5 Merge pull request #617 from PhilipRosedale/master 
Smooth gyro look that won't make you throw up
 2013-07-03 13:11:50 -07:00
Eric Johnston
fe46a3f0c9 [trivial] small bracket fix per request in https://github.com/worklist/hifi/pull/618/files 2013-07-03 13:11:26 -07:00
Philip Rosedale
3388fccc86 Fixes per code review 2013-07-03 13:09:55 -07:00
Philip Rosedale
c309774e3c Merge branch 'master' of https://github.com/worklist/hifi 2013-07-03 13:01:21 -07:00
Stephen Birarda
331351765e remove fvversioncomparator from headers passed to qt4 2013-07-03 12:51:26 -07:00
ZappoMan
485c603d4f added some timing debugging, and bail early if voxel server is slow 2013-07-03 12:42:34 -07:00
Stephen Birarda
fc3ce26c70 Merge pull request #618 from machinelevel/dev4 
Fixed two-finger touch delay, and all other hidden event-pile-up.
 2013-07-03 12:09:46 -07:00
Eric Johnston
e8ee041f20 Virtual method warning removal. 
Warning was "Delete called on HifiLeapListener that has virtual functions but non-virtual destructor"
 2013-07-03 11:46:53 -07:00
Eric Johnston
acef2bc669 Fixed two-finger touch delay, and all other hidden event-pile-up. 
Added a processEvents() call in the idle, because otherwise calling idle updates starves the event handlers.
 2013-07-03 11:37:38 -07:00
Eric Johnston
010fe7fadd Fixed two-finger touch delay, and all other hidden event-pile-up. 
Added a processEvents() call in the idle, because otherwise calling idle updates starves the event handlers.
 2013-07-03 11:27:15 -07:00
Philip Rosedale
7880c74304 smooth gyro look on by default if not in settings 2013-07-03 11:17:06 -07:00
Philip Rosedale
bf4bc22fbf Merge branch 'master' of https://github.com/worklist/hifi 2013-07-03 11:11:00 -07:00
Philip Rosedale
1868717520 Improve gyro look to smoothly follow the head and not move for small movements 2013-07-03 11:10:40 -07:00
Stephen Birarda
36c6912de8 your agents are now nodes 2013-07-03 10:35:09 -07:00
Eric Johnston
fd2009738b Merge branch 'master' of https://github.com/worklist/hifi into dev4 2013-07-03 09:56:00 -07:00
Stephen Birarda
00fa688aba Merge pull request #614 from machinelevel/dev4 
(changed per requests and re-merged) Two Leap-related crashes fixed, plu...
 2013-07-03 09:53:40 -07:00
tosh
a542ebc851 bandwidth meter - avoid division by zero 2013-07-03 14:01:09 +02:00