Pontus Fransson
|
43b111f0d3
|
Pull MiscBranch
|
2013-11-27 11:28:11 +01:00 |
Pontus Fransson
|
f02a67b9b1
|
Merge branch 'MiscBranch' of https://github.com/dean11/Danbias into Network
|
2013-11-27 11:26:54 +01:00 |
Pontus Fransson
|
aeddc032d9
|
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
Conflicts:
Code/Network/NetworkDependencies/Connection.cpp
Code/Network/NetworkDependencies/Connection.h
Code/Network/NetworkDependencies/IConnection.h
Code/Network/OysterNetworkClient/Client.cpp
Code/Network/OysterNetworkClient/Client.h
Code/Network/OysterNetworkClient/ClientMain.cpp
Code/Network/OysterNetworkServer/Client.cpp
Code/Network/OysterNetworkServer/Client.h
Code/Network/OysterNetworkServer/ServerMain.cpp
|
2013-11-27 11:06:03 +01:00 |
Pontus Fransson
|
214e29e906
|
OysterByte
Added Byte class instead of handling byte messages manually.
Converted all functions to use OysterByte.
|
2013-11-27 11:01:22 +01:00 |
dean11
|
48c812b033
|
Forgot to follow coding standard...
|
2013-11-26 21:51:40 +01:00 |
dean11
|
e4904870b3
|
Added a threading wrapper with basic functionality that needs real testing
|
2013-11-26 21:08:34 +01:00 |
Sam Mario Svensson
|
f6ade9e4fd
|
ErrorMessages everywhere!
|
2013-11-26 13:45:03 +01:00 |
dean11
|
1f27336b3f
|
Added filename paramater in custom load function
|
2013-11-26 12:09:38 +01:00 |
dean11
|
e5cef4895e
|
Added support for custom loading, unloading and reloading
|
2013-11-26 10:55:51 +01:00 |
Pontus Fransson
|
45c145439a
|
Fixade crash och flyttade initsockets, shutdownsockets.
Moved initsocket and shutdownsockets to WinsockFunctions.
|
2013-11-25 20:27:23 +01:00 |
Pontus Fransson
|
6b57815bb8
|
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
Conflicts:
Code/Network/NetworkDependencies/Connection.cpp
|
2013-11-25 19:05:28 +01:00 |
Pontus Fransson
|
caabb6702e
|
Fixed code standard, Added packing functions
|
2013-11-25 19:00:33 +01:00 |
Sam Mario Svensson
|
ca5e578af5
|
reconstruction in connection.
|
2013-11-25 14:03:32 +01:00 |
Sam Mario Svensson
|
82b8ef7b05
|
Fixed connection split up connect function and added initiateClient()
|
2013-11-25 12:14:01 +01:00 |
Sam Mario Svensson
|
640ac2172a
|
checked the coding standard and changed it accordinly
|
2013-11-25 11:39:54 +01:00 |
Pontus Fransson
|
ad7091e520
|
Fixed automatic size on Messages
|
2013-11-22 15:48:49 +01:00 |
Pontus Fransson
|
6eff55e763
|
Fixed possible crash
|
2013-11-22 14:31:07 +01:00 |
Pontus Fransson
|
d33220f8ca
|
Fixed memory leaks
Fixed memory leaks.
|
2013-11-22 14:23:08 +01:00 |
dean11
|
7b0265db1d
|
Merge branch 'Graphics' of https://github.com/dean11/Danbias into MiscBranch
|
2013-11-22 12:05:58 +01:00 |
Pontus Fransson
|
623cffced6
|
Added protocols to an enum
Now we don't have to type cast
|
2013-11-22 11:40:55 +01:00 |
lanariel
|
3cd4c12172
|
Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
|
2013-11-22 10:56:21 +01:00 |
lanariel
|
59dcbc9729
|
Fixed Projection
|
2013-11-22 10:55:21 +01:00 |
dean11
|
15455db1b2
|
Added a resource handler with basic byte loading
|
2013-11-22 10:46:25 +01:00 |
Dander7BD
|
480a624019
|
Merge branch 'Graphics' of https://github.com/dean11/Danbias into Graphics
|
2013-11-22 10:24:08 +01:00 |
Sam Mario Svensson
|
9e6593abd1
|
bug med reference på typecast
|
2013-11-22 09:49:48 +01:00 |
Pontus Fransson
|
c5e432b566
|
Fixed size
|
2013-11-22 09:43:24 +01:00 |
Pontus Fransson
|
bacb83b084
|
Merge branch 'Network' of https://github.com/dean11/Danbias into Network
Conflicts:
Code/Network/NetworkDependencies/Connection.cpp
Code/Network/NetworkDependencies/Connection.h
Code/Network/OysterNetworkClient/ClientMain.cpp
Code/Network/OysterNetworkServer/ServerMain.cpp
|
2013-11-22 09:24:44 +01:00 |
Pontus Fransson
|
5265fd1af1
|
Fixed merge errors
|
2013-11-22 09:17:07 +01:00 |
Pontus Fransson
|
954a1ac669
|
Fixed error
Fixed translation
|
2013-11-22 08:56:00 +01:00 |
Sam Mario Svensson
|
4142688f6c
|
unsigned char instead of char and chat program with protocols
|
2013-11-22 08:54:26 +01:00 |
lanariel
|
5abaef6e86
|
Fixed render errors
|
2013-11-21 23:54:12 +01:00 |
lanariel
|
ff1695497f
|
Debug From Home
|
2013-11-21 18:31:16 +01:00 |
lanariel
|
3ef36547a9
|
Merge branch 'RigidBody' of https://github.com/dean11/Danbias into Graphics
|
2013-11-21 15:21:03 +01:00 |
Dander7BD
|
8af3cde642
|
Merge remote-tracking branch 'origin/RigidBody' into Graphics
|
2013-11-21 15:20:19 +01:00 |
Dander7BD
|
dc9f4597e2
|
Added OrientationMatrix build methods + other stuff
|
2013-11-21 15:19:32 +01:00 |
Pontus Fransson
|
dcf456ce6d
|
Fixed implementation of Translator
|
2013-11-21 14:49:30 +01:00 |
lanariel
|
b419849fd4
|
Merged Obj and Engine Restructure
|
2013-11-21 14:17:03 +01:00 |
lanariel
|
9a0206bf35
|
More
|
2013-11-21 14:14:30 +01:00 |
lanariel
|
7b31377be8
|
Engine Sructured
|
2013-11-21 13:50:43 +01:00 |
Pontus Fransson
|
7c417dd223
|
Merge
|
2013-11-21 13:46:25 +01:00 |
Tobias Grundel
|
f08e9491ed
|
ObjReader
|
2013-11-21 13:45:11 +01:00 |
Pontus Fransson
|
87e1cf0436
|
Added Message base class
Packing functions,
MessageHeader; MessageTest,
|
2013-11-21 13:42:38 +01:00 |
Sam Mario Svensson
|
f77efb107d
|
Implemented Translator
also fixed some coding standards with namespaces in client, connection,
listener, server.
added protocols with enums for packagetype.
|
2013-11-21 13:40:52 +01:00 |
Tobias Grundel
|
ddbc808977
|
Re-fixed ObjReader
|
2013-11-21 12:47:47 +01:00 |
Dander7BD
|
938826b84e
|
Forgot to test compile RigidBody
Compile Errors is fixed
|
2013-11-21 11:47:20 +01:00 |
Dander7BD
|
f51d2312dd
|
RigidBody DONE
Needs only testing for confirmations
|
2013-11-21 11:39:11 +01:00 |
lanariel
|
a94429fd9d
|
Fixed Unresolved Externals from Hiarchy Flattening
|
2013-11-21 10:02:17 +01:00 |
lanariel
|
dc9c448150
|
Fix compile Errors
|
2013-11-21 09:43:53 +01:00 |
Dander7BD
|
d90074d909
|
Minor changes
Some argument renaming and changed a few RigidBody functions, in respect
to the change in the Box struct
|
2013-11-20 17:40:12 +01:00 |
Dander7BD
|
8dee300dc8
|
Merge remote-tracking branch 'origin/Physics' into RigidBody
|
2013-11-20 17:01:12 +01:00 |