Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• bab60ed0bb move some parameters into GameParams.h master Josh Holtrop 2012-11-04 08:14:59 -05:00
• 412b84e268 clear out m_net_client on disconnect() Josh Holtrop 2012-11-04 08:10:49 -05:00
• 42791de89b refptr allows NULL to be assigned to it Josh Holtrop 2012-11-04 08:09:30 -05:00
• df2808afb9 handle connect()/disconnect() logic when it is actually needed Josh Holtrop 2012-11-04 08:01:00 -05:00
• d0e562c077 fill in start_server() and stop_server() Josh Holtrop 2012-11-04 07:51:52 -05:00
• 9414c30773 handle menu choices in run() Josh Holtrop 2012-11-04 00:46:20 -04:00
• f10bd59226 add and respond to exit button, respond to singleplayer button Josh Holtrop 2012-11-03 17:08:08 -04:00
• 37054be6be add real main menu, buttons not responding yet Josh Holtrop 2012-11-03 16:51:13 -04:00
• 88f644e051 recenter menu on resize Josh Holtrop 2012-11-03 09:20:05 -04:00
• ad3e8a5481 center gui window by manually setting its position Josh Holtrop 2012-11-03 09:03:23 -04:00
• 6a6184ab59 make sfgui window non-resizable Josh Holtrop 2012-11-02 23:32:16 -04:00
• 893cac5d9a break up Client::run() into multiple methods Josh Holtrop 2012-11-02 23:28:26 -04:00
• a4df9488a9 draw test menu before entering game Josh Holtrop 2012-11-02 23:20:09 -04:00
• f3770d1c89 change Window to RenderWindow Josh Holtrop 2012-11-02 23:07:05 -04:00
• 95bab5a823 include/link with SFGUI Josh Holtrop 2012-11-02 23:06:44 -04:00
• 426cc26db0 abstract connect() and disconnect() in Client Josh Holtrop 2012-10-21 13:31:52 -04:00
• 5ba97bb089 remove src/common/Timer class, Network does its own time management Josh Holtrop 2012-10-21 13:18:58 -04:00
• 4c25126ba6 do not allow player to shoot while dead Josh Holtrop 2012-10-14 14:58:53 -04:00
• d488a28827 oops - fixed sky Josh Holtrop 2012-10-13 22:18:00 -04:00
• 81c9015bd7 add shot reload overlay bar Josh Holtrop 2012-10-13 22:03:59 -04:00
• 2eeeabcff3 add Shot::get_elapsed_time() and Shot::get_duration() Josh Holtrop 2012-10-13 21:38:50 -04:00
• db0704a799 bugfix: only recenter mouse cursor while cursor is grabbed Josh Holtrop 2012-10-13 21:24:03 -04:00
• b6c66c4955 Implemented Player deaths xethm55 2012-10-12 19:57:56 -04:00
• 7dd1b1f66f Remove m_shots vector xethm55 2012-10-08 19:30:36 -04:00
• fbfcea6bc9 Switched to using the shot class on the server. Broadcast shots to all players xethm55 2012-10-08 19:28:17 -04:00
• cc8d1a05ce increase shot speed; descrease player speed Josh Holtrop 2012-10-07 08:21:33 -04:00
• 8a74d6dd2a introduced tunable shot angle Josh Holtrop 2012-10-07 08:14:47 -04:00
• f1809bf193 fix Shot trajectory calculation Josh Holtrop 2012-10-07 07:54:38 -04:00
• 1741476456 trying to fix Shot position calculation, better, but still wrong Josh Holtrop 2012-10-06 22:47:29 -04:00
• 69f403cee1 add Client::create_shot(); only send one shot to server Josh Holtrop 2012-10-06 22:13:23 -04:00
• 59b81aebe0 add sphere object, attempting to draw shot but position is way wrong Josh Holtrop 2012-10-06 22:03:37 -04:00
• f0b1b91a9f client removes Shot objects when they expire Josh Holtrop 2012-10-06 21:28:15 -04:00
• 1ceacd913d Shots keep track of their launch time Josh Holtrop 2012-10-06 21:27:55 -04:00
• 3237d4e0e6 Client creates a Shot object when player sends a shot (not drawing it yet) Josh Holtrop 2012-10-06 21:11:42 -04:00
• bfc8a6f25b add initial Shot class, fully untested Josh Holtrop 2012-10-06 20:58:23 -04:00
• cf3f64fed9 Only allow player to shoot if player does not have any projectiles pending xethm55 2012-10-06 10:57:05 -04:00
• 3e22ad70e1 send slightly more accurate shot distance to server Josh Holtrop 2012-10-04 00:38:10 -04:00
• 11a9b70522 draw slightly lower damaged tile model for damaged tiles Josh Holtrop 2012-10-04 00:30:16 -04:00
• 81eda3f71d add hex-tile-damaged model Josh Holtrop 2012-10-04 00:27:34 -04:00
• ef4780ab3c not sure what that was Josh Holtrop 2012-10-03 23:27:39 -04:00
• b36725e471 avoid implicit conversion from vec4 to varying vec3 Josh Holtrop 2012-10-03 23:22:04 -04:00
• b20d7ab037 print shader source when it fails to compile Josh Holtrop 2012-10-03 23:22:04 -04:00
• 7b9fe3aa6d fix SFML path for Windows Josh Holtrop 2012-10-03 23:22:04 -04:00
• a5ccedb230 Fixed the removal of damaged tiles and lose hover over damaged tiles xethm55 2012-10-02 21:28:29 -04:00
• fd04772828 Initial shot logic to remove tiles xethm55 2012-10-02 00:34:08 -04:00
• 0a34f6044f Merge remote-tracking branch 'holtrop/master' xethm55 2012-10-01 22:34:16 -04:00
• 116f066a80 Moved the hover logic to the server xethm55 2012-10-01 22:30:41 -04:00
• 8598c40360 Merge remote-tracking branch 'chris/master' Josh Holtrop 2012-10-01 22:23:36 -04:00
• b0b8de00fa toggle cursor grabbing status with F1 Josh Holtrop 2012-10-01 22:22:53 -04:00
• 8ed2688095 Fix segfault when one client of many close with same user name xethm55 2012-10-01 22:20:02 -04:00
• 7c7b4a7088 Merged in holtrop/master xethm55 2012-10-01 21:22:50 -04:00
• efe25fe610 Connection disconnects now working xethm55 2012-10-01 21:17:49 -04:00
• 47fc4098a2 use "m_" prefix for Client instance variables Josh Holtrop 2012-09-30 11:03:24 -04:00
• 71368d1ed6 draw shot ring focus point where shot will land Josh Holtrop 2012-09-29 21:39:48 -04:00
• 8f29d08fe9 decrease player hover when not above tile (just on client for now) Josh Holtrop 2012-09-29 21:11:09 -04:00
• f173281614 Added simple player disconnect functionality xethm55 2012-09-28 00:32:05 -04:00
• 4a40b403d9 draw borders on shot ring Josh Holtrop 2012-09-28 00:26:09 -04:00
• f68a4a682a draw shot ring Josh Holtrop 2012-09-28 00:22:30 -04:00
• 37120edb73 Merged in holtrop/master xethm55 2012-09-27 23:29:56 -04:00
• 741a325a5f add shot-ring shader and create shot-ring attributes buffer Josh Holtrop 2012-09-27 23:01:52 -04:00
• ba0bc9b77d Multiplayer framework in place (can now connect multiple clients and view them in game) Chris Peterson 2012-09-25 20:36:11 -04:00
• eacfd38e15 draw overlay hover bar Josh Holtrop 2012-09-23 15:17:45 -04:00
• 7df681082a simplify GLProgram creation with stdarg Josh Holtrop 2012-09-24 22:11:29 -04:00
• 889ba4735a CCFS: print error when unable to find file by default Josh Holtrop 2012-09-24 22:05:52 -04:00
• abd731f3ca Multiplayer framework in place (can now connect multiple clients and view them in game) xethm55 2012-09-24 20:31:51 -04:00
• 249e7a626c minor bugfix - using more memory on sky than needed Josh Holtrop 2012-09-23 22:31:34 -04:00
• a5b1f5c131 draw border around overlay map Josh Holtrop 2012-09-23 15:35:01 -04:00
• 24ee6b011e draw overlay hover bar Josh Holtrop 2012-09-23 15:17:45 -04:00
• 3e178b4d97 make Client::draw_player() accept a player argument Josh Holtrop 2012-09-23 11:58:08 -04:00
• dabca714c9 Corrected spacing xethm55 2012-09-23 10:43:38 -04:00
• 57fe48887d Fixed the network lag/swamped bug xethm55 2012-09-23 10:39:42 -04:00
• b785304adf make lava slowly move over time Josh Holtrop 2012-09-21 22:05:22 -04:00
• b1163044b8 draw lava all the way to the sky Josh Holtrop 2012-09-21 21:47:58 -04:00
• 1f80d8e870 add lava GLSL program and render lava floor Josh Holtrop 2012-09-21 21:43:04 -04:00
• 76e9390437 fix lava texture path Josh Holtrop 2012-09-21 18:57:27 -04:00
• 254079d8dc update SFML path Josh Holtrop 2012-09-21 18:52:20 -04:00
• d4d2793ecf attempt to load texture using sfml-graphics; not building on linux Josh Holtrop 2012-09-20 00:49:17 -04:00
• 8d2a03c4c1 ignore tags file Josh Holtrop 2012-09-19 23:03:08 -04:00
• d1b6d15afa lighten hex tile model Josh Holtrop 2012-09-17 22:46:24 -04:00
• b739bed248 add sky Josh Holtrop 2012-09-17 22:41:59 -04:00
• d5301b6d6c add Player::hover Josh Holtrop 2012-09-17 21:08:11 -04:00
• 41b06a1de7 fix link errors on Windows Josh Holtrop 2012-09-17 19:29:00 -04:00
• 49b91ec088 draw red player point on overlay map Josh Holtrop 2012-09-16 15:45:19 -04:00
• 6f0aa56976 move and rotate overlay map with player Josh Holtrop 2012-09-16 14:22:06 -04:00
• 23b4177962 draw tile borders in overlay map Josh Holtrop 2012-09-16 14:13:00 -04:00
• c095df40d4 increase default client resolution Josh Holtrop 2012-09-16 14:05:24 -04:00
• 728fe2dc14 missing Z coordinate in overlay_hex_attributes Josh Holtrop 2012-09-16 14:03:14 -04:00
• 1378353226 attempt to draw overlay map - strange results Josh Holtrop 2012-09-16 13:47:48 -04:00
• ca50407d90 make GLMatrix::to_uniform() const Josh Holtrop 2012-09-16 12:39:42 -04:00
• 932b0b55f6 remove scale uniform from shaders Josh Holtrop 2012-09-15 20:53:14 -04:00
• a1a81d66e1 add GLProgram::uniform() Josh Holtrop 2012-09-15 20:35:48 -04:00
• 24a08e6017 Squashed commit of Chris's networking code Chris Peterson 2012-09-15 09:46:32 -04:00
• 05dc0b021f import obj shader changes into obj_tex Josh Holtrop 2012-09-15 08:43:59 -04:00
• c7af7f8f2f rename shaders Josh Holtrop 2012-09-15 08:43:59 -04:00
• ac79196325 getting ready to draw a map overlay Josh Holtrop 2012-09-14 00:05:26 -04:00
• 84aecf957c draw each tile with its own size Josh Holtrop 2012-09-13 23:47:48 -04:00
• 89fc42251f create buffers for overlay hex tiles Josh Holtrop 2012-09-13 23:43:04 -04:00
• ab65139951 only determine uniform locations once Josh Holtrop 2012-09-13 23:16:12 -04:00
• 56fb845630 chmod -x some source files Josh Holtrop 2012-09-13 22:57:00 -04:00
• 0e9e54bc7a move OpenGL/SFML code to Client-gl.cc Josh Holtrop 2012-09-13 22:55:25 -04:00