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

1351 Commits

Author SHA1 Message Date
dean11 b4ad883472 New input - added new input and more menu stuff 2014-02-25 14:25:54 +01:00
dean11 6dc60a2082 Input - Added more functionality, custom tag and all-in-one key callback 2014-02-25 14:20:11 +01:00
dean11 13167064cb Input - Added mouse features, custom tags and all-in-one callback 2014-02-25 13:49:20 +01:00
Dennis Andersen 18d0a6460b Input - Added method for releasing default input object 2014-02-25 09:01:06 +01:00
Dennis Andersen df2572a95e Input - Added method for releasing default input object 2014-02-25 01:05:37 +01:00
Dander7BD 1f90de4cb4 some implemetations 2014-02-24 19:45:13 +01:00
Dander7BD 3071dfcb2f Merge remote-tracking branch 'origin/Input' into New-inputsystem 2014-02-24 16:41:18 +01:00
dean11 b46b6525cd Input - Merged with old input stuff that caused errors 2014-02-24 16:27:43 +01:00
dean11 cc17f80fd7 Input - Added toggle for input 2014-02-24 16:01:06 +01:00
Dander7BD 2d788137b2 Dans Raw device lab demo 
To be reverted
 2014-02-24 13:15:01 +01:00
Dennis Andersen 44aab68bfb Input - More support for mouse 2014-02-21 21:04:30 +01:00
Dander7BD dee6c5f8d1 MainState renders now a mouseCursor 2014-02-21 12:31:31 +01:00
Dander7BD 40276391af post merge fixes 2014-02-21 12:18:46 +01:00
Dander7BD 60a5ddc79d Merge remote-tracking branch 'origin/GameClient' into New-inputsystem 
Conflicts:
	Code/Game/GameClient/GameClient.vcxproj
	Code/Game/GameClient/GameClientState/GameState.cpp
 2014-02-21 12:14:22 +01:00
Dander7BD 9a470fc175 post merge fixes 2014-02-21 12:09:38 +01:00
Dander7BD adda3c1fff Merge remote-tracking branch 'origin/Input' into New-inputsystem 
Conflicts:
	Code/Misc/Input/Include/Mouse.h
 2014-02-21 11:54:40 +01:00
dean11 c04ef3a425 Misc - Merged with Input 2014-02-21 11:52:48 +01:00
dean11 ed6f80765e Misc - Intergrated seperate textual input 2014-02-21 11:43:05 +01:00
Pontus Fransson 54adb19eb8 Unnecessary get client 2014-02-21 10:54:30 +01:00
Pontus Fransson f8b8439874 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-21 10:49:46 +01:00
lindaandersson 0ade5fde25 GameClient UI base. TODO: make it look pretty 2014-02-21 10:49:02 +01:00
Pontus Fransson 93eb598012 Fixed dynamic objects not being updated on startup. 2014-02-21 10:48:09 +01:00
Dander7BD ac492b413b implementations 2014-02-21 09:36:43 +01:00
Dander7BD ab70cb53c4 Merge remote-tracking branch 'origin/GameClient' into New-inputsystem 
Conflicts:
	Code/Game/GameClient/GameClientState/GameState.cpp
	Code/Game/GameClient/GameClientState/GamingUI.cpp
 2014-02-20 17:19:48 +01:00
Dander7BD 61ce9a9a3e New input system integrations 2014-02-20 16:55:34 +01:00
lindaandersson 3bee35785a moved debug buttons to gameState 2014-02-20 16:51:14 +01:00
lindaandersson f03da77a55 Merge remote-tracking branch 'origin/Physics' into GameClientGraphics 2014-02-20 16:38:41 +01:00
lindaandersson d7a9772889 Merge with gameServer 2014-02-20 16:38:15 +01:00
Dander7BD 536f1a69da Merge remote-tracking branch 'origin/Input' into New-inputsystem 
Conflicts:
	Code/Misc/Input/Include/Mouse.h
 2014-02-20 16:36:06 +01:00
lindaandersson d83e545e58 Started adding GameUI 2014-02-20 16:35:49 +01:00
Dander7BD daa3f84c9c Added feature Input::Mouse::GetDeltaPosition 
plus a few improvements
 2014-02-20 16:34:45 +01:00
Pontus Fransson 708526a54b Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer 2014-02-20 16:24:44 +01:00
Dander7BD 3e8595f52c branch jumping 2014-02-20 16:15:47 +01:00
Erik Persson 41cd83500c GL - deleteing cones in attatchmentMassdriver 2014-02-20 16:02:53 +01:00
Pontus Fransson f532514131 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 15:57:36 +01:00
Pontus Fransson dedd0e87c7 Added player disconnect protocol. 2014-02-20 15:47:11 +01:00
Robin Engman e3141cd1f9 Added move to limbo for custom bodies 
NO idea if this works
 2014-02-20 15:45:07 +01:00
lanariel 67d150fce1 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 15:16:20 +01:00
lanariel a3c4099111 Global Tint 2014-02-20 15:15:54 +01:00
Robin Engman f8f656d7c9 Player now has better movement 
Something is "dragging" the player slightly, but will be fixed. Bumps up
and down, tweaking physical properties should fix it.
 2014-02-20 15:14:02 +01:00
Dander7BD fa2c4455f1 missed file 2014-02-20 14:59:24 +01:00
Dander7BD ccd1ce3ab1 jumping 2014-02-20 14:58:42 +01:00
Dander7BD 0aabd0b323 Merge remote-tracking branch 'origin/GameClient' into New-inputsystem 2014-02-20 14:40:04 +01:00
Dander7BD 8993241408 Win32ApplicationKeyboard fully implemented 
ApplicationKeyboard, Win32ApplicationKeyboard & implemented into the
CreateDevice function
 2014-02-20 14:39:12 +01:00
lindaandersson de70388dfb world matrix for RB on client fix 2014-02-20 13:35:51 +01:00
Dander7BD 2c8b52e0fa some implementations 2014-02-20 13:27:21 +01:00
dean11 8f3eb586c6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 12:44:24 +01:00
lanariel ab830f2293 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-20 12:08:31 +01:00
lanariel a965c66e13 Seperate Glow and Tint 2014-02-20 12:07:53 +01:00
lindaandersson 50fc2fcc29 Merge remote-tracking branch 'origin/GameLogic' into GameClient 2014-02-20 11:59:44 +01:00