1ed1bab751
Created test box that should now be shot at by the player
2014-01-27 13:55:09 +01:00
5b984db9ba
GL - gameState merge
2014-01-27 13:25:09 +01:00
d6432b2c73
Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat
2014-01-27 10:16:25 +01:00
1748fe323a
GL - Added Parsing functions for levelLoader and moved Packing classes to misc
2014-01-27 10:15:39 +01:00
e188794aa3
GL - Load level in LevelParser
2014-01-27 10:14:02 +01:00
74ac5e2d31
Updated creation of objects
2014-01-27 08:54:25 +01:00
3c1d66e3f8
Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat
...
Conflicts:
Code/Dokumentation/LevelLoader.uxf
Code/Game/GameLogic/GameLogic.vcxproj
2014-01-24 10:42:19 +01:00
c84ed645f0
GameLogic - implementation of LevelLoader
2014-01-24 10:22:18 +01:00
aaf3bf30f9
GL - LevelParser half way implemented.
2014-01-24 10:01:58 +01:00
0f5517398d
GL - Update uml, LevelParser.h.cpp ObjectDefines.h
2014-01-24 09:00:59 +01:00
fb2cf714c6
GL - sending dir to server, forward and backward walking works
2014-01-23 14:28:53 +01:00
07e5519850
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-23 09:25:02 +01:00
8c297d1e9b
GL - starting to send lookdir to server
2014-01-23 09:24:55 +01:00
bd739f8acb
GL - Creation of objects kinda sorted
2014-01-23 09:14:04 +01:00
121fd51c45
GL collision with level should worm
2014-01-23 08:57:46 +01:00
3f144289ec
GL - merge with gameserver, crash on collision in gameLogic
2014-01-23 08:30:26 +01:00
a591903d8f
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-23 08:25:10 +01:00
f657a58a4f
GL - adding a camera on the client
2014-01-23 08:24:35 +01:00
6a888cb154
GL - adjusting collisionManager
2014-01-22 15:47:44 +01:00
22a5db97f8
Added final protocols, and a bit of support for them on server side
2014-01-22 15:22:52 +01:00
ce80e8155c
GL - formatting mistake
2014-01-22 14:39:10 +01:00
43eac4cbe3
moved ForcePushAction for massdriver to collisionManager
2014-01-22 14:26:45 +01:00
80204ecbe3
GL - Massdriver usage of applyeffect
2014-01-22 13:02:13 +01:00
954de26b43
GL - mergeproblems
2014-01-21 16:11:02 +01:00
0aae9de92b
blah
2014-01-21 16:10:07 +01:00
ebaa668382
Major updates to Collision handling with the class CollitionManager. changes started on the massdriver
2014-01-21 16:09:39 +01:00
8792aab992
GL - merge with gameServer
2014-01-21 14:36:46 +01:00
50c09547f3
GameServer - Added protocols and stuff
2014-01-21 14:32:42 +01:00
561418c427
GL - gravity working
2014-01-21 14:28:27 +01:00
06d468299a
GL - linking problem fix
2014-01-21 10:37:45 +01:00
f7f59e8ac8
GameServer - Added more protocols and modified old ones a bit. Also added a new project that starts both server and client
2014-01-21 09:52:48 +01:00
0a41d20099
GameLogic - Merged with graphics
2014-01-20 16:36:25 +01:00
386b27e2f7
GameLogic - Merge with sprint2.5
2014-01-20 16:17:01 +01:00
1a3c63cda9
GameLogic - fixed some minor merging errors
2014-01-20 16:02:26 +01:00
ab2a3a3892
GameLogic - fixed some minor merging errors
2014-01-20 16:01:54 +01:00
6c3c234be1
GameLogic - pree-sprint merge
2014-01-20 15:47:52 +01:00
a1128986d5
Merge with Gamle Logic
2014-01-20 11:59:43 +01:00
ce4c57bab3
GL - player inherits dynamicobject instead of object
2014-01-20 08:40:41 +01:00
eaf0ae1479
GL - can now compile
2014-01-17 08:52:34 +01:00
7b2be02113
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-16 12:26:33 +01:00
a168328a44
GL - movement with physics working!!
2014-01-16 12:26:14 +01:00
d08e999f07
Create level and initiate it with a rigidbody etc
2014-01-16 12:08:24 +01:00
225d8912da
GL - make rigidbody level
2014-01-16 11:40:29 +01:00
0080a9f6f2
small name changes
2014-01-16 11:17:19 +01:00
567fa229eb
small name changes
2014-01-16 11:07:45 +01:00
aac92bc20e
GL- send new player pos to client
2014-01-16 09:30:16 +01:00
0c8783ba84
GL - merge done
2014-01-15 12:02:52 +01:00
8557559b9b
GL - going to merge
2014-01-15 11:57:36 +01:00
5f00aa7af7
GL - Merge with origin/Gamelogic
2014-01-15 11:45:34 +01:00
208482b0ce
GL merge error
2014-01-15 11:25:59 +01:00
ceac5ce31d
Modified namespace around Threadsafe queue and IQueue. Added TCP_NODELAY to sockets. Implemented some functionality to gamelogic
2014-01-15 11:03:25 +01:00
9a32c44e49
GL - Merge branch 'GameLogic'
2014-01-15 08:19:35 +01:00
0ffe26c134
GL - Merge client with gameserver
2014-01-15 08:18:06 +01:00
54babfc7c7
Gameserver - Merged with Gamelogic
2014-01-14 10:38:35 +01:00
4c1be4d807
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Code/Game/GameLogic/Game.cpp
2014-01-14 10:33:08 +01:00
87b8c0c7bb
Gameserver - Merged with Gamelogic
2014-01-14 10:29:39 +01:00
54240b217c
GameLogic - game interface updated(not finnished)
...
förlåt dennis
2014-01-14 10:28:12 +01:00
32e64c0dbb
GL - moved reciever struct to a separate file
2014-01-14 10:25:49 +01:00
82de85d1ac
Fixed minor server network bug, modified shader to get visual
2014-01-14 10:15:50 +01:00
97cba4248d
GameServer - Added more protocols. Divided the code in gamesession into several .cpp files
2014-01-14 09:25:22 +01:00
04c5898f4e
GL - sending string and createOBJ working
2014-01-14 09:24:55 +01:00
eb9360377d
GameServer - Merged with other half of GameLogic
2014-01-13 12:50:27 +01:00
ce89e6bc98
GameServer - Fixed some minor bugs, one that made server crash on exit. Also integrated some of GameLogics new API functions
2014-01-13 12:44:33 +01:00
792f78c34a
GL- adding client UML, trying AddObj protocol with down-button. Problem with sending char*
2014-01-13 12:11:45 +01:00
2b5a5b2fbd
GameServer - Merge with gamelogic
2014-01-10 23:36:03 +01:00
059b3dd5e4
GameLogic - Basic game interface made (functions not yet implemented)
2014-01-10 12:33:15 +01:00
f6ba81cd44
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-01-10 10:48:29 +01:00
c541d032e7
GL - can move a obj on the client via the server
2014-01-10 10:47:54 +01:00
586031aa94
GameLogic - making sure GameLogic uses the new physics api
2014-01-10 10:08:42 +01:00
a02a32c029
Network now closes listener gracefully, meaning threads dont crash anymore, also fixed a minor bug in Game folder
2014-01-09 14:18:01 +01:00
52ba5602d5
GameLogic - player now using some of the new phys api
2014-01-09 13:06:18 +01:00
48b9189a03
Revert "state"
...
This reverts commit 4a07586076
2014-01-09 12:51:17 +01:00
4a07586076
state
2014-01-09 12:43:32 +01:00
42de421904
Master - Modified igore
2014-01-08 13:07:55 +01:00
ed202a15a2
Worked over the holidays
2014-01-07 10:26:09 +01:00
0065779205
Added comments where the physic generated errors due to big patch
2013-12-21 17:37:30 +01:00
d3721fcada
last updates
...
random stuff
2013-12-20 11:10:36 +01:00
be39365a27
Gamelogic - Merged with existing stuff
2013-12-20 09:47:24 +01:00
15d6ac8cf9
GameLogic - Final sprint2 merge
2013-12-20 09:42:02 +01:00
ea5fc78817
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-20 09:04:30 +01:00
606cb10f8b
GL - removed server include from gameLancher
2013-12-20 09:04:18 +01:00
f4232ca0b4
gamplay code in gamesession
2013-12-20 08:59:59 +01:00
694d5576d7
GameLogic - Pre-merge with physics
2013-12-19 15:35:49 +01:00
ecf1c5fc36
GL - delete timer
2013-12-19 14:32:52 +01:00
ea59c25119
GL - mergeing error
2013-12-19 13:49:46 +01:00
bb61b83392
GL - merge
2013-12-19 13:46:01 +01:00
d68fd63b25
Added server launcher
2013-12-19 13:35:56 +01:00
0570d76e24
Modified part of some player states
2013-12-19 12:41:37 +01:00
934aa6e45a
Merge
2013-12-19 12:34:59 +01:00
beb116e964
Fixed some threafing and stuff
2013-12-19 12:32:23 +01:00
27aad0d86f
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-19 11:58:54 +01:00
ba6f7114b5
GL - added id in object, vector
2013-12-19 11:58:42 +01:00
e68001da0e
testing updated
...
message to client about object creation, message to client about player
movement
2013-12-19 11:46:11 +01:00
057dce0aca
GL - merge errors
2013-12-19 10:31:59 +01:00
13430f31fc
GL - merge and some more protocols
2013-12-19 10:22:32 +01:00
0ea08fbd54
gamesession testing
2013-12-19 10:21:03 +01:00
a4907c8e2e
GL - control protocol added
2013-12-18 15:28:47 +01:00
92b3525587
GameLogic - Cleanup after erik ;)
2013-12-18 13:12:11 +01:00
33d045de1a
GameLogic - Merge with Erik
2013-12-18 13:10:47 +01:00
8721224d7c
GameLogic - Added alot of functionality to Game related parts
2013-12-18 13:07:10 +01:00
f5490bf111
using a global id in object
2013-12-18 13:01:25 +01:00
0c98e2847d
GL - added some protocols
2013-12-18 12:18:01 +01:00
e16c939285
GL - using window manager, fixed consistent linking in danBiasGame
2013-12-18 10:47:30 +01:00
e9c5a49778
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-18 08:44:18 +01:00
347b546566
GameLogic - some minor fixes
2013-12-18 08:44:10 +01:00
2daf93987a
team fix
2013-12-18 08:41:31 +01:00
1eceb6095f
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-18 08:37:55 +01:00
bf5cc69ff7
GameLogic - Added Postbox system to netsession
2013-12-18 08:37:45 +01:00
4d7be753c5
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-18 08:32:20 +01:00
8173f3818d
gamelogic update and added some level design elements
...
teammanager, team,
2013-12-18 08:30:58 +01:00
8700824d12
Gamlogic - Merge with Linda
2013-12-17 14:32:57 +01:00
097fa1da34
GameLogic - Pre merge with Linda
2013-12-17 14:15:20 +01:00
9d722bced3
GL - recieve messages from server
2013-12-17 13:39:10 +01:00
8667e14afb
Merged with Linda after merge conflicts
2013-12-17 10:28:44 +01:00
4650615a61
Gamelogic - Pre merge with Linda
2013-12-17 10:25:34 +01:00
5d1d64bebb
GL - trying to send move protocol
2013-12-17 10:07:46 +01:00
dc3221ee11
GL - set pos function for C_models
2013-12-16 11:08:10 +01:00
b351a7bac4
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-16 10:02:41 +01:00
6bfe7711ab
Gamelogic - Modified gameprotocol id:s
2013-12-16 10:02:30 +01:00
b60166a6e8
GL - connect to server, need right IP
2013-12-16 09:55:51 +01:00
7cda07507a
GameLogic - Pre merge with Netowkr
2013-12-16 09:50:23 +01:00
fa1473455f
GL - added C_obj files, client obj in game state to send input
2013-12-16 09:45:12 +01:00
34d79d1207
Gamelogic - Forgot some stuff
2013-12-16 09:09:54 +01:00
9eb8fcba40
Gamelogic - Publication to others...
2013-12-16 09:00:11 +01:00
f29f50f830
Merged with Gamelogic branch and fixed errors and added features
2013-12-14 22:04:42 +01:00
8b1c2b91e8
Fixed some craches and stuff
2013-12-13 23:47:16 +01:00
c41f5dda3f
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-13 12:03:04 +01:00
7c1d19946d
GL - Connection to network in clinet
2013-12-13 12:02:49 +01:00
f1f9f4d20a
added include string in level.h
2013-12-13 11:11:51 +01:00
7817003db8
updated h.files
...
description, started with level concept
2013-12-13 11:09:09 +01:00
4617523f8b
Gamelogic - Commit because branch switch
2013-12-12 20:32:54 +01:00
a3e4262c08
Merge with Other part of gamelogic(DanbiasGame)
2013-12-12 14:44:06 +01:00
71d31db884
GAMELOGIC - Fixed a minor major huge issue with no problems
2013-12-12 14:37:35 +01:00
693b9df928
Some wierd stuff is going on here
2013-12-12 12:54:08 +01:00
c63e9f1c08
Some comments on the massdriver and player
2013-12-12 12:21:19 +01:00
9b9a92556a
Pre-merge with network, (again)
2013-12-12 12:17:39 +01:00
8f36f64c4f
updated AttatchmentMassDriver and CollisionManager
...
weapon attatchments now have a owner(player) to facillitate the weapon
manipulating the player using it.
CollisionManager now works with a tag void* in the rigidbody to link
with a game object instead of the RefManager component
2013-12-12 12:16:13 +01:00
af7f0e01a8
Pre-network merge, (again)
2013-12-12 10:36:55 +01:00
c801ab829a
Merge remote-tracking branch 'origin/Physics' into GameLogic
...
Conflicts:
Bin/Content/Shaders/TextureDebug.cso
2013-12-12 10:10:52 +01:00
2424b51c3e
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Bin/Content/Shaders/DebugVertex.cso
2013-12-12 09:39:27 +01:00
e11d7d94f7
updated the weapon system, collisionManager and redid the "object" heirarki
2013-12-12 09:36:14 +01:00
fd3776a53b
GameLogic - Pre-network merge
2013-12-12 09:33:59 +01:00
22665bc44b
GL - started using network and protocols for sending/recieveing
2013-12-11 12:14:00 +01:00
bb789faa67
GL - merge with network - fixed dependencies in launcher project
2013-12-11 09:00:36 +01:00
465ea1bd19
GL - soleved merge errors in project files
2013-12-10 11:50:35 +01:00
78f20e04a1
GL - moved object files to Obj
2013-12-10 11:27:20 +01:00
f0181ad9f4
GL - fixed defines in headers - more structure for states
2013-12-10 11:26:18 +01:00
4b9f2671bf
updated weapon
2013-12-10 11:17:25 +01:00
58c3371edd
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-10 09:57:13 +01:00
97e0b1298a
added functionallity to player and weapon, started on the weapon design.
2013-12-10 09:57:05 +01:00
1f172b422a
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-09 12:05:30 +01:00
ea593743ad
GL - added UI object
2013-12-09 12:01:36 +01:00
a45ffb2e40
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-09 11:58:44 +01:00
fbd95a7109
GAMELOGIC - Added a protocol api
2013-12-09 11:57:34 +01:00
4134836405
GL - added client objects
...
- no memory leaks in client
2013-12-09 11:05:47 +01:00
5416df6d86
Merge remote-tracking branch 'origin/GameLogic' into GameLogic
2013-12-09 09:24:01 +01:00
38a1602d3f
GL - merge with graphics api. Lobby and game state.
2013-12-09 09:23:39 +01:00
b331ce1a1f
GL - started working with client application
2013-12-06 10:38:43 +01:00
63addde51e
made "interfaces" of most classes
2013-12-05 11:50:39 +01:00
1cb880a66e
GameLogic - Fixed the window class
2013-12-04 15:59:44 +01:00
b35ffdecfd
GameLogic - Merged with DanbiasGame project
2013-12-04 11:40:22 +01:00
64a8089e54
GameLogic - Worked on server
2013-12-04 11:37:26 +01:00
e658071643
GL- open a red window from lancher project
2013-12-04 11:32:43 +01:00
3d973c16a2
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2013-12-03 12:09:22 +01:00
a852e8eab4
Created the game modules
2013-12-03 12:07:37 +01:00
Erik Persson
lindaandersson
Sam Mario Svensson
Pontus Fransson
Dennis Andersen