Commit Graph

160 Commits

Author SHA1 Message Date
dean11 13167064cb Input - Added mouse features, custom tags and all-in-one callback 2014-02-25 13:49:20 +01:00
Dennis Andersen df2572a95e Input - Added method for releasing default input object 2014-02-25 01:05:37 +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
Dennis Andersen 44aab68bfb Input - More support for mouse 2014-02-21 21:04:30 +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
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
Dander7BD daa3f84c9c Added feature Input::Mouse::GetDeltaPosition
plus a few improvements
2014-02-20 16:34:45 +01:00
Dander7BD 3e8595f52c branch jumping 2014-02-20 16:15:47 +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
Dander7BD 2c8b52e0fa some implementations 2014-02-20 13:27:21 +01:00
dean11 8cf0087a95 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer 2014-02-20 11:32:57 +01:00
dean11 53dc42ffc4 Input - Added normalized cordinates 2014-02-20 11:27:43 +01:00
Dander7BD d945eea992 Fixed left turn mirroring and filter turn signals 2014-02-20 11:17:23 +01:00
Dander7BD a78a4f70f1 Dan doing stuff 2014-02-20 11:12:53 +01:00
Dander7BD 3b70e0baec Merge remote-tracking branch 'origin/GameClientGraphics' into GameClient 2014-02-19 16:09:07 +01:00
lanariel 4697b85e3b Small fixes 2014-02-19 15:57:52 +01:00
Dander7BD c2226fa9d1 Clamp fixed
WTF!? I'm 100% positive that I already did this fix. WTF!?
2014-02-19 15:47:55 +01:00
Dander7BD 706395680f Added bunch of Quaternion functions
Needed one of them to create  a bug trap
2014-02-19 14:51:37 +01:00
Dander7BD 0f1d07cee0 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient 2014-02-19 13:15:29 +01:00
Dander7BD 8816efafc8 GameState pre-work for subStates 2014-02-19 13:15:19 +01:00
Erik Persson c2ef8350cf GL - players created with unique ids 2014-02-19 10:15:52 +01:00
dean11 22f9daf0d8 Connection between server and client is stable 2014-02-18 16:38:08 +01:00
Dander7BD 2e75d168a1 New Cameras
V2 is quaternion based
2014-02-18 12:04:22 +01:00
Dander7BD c8c0bb9bc4 Clamp fixed 2014-02-18 11:06:11 +01:00
dean11 7395a0a495 Major cleanup 2014-02-17 10:38:11 +01:00
dean11 bb204a80f7 Merged with all modules 2014-02-17 09:17:28 +01:00
Dennis Andersen 97f9bfcb96 GameServer - merged with Camera 2014-02-16 01:28:34 +01:00
Dennis Andersen 21c640c6e1 GameServer - Merged with Standalone Server and modified some stuff, still compile errors, will try to merge with other 2014-02-16 01:12:03 +01:00
Dennis Andersen deb173bc46 GameServer - Merged with gamephysics 2014-02-15 22:49:13 +01:00
Dennis Andersen b834f1fb9b GameServer - Merged with GameServer 2014-02-15 22:33:40 +01:00
Dennis Andersen 359c208f57 GameServer - Some minor changes 2014-02-15 09:29:54 +01:00
Dander7BD ba7f9aaa38 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer
Conflicts:
	Code/Game/DanBiasGame/GameClientState/C_Object.h
	Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.cpp
	Code/Game/DanBiasGame/GameClientState/C_obj/C_Player.h
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
2014-02-14 15:38:01 +01:00
lindaandersson bfb9864be9 GL - handle if the model dose not exist 2014-02-14 15:07:55 +01:00
Dander7BD 14661a86f8 Merge remote-tracking branch 'origin/GameLogic' into Camera-Merge-buffer
Conflicts:
	Code/Game/DanBiasGame/DanBiasGame_Impl.cpp
	Code/Game/DanBiasGame/GameClientState/GameState.cpp
2014-02-14 10:02:25 +01:00
Pontus Fransson 06ae4d29dd GL - Fixed some warnings. 2014-02-14 09:44:31 +01:00
Dander7BD 49fc55be60 Textfield and Bunch of fixes 2014-02-14 09:40:53 +01:00
Dander7BD 3b225ea054 Merge 2014-02-13 15:32:54 +01:00
Pontus Fransson d01acbcbe0 Misc - Added text and textcolor to buttons, seperate render function. 2014-02-13 15:21:19 +01:00
Pontus Fransson 74d28d1f62 Misc - Changed to MouseInput struct in EventHandler update. 2014-02-12 15:44:27 +01:00
Pontus Fransson b9c4fe1849 GL - Eventhandler does not delete collections any more. 2014-02-12 15:12:01 +01:00
lindaandersson 10c0019c02 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic 2014-02-12 11:36:19 +01:00
Pontus Fransson f2a444507c GL - FIxed Button state flickering, added flag resizeToScreenAspectRatio. 2014-02-12 11:35:57 +01:00
lindaandersson c1757eef21 GL - moving character 2014-02-12 11:35:34 +01:00
Pontus Fransson 8e07475434 GL - Buttons is now using one texture per button type. Fixed button state when spamming the button. 2014-02-12 10:02:52 +01:00
Pontus Fransson 0bae7b9c6b Misc - Fixed a few errors that can occur 2014-02-12 09:50:09 +01:00
Pontus Fransson d0955b2f4e GL - Button delete update. 2014-02-12 09:08:38 +01:00