|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b20d7ab037
|
print shader source when it fails to compile
|
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 |
|
xethm55
|
efe25fe610
|
Connection disconnects now working
|
2012-10-01 21:17:49 -04:00 |
|
|
|
47fc4098a2
|
use "m_" prefix for Client instance variables
|
2012-09-30 11:03:24 -04:00 |
|
|
|
71368d1ed6
|
draw shot ring focus point where shot will land
|
2012-09-29 21:39:48 -04:00 |
|
|
|
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 |
|
|
|
4a40b403d9
|
draw borders on shot ring
|
2012-09-28 00:26:09 -04:00 |
|
|
|
f68a4a682a
|
draw shot ring
|
2012-09-28 00:22:30 -04:00 |
|
|
|
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 |
|
|
|
7df681082a
|
simplify GLProgram creation with stdarg
|
2012-09-24 22:11:29 -04:00 |
|
|
|
249e7a626c
|
minor bugfix - using more memory on sky than needed
|
2012-09-23 22:31:34 -04:00 |
|
|
|
a5b1f5c131
|
draw border around overlay map
|
2012-09-23 15:35:01 -04:00 |
|
|
|
24ee6b011e
|
draw overlay hover bar
|
2012-09-23 15:17:45 -04:00 |
|
|
|
3e178b4d97
|
make Client::draw_player() accept a player argument
|
2012-09-23 11:58:08 -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 |
|
|
|
b785304adf
|
make lava slowly move over time
|
2012-09-21 22:05:22 -04:00 |
|
|
|
b1163044b8
|
draw lava all the way to the sky
|
2012-09-21 21:47:58 -04:00 |
|
|
|
1f80d8e870
|
add lava GLSL program and render lava floor
|
2012-09-21 21:43:04 -04:00 |
|
|
|
76e9390437
|
fix lava texture path
|
2012-09-21 18:57:27 -04:00 |
|
|
|
d4d2793ecf
|
attempt to load texture using sfml-graphics; not building on linux
|
2012-09-20 00:49:17 -04:00 |
|
|
|
b739bed248
|
add sky
|
2012-09-17 22:41:59 -04:00 |
|
|
|
49b91ec088
|
draw red player point on overlay map
|
2012-09-16 15:45:19 -04:00 |
|
|
|
6f0aa56976
|
move and rotate overlay map with player
|
2012-09-16 14:22:06 -04:00 |
|
|
|
23b4177962
|
draw tile borders in overlay map
|
2012-09-16 14:13:00 -04:00 |
|
