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

24 Commits

Author SHA1 Message Date
Josh Holtrop
7b9fe3aa6d fix SFML path for Windows 2012-10-03 23:22:04 -04:00
Josh Holtrop
254079d8dc update SFML path 2012-09-21 18:52:20 -04:00
Josh Holtrop
41b06a1de7 fix link errors on Windows 2012-09-17 19:29:00 -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
46c9a81c11 use gl3w instead of glew; render map with shaders 2012-09-11 19:16:08 -04:00
Josh Holtrop
a9c99fbe4a build with debugging information for now 2012-09-10 21:04:02 -04:00
Josh Holtrop
305fa696f6 copy glew32 library to bin directory on windows 2012-09-06 21:49:14 -04:00
Josh Holtrop
f5399ee5ac use sys.platform for platform detection 2012-09-06 21:49:14 -04:00
Josh Holtrop
2adebf36f4 add include path for all source directories 2012-09-06 00:33:40 -04:00
Josh Holtrop
e2ebe6afa4 build with GLEW on Windows 2012-09-04 09:59:53 -04:00
Josh Holtrop
39bd1778bf add WFObj object-loading library sources 2012-09-03 09:14:47 -04:00
Josh Holtrop
a6df74a757 link with GLEW 2012-09-02 22:00:38 -04:00
Josh Holtrop
9b993f2028 allow source files in arbitrary subdirectories under src/*; allow C source files in addition to C++ 2012-08-29 23:20:10 -04:00
Josh Holtrop
9c90adbc75 add assets/fs directory with initial OpenGL shaders and CCFS generation script 2012-08-28 20:57:03 -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
3eff7d6097 use a different object file suffix for server object files to avoid scons environment conflict 2012-08-20 19:20:06 -04:00
Josh Holtrop
832e63fb81 link with sfml-graphics library 2012-08-16 00:24:28 -04:00
Josh Holtrop
f1c3d2c95b add a server main.cc 2012-08-15 22:36:55 -04:00
Josh Holtrop
34e909fca8 split client into main.cc and Client class 2012-08-14 21:46:41 -04:00
Josh Holtrop
c216b9d09e linux build fix from Chris 2012-08-14 00:12:25 -04:00
Josh Holtrop
fee19eab42 statically link with SFML on Windows 2012-08-13 23:46:05 -04:00
Josh Holtrop
91bbc211c1 update to build on linux 2012-08-13 23:43:03 -04:00
Josh Holtrop
eae0dc9e34 update template to use SFML-2.0-rc 2012-08-13 23:27:33 -04:00
Josh Holtrop
31d9ab8f10 initial build system 
working to compile from cygwin in Windows with SFML-1.6
 2012-08-13 23:07:37 -04:00