GreYFoX
2ab15cc752
fixed 1 line merge mistake. fixes #45
2011-05-09 18:45:35 +02: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
oy
15e1d4f1d6
distinguish [chat] and [teamchat] in console messages. Closes #643
2011-05-05 02:08:39 +02:00
Romain Labolle
f4ca6d9ad5
Some Clean up: closes #28
...
* m_VoteEnforcer variable is never used.
* pController variable is not used in OnMessage scoop.
* CNetObj_ClientInfo have now only 4 m_Name ints, so change it to 4 in ghost.cpp
2011-04-20 18:07:38 +02:00
GreYFoX
dca0057bc1
Fixed a possible crash
2011-04-19 21:44:02 +02:00
GreYFoX
14e4557dfc
Made EMOTICON_WTF eye action EMOTE_SURPRISE
2011-04-15 04:38:48 +02:00
GreYFoX
9397c4a55f
some make release changes for adding sql server files
...
Servers are no longer build with SQL by default.
fixed compilation on Mac OS X 10.5
2011-04-15 04:32:53 +02:00
GreYFoX
c5d992dc2c
nothing
2011-04-14 04:42:09 +02:00
GreYFoX
7c6d405e2a
Fixed vote abortion by admin login
2011-04-14 04:26:13 +02:00
GreYFoX
c37bad0be8
fixed a crash
2011-04-14 04:00:22 +02:00
GreYFoX
dc886b7b2e
New emoticons eye actions
2011-04-14 01:36:51 +02: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
GreYFoX
f7892d3f00
Administrator privacy, re-enabled disabled functions
2011-04-14 00:53:33 +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
dd70b687ed
Better ICons + Mac Icons
...
Disabled Emotional tees until reworked
2011-04-13 01:34:39 +02:00
GreYFoX
4a46168631
Temporarily removed crash features til it's fixed, made version 1.071a
...
changed some names for the build bot to work
2011-04-12 03:52:01 +02:00
GreYFoX
0ee65685be
Fixed Crazy shotgun bullets
2011-04-12 00:28:00 +02:00
GreYFoX
b4f05a6772
removed comments from voting - no longer needed
2011-04-10 15:32:56 +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
9b97eb282a
prevent that you can add votes with an empty description
2011-04-05 20:06:41 +02:00
oy
0046825953
fixed server crash on remove vote
2011-04-04 16:58:53 +02:00
oy
d7b6c3543b
fixed a compiler warning. Closes #565
2011-04-01 17:46:20 +02:00
heinrich5991
b6fa69cedb
the server shows the disconnect reason of clients now
2011-04-01 00:05:35 +02:00
oy
32876b9ba7
changed the output level of a console message
2011-03-31 21:46:01 +02:00
oy
f9288eb5b1
fixed that spectators go to free view if the followed player joins spectators and prevent that you can follow spectators
2011-03-28 23:45:47 +02:00
oy
34a9ca20a7
added ipv6 support from the old lua branch
2011-03-28 20:11:28 +02:00
oy
722644008f
added a respawn delay command for tdm
2011-03-26 22:38:05 +01:00
oy
5b328e5484
added a limit for the number of votes that can be added to the server and send options as lists when a client joins. Closes #459
2011-03-26 22:06:29 +01:00
oy
fbeace5272
cleaned up some voting code
2011-03-26 17:44:34 +01:00
oy
b8f144ba81
added a vote that allows to move a player to spectators. Closes #58
2011-03-26 16:56:59 +01:00
oy
0e207fba6f
fixed problem with force_vote command
2011-03-26 16:24:12 +01:00
oy
6ece07ee74
added force_vote command
2011-03-25 12:06:45 +01:00
oy
359b806e95
added remove_vote command. Closes #47
2011-03-25 11:49:35 +01:00
oy
a4580d451f
added reasons to vote in general and show reason in vote hud. Closes #219
2011-03-25 10:26:59 +01:00
oy
8ad3def65e
added aliases for votes. Closes #144
2011-03-25 09:49:21 +01: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
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
ee2f625754
added extended spectator mode. Closes #28
2011-03-10 10:08:14 +01:00
oy
0640acb27e
added a command to set a minimum player limit that is needed to start a kick vote
2011-03-04 17:35:50 +01:00
GreYFoX
709f0cd0f9
Removed Spam checks from ConRank
...
Moved CGameContext::ProcessSpamProtection(int ClientID) away from vanilla functions
Made Muted text shown to sender
Corrected a + to *
Added FileScore ShowRank to Spam protection
changed SendChatTarget to SendChat in SQLScore and added it into the Spam protection
2011-02-27 10:07:57 +02:00
heinrich5991
3d0aab503f
rewritten mutes
2011-02-23 23:45:31 +02:00
GreYFoX
b3da5344c1
Fixed banning Higher level players
...
Fixed abort vote on login
removed ComparePlayers (useless i think)
Refactored last_mapvote
2011-02-23 16:27:11 +02:00
GreYFoX
6d181a2daa
Fixed a merge mistake
2011-02-23 09:43:05 +02:00