Erik Persson
|
502d0c8586
|
GL - actually fixed respawning(turned off)
|
2014-02-04 14:07:13 +01:00 |
Dander7BD
|
9efa4fcb23
|
Commit error fix
for some odd reason Player.cpp change followed the last one
|
2014-02-04 13:08:03 +01:00 |
|
Dander7BD
|
54deef7f2b
|
Project file fixes for GL
|
2014-02-04 13:06:10 +01:00 |
lindaandersson
|
f88e16c581
|
GL - merge
|
2014-02-04 11:53:40 +01:00 |
|
lindaandersson
|
fa02814ca0
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 11:50:40 +01:00 |
|
lindaandersson
|
d54cffee8e
|
GL - camera follows player
|
2014-02-04 11:50:15 +01:00 |
|
Erik Persson
|
3bf9f59f5a
|
GL - Player dies and respawns
|
2014-02-04 11:13:16 +01:00 |
|
lindaandersson
|
fcadd5b4c3
|
GL - testing physics
|
2014-02-04 10:29:02 +01:00 |
|
lindaandersson
|
1f28c05983
|
GL - added jump
|
2014-02-03 16:30:47 +01:00 |
|
lindaandersson
|
e21cfe4cd4
|
GL - merge with Erik
|
2014-02-03 16:21:48 +01:00 |
|
lindaandersson
|
ab962eea99
|
GL - added error check
|
2014-02-03 16:20:05 +01:00 |
|
lindaandersson
|
a3886c4f1f
|
GL - added models and started to fix camera movement
|
2014-02-03 15:52:00 +01:00 |
|
Erik Persson
|
99b041f165
|
GL - first implementation of weapons forcepull with pickup functionallity
|
2014-02-03 15:32:58 +01:00 |
|
Erik Persson
|
ae6a570a12
|
GL - trying to make walking nice
|
2014-01-30 15:12:53 +01:00 |
|
Erik Persson
|
323b7322fa
|
GL - testing
|
2014-01-30 11:11:45 +01:00 |
|
lindaandersson
|
446bdd412b
|
GL - updated constructors to set before and after collision response functions
|
2014-01-29 14:33:21 +01:00 |
|
lindaandersson
|
3b552d5361
|
GL - change gamelogic to use the new physics
|
2014-01-28 15:44:32 +01:00 |
|
lindaandersson
|
3896514bae
|
GL - mergecommit
|
2014-01-27 14:02:37 +01:00 |
|
lindaandersson
|
4085a5f5e2
|
GL - added shot protocol
|
2014-01-27 13:56:31 +01:00 |
|
Erik Persson
|
1ed1bab751
|
Created test box that should now be shot at by the player
|
2014-01-27 13:55:09 +01:00 |
|
Erik Persson
|
74ac5e2d31
|
Updated creation of objects
|
2014-01-27 08:54:25 +01:00 |
|
lindaandersson
|
fb2cf714c6
|
GL - sending dir to server, forward and backward walking works
|
2014-01-23 14:28:53 +01:00 |
|
lindaandersson
|
07e5519850
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-23 09:25:02 +01:00 |
|
lindaandersson
|
8c297d1e9b
|
GL - starting to send lookdir to server
|
2014-01-23 09:24:55 +01:00 |
|
Erik Persson
|
bd739f8acb
|
GL - Creation of objects kinda sorted
|
2014-01-23 09:14:04 +01:00 |
|
lindaandersson
|
a591903d8f
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-23 08:25:10 +01:00 |
|
lindaandersson
|
f657a58a4f
|
GL - adding a camera on the client
|
2014-01-23 08:24:35 +01:00 |
|
Erik Persson
|
ebaa668382
|
Major updates to Collision handling with the class CollitionManager. changes started on the massdriver
|
2014-01-21 16:09:39 +01:00 |
|
lindaandersson
|
561418c427
|
GL - gravity working
|
2014-01-21 14:28:27 +01:00 |
Dennis Andersen
|
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 |
|
Dennis Andersen
|
386b27e2f7
|
GameLogic - Merge with sprint2.5
|
2014-01-20 16:17:01 +01:00 |
|
Dennis Andersen
|
6c3c234be1
|
GameLogic - pree-sprint merge
|
2014-01-20 15:47:52 +01:00 |
|
Erik Persson
|
ce4c57bab3
|
GL - player inherits dynamicobject instead of object
|
2014-01-20 08:40:41 +01:00 |
|
lindaandersson
|
7b2be02113
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-01-16 12:26:33 +01:00 |
|
lindaandersson
|
a168328a44
|
GL - movement with physics working!!
|
2014-01-16 12:26:14 +01:00 |
|
Erik Persson
|
0080a9f6f2
|
small name changes
|
2014-01-16 11:17:19 +01:00 |
|
Dennis Andersen
|
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 |
|
Dennis Andersen
|
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 |
|
Erik Persson
|
059b3dd5e4
|
GameLogic - Basic game interface made (functions not yet implemented)
|
2014-01-10 12:33:15 +01:00 |
|
Erik Persson
|
586031aa94
|
GameLogic - making sure GameLogic uses the new physics api
|
2014-01-10 10:08:42 +01:00 |
|
Erik Persson
|
52ba5602d5
|
GameLogic - player now using some of the new phys api
|
2014-01-09 13:06:18 +01:00 |
|
Erik Persson
|
48b9189a03
|
Revert "state"
This reverts commit 4a07586076.
|
2014-01-09 12:51:17 +01:00 |
|
Erik Persson
|
4a07586076
|
state
|
2014-01-09 12:43:32 +01:00 |
|
Dennis Andersen
|
ed202a15a2
|
Worked over the holidays
|
2014-01-07 10:26:09 +01:00 |
|
Dennis Andersen
|
0065779205
|
Added comments where the physic generated errors due to big patch
|
2013-12-21 17:37:30 +01:00 |
|
Dennis Andersen
|
15d6ac8cf9
|
GameLogic - Final sprint2 merge
|
2013-12-20 09:42:02 +01:00 |
|
Dennis Andersen
|
694d5576d7
|
GameLogic - Pre-merge with physics
|
2013-12-19 15:35:49 +01:00 |
|
Erik Persson
|
0ea08fbd54
|
gamesession testing
|
2013-12-19 10:21:03 +01:00 |
|
Erik Persson
|
8173f3818d
|
gamelogic update and added some level design elements
teammanager, team,
|
2013-12-18 08:30:58 +01:00 |
|
Erik Persson
|
c63e9f1c08
|
Some comments on the massdriver and player
|
2013-12-12 12:21:19 +01:00 |