Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 11:33:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1150 commits 25 branches 0 tags 1.1 GiB
Commit graph

507 commits

Author SHA1 Message Date
birarda
e638805bd7 Merge pull request #30 from PhilipRosedale/master 
Added startup timer
 2013-04-11 17:54:45 -07:00
Philip Rosedale
76e2ca301e Fixes stephen asked for - remove finger stuff 2013-04-11 17:53:57 -07:00
Philip Rosedale
27c032270c Resolved merge 2013-04-11 17:49:43 -07:00
Philip Rosedale
47dfb08ff2 Merge remote-tracking branch 'origin/startupTimer' 2013-04-11 17:46:20 -07:00
birarda
9ea6457c0c Merge pull request #28 from PhilipRosedale/master 
Trivial change for Stephen to teach me
 2013-04-11 17:41:19 -07:00
Jeffrey Ventrella
948ca6279c improved avatar handshake forces 2013-04-11 17:39:18 -07:00
Philip Rosedale
f1bf7d0eb5 trivial test, removed one unneeded variable 2013-04-11 17:35:32 -07:00
Jeffrey Ventrella
766fad8c2a Merge branch 'master' of https://github.com/worklist/hifi 2013-04-11 16:51:27 -07:00
Jeffrey Ventrella
1dc390bf3a working on avatar local ori motions 2013-04-11 16:51:08 -07:00
Stephen Birarda
7c3f5264b5 resolve conflicts on merge with upstream master 2013-04-11 16:48:40 -07:00
Stephen Birarda
a1d209dd70 manage one AgentList per process via singleton 2013-04-11 15:45:04 -07:00
Jeffrey Ventrella
bd09084031 cleaned up some Orientation formtting 2013-04-11 15:37:15 -07:00
Jeffrey Ventrella
661d5fdb3e Merge 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-11 15:32:44 -07:00
Jeffrey Ventrella
556f11a0c0 added test 'other' avatar for proxemixs testing 2013-04-11 15:32:35 -07:00
Stephen Birarda
606c91bb47 remove the Vector3D class, not in use 2013-04-11 14:56:10 -07:00
Jeffrey Ventrella
6f0881f40d reversed left-right strafe 2013-04-11 13:06:47 -07:00
Stephen Birarda
78fdccccad rename avatar mixer packet header, match in interface network receive 2013-04-11 11:18:54 -07:00
ZappoMan
002d35932e Merge pull request #21 from birarda/19170B 
Leo's Avatar Mixer + birarda's AgentData updates
 2013-04-11 10:43:02 -07:00
ZappoMan
0fff73e225 fixed plainting with new head implementation 2013-04-11 01:36:52 -07:00
ZappoMan
24862ca535 fixing up render view frustum, now it's working 2013-04-11 01:02:04 -07:00
Philip Rosedale
a0938cddea Merge remote-tracking branch 'origin' into startupTimer 2013-04-11 00:11:52 -07:00
Philip Rosedale
407da2aea8 Added a startup timer 2013-04-11 00:11:31 -07:00
Jeffrey Ventrella
cd8c760959 cleaned up some code 2013-04-11 00:10:52 -07:00
Philip Rosedale
81c4186179 pull (Jeffrey) 
Merge branch 'master' of github.com:worklist/hifi
 2013-04-10 21:55:47 -07:00
Jeffrey Ventrella
dbbe7500ac removed negative z hack in avatar. Avatar getting less hacky 2013-04-10 21:52:18 -07:00
Jeffrey Ventrella
6b4486c8c9 removed Vector3D class and fixed bug in avatar springs 2013-04-10 21:34:54 -07:00
ZappoMan
712b14c364 hacking on frustum for camera 2013-04-10 21:27:29 -07:00
ZappoMan
0f17c148f4 adding camera vs head for frustum view, not working yet 2013-04-10 21:21:13 -07:00
Jeffrey Ventrella
0564aa1a1b Hi! 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-10 21:12:20 -07:00
Jeffrey Ventrella
f294cc8782 working on avatar orientation issues 2013-04-10 21:12:15 -07:00
Philip Rosedale
e0a704935d made display a bit cleaner 2013-04-10 19:08:22 -07:00
Philip Rosedale
5ea6a9a696 Add little balls to the end of the world coordinate axis markers when shown 2013-04-10 18:57:09 -07:00
Philip Rosedale
834821d005 Removed the lattice object 2013-04-10 18:25:54 -07:00
Philip Rosedale
34e5b670a2 Tweaked location and color of agents display for menu, removed audio start playback log 2013-04-10 18:01:18 -07:00
Philip Rosedale
859903274d Tweaks to menu to have right position under Mac, always on, slightly smaller font 2013-04-10 17:48:09 -07:00
Philip Rosedale
8b54b528c3 Fixed Menu to hit very top of screen on Mac 2013-04-10 17:35:53 -07:00
Philip Rosedale
6a5f1ac73e Merge remote-tracking branch 'origin/master' 2013-04-10 17:00:30 -07:00
Philip Rosedale
8d5ee616ac Added a debug menu option 2013-04-10 16:58:53 -07:00
Stephen Birarda
56f4484720 Merge branch 'master' of github.com:worklist/hifi 2013-04-10 16:57:34 -07:00
Stephen Birarda
6270659cdc inline declaration and initialization for menu 2013-04-10 16:56:15 -07:00
Jeffrey Ventrella
8429db73fa Hi there! 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-10 16:52:55 -07:00
Jeffrey Ventrella
020c21d1d6 removed Vector3D class and fixed bug in avatar springs 2013-04-10 16:52:48 -07:00
Stephen Birarda
19b9a0f5f5 include cstring in MenuColumn for strlen and strcpy 2013-04-10 16:18:26 -07:00
Stephen Birarda
189bfdfb36 add header comments to Vincent's menu files 2013-04-10 16:16:36 -07:00
Stephen Birarda
6665e62341 include cstring for strlen and strcpy 2013-04-10 16:13:27 -07:00
Stephen Birarda
27ab895381 have MenuColumn constructor take const char* 2013-04-10 16:10:50 -07:00
Stephen Birarda
b152d43f77 refactor menu callbacks and row/column adding 2013-04-10 16:07:46 -07:00
birarda
88c2e9510d Merge pull request #22 from dominiquevincent/19171 
Code Review for Job #19171
 2013-04-10 15:49:23 -07:00
vincent
ebc5874441 #19171 Missing Code Review changes - part 2 2013-04-11 00:47:53 +02:00
Stephen Birarda
7731ae886a remove some more MARKER_CAPTURE code 2013-04-10 15:30:33 -07:00