163 Commits

Author SHA1 Message Date
412b84e268 clear out m_net_client on disconnect()
multiple connect() attempts in one run still does not work
2012-11-04 08:10:49 -05:00
42791de89b refptr allows NULL to be assigned to it 2012-11-04 08:09:30 -05:00
df2808afb9 handle connect()/disconnect() logic when it is actually needed 2012-11-04 08:01:00 -05:00
d0e562c077 fill in start_server() and stop_server() 2012-11-04 07:51:52 -05:00
9414c30773 handle menu choices in run() 2012-11-04 00:46:20 -04:00
f10bd59226 add and respond to exit button, respond to singleplayer button 2012-11-03 17:08:08 -04:00
37054be6be add real main menu, buttons not responding yet 2012-11-03 16:51:13 -04:00
88f644e051 recenter menu on resize 2012-11-03 09:20:05 -04:00
ad3e8a5481 center gui window by manually setting its position 2012-11-03 09:03:23 -04:00
6a6184ab59 make sfgui window non-resizable 2012-11-02 23:32:16 -04:00
893cac5d9a break up Client::run() into multiple methods 2012-11-02 23:28:26 -04:00
a4df9488a9 draw test menu before entering game 2012-11-02 23:20:09 -04:00
f3770d1c89 change Window to RenderWindow 2012-11-02 23:07:05 -04:00
95bab5a823 include/link with SFGUI 2012-11-02 23:06:44 -04:00
426cc26db0 abstract connect() and disconnect() in Client 2012-10-21 13:31:52 -04:00
5ba97bb089 remove src/common/Timer class, Network does its own time management 2012-10-21 13:18:58 -04:00
4c25126ba6 do not allow player to shoot while dead 2012-10-14 14:58:53 -04:00
d488a28827 oops - fixed sky 2012-10-13 22:18:00 -04:00
81c9015bd7 add shot reload overlay bar 2012-10-13 22:03:59 -04:00
2eeeabcff3 add Shot::get_elapsed_time() and Shot::get_duration() 2012-10-13 21:38:50 -04:00
db0704a799 bugfix: only recenter mouse cursor while cursor is grabbed 2012-10-13 21:24:03 -04:00
xethm55
b6c66c4955 Implemented Player deaths 2012-10-12 19:57:56 -04:00
xethm55
7dd1b1f66f Remove m_shots vector 2012-10-08 19:30:36 -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
cc8d1a05ce increase shot speed; descrease player speed 2012-10-07 08:21:33 -04:00
8a74d6dd2a introduced tunable shot angle 2012-10-07 08:14:47 -04:00
f1809bf193 fix Shot trajectory calculation 2012-10-07 07:54:38 -04:00
1741476456 trying to fix Shot position calculation, better, but still wrong 2012-10-06 22:47:29 -04:00
69f403cee1 add Client::create_shot(); only send one shot to server 2012-10-06 22:13:23 -04:00
59b81aebe0 add sphere object, attempting to draw shot but position is way wrong 2012-10-06 22:03:37 -04:00
f0b1b91a9f client removes Shot objects when they expire 2012-10-06 21:28:15 -04:00
1ceacd913d Shots keep track of their launch time 2012-10-06 21:27:55 -04:00
3237d4e0e6 Client creates a Shot object when player sends a shot (not drawing it yet) 2012-10-06 21:11:42 -04:00
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
3e22ad70e1 send slightly more accurate shot distance to server 2012-10-04 00:38:10 -04:00
11a9b70522 draw slightly lower damaged tile model for damaged tiles 2012-10-04 00:30:16 -04:00
81eda3f71d add hex-tile-damaged model 2012-10-04 00:27:34 -04:00
ef4780ab3c not sure what that was 2012-10-03 23:27:39 -04:00
b36725e471 avoid implicit conversion from vec4 to varying vec3 2012-10-03 23:22:04 -04:00
b20d7ab037 print shader source when it fails to compile 2012-10-03 23:22:04 -04:00
7b9fe3aa6d fix SFML path for Windows 2012-10-03 23:22:04 -04:00
xethm55
a5ccedb230 Fixed the removal of damaged tiles and lose hover over damaged tiles 2012-10-02 21:28:29 -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
8598c40360 Merge remote-tracking branch 'chris/master' 2012-10-01 22:23:36 -04:00
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