59 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dmitri K	3ff9a79f39	Merge branch 'master' of github.com:fataku/LOG750-LAB2	2016-11-25 19:51:58 -05:00
Dmitri K	e4b40b84bb	minor tweaks	2016-11-25 19:51:55 -05:00
Riku Avelar	b0169b94a5	Rotation	2016-11-25 19:51:03 -05:00
Riku Avelar	7c05245201	Proper remov	2016-11-25 18:27:26 -05:00
Riku Avelar	78935a18ae	Segfault unfaulted	2016-11-25 18:17:32 -05:00
Dmitri K	1a8976cafd	dakfjgkabfiharblkhjadrgkrw	2016-11-25 18:11:33 -05:00
Dmitri K	ad860abf7d	starting game UI	2016-11-18 22:31:24 -05:00
Dmitri K	b95b9b628c	Merge branch 'master' of github.com:fataku/LOG750-LAB2	2016-11-18 21:14:53 -05:00
Dmitri K	29aeb866b1	fixing some light bullshit	2016-11-18 21:14:51 -05:00
Riku Avelar	2c905aa6a8	Delete with segfault	2016-11-18 20:34:52 -05:00
Dmitri K	d86f533f94	Merge branch 'master' of github.com:fataku/LOG750-LAB2	2016-11-18 20:17:03 -05:00
Dmitri K	31fbcbd9e1	sdfsdfsdfsdf	2016-11-18 20:16:51 -05:00
Riku Avelar	b022c428d3	Texture Mag/Min Options	2016-11-18 19:55:22 -05:00
Riku Avelar	d729f9aaaf	Object Selection	2016-11-18 19:42:44 -05:00
Dmitri K	48e5889f60	Spicy memeball	2016-11-18 19:13:43 -05:00
Dmitri K	74e43e0294	Merge branch 'master' of github.com:fataku/LOG750-LAB2	2016-11-18 17:51:53 -05:00
Dmitri K	489578ba10	fucking around with lighting shaders and the speed of sound	2016-11-18 17:51:49 -05:00
Riku Avelar	505af84739	Create on Shift Click	2016-11-18 17:37:50 -05:00
Dmitri K	b985770871	fixing cube putting	2016-11-15 17:29:40 -05:00
Dmitri K	e57d54f861	AAAAWWWW YYYEEEAAAAHHHH	2016-11-11 21:40:26 -05:00
Dmitri K	608172b640	i give up	2016-11-10 23:46:10 -05:00
Dmitri K	d73b7f19dd	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA	2016-11-10 23:26:00 -05:00
Dmitri K	36020ec131	[WIP] sooo cloooose	2016-11-10 22:47:50 -05:00
Dmitri K	9c79eca90d	tweaking lights and shit	2016-11-10 20:30:21 -05:00
unknown	52d547bd1e	rip	2016-11-10 18:51:45 -05:00
unknown	968f0761a2	Rewah?	2016-11-10 16:24:47 -05:00
unknown	c59eb0037f	Wah?	2016-11-10 16:24:23 -05:00
unknown	0d23827d81	Sphere rotat	2016-11-10 13:28:46 -05:00
unknown	0663336b94	Dragon ballsie	2016-11-10 13:18:09 -05:00
unknown	2b38d0b793	Spheres... not working	2016-11-10 13:09:48 -05:00
unknown	a0f82956c9	Sphere Data	2016-11-10 12:53:19 -05:00
unknown	d1ed0a00dd	Phong Toggle	2016-11-10 12:15:11 -05:00
Riku Avelar	e7c2dc3e63	Better phase shift and ambient light	2016-11-10 00:59:04 -05:00
Riku Avelar	ba769e6ed3	Merge branch 'issues/4-phong' of github.com:fataku/LOG750-LAB2 into issues/4-phong	2016-11-09 23:34:32 -05:00
Riku Avelar	115fe0a5a1	Textures?	2016-11-09 23:29:28 -05:00
Dmitri K	a2b7b58b68	saturate that shit up	2016-11-09 23:25:23 -05:00
Riku Avelar	c27d8d5bc7	Aww yiss	2016-11-09 23:16:56 -05:00
Riku Avelar	1e0224ee52	GREAT SCOTT	2016-11-09 21:29:44 -05:00
Riku Avelar	eb4386ef23	The rumour come out, does phong lighting is work?	2016-11-09 21:10:25 -05:00
Riku Avelar	fff57b7285	Merge remote-tracking branch 'origin/issues/2-skybox' into issues/4-phong	2016-11-09 20:20:36 -05:00
Dmitri K	0ab395036b	HAZA!	2016-11-09 20:17:54 -05:00
Riku Avelar	28ccdafce5	Merge remote-tracking branch 'origin/issues/2-skybox' into issues/4-phong	2016-11-09 20:16:16 -05:00
Riku Avelar	9b8c991307	Phong, but direction is fucked	2016-11-09 20:15:54 -05:00
Dmitri K	487bf12fa7	completing skybox	2016-11-09 20:10:09 -05:00
Dmitri K	a883722d25	working on texturing	2016-11-09 19:29:05 -05:00
Riku Avelar	104038d7f6	Fixed distance culling	2016-11-09 18:08:29 -05:00
Riku Avelar	da52327de5	Add missing UVs (still missing?)	2016-11-09 17:58:45 -05:00
Riku Avelar	36208f6f26	Skybox, but only without scale	2016-11-09 17:51:29 -05:00
Riku Avelar	b1a838d170	Working camera	2016-11-09 16:52:31 -05:00
Riku Avelar	99d5fb4e24	Beginnings of skybox	2016-11-09 16:14:18 -05:00