NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,214 Commits 1 Branch 0 Tags 38 MiB
Commit Graph

252 Commits

Author SHA1 Message Date
dean11 7395a0a495 Major cleanup 2014-02-17 10:38:11 +01:00
dean11 fb48b0b34c Merge branch 'Camera' of https://github.com/dean11/Danbias into GameServer 2014-02-17 09:11:08 +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 d32e614b00 GL - Hax to get the world model initiated. reading spawnpoints 2014-02-14 16:03:46 +01:00
Sam Mario Svensson 26fb7a5664 GL- Compile fel med spawnpoint fixat 2014-02-14 15:36:19 +01:00
Sam Mario Svensson 3051621f30 GL- levelLoader can now load a correct spawnpoint 2014-02-14 15:19:07 +01:00
lindaandersson 25b0162b59 GL - explosive crate testing 2014-02-14 13:54:50 +01:00
lindaandersson bab3af787c GL - merge with new physics movement 2014-02-14 13:54:28 +01:00
lindaandersson 8110b677ff GL - added spawnpoint array 2014-02-14 13:09:55 +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
Erik Persson 7791dc076e GL - static and dynamic objects can now set extraDamageOnCollision in constructor 2014-02-14 11:16:15 +01:00
lindaandersson 975894b037 GL - init objects 2014-02-14 11:11:49 +01:00
lindaandersson 9038277a2c Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-14 11:07:11 +01:00
lindaandersson 1a01dbd760 GL - initiating objects 2014-02-14 11:07:03 +01:00
Erik Persson 8d8fa78da0 GL - fixed portal constructor 2014-02-14 11:04:01 +01:00
Erik Persson c5e4580ada GL - include error fixed 2014-02-14 10:59:33 +01:00
Erik Persson f14a83aef2 GL - Explosivebox now takes a float forceMagnitude instead of a vector 2014-02-14 10:57:24 +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 5defe7c0f7 GL - fixed compile errors 2014-02-14 10:08:29 +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
lindaandersson 2dee9dd084 GL - initiating ccc map from folder ../Content/Worlds. Sync with graphics content. 2014-02-13 16:33:26 +01:00
Erik Persson bd6b531418 GL - added Portal and started on crystalformation 2014-02-13 09:58:25 +01:00
Sam Mario Svensson 573a0109e3 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 
Conflicts:
	Code/Game/GameLogic/GameLogicStates.h
	Code/Game/GameLogic/JumpPad.cpp
	Code/Game/GameLogic/JumpPad.h
 2014-02-12 15:03:40 +01:00
Sam Mario Svensson 64b2d688bd Försök till merge men det är cp 2014-02-12 14:48:58 +01:00
Erik Persson 6cbec3e2ac GL - jumppad testing 2014-02-12 14:45:10 +01:00
Erik Persson 14d492f22e changes in massdriver 2014-02-12 14:12:48 +01:00
lindaandersson 7c44e8ba17 GL - added jumppad model and rigidbody 2014-02-12 14:12:47 +01:00
Erik Persson b95e1d6b7a changes in massdriver 2014-02-12 14:00:53 +01:00
lindaandersson 97c3097fc7 GL - added jumppad model and rigidbody 2014-02-12 13:37:21 +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 10c0019c02 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 11:36:19 +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
Erik Persson 3a80a71143 GL - working on weapon 2014-02-12 11:32:30 +01:00
Erik Persson 7394f68769 GL - fixed what some asshole did in weapon 2014-02-12 10:57:43 +01:00
Erik Persson 1db41a863b Merge remote-tracking branch 'origin/GamePhysics' into GameLogic 2014-02-12 10:44:13 +01:00
Erik Persson 0d643a890d GL - massdriver 2014-02-12 10:43:41 +01:00
lindaandersson 8c1f1e6608 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 09:32:22 +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