26755f8b0b
GL- level format more updates....
2014-02-10 16:24:05 +01:00
a12146215d
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-10 15:54:46 +01:00
b731c206f4
GL - physics merge 2
2014-02-10 15:54:38 +01:00
26e151f9b4
Fixed state problem
2014-02-10 15:46:55 +01:00
c75493b6ce
GL - Levelformat updated 3.0 with new format!
2014-02-10 14:59:12 +01:00
49d29d87a5
GL - merge with bullet physics and updated server
2014-02-10 14:41:43 +01:00
eb39008529
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-10 14:00:24 +01:00
c87bab8808
GL - started using the lvl format. Objects on client have pos, rot and scale (not verified)
2014-02-10 14:00:14 +01:00
05aa3cc9e9
Added on move functionality
2014-02-10 13:55:01 +01:00
e5e99924d9
Updates for objects
2014-02-10 13:25:28 +01:00
ba0d6ca73a
Amazing merge with server
2014-02-10 12:42:31 +01:00
99146430a4
Major overhaul
2014-02-09 21:24:09 +01:00
14bf3ede86
Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors..
2014-02-09 18:58:14 +01:00
4abfdd70fe
Merged with GameLogic and fixed merging errors, some minor justifications may be needed later on due to merging errors..
2014-02-09 18:58:07 +01:00
310ed3dfc5
GameServer - Multiplayer now working properly
2014-02-09 16:42:26 +01:00
92447a6352
Very cool stuff
2014-02-07 16:01:43 +01:00
ab9f81ac60
Collisions work better
...
Still needs polishing
2014-02-07 15:38:53 +01:00
0c4f70e400
GL - Updated loadLevelHeader() .Added Cylinder bounding volume.
2014-02-07 15:20:34 +01:00
fef40f58f9
GL - Fixed memory leaks in LevelLoader.
2014-02-07 14:44:25 +01:00
9bdf258c5d
GL - Updated LevelLoader 2.0. Bounding volume 1.0
...
The ObjectSpecialType enum is not correct. It has to be updated.
2014-02-07 14:12:54 +01:00
b225c53611
More cool stuff
2014-02-07 11:43:18 +01:00
f372d3e05b
Some cool stuff
2014-02-06 21:15:28 +01:00
81d43b59c0
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-05 15:54:56 +01:00
91db71fe0e
GL - 20 boxes and a house
2014-02-05 15:54:48 +01:00
a3cea997ba
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-05 15:47:00 +01:00
b39a670347
GL - Updated LevelLoader, works with Fredricks level editor.
2014-02-05 15:46:45 +01:00
201a07f0dc
GameServer - Merged with GameLogic
2014-02-05 15:16:31 +01:00
70a2cf27e3
GL - almost ok, at least on the top of the world
2014-02-05 11:53:38 +01:00
426444ca34
GL - added more boxes and weaponfunctionality
2014-02-05 11:46:04 +01:00
6818dda2b9
GL - testing
2014-02-05 09:06:33 +01:00
db822fa832
GameServer - Merged with gamelogic
2014-02-04 22:33:39 +01:00
b7f550859d
GameServer - Merge with GameLogic
2014-02-04 22:13:07 +01:00
b43902d31e
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 16:39:11 +01:00
ec4d34b131
GL - added error checking
2014-02-04 16:39:01 +01:00
4ad86ae83b
GL - Added jumppad(implemented but not tested)
2014-02-04 16:24:48 +01:00
d364456189
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 16:08:53 +01:00
d8c7220569
GL - added some testing things in player and more objects to the world
2014-02-04 16:08:28 +01:00
de8c76f051
GameServer - Fixed bugg where threads touched same data, n players should now be able to connect
2014-02-04 16:07:10 +01:00
b810fa1586
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 14:31:00 +01:00
8834f6a2ec
GL - LevelLoader update.
2014-02-04 14:30:45 +01:00
502d0c8586
GL - actually fixed respawning(turned off)
2014-02-04 14:07:13 +01:00
bd9e4599cb
GL - fixed respawning and also fixed weapon
2014-02-04 13:58:48 +01:00
9efa4fcb23
Commit error fix
...
for some odd reason Player.cpp change followed the last one
2014-02-04 13:08:03 +01:00
54deef7f2b
Project file fixes for GL
2014-02-04 13:06:10 +01:00
f88e16c581
GL - merge
2014-02-04 11:53:40 +01:00
fa02814ca0
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 11:50:40 +01:00
d54cffee8e
GL - camera follows player
2014-02-04 11:50:15 +01:00
2897305dd0
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-04 11:36:24 +01:00
1261ed734f
GL - Updated level loader.
2014-02-04 11:36:10 +01:00
3bf9f59f5a
GL - Player dies and respawns
2014-02-04 11:13:16 +01:00
fcadd5b4c3
GL - testing physics
2014-02-04 10:29:02 +01:00
1f28c05983
GL - added jump
2014-02-03 16:30:47 +01:00
cf73524e3b
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
2014-02-03 16:21:57 +01:00
e21cfe4cd4
GL - merge with Erik
2014-02-03 16:21:48 +01:00
2c3b1e5038
GL - using real dmg algorithm
2014-02-03 16:20:50 +01:00
ab962eea99
GL - added error check
2014-02-03 16:20:05 +01:00
7f29b62c6f
GL - YOU CAN NOW SHOOT STUFF YAAAAY
2014-02-03 16:19:24 +01:00
a3886c4f1f
GL - added models and started to fix camera movement
2014-02-03 15:52:00 +01:00
d77b3d92d8
GL - using movetolimbo in massdriver pickup functionallity
2014-02-03 15:45:48 +01:00
99b041f165
GL - first implementation of weapons forcepull with pickup functionallity
2014-02-03 15:32:58 +01:00
e7fee8b2e7
GL - Updated LevelLoader. Added lights.
...
Added lights.
Changed the return type to vector<SmartPointer<ObjectTypeHeader>>
Hid the LevelParser from the outside.
2014-02-03 14:50:27 +01:00
8f234611d2
GL - mergeissues fixed
2014-02-03 10:48:12 +01:00
ef71b365ab
asd
2014-02-03 10:42:40 +01:00
a673e64694
GameServer - Pre-merge with graphic
2014-01-31 22:52:52 +01:00
5b263caccd
GL - merge with GL
2014-01-31 16:42:25 +01:00
e327f64702
GL - can play with two characters
2014-01-31 16:33:16 +01:00
7b503bcb52
GL - working with snap
2014-01-31 15:17:09 +01:00
16f535bfa3
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Code/Game/GameLogic/AttatchmentMassDriver.cpp
Code/Game/GameLogic/Game_PlayerData.cpp
Code/Game/GameLogic/Level.cpp
2014-01-31 14:16:32 +01:00
b753387649
asd
2014-01-31 14:14:20 +01:00
16a342da49
GL - adjusting in GL, added forcepushData struct for passing args when shooting. connect changes in network
2014-01-31 14:05:52 +01:00
57c230d458
GL - will merge with physics
2014-01-31 13:56:22 +01:00
fa7f400c71
GL - test this robin
2014-01-31 10:58:03 +01:00
4df6b849a6
GL - working with new models and server
2014-01-31 09:39:44 +01:00
31feccf284
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
...
Conflicts:
Code/Game/DanBiasGame/GameClientState/GameState.cpp
Code/Game/GameLogic/Game.cpp
2014-01-31 09:17:54 +01:00
c30db71e94
GL - more testing and changes to the level and using the physics API
2014-01-31 09:12:15 +01:00
40f0fe61f0
GameServer - Fixed Protocols not recieveing properly and fixed the resource loader.
2014-01-31 08:41:08 +01:00
ae6a570a12
GL - trying to make walking nice
2014-01-30 15:12:53 +01:00
261421af21
Merge remote-tracking branch 'origin/GameLogic-LevelFormat' into GameLogic
2014-01-30 13:44:18 +01:00
c78bbba3eb
GL- Removed commentet unnecessary code
2014-01-30 13:33:59 +01:00
2a69af5c9f
GL - merge
2014-01-30 12:01:48 +01:00
323b7322fa
GL - testing
2014-01-30 11:11:45 +01:00
a249e7ede9
GL - merge with new serverAPI
2014-01-30 10:57:44 +01:00
09693c7f35
GL - merge
2014-01-30 09:40:58 +01:00
fa29cd7307
GameServer - Merged with GameLogic
2014-01-30 00:19:00 +01:00
44ba45bcc2
GL - added setCollisionfunc to object
2014-01-29 16:01:56 +01:00
1e89bb4e30
Fixed protocol messaging. Known crash when recieveing protocol on server after a while...
2014-01-29 15:01:14 +01:00
446bdd412b
GL - updated constructors to set before and after collision response functions
2014-01-29 14:33:21 +01:00
16334ea2db
GL - collision working, going to merge with physics
2014-01-29 13:18:17 +01:00
f968adebeb
GL - LevelLoader = done and done
2014-01-28 16:15:10 +01:00
3b552d5361
GL - change gamelogic to use the new physics
2014-01-28 15:44:32 +01:00
a56fcbcb9b
GL - can send object position from level objects, gravity and frustrum problems.
2014-01-28 15:04:25 +01:00
2b63563a9b
Merge branch 'GameLogic-LevelFormat' of https://github.com/dean11/Danbias into GameLogic-LevelFormat
2014-01-28 11:30:59 +01:00
d2ebad7445
GL - Fixed ParseFunction so now we only have 1 + specialcases functions instead of 1 function for every case
2014-01-28 11:29:35 +01:00
4de1c1aafd
GL - More Object structs, LevelLoader api comments.
...
Changed the LevelParser to use the new functions from ParserFunctions.
Might need to cast something to (void*).
2014-01-28 11:27:29 +01:00
dd2b214122
GL- la in memcpy för parsing i parseFunctions
2014-01-27 14:57:18 +01:00
e11dc6551c
GL - ?
2014-01-27 14:45:19 +01:00
a8dbf2a4c9
GL - added test box to level
2014-01-27 14:43:39 +01:00
3896514bae
GL - mergecommit
2014-01-27 14:02:37 +01:00
91bf6ce901
GL- LevelFormat fix
2014-01-27 13:57:18 +01:00
4085a5f5e2
GL - added shot protocol
2014-01-27 13:56:31 +01:00
1ed1bab751
Created test box that should now be shot at by the player
2014-01-27 13:55: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
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
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
561418c427
GL - gravity working
2014-01-21 14:28:27 +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
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
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
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
54240b217c
GameLogic - game interface updated(not finnished)
...
förlåt dennis
2014-01-14 10:28:12 +01:00
97cba4248d
GameServer - Added more protocols. Divided the code in gamesession into several .cpp files
2014-01-14 09:25:22 +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
059b3dd5e4
GameLogic - Basic game interface made (functions not yet implemented)
2014-01-10 12:33:15 +01:00
586031aa94
GameLogic - making sure GameLogic uses the new physics api
2014-01-10 10:08:42 +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
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
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
bb61b83392
GL - merge
2013-12-19 13:46:01 +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
0ea08fbd54
gamesession testing
2013-12-19 10:21:03 +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
2daf93987a
team fix
2013-12-18 08:41:31 +01:00
8173f3818d
gamelogic update and added some level design elements
...
teammanager, team,
2013-12-18 08:30:58 +01:00
f29f50f830
Merged with Gamelogic branch and fixed errors and added features
2013-12-14 22:04:42 +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
c63e9f1c08
Some comments on the massdriver and player
2013-12-12 12:21:19 +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
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
465ea1bd19
GL - soleved merge errors in project files
2013-12-10 11:50:35 +01:00
4b9f2671bf
updated weapon
2013-12-10 11:17:25 +01:00
97e0b1298a
added functionallity to player and weapon, started on the weapon design.
2013-12-10 09:57:05 +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
63addde51e
made "interfaces" of most classes
2013-12-05 11:50:39 +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
Sam Mario Svensson
lindaandersson
Robin Engman
Dennis Andersen
Pontus Fransson
Erik Persson
Dander7BD