josh/treacherous-terrain
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
79 Commits 1 Branch 0 Tags
Commit Graph

51 Commits

Author SHA1 Message Date
Josh Holtrop
c095df40d4 increase default client resolution 2012-09-16 14:05:24 -04:00
Josh Holtrop
728fe2dc14 missing Z coordinate in overlay_hex_attributes 2012-09-16 14:03:14 -04:00
Josh Holtrop
1378353226 attempt to draw overlay map - strange results 2012-09-16 13:47:48 -04:00
Josh Holtrop
ca50407d90 make GLMatrix::to_uniform() const 2012-09-16 12:39:42 -04:00
Josh Holtrop
932b0b55f6 remove scale uniform from shaders 2012-09-15 20:53:14 -04:00
Josh Holtrop
a1a81d66e1 add GLProgram::uniform() 2012-09-15 20:35:48 -04:00
Chris Peterson
24a08e6017 Squashed commit of Chris's networking code 
commit 052d5a2ee82d14752ba7a2a89b375de0f4b3214d
Author: Chris Peterson <xethm55@yahoo.com>
Date:   Fri Sep 14 20:49:49 2012 -0400

    Damn! - Forgot to add the Types.h file

commit 8bb6f6d56279289dd0c1f118dffb390dc6538a7c
Author: Chris Peterson <xethm55@yahoo.com>
Date:   Fri Sep 14 20:41:46 2012 -0400

    Fixed a lot of the lag issues.  There are still some tweaks needed, but that is going to happen with the input system changes

commit 0b5fe2dd64b561d965229a8dff25575eaf5c9264
Author: Chris Peterson <xethm55@yahoo.com>
Date:   Fri Sep 14 20:21:31 2012 -0400

    Client server stuff working.  A lot of lag in the system though

commit 07fac2c86d3b379fd1ac287bf3f60b778ca59508
Merge: 5cfd5b2 ac79196
Author: Chris Peterson <xethm55@yahoo.com>
Date:   Fri Sep 14 17:49:18 2012 -0400

    Merging in changes from Holtrop

commit 5cfd5b28d5e384803ef7b807849ac570e6c84e0f
Author: Chris Peterson <xethm55@yahoo.com>
Date:   Sun Sep 9 12:23:12 2012 -0400

    Building on linux now

commit 470d486cdebd95099020911dee7f9290c78ee274
Merge: 842040d f072eec
Author: Chris Peterson <xethm55@yahoo.com>
Date:   Sun Sep 9 11:58:39 2012 -0400

    Merged in master with tank model

commit 842040d0fee481f726b2ae5aec60787371af3923
Merge: 6866c58 9b993f2
Author: Chris Peterson <xethm55@yahoo.com>
Date:   Thu Aug 30 23:25:19 2012 -0400

    Merged in changes from upstream (holtrop/master)

commit 6866c58200cc50d3ccc886266303c1b654c89527
Author: Chris Peterson <xethm55@yahoo.com>
Date:   Sat Aug 18 17:07:50 2012 -0400

    added server code and a simple echo server.
 2012-09-15 09:49:12 -04:00
Josh Holtrop
c7af7f8f2f rename shaders 2012-09-15 08:43:59 -04:00
Josh Holtrop
ac79196325 getting ready to draw a map overlay 2012-09-14 00:05:26 -04:00
Josh Holtrop
84aecf957c draw each tile with its own size 2012-09-13 23:47:48 -04:00
Josh Holtrop
89fc42251f create buffers for overlay hex tiles 2012-09-13 23:43:04 -04:00
Josh Holtrop
ab65139951 only determine uniform locations once 2012-09-13 23:16:12 -04:00
Josh Holtrop
56fb845630 chmod -x some source files 2012-09-13 22:57:00 -04:00
Josh Holtrop
0e9e54bc7a move OpenGL/SFML code to Client-gl.cc 2012-09-13 22:55:25 -04:00
Josh Holtrop
013f0f30ab Map is an array of HexTiles 2012-09-11 23:13:33 -04:00
Josh Holtrop
3bcf26fc20 scale down player size and move speed 2012-09-11 22:58:46 -04:00
Josh Holtrop
be67a414db draw hex tiles for map tiles 2012-09-11 22:52:32 -04:00
Josh Holtrop
46c9a81c11 use gl3w instead of glew; render map with shaders 2012-09-11 19:16:08 -04:00
Josh Holtrop
2569e3a007 fix GLMatrix::rotate() bug 2012-09-11 19:06:44 -04:00
Josh Holtrop
8d0d11bc3b add GLBuffer::bind() and GLProgram::use() 2012-09-11 19:05:18 -04:00
Josh Holtrop
cfa2850292 positioning with shaders working, normals not 2012-09-10 23:14:02 -04:00
Josh Holtrop
05dfd6f8a7 add look_at() and built-in stack to GLMatrix 2012-09-10 21:20:59 -04:00
Josh Holtrop
19b3a79f33 add HexTile class 2012-09-09 23:25:48 -04:00
Josh Holtrop
22b52f5fcc add scale factor to obj shader and scale tank object up 2012-09-08 00:15:41 -04:00
Josh Holtrop
abb0d99553 draw tank object using shader from model file 2012-09-08 00:12:36 -04:00
Josh Holtrop
c70cc450cc load tank model, not drawing it yet 2012-09-07 23:59:16 -04:00
Josh Holtrop
4d3f088e3f wfobj: ignore object name directive for now 2012-09-07 23:57:43 -04:00
Josh Holtrop
465c2c50be strange wfobj coding bug 2012-09-07 23:57:04 -04:00
Josh Holtrop
bf8ee88cd2 create a GLProgram for object shader 2012-09-07 23:44:31 -04:00
Josh Holtrop
cf227cc5ab pass antialias level and compatibility context flags to Client 2012-09-06 21:49:14 -04:00
Josh Holtrop
b7e22a375d add command-line options for antialias_level and compatibility_context 2012-09-06 21:49:14 -04:00
Josh Holtrop
471e9984db add GLMatrix class 2012-09-06 01:13:11 -04:00
Josh Holtrop
ac434fab3e move GL* sources into src/client/GL 2012-09-06 00:36:25 -04:00
Josh Holtrop
39bd1778bf add WFObj object-loading library sources 2012-09-03 09:14:47 -04:00
Josh Holtrop
db3ffa84af add get_uniform_location{,s}() 2012-09-03 00:55:45 -04:00
Josh Holtrop
ed3b5fa454 add GLProgram class 2012-09-03 00:29:05 -04:00
Josh Holtrop
378c13c869 add GLShader class 2012-09-02 23:17:01 -04:00
Josh Holtrop
92eea9e39c remove GLBuffer constructor parameters 2012-09-02 23:16:48 -04:00
Josh Holtrop
af522a2d53 add GLBuffer class 2012-09-02 22:33:53 -04:00
Josh Holtrop
be56fd0aa5 initialize GLEW from Client 2012-09-02 22:28:06 -04:00
Josh Holtrop
f06dbf7bac mouse wheel rotates player 2012-08-29 01:07:52 -04:00
Josh Holtrop
7b076cdc13 temporarily be able to move player around 2012-08-29 00:33:59 -04:00
Josh Holtrop
ee38a6f655 use camera-position based drawing with gluLookAt() 2012-08-28 21:22:55 -04:00
Josh Holtrop
38dbf27c82 draw a simple box for the client-controlled player 2012-08-22 23:00:47 -04:00
Josh Holtrop
2c7e454ca8 add a simple Map class and draw it from the Client 2012-08-20 20:13:41 -04:00
Josh Holtrop
832e63fb81 link with sfml-graphics library 2012-08-16 00:24:28 -04:00
Josh Holtrop
4bb7a8dab7 fix GL projection matrix adjustment on window resize 2012-08-14 22:16:55 -04:00
Josh Holtrop
aedc9b664c add simple fixed-functionality OpenGL demo to client for now 2012-08-14 22:11:31 -04:00
Josh Holtrop
34e909fca8 split client into main.cc and Client class 2012-08-14 21:46:41 -04:00
Josh Holtrop
eae0dc9e34 update template to use SFML-2.0-rc 2012-08-13 23:27:33 -04:00