 Jace
|
505a6c7396
|
Hiding first person models properly
|
2016-01-25 14:32:48 +01:00 |
|
|
Jace
|
b6fd18baed
|
Hacked in serverside effects
|
2016-01-25 11:56:40 +01:00 |
|
|
Jace
|
4245264029
|
Weapon RayZ
Weapon RayZ
|
2016-01-25 11:26:33 +01:00 |
|
|
Jace
|
b95c1fdfa4
|
Merge remote-tracking branch 'origin/Menu'
# Conflicts:
# include/Engine/Rendering/ModelJob.h
# resources/Schema/Components.xsd
# resources/Schema/Entities/Player.xml
# resources/Schema/Entities/RenderingWorld.xml
# src/Game/Game.cpp
|
2016-01-25 00:25:03 +01:00 |
|
|
Jace
|
04f6233d99
|
Crude animations
|
2016-01-24 23:44:29 +01:00 |
|
 viktorljung
|
d03b3fb071
|
Merge remote-tracking branch 'origin/master' into Menu
# Conflicts:
# resources/Schema/Entities/Player.xml
|
2016-01-24 22:23:53 +01:00 |
|
|
viktorljung
|
7e92d6f53f
|
Healthbar on player
|
2016-01-24 22:21:10 +01:00 |
|
|
Jace
|
0c56a05144
|
Merge branch 'master' of github.com:teamfisk/TacticalZ
# Conflicts:
# resources/Schema/Entities/Player.xml
# src/Engine/Network/Server.cpp
|
2016-01-24 21:21:51 +01:00 |
|
|
Jace
|
9f3d887ac4
|
Networking bugfixes
|
2016-01-24 18:37:36 +01:00 |
|
|
Jace
|
235b26ad61
|
WIP shoot
|
2016-01-24 17:16:18 +01:00 |
|
 antc13
|
aa20b48188
|
Merge remote-tracking branch 'origin/master' into Importer
# Conflicts:
# resources/Schema/Entities/MovementTest.xml
# resources/Schema/Entities/Player.xml
|
2016-01-24 16:22:22 +01:00 |
|
|
Jace
|
373bb33cf0
|
Player jumping taking air acceleration into account
|
2016-01-24 15:20:34 +01:00 |
|
|
antc13
|
3baa988ad4
|
Changed .obj files to our own format. DummyScene.mesh may be broken.
|
2016-01-23 20:35:58 +01:00 |
|
|
Jace
|
1ce9128da8
|
Source-like movement
|
2016-01-23 19:45:23 +01:00 |
|
|
Jace
|
666ef6589e
|
Crouching!
|
2016-01-23 15:06:47 +01:00 |
|
|
Jace
|
31e7340daf
|
Ignoring interpolation and rendering for local player entities!
|
2016-01-23 00:40:37 +01:00 |
|
|
Jace
|
ca2aab449e
|
Basic movement and camera management between players and editor
|
2016-01-22 16:12:51 +01:00 |
|
|
Jace
|
db1b972cd1
|
Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems
|
2016-01-15 18:32:47 +01:00 |
|
|
Jace
|
6ad1839def
|
Initial work on PlayerMovementSystem
|
2016-01-14 17:03:48 +01:00 |
|