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

47 Commits

Author SHA1 Message Date
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
xethm55
cf3f64fed9 Only allow player to shoot if player does not have any projectiles pending 2012-10-06 10:57:05 -04:00
Josh Holtrop
3e22ad70e1 send slightly more accurate shot distance to server 2012-10-04 00:38:10 -04:00
xethm55
fd04772828 Initial shot logic to remove tiles 2012-10-02 00:34:08 -04:00
xethm55
0a34f6044f Merge remote-tracking branch 'holtrop/master' 2012-10-01 22:34:16 -04:00
xethm55
116f066a80 Moved the hover logic to the server 2012-10-01 22:30:41 -04:00
Josh Holtrop
8598c40360 Merge remote-tracking branch 'chris/master' 2012-10-01 22:23:36 -04:00
Josh Holtrop
b0b8de00fa toggle cursor grabbing status with F1 2012-10-01 22:22:53 -04:00
xethm55
8ed2688095 Fix segfault when one client of many close with same user name 2012-10-01 22:20:02 -04:00
xethm55
7c7b4a7088 Merged in holtrop/master 2012-10-01 21:22:50 -04:00
xethm55
efe25fe610 Connection disconnects now working 2012-10-01 21:17:49 -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
8f29d08fe9 decrease player hover when not above tile (just on client for now) 2012-09-29 21:11:09 -04:00
xethm55
f173281614 Added simple player disconnect functionality 2012-09-28 00:32:05 -04:00
Josh Holtrop
f68a4a682a draw shot ring 2012-09-28 00:22:30 -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
eacfd38e15 draw overlay hover bar 
draw border around overlay map

Changed from refptr<map<U8, Player> > to map<U8, refptr<player> >

minor bugfix - using more memory on sky than needed

Fixed some bugs with multiplayer

CCFS: print error when unable to find file by default

simplify GLProgram creation with stdarg
 2012-09-25 19:17:43 -04:00
xethm55
abd731f3ca Multiplayer framework in place (can now connect multiple clients and view them in game) 2012-09-24 20:31:51 -04:00
xethm55
dabca714c9 Corrected spacing 2012-09-23 10:43:38 -04:00
xethm55
57fe48887d Fixed the network lag/swamped bug 2012-09-23 10:39:42 -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
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
cfa2850292 positioning with shaders working, normals not 2012-09-10 23:14:02 -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
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
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
Josh Holtrop
31d9ab8f10 initial build system 
working to compile from cygwin in Windows with SFML-1.6
 2012-08-13 23:07:37 -04:00