Commit Graph

71 Commits

Author SHA1 Message Date
Kayne Ruse 99bbe4be3a Removed the local editor files
I'll be using Sketch to create the maps

git clone https://github.com/Ratstail91/Sketch.git
2013-07-01 18:26:27 +10:00
Kayne Ruse 4dc05f8daf Removed iostream
This was left in by mistake
2013-07-01 18:19:31 +10:00
Kayne Ruse b7205c278a Merge branch 'master' into dev 2013-07-01 18:14:55 +10:00
Kayne Ruse 6bee9b021d Entire project now builds using the local version of SDL_net 2013-07-01 17:57:11 +10:00
Kayne Ruse a49b0eb1fe Changed the timing system to give the machine a rest only when it's OK to 2013-06-26 23:52:31 +10:00
Kayne Ruse 2089105695 Fixed formatting 2013-06-26 17:59:11 +10:00
Kayne Ruse f667f503e7 Simple Multiplayer is working prototype-simple-multiplayer 2013-06-25 00:12:53 +10:00
Kayne Ruse 50bef9736c Deleting players on logout 2013-06-24 23:34:48 +10:00
Kayne Ruse 6d1ba24404 Simplified the packet system 2013-06-24 22:59:06 +10:00
Kayne Ruse ebd8c5e6fc Synchronization works 2013-06-24 21:46:11 +10:00
Kayne Ruse 42f9c5e1df Fixed for loops using the auto keyword 2013-06-24 16:31:38 +10:00
Kayne Ruse 3f2fcdf9e1 Players are being added in the client
The client sends a debug player to the server, with a constant movement to
show that the new client _is_ connecting. The next thing to add is the
sync system, so that the clients know what the server looks like when they
first join.
2013-06-24 16:15:48 +10:00
Kayne Ruse 2235f307e7 Added some multiplayer code to the server 2013-06-24 13:31:19 +10:00
Kayne Ruse 23782ff4e3 Removed maximum number of clients 2013-06-24 12:41:10 +10:00
Kayne Ruse 2a46f82f84 Updated README.md 2013-06-24 12:39:31 +10:00
Kayne Ruse 6a32599a69 Fixed a derp with the time 2013-06-24 12:18:36 +10:00
Kayne Ruse 0ca84a8653 Branch 'dev-map' is stable, merging into 'dev' 2013-06-24 10:45:51 +10:00
Kayne Ruse 66b2d6566c Branch 'dev-char' is stable, merging into 'dev' 2013-06-24 10:43:49 +10:00
Kayne Ruse 56375d64b6 Moved packets into their own namespace 2013-06-24 10:27:43 +10:00
Kayne Ruse 9608761cd5 Moved the entry structs into their own headers 2013-06-24 10:01:52 +10:00
Kayne Ruse c1d03d1cef Changed the name of the editor's main class 2013-06-24 09:26:25 +10:00
Kayne Ruse 09c88c7232 Merge branch 'dev' into dev-map 2013-06-24 09:23:12 +10:00
Kayne Ruse ddb93cfcf1 Changed the name of the client's main class 2013-06-24 09:22:43 +10:00
Kayne Ruse 42787dcb69 Explicitly deleted copy and move constructors 2013-06-24 09:13:27 +10:00
Kayne Ruse fcb17a8116 Merge branch 'dev' into dev-char 2013-06-24 09:02:36 +10:00
Kayne Ruse 2dc21f64fd Merge branch 'dev' into dev-map 2013-06-24 09:01:20 +10:00
Kayne Ruse f049c96df7 Switched from the service locator pattern to singleton pattern 2013-06-24 09:00:50 +10:00
Kayne Ruse d9ffa22b76 Created the editor shell 2013-06-23 16:19:41 +10:00
Kayne Ruse 24654d9e17 Merged the new frame rate system into dev-char 2013-06-23 15:11:24 +10:00
Kayne Ruse 7ad855348f Implemented a simpler frame rate system 2013-06-23 15:05:52 +10:00
Kayne Ruse d833b76856 PlayerCharacter is moving around smoothly 2013-06-23 13:53:55 +10:00
Kayne Ruse 3232925ccd Codebase update 2013-06-22 18:39:56 +10:00
Kayne Ruse e4ffba80aa Fixed incorrect preprocessor guard 2013-06-22 18:22:21 +10:00
Kayne Ruse a4d184ca75 Moved random code out of defines.* 2013-06-21 21:36:48 +10:00
Kayne Ruse 89179626be Improved Vector2 with floats & non-member operators 2013-06-21 15:23:07 +10:00
Kayne Ruse fc381348a5 Updated the game pitch 2013-06-21 14:50:59 +10:00
Kayne Ruse 5e99192fbf Lose focus on a server after a button is released prototype-server-client 2013-06-18 19:38:08 +10:00
Kayne Ruse 33adb4b1a5 Put the license header into all source files 2013-06-18 16:40:51 +10:00
Kayne Ruse 33474cc6c0 Smooth connection and disconnection complete
The clients can connect and disconnect from the server with known no
issues. There is no way to shutdown the server yet, but it might be
possible to kick someone else from the server soon.
2013-06-18 16:21:42 +10:00
Kayne Ruse e833129983 Added guards incase of multiple calls 2013-06-18 14:06:57 +10:00
Kayne Ruse fd65fec5f7 The client is registering with the server 2013-06-17 19:53:22 +10:00
Kayne Ruse 69f03cd250 Working on connection systems 2013-06-17 19:04:05 +10:00
Kayne Ruse 27ed91688a Added the meta field to Packet to support Packet's metadata 2013-06-17 18:37:27 +10:00
Kayne Ruse 68ec7323a3 I can't progress until I add the address information to the Packet struct 2013-06-17 17:51:26 +10:00
Kayne Ruse 7b11bf22cb Specified a minimum Packet size for the DEBUG build 2013-06-17 17:14:10 +10:00
Kayne Ruse d83a536f35 Added debug output 2013-06-17 15:57:12 +10:00
Kayne Ruse ea761fb5bb Fixed the bug
running was false when it was checked in networkQueue(), so the thread was
ending early.
2013-06-17 15:49:57 +10:00
Kayne Ruse 685ca94335 This has the odd quirk related to networkQueue() 2013-06-17 15:15:27 +10:00
Kayne Ruse 5b2fd80a61 Fixed the Packet::type bug
In popNetworkPacket(), a second Packet p was being created, which was
destroyed when it went out of scope, and the original Packet p was being
returned.
2013-06-17 11:01:00 +10:00
Kayne Ruse d1aac9ffd8 Added peekNetworkPacket() 2013-06-17 10:12:20 +10:00