def
0bac9f0de8
Manual preparation for cleaner clang-format
...
Also include what you use explicitly
2020-09-26 21:41:01 +02:00
Learath
a650a3c320
Remove the initial lifespan check
2019-10-14 02:28:24 +02:00
fokkonaut
af7fd12341
Remove m_Weapon parameter from CProjectile
2019-06-02 22:04:11 +02:00
heinrich5991
b9cdacbb37
Try to unfix the grenade bug for the map "Binary"
2018-03-24 14:01:01 +01:00
def
a77cd039a6
Get rid of all Clang warnings
2015-04-18 22:29:28 +02:00
nuborn
03bc769c09
prediction of hammer (hits) and grenade (explosions)
2014-12-01 01:31:58 +01:00
def
627d6386ee
Revert "Revert "Revert "Add antiping for weapons (by nuborn)"""
...
This reverts commit 8f7e24b4db
.
2014-11-02 10:59:22 +01:00
nuborn
8f7e24b4db
Revert "Revert "Add antiping for weapons (by nuborn)""
...
This reverts commit 755e9f4d1c
.
2014-10-28 15:50:28 +01:00
def
755e9f4d1c
Revert "Add antiping for weapons (by nuborn)"
...
This reverts commit 48e66a2ab3
.
Conflicts:
src/game/client/gameclient.cpp
src/game/version.h
2014-10-27 20:03:22 +01:00
def
48e66a2ab3
Add antiping for weapons (by nuborn)
2014-10-23 17:31:29 +02:00
HMH
78bed556c0
replaced tunings from projectiles and laser by zonespecific tunings
2014-03-23 17:10:49 +01:00
GreYFoX
cd4ba53bae
Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace
...
Conflicts:
bam.lua
scripts/build.py
scripts/make_release.py
src/engine/server.h
src/game/client/gameclient.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/player.cpp
src/game/version.h
2012-04-12 02:09:31 +02:00
oy
dfe91338f0
added pause command. Closes #15
2012-01-10 00:49:31 +01:00
GreYFoX
0df6d0541f
Merge branch 'master' of git://github.com/oy/teeworlds into HEAD
...
Conflicts:
bam.lua
src/engine/console.h
src/engine/server.h
src/engine/server/server.cpp
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/game/client/components/binds.cpp
src/game/client/components/chat.h
src/game/client/components/console.cpp
src/game/client/components/console.h
src/game/client/components/controls.cpp
src/game/client/components/emoticon.h
src/game/client/components/maplayers.cpp
src/game/client/components/menus.h
src/game/client/components/scoreboard.h
src/game/client/components/spectator.h
src/game/client/components/voting.h
src/game/client/gameclient.cpp
src/game/client/gameclient.h
src/game/client/render.h
src/game/collision.cpp
src/game/editor/ed_layer_tiles.cpp
src/game/gamecore.cpp
src/game/gamecore.h
src/game/layers.cpp
src/game/layers.h
src/game/mapitems.h
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/laser.h
src/game/server/entities/pickup.cpp
src/game/server/entities/pickup.h
src/game/server/entities/projectile.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/gameworld.cpp
src/game/server/gameworld.h
src/game/server/player.cpp
src/game/variables.h
2011-04-14 01:27:49 +02:00
oy
06115dd49d
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 20:37:12 +02:00
GreYFoX
f7f6058a92
Merged Oy, Cleaned up, removed some useless features and code parts
...
Added Icon by landil
alot more...
2011-04-09 22:32:17 +02:00
GreYFoXGTi
5d9ee1736e
made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/german.txt
data/languages/russian.txt
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamecontext.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/gamemodes/ctf.h
src/game/server/gamemodes/dm.cpp
src/game/server/gamemodes/dm.h
src/game/server/gamemodes/mod.cpp
src/game/server/gamemodes/tdm.cpp
src/game/server/gamemodes/tdm.h
2010-11-22 00:26:00 +02:00
Sworddragon
fc9211c777
Updated copyrights
2010-11-20 21:26:06 +01:00
GreYFoXGTi
071fb6a5a3
new Switch System //TODO Rendering Rotation
2010-11-14 02:39:04 +02:00
GreYFoXGTi
1fe93f4592
Reworked the Crazy Shotgun, and fixed a bug ( still needs testing )
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:47:10 +02:00
GreYFoXGTi
15542a6c20
Fixed doors and lasers not affect more than 1 player, but there is something wrong, i need sleep, this sometimes compiles and runs perfectly and some times it compiles but runs buggy, need to correct CLight::HitCharacter and CDoor::HitCharacter
...
also did some refactoring
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 08:25:21 +02:00
GreYFoXGTi
883e0f2222
Trying to fix the crazy shotgun bullets -.-"
2010-08-26 19:55:22 +02:00
GreYFoXGTi
51c6af1303
SvShotgunBulletSound
...
also added protection to shotgun stucks, needs to be tested when a random crazy shotgun bullet gets stuck
loaded the score file before saving to avoid corruption
added freeze and unfreeze in rcon
added protection in some rcon commands
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-23 23:40:23 +02:00
btd
512597f729
Add crazy shotguns. Need to test
2010-08-14 14:46:54 +04:00
GreYFoXGTi
434b4aad86
The Porting of DDRace-Beta to trunk by [BlackTee] den Maps with one and two layer works properly. Laser works. Fix second game layer Re-added logs Readded the rcon commands addvote and scoring system and time Fixed Weapons
...
Signed-off-by: btd <bardadymchik@gmail.com>
2010-07-29 08:59:32 +03:00
Magnus Auvinen
72c06a2589
copied refactor to trunk
2010-05-29 07:25:38 +00:00