Alexander Akulich
c2f276cee1
Port CConfig API from the upstream (0.7.5)
...
The old (g_Config) API is kept to not break the stuff.
See commits:
de5859b37178076761eb
2021-01-10 17:10:19 +03:00
def
3be8a592e5
Run clang-format
...
Purely automatic change. In case of conflict with this change, apply the
other change and rerun the formatting to restore it:
$ python scripts/fix_style.py
2020-09-26 21:50:15 +02:00
def
0bac9f0de8
Manual preparation for cleaner clang-format
...
Also include what you use explicitly
2020-09-26 21:41:01 +02:00
Learath
88ca573682
Serverinfo and Register support for 0.7
...
Co-authored-by: Tim Schumacher <tim@timakro.de>
2020-06-19 20:28:55 +03:00
GreYFoX
cc63cf2553
Merge branch 'master' of git://github.com/oy/teeworlds
...
Conflicts:
src/engine/external/pnglite/pnglite.c
src/engine/external/pnglite/pnglite.h
src/engine/shared/config_variables.h
src/game/client/components/menus_browser.cpp
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/gamecontext.cpp
src/game/server/player.cpp
src/game/version.h
2011-05-09 18:36:13 +02:00
Choupom
c2f75b0017
structs are structs, classes are classes
2011-05-03 19:23:33 +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
oy
4ad6d2f01e
fixed problem with sv_bindaddr on the server
2011-04-04 18:20:05 +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
ed3299be05
more cleanup
2010-10-11 03:50:43 +02:00
oy
41afca6db2
added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8
2010-08-25 01:17:02 +02:00
GreYFoXGTi
7ff7ca85ec
sometimes my git just wants to commit a file no matter how many times i revert it
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-24 23:38:40 +02:00
oy
cabecb7fa9
added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8
2010-08-18 00:06:00 +02:00
GreYFoXGTi
01cc3f4d68
Merge branch 'master' of http://github.com/oy/teeworlds
...
and fixed Conflicts:
src/engine/server/register.h
src/game/server/gamemodes/mod.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-15 20:46:02 +03:00
oy
0e36b772d4
fixed line endings in some files
2010-08-15 15:34:55 +02: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
