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

102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
7df681082a simplify GLProgram creation with stdarg 2012-09-24 22:11:29 -04:00
Josh Holtrop
889ba4735a CCFS: print error when unable to find file by default 2012-09-24 22:05:52 -04:00
Josh Holtrop
249e7a626c minor bugfix - using more memory on sky than needed 2012-09-23 22:31:34 -04:00
Josh Holtrop
a5b1f5c131 draw border around overlay map 2012-09-23 15:35:01 -04:00
Josh Holtrop
24ee6b011e draw overlay hover bar 2012-09-23 15:17:45 -04:00
Josh Holtrop
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
Josh Holtrop
b785304adf make lava slowly move over time 2012-09-21 22:05:22 -04:00
Josh Holtrop
b1163044b8 draw lava all the way to the sky 2012-09-21 21:47:58 -04:00
Josh Holtrop
1f80d8e870 add lava GLSL program and render lava floor 2012-09-21 21:43:04 -04:00
Josh Holtrop
76e9390437 fix lava texture path 2012-09-21 18:57:27 -04:00
Josh Holtrop
254079d8dc update SFML path 2012-09-21 18:52:20 -04:00
Josh Holtrop
d4d2793ecf attempt to load texture using sfml-graphics; not building on linux 2012-09-20 00:49:17 -04:00
Josh Holtrop
8d2a03c4c1 ignore tags file 2012-09-19 23:03:08 -04:00
Josh Holtrop
d1b6d15afa lighten hex tile model 2012-09-17 22:46:24 -04:00
Josh Holtrop
b739bed248 add sky 2012-09-17 22:41:59 -04:00
Josh Holtrop
d5301b6d6c add Player::hover 2012-09-17 21:08:11 -04:00
Josh Holtrop
41b06a1de7 fix link errors on Windows 2012-09-17 19:29:00 -04:00
Josh Holtrop
49b91ec088 draw red player point on overlay map 2012-09-16 15:45:19 -04:00
Josh Holtrop
6f0aa56976 move and rotate overlay map with player 2012-09-16 14:22:06 -04:00
Josh Holtrop
23b4177962 draw tile borders in overlay map 2012-09-16 14:13:00 -04:00
Josh Holtrop
c095df40d4 increase default client resolution 2012-09-16 14:05:24 -04:00
Josh Holtrop
728fe2dc14 missing Z coordinate in overlay_hex_attributes 2012-09-16 14:03:14 -04:00
Josh Holtrop
1378353226 attempt to draw overlay map - strange results 2012-09-16 13:47:48 -04:00
Josh Holtrop
ca50407d90 make GLMatrix::to_uniform() const 2012-09-16 12:39:42 -04:00
Josh Holtrop
932b0b55f6 remove scale uniform from shaders 2012-09-15 20:53:14 -04:00
Josh Holtrop
a1a81d66e1 add GLProgram::uniform() 2012-09-15 20:35:48 -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
05dc0b021f import obj shader changes into obj_tex 2012-09-15 08:43:59 -04:00
Josh Holtrop
c7af7f8f2f rename shaders 2012-09-15 08:43:59 -04:00
Josh Holtrop
ac79196325 getting ready to draw a map overlay 2012-09-14 00:05:26 -04:00
Josh Holtrop
84aecf957c draw each tile with its own size 2012-09-13 23:47:48 -04:00
Josh Holtrop
89fc42251f create buffers for overlay hex tiles 2012-09-13 23:43:04 -04:00
Josh Holtrop
ab65139951 only determine uniform locations once 2012-09-13 23:16: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
10bb7f6042 add hex-tile model 2012-09-11 22:29:15 -04:00
Josh Holtrop
aa52be8801 HexTile cleanup 2012-09-11 19:18:43 -04:00
Josh Holtrop
46c9a81c11 use gl3w instead of glew; render map with shaders 2012-09-11 19:16:08 -04:00
Josh Holtrop
2569e3a007 fix GLMatrix::rotate() bug 2012-09-11 19:06:44 -04:00
Josh Holtrop
8d0d11bc3b add GLBuffer::bind() and GLProgram::use() 2012-09-11 19:05:18 -04:00
Josh Holtrop
386d012ff7 small fragment shader tweak 2012-09-10 23:26:30 -04:00
Josh Holtrop
eb0a24b8d4 fix normal_i calculation 2012-09-10 23:24:52 -04:00
Josh Holtrop
cfa2850292 positioning with shaders working, normals not 2012-09-10 23:14:02 -04:00
Josh Holtrop
4a6d38ddb9 add projection and modelview matrices to obj shader 2012-09-10 21:29:11 -04:00