NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • a8055cfbf7 Merge with physics Linda Andersson 2014-02-26 10:25:39 +0100
  • dbbc7a9769 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2014-02-26 10:24:42 +0100
  • 925f05b3b0 Health pickups is now working! Pontus Fransson 2014-02-26 10:23:38 +0100
  • 9ec3fc6fa4 Does not render non visible models anymore. Pontus Fransson 2014-02-26 10:22:43 +0100
  • 8798fc9006 Fixed static id not matching on client/server. Pontus Fransson 2014-02-26 10:22:08 +0100
  • 2f19390cd2 Fixed player jump Robin Engman 2014-02-26 10:05:18 +0100
  • 13d6a062fc Added collision and weapon events and send them to client Linda Andersson 2014-02-26 10:05:07 +0100
  • 2d9f89676a Merge with GL Robin Engman 2014-02-26 09:48:19 +0100
  • 08bec9470e Merge remote-tracking branch 'origin/GameServer' into Physics Robin Engman 2014-02-26 09:39:39 +0100
  • 8438b7dfbb Renamed actionEvent Linda Andersson 2014-02-26 09:11:45 +0100
  • 4d077106dc Weapon action enum added Linda Andersson 2014-02-26 08:51:56 +0100
  • ca693c412f Player air check function Robin Engman 2014-02-26 08:51:18 +0100
  • 081bd9db36 Merge branch 'New-inputsystem' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-26 08:49:15 +0100
  • 47e6d93957 Fixed player going bonkers on lower hemisphere Robin Engman 2014-02-25 18:25:51 +0100
  • 6b9be0ee8e Multi bone animation support Dander7BD 2014-02-25 17:05:25 +0100
  • 8d7bff808a NewInput - Merged with Gameserver dean11 2014-02-25 16:49:33 +0100
  • 7c52fe236f NewInput - Merged with gameClient dean11 2014-02-25 16:42:51 +0100
  • de3250f650 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Linda Andersson 2014-02-25 16:26:46 +0100
  • 638f2f6241 Addded objectDelete protocol. Enable/ disable will be used for visibility on client Linda Andersson 2014-02-25 16:26:37 +0100
  • 11eda5065e Reading hp pickups from levelformat. Updating pickups. Pontus Fransson 2014-02-25 16:10:02 +0100
  • f2bb50804c Play action animation Linda Andersson 2014-02-25 16:08:45 +0100
  • d56d1d7569 Fixed error with reading lights from level format. Pontus Fransson 2014-02-25 16:07:50 +0100
  • 0fd038be8c NewInpuit - Pre-merge with gameclient dean11 2014-02-25 15:52:15 +0100
  • 2052f60ea4 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Pontus Fransson 2014-02-25 14:37:07 +0100
  • 0369d8cf19 Not finished Pickup system. Pontus Fransson 2014-02-25 14:36:54 +0100
  • 2996627c56 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameLogic Linda Andersson 2014-02-25 14:35:39 +0100
  • b8395e9af7 Added eventfunctions for PlayerAction and PickupEvent Linda Andersson 2014-02-25 14:35:27 +0100
  • b4ad883472 New input - added new input and more menu stuff dean11 2014-02-25 14:25:54 +0100
  • 6dc60a2082 Input - Added more functionality, custom tag and all-in-one key callback dean11 2014-02-25 14:20:11 +0100
  • 73ca65516d More stuff Tobias Grundel 2014-02-25 14:12:06 +0100
  • 70419e9dd8 Nothing of importance Tobias Grundel 2014-02-25 14:08:15 +0100
  • 31bf73c2fd GL - weapon energy, force etc inside weapon Erik Persson 2014-02-25 13:56:35 +0100
  • 13167064cb Input - Added mouse features, custom tags and all-in-one callback dean11 2014-02-25 13:49:20 +0100
  • f56323ee01 Merge with affectedByTag. Sending killer ID Linda Andersson 2014-02-25 12:12:24 +0100
  • 7460f16512 Added player stats. Added players to level. Respawn logic in level. Linda Andersson 2014-02-25 11:46:05 +0100
  • 8a359bd1ba GL - only 1 player can manipulate a object at a time Erik Persson 2014-02-25 11:20:46 +0100
  • 5ba57c1a72 Merge remote-tracking branch 'origin/GameClient' into GameLogic Erik Persson 2014-02-25 10:44:51 +0100
  • bc17a9f09e merge Erik Persson 2014-02-25 10:37:33 +0100
  • 53f0699b61 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lanariel 2014-02-25 09:45:13 +0100
  • f35f96b8f2 Instanced fix, render char, manual instanced flag per model, wireframe fix lanariel 2014-02-25 09:45:02 +0100
  • 18d0a6460b Input - Added method for releasing default input object Dennis Andersen 2014-02-25 01:05:37 +0100
  • 0af0404812 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-25 08:54:59 +0100
  • df2572a95e Input - Added method for releasing default input object Dennis Andersen 2014-02-25 01:05:37 +0100
  • 56258e48c7 Merge branch 'New-inputsystem' of https://github.com/dean11/Danbias into Input Dennis Andersen 2014-02-25 00:08:11 +0100
  • 282cbebd7c Merge branch 'Input' of https://github.com/dean11/Danbias into Input Dennis Andersen 2014-02-25 00:07:01 +0100
  • 1f90de4cb4 some implemetations Dander7BD 2014-02-24 19:45:13 +0100
  • 3071dfcb2f Merge remote-tracking branch 'origin/Input' into New-inputsystem Dander7BD 2014-02-24 16:41:18 +0100
  • feb7c51e1c Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-24 16:30:31 +0100
  • b46b6525cd Input - Merged with old input stuff that caused errors dean11 2014-02-24 16:27:43 +0100
  • 9ccdbd55e2 Not connecting with broadcast anymore. Pontus Fransson 2014-02-24 16:18:47 +0100
  • cc17f80fd7 Input - Added toggle for input dean11 2014-02-24 16:01:06 +0100
  • 1b0772a004 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient Linda Andersson 2014-02-24 14:59:35 +0100
  • 114e14c408 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-24 14:59:09 +0100
  • 627063748d Player action protocol added lindaandersson 2014-02-24 14:59:01 +0100
  • 704e562d01 Merge branch 'GameServer' into GameClient Linda Andersson 2014-02-24 14:48:36 +0100
  • f77f67eaaa Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lanariel 2014-02-24 14:44:46 +0100
  • 37e9d47207 Instanced Rendering lanariel 2014-02-24 14:44:36 +0100
  • 6e0338ee6b Minor mathematical fix Dander7BD 2014-02-24 14:35:38 +0100
  • 2d788137b2 Dans Raw device lab demo Dander7BD 2014-02-24 13:15:01 +0100
  • 342aada491 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-24 12:31:19 +0100
  • 7f067b0010 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-24 11:05:30 +0100
  • bf07ef5f5f Connecting to the ip and port received in the last broadcast message. Pontus Fransson 2014-02-23 22:25:41 +0100
  • 5fe89f1d8f Fixed some crashes and added mutex around broadcast options on network server. Pontus Fransson 2014-02-23 22:07:33 +0100
  • 203220f43b When OysterThread was idle it was using a lot of cpu power. Pontus Fransson 2014-02-23 22:06:18 +0100
  • 0cb7940bae Sending real ip address, port and server name. Pontus Fransson 2014-02-23 21:15:16 +0100
  • be1c3e2af0 Sending strings in broadcast message. Pontus Fransson 2014-02-23 20:40:29 +0100
  • d64f3d7a20 Broadcasting works and I am getting the protocols out to LanMenuState! Pontus Fransson 2014-02-23 20:23:15 +0100
  • a0bf9e862a Started implementing broadcasting. Pontus Fransson 2014-02-23 18:38:20 +0100
  • 8e9d1a4999 Reworked NetworkClient's thread. Pontus Fransson 2014-02-22 22:38:28 +0100
  • 6eb0a282c2 LevelLoader reads lights and cgMesh correctly. Pontus Fransson 2014-02-22 12:58:43 +0100
  • 44aab68bfb Input - More support for mouse Dennis Andersen 2014-02-21 21:04:30 +0100
  • 7bb67b6a85 sec respawn lindaandersson 2014-02-21 15:56:32 +0100
  • 1d147004a2 small fixes and explosive crate do 90 dmg lindaandersson 2014-02-21 15:54:43 +0100
  • 4f838bb39e Merge remote-tracking branch 'origin/GameLogic' into GameClient lindaandersson 2014-02-21 15:42:21 +0100
  • 22f52150d5 Sending dmg, respawn and dead from player to client lindaandersson 2014-02-21 15:42:09 +0100
  • 8e0f6eefda Merge remote-tracking branch 'origin/Physics' into GameLogic Erik Persson 2014-02-21 15:04:48 +0100
  • ed3152057c GL - fixing with explosivecrate and massdriver Erik Persson 2014-02-21 15:02:42 +0100
  • e133562021 Merge with server Robin Engman 2014-02-21 14:14:30 +0100
  • 954dc67f7a Fixed multiple collisions Robin Engman 2014-02-21 14:09:38 +0100
  • 1c71d7ef80 Don't update/send to inavlidated clients Pontus Fransson 2014-02-21 13:54:04 +0100
  • 17d5991545 Merge branch 'GameLogic' of https://github.com/dean11/Danbias into GameServer dean11 2014-02-21 13:24:58 +0100
  • 4360519be7 Merge remote-tracking branch 'origin/GameClient' into GameLogic Erik Persson 2014-02-21 13:00:20 +0100
  • 87cf2d8ac5 GL - stuff Erik Persson 2014-02-21 12:59:04 +0100
  • b0aa6acdd6 Merge branch 'GameClient' of https://github.com/dean11/Danbias into GameClient lindaandersson 2014-02-21 12:38:34 +0100
  • 38717f011c Render players with run animation lindaandersson 2014-02-21 12:38:25 +0100
  • dee6c5f8d1 MainState renders now a mouseCursor Dander7BD 2014-02-21 12:31:31 +0100
  • d7e0b55a82 Experiment - Release from limbo Robin Engman 2014-02-21 12:21:10 +0100
  • 5aeac78f60 instanced structure in place lanariel 2014-02-21 12:19:53 +0100
  • 40276391af post merge fixes Dander7BD 2014-02-21 12:18:46 +0100
  • 60a5ddc79d Merge remote-tracking branch 'origin/GameClient' into New-inputsystem Dander7BD 2014-02-21 12:14:22 +0100
  • 9a470fc175 post merge fixes Dander7BD 2014-02-21 12:09:38 +0100
  • 7f4120e807 Merge remote-tracking branch 'origin/GameLogic' into Physics Robin Engman 2014-02-21 11:59:42 +0100
  • 3c25bb62ba Merge remote-tracking branch 'origin/GameClient' into Physics Robin Engman 2014-02-21 11:58:59 +0100
  • 695d6db7a9 Merge remote-tracking branch 'origin/GameServer' into GameLogic Erik Persson 2014-02-21 11:57:21 +0100
  • a4a531264f GL - second draft damage Erik Persson 2014-02-21 11:56:48 +0100
  • adda3c1fff Merge remote-tracking branch 'origin/Input' into New-inputsystem Dander7BD 2014-02-21 11:54:40 +0100
  • c04ef3a425 Misc - Merged with Input dean11 2014-02-21 11:52:48 +0100
  • 8f0a0464a5 Merge branch 'Misc' of https://github.com/dean11/Danbias into GameClient lanariel 2014-02-21 11:51:00 +0100
  • 957d73f0f7 Merge branch 'GameServer' of https://github.com/dean11/Danbias into GameClient lanariel 2014-02-21 11:50:22 +0100
  • bd0daf363d start with Instanced lanariel 2014-02-21 11:49:24 +0100