Dander7BD
|
f04a928d6e
|
Merge remote-tracking branch 'origin/Physics' into GameClient
|
2014-02-19 14:01:46 +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 |
lindaandersson
|
932ef429c2
|
GameClient - removed hardcoding for lvl, use 2ofAll map for correct world. Init player gets wrong scale and isMyPlayer. Need to verify camera on client
|
2014-02-19 12:09:42 +01:00 |
|
dean11
|
65163447bb
|
GameServer - Merged with Physics
|
2014-02-19 11:09:37 +01:00 |
|
Robin Engman
|
fa95e6b821
|
Linda fixing some lvl loading stuff
|
2014-02-19 10:55:59 +01:00 |
Erik Persson
|
c2ef8350cf
|
GL - players created with unique ids
|
2014-02-19 10:15:52 +01:00 |
|
Erik Persson
|
be8b7537b5
|
GL - merging
|
2014-02-18 13:47:40 +01:00 |
|
lindaandersson
|
25b0162b59
|
GL - explosive crate testing
|
2014-02-14 13:54:50 +01:00 |
|
Robin Engman
|
f8e68b95b2
|
Temporary jump
|
2014-02-14 12:07:49 +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 |
|
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 |
|
lindaandersson
|
2dee9dd084
|
GL - initiating ccc map from folder ../Content/Worlds. Sync with graphics content.
|
2014-02-13 16:33:26 +01:00 |
Sam Mario Svensson
|
64b2d688bd
|
Försök till merge men det är cp
|
2014-02-12 14:48:58 +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
|
fa16f71a26
|
GL - forgot to commit files
|
2014-02-12 11:36:08 +01:00 |
|
lindaandersson
|
c1757eef21
|
GL - moving character
|
2014-02-12 11:35:34 +01:00 |
|
lindaandersson
|
d771a5181d
|
GL - rotation and gravity fixed
|
2014-02-11 13:41:38 +01:00 |
|
dean11
|
de4ea0a830
|
GameServer - Merged with GameLogic, some stuff is broken
|
2014-02-11 13:03:37 +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 |
|
lindaandersson
|
49d29d87a5
|
GL - merge with bullet physics and updated server
|
2014-02-10 14:41:43 +01:00 |
|
lindaandersson
|
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 |
|
Robin Engman
|
99146430a4
|
Major overhaul
|
2014-02-09 21:24:09 +01:00 |
|
Robin Engman
|
ab9f81ac60
|
Collisions work better
Still needs polishing
|
2014-02-07 15:38:53 +01:00 |
|
Robin Engman
|
f372d3e05b
|
Some cool stuff
|
2014-02-06 21:15:28 +01:00 |
|
lindaandersson
|
91db71fe0e
|
GL - 20 boxes and a house
|
2014-02-05 15:54:48 +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
|
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
|
8f234611d2
|
GL - mergeissues fixed
|
2014-02-03 10:48:12 +01:00 |
|
Erik Persson
|
ef71b365ab
|
asd
|
2014-02-03 10:42:40 +01:00 |
|
lindaandersson
|
e327f64702
|
GL - can play with two characters
|
2014-01-31 16:33:16 +01:00 |
|
lindaandersson
|
7b503bcb52
|
GL - working with snap
|
2014-01-31 15:17:09 +01:00 |
|
lindaandersson
|
fa7f400c71
|
GL - test this robin
|
2014-01-31 10:58:03 +01:00 |
|
Erik Persson
|
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 |
|
Erik Persson
|
c30db71e94
|
GL - more testing and changes to the level and using the physics API
|
2014-01-31 09:12:15 +01:00 |
|
Erik Persson
|
ae6a570a12
|
GL - trying to make walking nice
|
2014-01-30 15:12:53 +01:00 |
|
lindaandersson
|
2a69af5c9f
|
GL - merge
|
2014-01-30 12:01:48 +01:00 |
|
Erik Persson
|
323b7322fa
|
GL - testing
|
2014-01-30 11:11:45 +01:00 |
|
lindaandersson
|
a249e7ede9
|
GL - merge with new serverAPI
|
2014-01-30 10:57:44 +01:00 |
|
lindaandersson
|
09693c7f35
|
GL - merge
|
2014-01-30 09:40:58 +01:00 |
|
Dennis Andersen
|
fa29cd7307
|
GameServer - Merged with GameLogic
|
2014-01-30 00:19:00 +01:00 |
|
Dennis Andersen
|
1e89bb4e30
|
Fixed protocol messaging. Known crash when recieveing protocol on server after a while...
|
2014-01-29 15:01:14 +01:00 |