Robin Engman
|
3520062577
|
Implemented TurnLeft function
|
2014-02-19 13:59:59 +01:00 |
|
Robin Engman
|
0a9b522e15
|
Merge remote-tracking branch 'origin/GameLogic' into Physics
|
2014-02-19 13:50:33 +01:00 |
dean11
|
f0c581ca04
|
GameLogic - Added functions for relative rotation
|
2014-02-19 13:47:49 +01:00 |
|
dean11
|
8a3cd796ca
|
GameServer - Pontus found idiot bug that dennis made
|
2014-02-19 12:46:05 +01:00 |
Erik Persson
|
be8b7537b5
|
GL - merging
|
2014-02-18 13:47:40 +01:00 |
|
dean11
|
d96825816d
|
Merge branch 'GamePhysics' of https://github.com/dean11/Danbias into GameServer
|
2014-02-17 09:01:41 +01:00 |
|
Robin Engman
|
a90f33d20e
|
Jumpy jump
|
2014-02-17 06:44:29 +01:00 |
lindaandersson
|
25b0162b59
|
GL - explosive crate testing
|
2014-02-14 13:54:50 +01:00 |
|
Erik Persson
|
8b92c015ea
|
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
Conflicts:
Code/Game/GameLogic/Player.cpp
|
2014-02-14 12:46:27 +01:00 |
|
Robin Engman
|
f8e68b95b2
|
Temporary jump
|
2014-02-14 12:07:49 +01:00 |
|
Erik Persson
|
9fc8a8840f
|
GL - fixed movement(pretty unstable but its working)
|
2014-02-14 12:03:29 +01:00 |
|
Robin Engman
|
61c49cf352
|
Merge with game logic
|
2014-02-14 11:54:28 +01:00 |
|
Robin Engman
|
a42dfe96f1
|
Jump implemented
|
2014-02-14 11:52:44 +01:00 |
|
Erik Persson
|
8bbdb1156a
|
Merge remote-tracking branch 'origin/GamePhysics' into GameLogic
|
2014-02-14 11:34:47 +01:00 |
|
lindaandersson
|
50d07a102d
|
GL - initiate lvl
|
2014-02-14 10:32:41 +01:00 |
|
lindaandersson
|
1fc6f16409
|
GL - rotation testing
|
2014-02-14 10:09:03 +01:00 |
|
Erik Persson
|
59697bfcea
|
GL - fixed constructors to ease creation of objects, also fixed weapon crash on destruction
|
2014-02-14 09:59:26 +01:00 |
|
Robin Engman
|
ff951d2183
|
Moving fixed
Jumping and waiting for camera is next
|
2014-02-13 19:49:33 +01:00 |
Sam Mario Svensson
|
64b2d688bd
|
Försök till merge men det är cp
|
2014-02-12 14:48:58 +01:00 |
|
lindaandersson
|
25590566d1
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-12 13:13:40 +01:00 |
|
Erik Persson
|
b34df93e49
|
GL - Massdriver updates
|
2014-02-12 13:12:51 +01:00 |
|
lindaandersson
|
e8536cc5d4
|
GL - removed before collision event, sending look and right dir to server
|
2014-02-12 13:11:35 +01:00 |
|
lindaandersson
|
cc4e3f947c
|
GL - playermovement fixed, can walk in diagonal directions
|
2014-02-12 12:16:16 +01:00 |
|
lindaandersson
|
fa16f71a26
|
GL - forgot to commit files
|
2014-02-12 11:36:08 +01:00 |
|
lindaandersson
|
bdc5b5e736
|
GL - fixed graphics, collision with house, locked to 30 fps on client, jump added
|
2014-02-12 09:32:13 +01:00 |
|
lindaandersson
|
d771a5181d
|
GL - rotation and gravity fixed
|
2014-02-11 13:41:38 +01:00 |
|
lindaandersson
|
528a591fab
|
GL - almost rotating
|
2014-02-11 11:46:06 +01:00 |
|
lindaandersson
|
d16d223c2b
|
GL - player moving
|
2014-02-11 10:11:38 +01:00 |
|
lindaandersson
|
b731c206f4
|
GL - physics merge 2
|
2014-02-10 15:54:38 +01:00 |
|
Robin Engman
|
ba0d6ca73a
|
Amazing merge with server
|
2014-02-10 12:42:31 +01:00 |
|
Robin Engman
|
99146430a4
|
Major overhaul
|
2014-02-09 21:24:09 +01:00 |
|
Dennis Andersen
|
310ed3dfc5
|
GameServer - Multiplayer now working properly
|
2014-02-09 16:42:26 +01:00 |
|
lindaandersson
|
70a2cf27e3
|
GL - almost ok, at least on the top of the world
|
2014-02-05 11:53:38 +01:00 |
|
lindaandersson
|
426444ca34
|
GL - added more boxes and weaponfunctionality
|
2014-02-05 11:46:04 +01:00 |
|
lindaandersson
|
6818dda2b9
|
GL - testing
|
2014-02-05 09:06:33 +01:00 |
|
lindaandersson
|
b43902d31e
|
Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic
|
2014-02-04 16:39:11 +01:00 |
|
lindaandersson
|
ec4d34b131
|
GL - added error checking
|
2014-02-04 16:39:01 +01:00 |
|
Erik Persson
|
4ad86ae83b
|
GL - Added jumppad(implemented but not tested)
|
2014-02-04 16:24:48 +01:00 |
|
lindaandersson
|
d8c7220569
|
GL - added some testing things in player and more objects to the world
|
2014-02-04 16:08:28 +01:00 |
|
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 |