Conjure/LOG750-LAB2
6
0
Fork 0
mirror of https://github.com/ConjureETS/LOG750-LAB2.git synced 2026-03-24 11:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
75 Commits 10 Branches 0 Tags
Commit Graph

39 Commits

Author SHA1 Message Date
Dmitri K
04c4c17b58 Particles, first pass 2016-12-06 01:32:38 -05:00
Riku Avelar
b1e7de08fb Animated Sonic 2016-12-04 01:24:57 -05:00
Riku Avelar
d5ead46e24 WIP part 2 2016-12-02 20:17:43 -05:00
Riku Avelar
45e775b8f9 Merge branch 'master' into obj-loader 2016-12-02 17:57:31 -05:00
Riku Avelar
0aacf3fcae WIP Obj Loader 2016-12-02 16:25:43 -05:00
Dmitri K
2c06d4374d Setting up UI and selected cube texture change 2016-12-02 16:21:18 -05:00
Riku Avelar
dfaf752d73 Animation Controls 2016-11-30 16:55:47 -05:00
Riku Avelar
1a04dd8db3 Rotation and Toggle Normals 2016-11-30 16:22:35 -05:00
Riku Avelar
e3b690b42d Normal Map Toggle 2016-11-30 16:00:16 -05:00
Riku Avelar
f9f86d3700 Normal Maps 2016-11-30 15:20:47 -05:00
Riku Avelar
b0169b94a5 Rotation 2016-11-25 19:51:03 -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
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
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
d73b7f19dd AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2016-11-10 23:26:00 -05:00
Dmitri K
36020ec131 [WIP] sooo cloooose 2016-11-10 22:47:50 -05:00
unknown
52d547bd1e rip 2016-11-10 18:51:45 -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
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
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
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
99d5fb4e24 Beginnings of skybox 2016-11-09 16:14:18 -05:00
Dmitri K
c5fbaac3fd Merging and tweaking issues 1 and 11 2016-11-09 14:34:54 -05:00
Dmitri K
379f310fde Adding picking code. 
Notes: once more shaders are created, switch between them for picking
instead of applying colors and trying to juggle that shit.
 2016-11-02 02:47:57 -04:00
Dmitri K
b94626fb5d Added basic cube and removed unnecessary shapes. 
to add more cubes, create a GlNode and add a Cube child to it. Then add
that GlNode to  the SceneGroup.
 2016-10-30 23:40:43 -04:00
Riku Avelar
f72cdda386 Removed old lab 1 code 2016-10-28 16:42:51 -04:00
Riku Avelar
0977688583 Lab 1 End Version 2016-10-28 16:36:45 -04:00