Commit Graph

175 Commits

Author SHA1 Message Date
Dander7BD ee54ce5d73 Merge remote-tracking branch 'origin/GameClient' into PlayerRunEdits
Conflicts:
	Code/Game/GameClient/DanBiasGame_Impl.cpp
2014-02-27 12:47:26 +01:00
lanariel d5eeb3eec1 Merge branch 'New-inputsystem' of https://github.com/dean11/Danbias into Gtest 2014-02-27 09:05:09 +01:00
lanariel 3e72421cb5 half baked tiles 2014-02-27 09:04:12 +01:00
Dennis Andersen ffa6da1a2f GameLogic - Fixed drop on secondary, Modified how keys are sent 2014-02-27 08:19:50 +01:00
dean11 b1f82c8ef2 Merged with Physics 2014-02-26 14:07:46 +01:00
dean11 8d7bff808a NewInput - Merged with Gameserver 2014-02-25 16:49:33 +01:00
dean11 7c52fe236f NewInput - Merged with gameClient 2014-02-25 16:42:51 +01:00
dean11 0fd038be8c NewInpuit - Pre-merge with gameclient 2014-02-25 15:52:15 +01:00
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
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 6e0338ee6b Minor mathematical fix
AngularAxis had a bug.
SnapAngularAxis is determined broken. Do not use. :(
2014-02-24 14:35:38 +01:00
Pontus Fransson 203220f43b When OysterThread was idle it was using a lot of cpu power. 2014-02-23 22:06:18 +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
lanariel 8f0a0464a5 Merge branch 'Misc' of https://github.com/dean11/Danbias into GameClient 2014-02-21 11:51:00 +01:00
dean11 ed6f80765e Misc - Intergrated seperate textual input 2014-02-21 11:43:05 +01:00
dean11 3bdb65f92a Misc - Added methods for extracting resource reference count and resource size 2014-02-20 17:10:37 +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