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

40 Commits

Author SHA1 Message Date
Josh Holtrop
426cc26db0 abstract connect() and disconnect() in Client 2012-10-21 13:31:52 -04:00
Josh Holtrop
81c9015bd7 add shot reload overlay bar 2012-10-13 22:03:59 -04:00
xethm55
7dd1b1f66f Remove m_shots vector 2012-10-08 19:30:36 -04:00
Josh Holtrop
69f403cee1 add Client::create_shot(); only send one shot to server 2012-10-06 22:13:23 -04:00
Josh Holtrop
59b81aebe0 add sphere object, attempting to draw shot but position is way wrong 2012-10-06 22:03:37 -04:00
Josh Holtrop
f0b1b91a9f client removes Shot objects when they expire 2012-10-06 21:28:15 -04:00
Josh Holtrop
3237d4e0e6 Client creates a Shot object when player sends a shot (not drawing it yet) 2012-10-06 21:11:42 -04:00
Josh Holtrop
3e22ad70e1 send slightly more accurate shot distance to server 2012-10-04 00:38:10 -04:00
Josh Holtrop
11a9b70522 draw slightly lower damaged tile model for damaged tiles 2012-10-04 00:30:16 -04:00
xethm55
fd04772828 Initial shot logic to remove tiles 2012-10-02 00:34:08 -04:00
Josh Holtrop
b0b8de00fa toggle cursor grabbing status with F1 2012-10-01 22:22:53 -04:00
Josh Holtrop
47fc4098a2 use "m_" prefix for Client instance variables 2012-09-30 11:03:24 -04:00
Josh Holtrop
71368d1ed6 draw shot ring focus point where shot will land 2012-09-29 21:39:48 -04:00
Josh Holtrop
f68a4a682a draw shot ring 2012-09-28 00:22:30 -04:00
Josh Holtrop
741a325a5f add shot-ring shader and create shot-ring attributes buffer 2012-09-27 23:01:52 -04:00
Chris Peterson
ba0bc9b77d Multiplayer framework in place (can now connect multiple clients and view them in game) 
Fixed some bugs with multiplayer
Changed from refptr<map<U8, Player> > to map<U8, refptr<player> >
 2012-09-25 20:36:11 -04:00
Josh Holtrop
24ee6b011e draw overlay hover bar 2012-09-23 15:17:45 -04:00
Josh Holtrop
3e178b4d97 make Client::draw_player() accept a player argument 2012-09-23 11:58:08 -04:00
Josh Holtrop
1f80d8e870 add lava GLSL program and render lava floor 2012-09-21 21:43:04 -04:00
Josh Holtrop
d4d2793ecf attempt to load texture using sfml-graphics; not building on linux 2012-09-20 00:49:17 -04:00
Josh Holtrop
b739bed248 add sky 2012-09-17 22:41:59 -04:00
Josh Holtrop
1378353226 attempt to draw overlay map - strange results 2012-09-16 13:47: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
ac79196325 getting ready to draw a map overlay 2012-09-14 00:05:26 -04:00
Josh Holtrop
89fc42251f create buffers for overlay hex tiles 2012-09-13 23:43:04 -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
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
cfa2850292 positioning with shaders working, normals not 2012-09-10 23:14:02 -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
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
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
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
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