 stiffly
|
ec3ed1f46f
|
Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
# Conflicts:
# include/Game/Systems/Weapon/DefenderWeaponBehaviour.h
|
2016-03-08 10:39:52 +01:00 |
|
 Jace
|
217c3fe55c
|
Fixes
|
2016-03-03 22:58:45 +01:00 |
|
|
stiffly
|
20c6caa408
|
Merge remote-tracking branch 'origin/master' into Kill-streak-sounds
# Conflicts:
# resources/DefaultConfig.ini
|
2016-03-03 17:32:04 +01:00 |
|
|
Jace
|
1210c91535
|
Added Gameplay.AutoReload bool to config
|
2016-03-03 13:51:47 +01:00 |
|
 William Moberg
|
95078b6a4b
|
Fix so client doesn't override the servers respawn time with its config file. Server or single player client can still override the component with the config RespawnTime.
|
2016-03-02 14:37:33 +01:00 |
|
 Teejoon
|
de9657700b
|
Fixed draw final pass with shided objects having to many if-statments.
Shields is working with transparancy
Player cameras should have nearclip fater away and far clip nearer.
Defaultconfig push
|
2016-03-02 11:59:48 +01:00 |
|
|
Teejoon
|
f56705d921
|
You can now change the quality of SSAO by sliding the SSAO Quality
|
2016-02-26 11:51:20 +01:00 |
|
|
stiffly
|
7dbb9e452b
|
Added a announcer volume channel.
|
2016-02-24 15:08:39 +01:00 |
|
 Tleety
|
a8a3366e8a
|
Hopeless attempts to fix network bugs
|
2016-02-12 05:17:09 +01:00 |
|
|
William Moberg
|
11af6a3078
|
Merge branch 'master' into Respawning
# Conflicts:
# resources/DefaultConfig.ini
# resources/Schema/Entities/MovementTest.xml
# src/Game/Systems/SoundSystem.cpp
|
2016-02-12 00:29:51 +01:00 |
|
|
Jace
|
b761439c84
|
Added config flag Debug.OutOfBodyExperience that allows you to spawn and view a player from a third person perspective, without the active camera being changed.
|
2016-02-11 23:45:30 +01:00 |
|
|
William Moberg
|
8eea0c8395
|
WIP respawning.
|
2016-02-11 16:08:19 +01:00 |
|
|
stiffly
|
aa5878d6df
|
Used config for soundsystem properties.
|
2016-02-08 16:40:13 +01:00 |
|
|
stiffly
|
74c95089ea
|
Merge remote-tracking branch 'origin/PlayerMovement' into Networking
|
2016-01-22 16:19:35 +01:00 |
|
|
Jace
|
ca2aab449e
|
Basic movement and camera management between players and editor
|
2016-01-22 16:12:51 +01:00 |
|
|
stiffly
|
08fcdb382b
|
Used config for a lot of things
|
2016-01-22 13:18:53 +01:00 |
|
|
William Moberg
|
a346a329b3
|
Added an option to disable the Pool allocation in Config.ini, in case there is a mess with the MemoryPool.
|
2016-01-18 10:16:35 +01:00 |
|
|
William Moberg
|
c09fe4ae55
|
Added a bool option to disable threads in in the configfile regarding resource loading.
|
2016-01-15 16:18:39 +01:00 |
|
|
stiffly
|
a0255f1b31
|
Now uses config file to determine if client or server should be started.
|
2015-12-18 13:34:21 +01:00 |
|
|
stiffly
|
5c1a93021b
|
Client now reads address and port from config file. Default address is set to local host.
|
2015-12-18 11:22:13 +01:00 |
|
|
stiffly
|
076030a252
|
Fixes, mostly name changes
|
2015-12-17 17:28:43 +01:00 |
|
|
stiffly
|
50822d09fc
|
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# src/Game/Game.cpp
|
2015-12-17 14:10:02 +01:00 |
|
|
Jace
|
b87f559291
|
Updated default configs with editor stuff
|
2015-12-17 10:46:49 +01:00 |
|
|
stiffly
|
3f77da4a07
|
Merge remote-tracking branch 'origin/master' into Networking
# Conflicts:
# include/Game/Game.h
# resources/DefaultConfig.ini
# src/Game/Game.cpp
|
2015-12-14 17:07:12 +01:00 |
|
|
Jace
|
e82911cb8b
|
Renderer FOV setting in Config.ini
|
2015-12-14 11:39:13 +01:00 |
|
|
stiffly
|
d22e59f28f
|
Merge remote-tracking branch 'origin/master' into Networking
NOTE (in config file):
[Debug]
LoadMap=Schema/Entities/Test.xml
# Conflicts:
# include/Game/Game.h
# src/Game/Game.cpp
|
2015-12-10 13:53:18 +01:00 |
|
 sippeangelo
|
578018607a
|
Moved decision of which map to load to Config.ini
|
2015-12-09 14:32:34 +01:00 |
|
|
stiffly
|
ce41421dbb
|
Added a "StartNetwork" bool to DefaultConfig.
|
2015-12-09 10:37:40 +01:00 |
|
|
sippeangelo
|
872879c013
|
Engine puzzle completed
|
2015-11-30 17:02:24 +01:00 |
|