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 |
|
heinrich5991
|
c83c7b1a19
|
reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print)
|
2011-04-14 00:34:10 +02:00 |
|
oy
|
06115dd49d
|
added "Whitespace and line Endings cleanup" by GreYFoX
|
2011-04-13 20:37:12 +02:00 |
|
GreYFoX
|
32a85dabe3
|
Fixed some merge mistakes, NOTE: This will be be buggy to say the least
|
2011-04-09 23:01:10 +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
|
3fc6e2d2eb
|
prevent empty nicknames. Closes #616
|
2011-04-06 17:53:05 +02:00 |
|
oy
|
caf6e98ccb
|
fixed server crash on "bans" command
|
2011-04-06 17:30:50 +02:00 |
|
oy
|
4ad6d2f01e
|
fixed problem with sv_bindaddr on the server
|
2011-04-04 18:20:05 +02:00 |
|
oy
|
04a3b7be00
|
fixed problem with recorded demo files. Closes #570
|
2011-04-02 11:55:37 +02:00 |
|
heinrich5991
|
b6fa69cedb
|
the server shows the disconnect reason of clients now
|
2011-04-01 00:05:35 +02:00 |
|
oy
|
2a72c0b38b
|
added a mechanism to check for a valid standard map. Closes #132
|
2011-03-31 15:13:49 +02:00 |
|
oy
|
59d56cd332
|
finished IPv6 support (master servers aren't compatible with 0.5 and older). Closes #233
|
2011-03-30 12:08:33 +02:00 |
|
oy
|
34a9ca20a7
|
added ipv6 support from the old lua branch
|
2011-03-28 20:11:28 +02:00 |
|
Sebastian Wojtowicz
|
500605cbee
|
Server utf8 Conversion
|
2011-03-22 21:04:27 +02:00 |
|
oy
|
96808a1145
|
made it possible to just show the number of player slots of a server (instead of client ones). Closes #68
|
2011-03-20 15:33:49 +01:00 |
|
GreYFoX
|
45f3cf042a
|
Fixed a login with cheats
Renamed a constant
|
2011-03-18 00:17:01 +02:00 |
|
GreYFoX
|
0cbcdd027a
|
Removed Helper made Moderators able to moderate only
Enumerated levels
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
|
2011-03-16 16:27:30 +02:00 |
|
GreYFoX
|
16c074741f
|
To have Cheats you must set a password and sv_register 0
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
|
2011-03-16 15:41:26 +02:00 |
|
GreYFoX
|
cccfb09e32
|
Reverted Team to it's old state without leader or Strict until it's reworked
|
2011-03-16 15:14:25 +02:00 |
|
oy
|
7412fabb9c
|
made serverinfo use clan name and country code for players
|
2011-03-16 12:37:41 +01:00 |
|
oy
|
30d9c9f4d9
|
made network support clan name and country code for players
|
2011-03-15 11:23:49 +01:00 |
|
oy
|
27e5a6af0d
|
made clients sending startinfo a requirement to prevent empty player infos
|
2011-03-15 09:58:57 +01:00 |
|
oy
|
50b266086b
|
made dbg_dumpmem and dbg_lognetwork work again
|
2011-03-05 11:46:24 +01:00 |
|
oy
|
0ae19e1339
|
removed support for old server infos
|
2011-03-04 18:14:08 +01:00 |
|
oy
|
d9ce720387
|
made engine an interface
|
2011-02-27 15:03:57 +01:00 |
|
heinrich5991
|
3d0aab503f
|
rewritten mutes
|
2011-02-23 23:45:31 +02:00 |
|
oy
|
d939b84125
|
removed no longer needed progression browse info
|
2011-02-16 12:31:47 +01:00 |
|
oy
|
b63dbfede5
|
fixed problems with map downloading if the map changes during download. Closes #236
|
2011-02-16 12:07:54 +01:00 |
|
GreYFoXGTi
|
604ae5286f
|
Several Fixes and some more on the way
|
2011-02-14 23:34:46 +02:00 |
|
GreYFoXGTi
|
f83132448d
|
Merged Oy, Isolated Freeze from Deep Freeze
|
2011-02-13 19:32:06 +02:00 |
|
GreYFoXGTi
|
1b2703aaba
|
Refactoring & fixed WEAPONSPEC_GUN in content.py
|
2011-02-12 21:18:41 +01:00 |
|
GreYFoXGTi
|
09068d91a4
|
Compiler warnings
|
2011-02-08 18:58:36 +02:00 |
|
GreYFoXGTi
|
750b20f544
|
fixed banmaster.cfg run level
|
2011-02-07 08:53:41 +02:00 |
|
GreYFoXGTi
|
d7e4153ec4
|
Added banmaster by heinrich5991
|
2011-02-07 08:25:38 +02:00 |
|
GreYFoXGTi
|
4ca79188dc
|
DDRace Flags Finalized
|
2011-02-05 06:13:32 +02:00 |
|
GreYFoXGTi
|
9db333dfee
|
Re-enabled flag sending
|
2011-02-05 03:14:17 +02:00 |
|
GreYFoXGTi
|
e32b52b57a
|
don't send the DDRace flags until i change them to their final look
|
2011-02-01 00:45:25 +02:00 |
|
GreYFoXGTi
|
f1b002e7fa
|
DDRace flags for the server browser (client-sided).
Some fixes in the server sided part.
One task left, Adding the flags to SortHash(), added Todo in the code.
|
2011-01-30 18:21:41 +02:00 |
|
Floff Floffsson
|
8c32c01653
|
added unmute + some minor fix
|
2011-01-20 22:27:54 +02:00 |
|
GreYFoXGTi
|
9891ab8a10
|
Added timer to reduce join-spam when loading a new map by Floff aka LemonFace
removed an extra line
|
2011-01-20 22:25:09 +02:00 |
|
GreYFoXGTi
|
2151883b43
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/gamecore.cpp
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/pickup.cpp
src/game/server/entities/projectile.cpp
src/game/server/entity.h
src/game/server/gamecontext.cpp
src/game/server/player.cpp
src/game/variables.h
|
2011-01-20 16:10:32 +02:00 |
|
oy
|
7a20c313ee
|
made some output just show up on debug
|
2011-01-19 15:39:04 +01:00 |
|
Floff Floffsson
|
e0c02eb691
|
functioncall not needed, dunno why its there anyway
|
2011-01-17 14:59:21 +01:00 |
|
Floff Floffsson
|
3e530ac02d
|
SetClientAuthed() moved
|
2011-01-17 14:59:12 +01:00 |
|
oy
|
40f6740742
|
fixed few spelling mistakes and disabled an unused command
|
2011-01-17 12:56:49 +01:00 |
|
GreYFoXGTi
|
b502e6fd28
|
Fixed warnings and some white spaces
|
2011-01-12 11:10:57 +02:00 |
|
GreYFoXGTi
|
ddc5dd7ab3
|
Cleaned up & Re-arranged stuff
|
2011-01-06 05:46:10 +02:00 |
|
GreYFoXGTi
|
5e841fcfae
|
Merge branch 'master' of http://github.com/heinrich5991/DDRace
|
2010-12-19 15:22:31 +02:00 |
|
heinrich5991
|
bf62514088
|
added some DDRace flags for the server browser (server-sided), client-sided still needed
|
2010-12-19 14:11:14 +01:00 |
|
GreYFoXGTi
|
63961ecf1a
|
fixed mute evasion + kick
|
2010-12-19 07:25:01 +02:00 |
|