Commit Graph

1417 Commits

Author SHA1 Message Date
lanariel 3512121f52 Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
Conflicts:
	Code/OysterGraphics/OysterGraphics.vcxproj
	Debug/Tester.ilk
	Debug/Tester.pdb
	OysterGraphics/Core/ShaderManager.cpp
	OysterGraphics/OysterGraphics.vcxproj.filters
	Tester/Debug/CL.read.1.tlog
	Tester/Debug/CL.write.1.tlog
	Tester/Debug/cl.command.1.tlog
	Tester/Debug/link.command.1.tlog
	Tester/Debug/link.read.1.tlog
	Tester/Debug/link.write.1.tlog
	Tester/Tester.vcxproj
2013-11-20 10:35:00 +01:00
Pontus Fransson 5bcc285141 Sending empty strings, prints messages on server 2013-11-20 10:34:05 +01:00
lanariel 425a838f31 Core Update 2013-11-20 10:22:01 +01:00
Erik Persson 27e5b07ef6 object and worldObject 2013-11-19 18:35:35 +01:00
Sam Mario Svensson 58efe7fdd3 getline fix in chat program 2013-11-19 14:59:00 +01:00
Pontus Fransson 816dced937 Chat test server 2013-11-19 14:24:38 +01:00
Sam Mario Svensson 1df11becf7 chat test with server
created simple chat program for the client to be able to chat between
client through a server
2013-11-19 14:18:34 +01:00
Pontus Fransson ac75e178ce Sending a message from server to client (done and done) 2013-11-19 13:42:50 +01:00
Sam Mario Svensson adcef51227 third time is the charm
fixed send and recieve functions in IConnection
2013-11-19 12:55:54 +01:00
Sam Mario Svensson 89ce3dd0d1 Fixed IConnection and Connection 2013-11-19 12:41:58 +01:00
Sam Mario Svensson 56c32fcbc3 Iconnection interface 2013-11-19 12:38:13 +01:00
Erik Persson ea0f3f05b4 added level and player 2013-11-19 11:07:14 +01:00
Erik Persson 33f9a86945 Added Game
cpp and h files
2013-11-19 09:52:36 +01:00
Pontus Fransson c04593b575 Changed name on main files on server and client 2013-11-19 09:34:24 +01:00
Pontus Fransson 1022b15ea2 Removed stuff from project files 2013-11-18 16:47:57 +01:00
Pontus Fransson 32348f4cc2 Removed old stuff, and added main files for all projects 2013-11-18 16:34:50 +01:00
dean11 33e7afabcd Restructured folders to give a flexible solution for dependencies and added to ignore list 2013-11-18 15:41:09 +01:00