Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-30 07:46:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85615 commits 28 branches 28 tags 1.2 GiB
Commit graph

85615 commits

This branch
This branch
All branches
Author SHA1 Message Date
tosh
3be23b3faa integrates logging 2013-04-17 00:48:27 +02:00
ZappoMan
4f5ddb3700 fixed yaw/ideal yaw problem correctly 2013-04-16 15:46:20 -07:00
birarda
dd992c1dec Merge pull request #57 from ZappoMan/view_frustum_work 
fixed merge problem with shifted avatar
 2013-04-16 15:45:55 -07:00
ZappoMan
edfb1501f1 fixed merge problem with shifted avatar 2013-04-16 15:41:38 -07:00
tosh
ba4f6bc92c Merge branch 'master' of git://github.com/worklist/hifi into 19262 2013-04-17 00:40:37 +02:00
tosh
e811410f77 works around GLUT bugs related to monospace glyphs 2013-04-17 00:39:35 +02:00
tosh
dc4dc887ac silences warning about deprecated conversion of string literal to char* 2013-04-17 00:38:39 +02:00
tosh
cf3e2635c1 brings Log class into stable state 2013-04-17 00:38:21 +02:00
tosh
58b40f7ed2 adds Log class 2013-04-17 00:37:21 +02:00
Jeffrey Ventrella
fcbf44cad9 trying to get around git confusion 2013-04-16 15:11:23 -07:00
Jeffrey Ventrella
0c85f832e6 trying to get around git confusion 2013-04-16 14:56:49 -07:00
birarda
7ef80b37be Merge pull request #55 from ZappoMan/view_frustum_work 
Latest view frustum work
 2013-04-16 14:53:48 -07:00
birarda
ab73b67541 Merge pull request #56 from birarda/master 
comment fixes in Camera.cpp
 2013-04-16 14:40:09 -07:00
Stephen Birarda
2f5d5398b2 comment cleanup in Camera.cpp 2013-04-16 14:39:23 -07:00
ZappoMan
0ff88b882b tweaks to default Camera near clip, and camera positions in interface 2013-04-16 14:06:48 -07:00
Jeffrey Ventrella
1bef9544d9 Merge remote-tracking branch 'origin/master' 2013-04-16 13:56:45 -07:00
Jeffrey Ventrella
216cc465e7 Added idealYaw to camera and also switched ordering of gl camera rotation commands 2013-04-16 13:51:14 -07:00
Philip Rosedale
f4f8a4e41b Merge remote-tracking branch 'upstream/master' 2013-04-16 13:26:49 -07:00
ZappoMan
4422ade9ff Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-16 12:50:04 -07:00
birarda
60c37f053c Merge pull request #54 from birarda/master 
add missing packet header for broadcast head data
 2013-04-16 12:49:28 -07:00
Stephen Birarda
f8ab33ccc7 add missing packet header for broadcast head data 2013-04-16 12:48:47 -07:00
ZappoMan
4a28e5889b Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-16 12:39:58 -07:00
ZappoMan
ba016ca6f0 Merge pull request #53 from birarda/master 
fix broken VS build, change some char* to unsigned char*
 2013-04-16 12:38:16 -07:00
Stephen Birarda
8129c2477a fix broken voxel server build, change some char* to unsigned char* 2013-04-16 12:35:49 -07:00
Stephen Birarda
c921fd9b87 remove unnecessary SharedUtil include 2013-04-16 12:26:44 -07:00
Stephen Birarda
8b165f546d Merge branch 'master' of github.com:worklist/hifi 2013-04-16 12:25:35 -07:00
Stephen Birarda
0182c29e7b switch Util for SharedUtil in ViewFrustum 2013-04-16 12:25:23 -07:00
birarda
f66961d337 Merge pull request #52 from birarda/master 
missing includes for previous pull request
 2013-04-16 12:23:03 -07:00
Stephen Birarda
598bed3b55 include cstring and stdint in AvatarData UNIX build 2013-04-16 12:22:09 -07:00
ZappoMan
7d4edd8ba8 Merge pull request #51 from birarda/master 
avatar mixer fixes - using shared AvatarData class
 2013-04-16 12:18:55 -07:00
Stephen Birarda
e7e7bd290a remove debugging on voxel deletion 2013-04-16 12:04:56 -07:00
Stephen Birarda
53108b01ef resolve conflicts on merge with upstream master 2013-04-16 12:02:33 -07:00
Stephen Birarda
1dd21a450e Merge remote-tracking branch 'upstream/master' 2013-04-16 12:00:55 -07:00
Stephen Birarda
e71f21b7bf fix broken builds from last commit, pull new avatar data in VoxelAgentData 2013-04-16 11:59:03 -07:00
Stephen Birarda
5c091a51a6 change signature of parseData to use unsigned char*, include packet header always 2013-04-16 11:51:36 -07:00
ZappoMan
dcca1699d3 Adding first cut at ViewFrustum pointIn,SphereIn,BoxIn code. 
- Added Plane class
- Added AABox class
- Removed some experimental "slightly inside" code from view frustum
 2013-04-16 11:29:31 -07:00
stojce
6b59374921 Merge pull request #48 from stojce/19261 
Code Review for Job #19261
 2013-04-16 08:40:01 -07:00
stojce
75c63f53fc use safe version of sprintf 2013-04-16 17:38:34 +02:00
ZappoMan
a3fabaf300 Merge pull request #50 from tschw/19188 
19188
 2013-04-16 08:25:07 -07:00
ZappoMan
1408be00f5 Merge pull request #47 from PhilipRosedale/master 
Cleanup and partial re-enabling of head gyros
 2013-04-16 08:21:27 -07:00
Philip Rosedale
2179932f60 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-16 07:35:03 -07:00
Philip Rosedale
1cdeac0fec Merge pull request #49 from ZappoMan/view_frustum_work 
Latest view frustum work
 2013-04-16 07:24:36 -07:00
tosh
7c2cff824f renames AngleUtils -> AngleUtil for consistency with the rest of the files 2013-04-16 14:07:19 +02:00
tosh
ac55c610be tidies changeset 2013-04-16 14:06:03 +02:00
ZappoMan
246380b41e temp fix to setPitch() problem. Removed some debug printfs. Fixed menu flicker bug. 2013-04-16 00:55:44 -07:00
Philip Rosedale
d00001613f Renamed functions in head, added ability to change body yaw. 2013-04-15 21:06:45 -07:00
Philip Rosedale
5e5a7e0a0c Improved SerialInterface: Added gravity vector get function, closer to coding standards, better rendering of levels. 2013-04-15 20:52:18 -07:00
Philip Rosedale
b3e99513cb Merge branch 'master' of https://github.com/worklist/hifi 2013-04-15 18:37:59 -07:00
Philip Rosedale
cd3e414eda Removed unneeded variables in main.cpp for pitch,yaw. Renamed routines to make it more clear where gyros are being read. Re-enabled marker box being driven by head gyros. 2013-04-15 18:37:46 -07:00
Stephen Birarda
288a259ac1 more conflict resolutions for broken build after pull 2013-04-15 18:37:25 -07:00