Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-18 21:38:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1235 commits 25 branches 28 tags 1.2 GiB
Commit graph

1235 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
24689e97ab fix packing and unpacking of agent IDs 2013-04-15 11:12:31 -07:00
Philip Rosedale
b929f14648 Merge pull request #44 from ZappoMan/view_frustum_work 
fixed lighting when in frustum render mode
 2013-04-13 16:18:47 -07:00
ZappoMan
bd837862de fixed lighting when in frustum render mode 2013-04-13 16:16:10 -07:00
Philip Rosedale
531e294052 Merge pull request #43 from ZappoMan/view_frustum_work 
improved the menu states names for frustum rendering modes
 2013-04-13 16:03:25 -07:00
ZappoMan
e6a1fb416d improved the menu states names for frustum rendering modes 2013-04-13 15:58:10 -07:00
Philip Rosedale
40752104c2 Merge pull request #42 from ZappoMan/view_frustum_work 
Interface menu items and new drawing modes for client side view frustum
 2013-04-13 15:58:09 -07:00
ZappoMan
e429dfe61f fixed bug in rendering menu rows where state was longer than 5 characters 2013-04-13 15:57:30 -07:00
ZappoMan
37322fcb73 Many menu improvements, and some render_view_frustum() improvements 
- Added menu items for Quit, Voxels, Stars, Frustum features, etc.
- Added FrustomDrawMode enhancements to render_view_frustum()
 2013-04-13 15:20:21 -07:00
ZappoMan
e921d06877 Added new feature to MenuRow to allow custom callback for State 
Note: there's some bug in the menu render code that doesn't like state strings
that are longer than 4 characters + NULL. So, the current code will clip any
state string that is longer than 4 characters. We need to look into this 5
character limit. It's a bug.
 2013-04-13 15:18:19 -07:00
ZappoMan
27165be902 tweak starting fov adjust to 1.65 which seems correct 2013-04-13 13:19:48 -07:00
ZappoMan
4cb986b3f9 tweaks to ViewFrustum's default FOV, added comments 2013-04-13 13:09:20 -07:00
ZappoMan
093f489520 make menu columns render properly for menu items wider than 100 pixels 2013-04-13 13:07:02 -07:00
ZappoMan
ff1095a1e7 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-13 11:52:41 -07:00
ZappoMan
517f7506c9 Merge pull request #41 from PhilipRosedale/master 
Removed Hand class, added transmitter code to Head
 2013-04-12 21:27:29 -07:00
Philip Rosedale
98c8228161 had to take out call to myAvatar.getBonePosition - unclear why it now isn't working. 2013-04-12 21:11:03 -07:00
Philip Rosedale
d5d746ff9e Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 21:01:15 -07:00
Philip Rosedale
1d69acef56 Removed hand class files, relocated transmitter receiver function to Head.h 2013-04-12 21:01:01 -07:00
ZappoMan
1264bdf63d Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-12 18:28:17 -07:00
ZappoMan
f1e2a6688c Merge pull request #40 from birarda/reorganize 
fix for warnings produced by CounterStats refactor
 2013-04-12 17:29:17 -07:00
ZappoMan
505b2db935 some spacing cleanup 2013-04-12 17:27:54 -07:00
Stephen Birarda
cb233e843c Merge branch 'master' of github.com:worklist/hifi into reorganize 2013-04-12 17:25:41 -07:00
birarda
e5bcf2b620 Merge pull request #39 from ZappoMan/view_frustum_work 
View frustum work
 2013-04-12 17:25:30 -07:00
ZappoMan
54ba0d0224 cleaned up spacing for code review 2013-04-12 17:23:23 -07:00
ZappoMan
ca4286590e fixed column width to match codeing standard 2013-04-12 17:14:08 -07:00
ZappoMan
7c7c931e83 fixed build buster after merge 2013-04-12 17:10:04 -07:00
ZappoMan
98904d84ff Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 
Conflicts:
	interface/src/Head.cpp
 2013-04-12 17:02:11 -07:00
ZappoMan
5a8c5ff011 coding standards clean up 2013-04-12 16:55:57 -07:00
Jeffrey Ventrella
6ddebd523c cleaned up Orientation calls to right, up, front 2013-04-12 16:52:31 -07:00
Stephen Birarda
787bebb5fc don't call constructor and assignment operator 2013-04-12 16:51:59 -07:00
ZappoMan
5504d87212 Merge and Cleanup 
-Cleanup glmUtils(as in, get rid of it)
-Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
 2013-04-12 16:32:46 -07:00
Stephen Birarda
1415a25302 fix for warnings produced by CounterStats refactor 2013-04-12 16:22:35 -07:00
Philip Rosedale
5368cbf79a Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 16:15:01 -07:00
Philip Rosedale
6d7f343be8 draw a test sphere around my hand in orldspace 2013-04-12 16:13:40 -07:00
Jeffrey Ventrella
5cb0d84990 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 16:12:54 -07:00
Jeffrey Ventrella
84ca2dcb32 added get avatar bone 2013-04-12 16:12:31 -07:00
ZappoMan
c35be18697 Merge pull request #38 from birarda/reorganize 
pass a ROOT_DIR to LinkHifiLibrary
 2013-04-12 16:00:59 -07:00
Stephen Birarda
cc2f35ca89 pass a ROOT_DIR to LinkHifiLibrary 2013-04-12 15:59:16 -07:00
ZappoMan
2ea8ce8ef8 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-12 15:37:54 -07:00
birarda
e33dbceefb Merge pull request #37 from birarda/reorganize 
change a couple more long ints
 2013-04-12 15:35:31 -07:00
Stephen Birarda
f6adac1399 change a couple more long ints 2013-04-12 15:35:06 -07:00
Philip Rosedale
524ed7deb6 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 15:35:02 -07:00
ZappoMan
6e96408168 Merge pull request #36 from birarda/reorganize 
change long int to long in CounterStats
 2013-04-12 15:28:05 -07:00
Stephen Birarda
d30512e273 remove another long int 2013-04-12 15:25:41 -07:00
Stephen Birarda
83ee450759 change long int to long in CounterStats 2013-04-12 15:18:04 -07:00
Stephen Birarda
9b73d2559d Revert "add dependency to shared library from voxel library" 
This reverts commit e9d71c9406.
 2013-04-12 15:15:19 -07:00
ZappoMan
25f1f1ae3f include glmUtils.h so that we get vec3 opertator* 2013-04-12 15:08:57 -07:00
birarda
cd8604ebf2 Merge pull request #35 from birarda/reorganize 
add dependency on shared library from voxel library
 2013-04-12 15:08:55 -07:00
Stephen Birarda
a2d298a8e6 Merge branch 'master' of github.com:worklist/hifi into reorganize 2013-04-12 15:08:05 -07:00
Stephen Birarda
e9d71c9406 add dependency to shared library from voxel library 2013-04-12 15:06:51 -07:00
ZappoMan
77996fb140 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-12 15:06:41 -07:00