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

31 Commits

Author SHA1 Message Date
Josh Holtrop
5ba97bb089 remove src/common/Timer class, Network does its own time management 2012-10-21 13:18:58 -04:00
Josh Holtrop
2eeeabcff3 add Shot::get_elapsed_time() and Shot::get_duration() 2012-10-13 21:38:50 -04:00
xethm55
b6c66c4955 Implemented Player deaths 2012-10-12 19:57:56 -04:00
xethm55
fbfcea6bc9 Switched to using the shot class on the server. Broadcast shots to all players 2012-10-08 19:28:17 -04:00
Josh Holtrop
cc8d1a05ce increase shot speed; descrease player speed 2012-10-07 08:21:33 -04:00
Josh Holtrop
8a74d6dd2a introduced tunable shot angle 2012-10-07 08:14:47 -04:00
Josh Holtrop
f1809bf193 fix Shot trajectory calculation 2012-10-07 07:54:38 -04:00
Josh Holtrop
1741476456 trying to fix Shot position calculation, better, but still wrong 2012-10-06 22:47:29 -04:00
Josh Holtrop
1ceacd913d Shots keep track of their launch time 2012-10-06 21:27:55 -04:00
Josh Holtrop
bfc8a6f25b add initial Shot class, fully untested 2012-10-06 20:58:23 -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
ef4780ab3c not sure what that was 2012-10-03 23:27:39 -04:00
xethm55
fd04772828 Initial shot logic to remove tiles 2012-10-02 00:34:08 -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
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
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
Josh Holtrop
d5301b6d6c add Player::hover 2012-09-17 21:08:11 -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
013f0f30ab Map is an array of HexTiles 2012-09-11 23:13:33 -04:00
Josh Holtrop
aa52be8801 HexTile cleanup 2012-09-11 19:18:43 -04:00
Josh Holtrop
f77df195e0 simpler HexTile::point_within() 2012-09-10 21:04:02 -04:00
Josh Holtrop
433d702096 use #define for HexTile 2012-09-09 23:56:00 -04:00
Josh Holtrop
19b3a79f33 add HexTile class 2012-09-09 23:25:48 -04:00
Josh Holtrop
a568ab8fa8 add a basic Player class 2012-08-22 21:20:01 -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
34e909fca8 split client into main.cc and Client class 2012-08-14 21:46:41 -04:00