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
505a5b4172
Refactoring
2010-10-29 23:29:07 +02:00
btd
61092f7baa
Begin show_others
...
Signed-off-by: btd <bardadymchik@gmail.com>
2010-10-23 23:26:10 +04:00
heinrich5991
0cd8390036
Revert "better spam protection. Closes #82 . Feedback Please"
...
This reverts commit daac101024
.
2010-10-14 08:42:29 +02:00
GreYFoXGTi
daac101024
better spam protection. Closes #82 . Feedback Please
2010-10-12 16:13:56 +02:00
GreYFoXGTi
ef139eb73a
Cleanup (Putting stuff back vanilla like)
2010-10-10 16:11:11 +02:00
GreYFoXGTi
e7ab496262
Deleted old afk timer by noother, because it's replaced by a Vanilla feature
...
Note: we may need to tweak the vanilla features to suite DDRace needs in the future
2010-10-10 14:36:56 +02:00
GreYFoXGTi
40d2068c70
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/editor/ed_editor.cpp
src/game/editor/ed_editor.h
src/game/editor/ed_layer_tiles.cpp
src/game/server/gamecontroller.cpp
src/game/server/player.cpp
src/game/variables.h
2010-10-10 14:36:02 +02:00
oy
cd95f1869e
added inactive player kicking. Closes #51
2010-10-09 19:14:42 +02:00
GreYFoXGTi
896634a061
Total Cleanup
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:28:06 +03:00
GreYFoXGTi
4f22df654e
Fixed /pause crash in spectator with out using /pause 1st.
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 09:05:27 +03:00
btd
c4fa5c6128
Ugly command invis_me ^_^ seems very funny
2010-09-14 20:56:28 +04:00
btd
fec294caee
Fix linux compilation. Revert last changes. Add /show_other option (in menu now working)
2010-09-08 20:22:11 +04:00
btd
510a47a158
Fix Server Best and no needed float -> char* -> int cast
2010-08-26 21:55:04 +04:00
GreYFoXGTi
0325c59aa9
Merge branch 'master' of http://github.com/btd/DDRace
2010-08-24 03:38:33 +02:00
GreYFoXGTi
ed575f9b0c
Fixed 2x and 1.5x boosters
...
Removed Unused Vars
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-24 03:30: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
6fabca9e10
Add checkpoints. Client undestand that it is a DDRace server fully. Need to rework /top5 /rank. Clean rubbish. I want to sleep(
2010-08-23 23:37:27 +04:00
GreYFoXGTi
8b67e70dfb
Fixed /pause not saving the time
...
made sv_pauseable on by default
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-23 01:59:54 +02:00
GreYFoXGTi
66750a3220
Weapon pickup Sound Spam Disabled
...
/Pause Fixed but disabled pause with ninja
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-23 00:04:26 +02:00
btd
844f3116fe
D:/Portable Apps/PortableGit-1.7.1-preview20100612/pause works. Need to delete RACE_PAUSE. And check that character resurect correctly
2010-08-22 17:17:57 +04:00
btd
7f42b6225b
To the last DDRace. Need a lot fix
2010-07-29 23:55:33 +04:00
GreYFoXGTi
0a9dc07d0c
Fixes Issue #5
...
Changed /info
Fixed anti-rainbowmod
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-07-29 17:54:04 +03: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
Tom Adams
c9ff80a17d
made balance teams based apun points/minute ( #495 )
2010-05-31 20:35:47 +00:00
Magnus Auvinen
72c06a2589
copied refactor to trunk
2010-05-29 07:25:38 +00:00