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
eeeee
a58996b6bf
return from afk handling code immediately if player got kicked, as player struct is zeroed out
...
closes #47
2011-05-09 18:22:05 +02:00
oy
8d5badc260
skip player input if the chat is active to prevent abusing the linked emoticon. Closes #678
2011-05-05 02:13:32 +02:00
oy
15e1d4f1d6
distinguish [chat] and [teamchat] in console messages. Closes #643
2011-05-05 02:08:39 +02:00
oy
5fbf6d0bfd
fixed compiler warnings. Closes #679
2011-05-05 01:43:27 +02:00
Choupom
4dfcfc6913
fixed a variable name
2011-05-03 18:46:18 +02:00
GreYFoX
aba78d9e2e
Fixed and refactored 2nd afk warning thanks to @ravomavain for noticing it
2011-04-23 19:59:25 +02:00
GreYFoX
fae976c98b
Sending Scores in negative to clients. closes #36
2011-04-20 22:40:56 +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
9221bce3f4
Rechecked and fixed the afk kicking system. fixes #27
2011-04-20 16:34:03 +02:00
GreYFoX
9e5336a13d
fixed plasma snapping
2011-04-20 16:05:05 +02:00
GreYFoX
0584f2b7a2
Added Plasma Gun tweaking
...
made the default 3 plasmas per second more cpu friendly
2011-04-20 15:59:40 +02:00
GreYFoX
dca0057bc1
Fixed a possible crash
2011-04-19 21:44:02 +02:00
GreYFoX
83318d0583
Refactored some stuff in CLight and fixed CLight::Snap
2011-04-19 15:34:59 +02:00
GreYFoX
f5d38a84f9
formatting
2011-04-19 15:15:40 +02:00
GreYFoX
2fff744724
fixed laser snapping
2011-04-19 15:15:21 +02:00
GreYFoX
95408a8fd8
fixed a crash on toooooooo many draggers
2011-04-18 00:05:56 +02:00
GreYFoX
561ce64666
Renamed cheats to testing commands sv_test_cmds
...
Since these are testing commands, anyone can use them and only on their selves no login needed
Revised some rcon commands
cleanup some unwanted codes
2011-04-15 06:04:21 +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
03095b5ecf
Nothing
2011-04-12 00:27:52 +02:00
GreYFoX
b4f05a6772
removed comments from voting - no longer needed
2011-04-10 15:32:56 +02:00
GreYFoX
b2c67df7e7
fixed hammer hit
2011-04-10 15:07:36 +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
SushiTee
dce5222f78
removed unused function
2011-04-07 19:52:44 +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
d4f2b8de87
fixed skin colour of spectators
2011-03-27 11:52:16 +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
GreYFoX
741de082fc
fixed linux compilation
2011-03-22 21:56:52 +02:00
GreYFoX
61dcc7b848
Re-Added noother's afk kick
...
Disabled vanilla afk kick by default
enumerated variables.h
2011-03-22 21:49:12 +02:00
GreYFoX
1172a79693
fixed compilation
2011-03-22 21:15:15 +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
5b4d7a4658
Refactored + fixed sv_hit 0 + laser through others
2011-03-19 22:21:42 +02:00
GreYFoX
ed5c9c1d92
sv_show_other the ability to use the command showothers
2011-03-19 11:22:03 +02:00
GreYFoX
974f429957
Added git revision to several places
2011-03-18 01:21:07 +02:00
GreYFoX
45f3cf042a
Fixed a login with cheats
...
Renamed a constant
2011-03-18 00:17:01 +02:00
GreYFoX
c74cda68e0
Fixed tuned server behavior
2011-03-17 19:20:44 +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
GreYFoX
2dc557d77b
Fixed Rifle and Shotgun not affecting tees after Passing through owner when sv_old_laser = 1
2011-03-16 13:59:36 +02:00
GreYFoX
ca447b7aa4
http://bugs.mysql.com/bug.php?id=50046
2011-03-16 13:59:17 +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
83e83947cf
give ninja players the momentum they had before slicing, after slicing. Closes #120
2011-03-13 19:00:00 +01:00
oy
b834426548
fixed several problems with spectator view in game and demo player. Closes #83
2011-03-12 18:07:57 +01:00
oy
1f10c1e8bf
fixed problem with ctf if there're no flags
2011-03-10 10:14:41 +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
oy
9811c2396b
made network clip flags. Closes #131
2011-03-04 17:08:10 +01:00
oy
4bede550be
only update the ping if the scoreboard is active. Closes #27
2011-03-01 18:31:20 +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
EliteKuchen
55144629dc
wrong names
2011-02-26 20:49:29 +02:00
heinrich5991
652443f068
fixed rewritten mutes
2011-02-26 20:45:02 +02:00
GreYFoX
355dd98bfa
lol i missed this
2011-02-26 15:48:15 +02:00
heinrich5991
3d0aab503f
rewritten mutes
2011-02-23 23:45:31 +02:00
GreYFoX
90d93ba7b2
Client showothers
2011-02-23 22:22:05 +02:00
GreYFoX
bef7a1fbbd
Emote normal
...
lol
2011-02-23 21:53:15 +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
9e54b25740
Fixed 2 Teams bugs
...
Added comments so that remembering what CGameTeams::SetForceCharacterTeam does won't be hard
Raised the version so that bug tracking is easier
2011-02-23 14:14:56 +02:00
GreYFoX
6d181a2daa
Fixed a merge mistake
2011-02-23 09:43:05 +02:00
GreYFoX
48b29bebd4
Possibly Fixed a Teams bug
2011-02-23 08:18:38 +02:00
Romain Labolle
0209ef4126
The first parameter of set_team is the victim (cf. line 1190)
2011-02-23 08:02:55 +02:00
GreYFoX
e6643607f4
Reset Team from Super to normal on death
2011-02-23 07:31:39 +02:00
Romain Labolle
7ac12219ea
move/move_raw/up/down/left/right commands may apply on Victim not on player who typed the command
2011-02-21 21:40:13 +02:00
oy
45eee0c8c2
fixed spawning on crappy maps
2011-02-21 12:35:14 +01:00
GreYFoXGTi
4e9e60524e
Fixed last commit
2011-02-21 00:41:15 +02:00
GreYFoXGTi
2e1094f15d
Welcome Trust o_0 Aeeeh ?!
2011-02-20 20:17:38 +02:00
Sebastian Wojtowicz
c3739e0e4d
fixed a bug that prevented records to be saved in files
2011-02-20 19:11:04 +02:00
Sebastian Wojtowicz
968762b144
Fixed a casting error
2011-02-19 20:10:03 +02:00
Sebastian Wojtowicz
84196b1ef3
some little cleanup
...
If /times is entered with no params it now shows last 5 times of server in general
2011-02-19 19:53:15 +02:00
GreYFoXGTi
417b18963f
windows compiling
2011-02-16 19:56:20 +02:00
GreYFoXGTi
793ea4a499
Don't holdup spawning if tees are there
...
fixed cl_ddrace_scoreboard
2011-02-16 19:04:41 +02:00
oy
d939b84125
removed no longer needed progression browse info
2011-02-16 12:31:47 +01:00
GreYFoXGTi
cd998a2a93
sv_reset_pickups 1 to remove weapons on start tiles
2011-02-16 13:08:14 +02:00
GreYFoXGTi
335a8f69c2
Morning Cleanup
2011-02-16 10:21:23 +02:00
Sebastian Wojtowicz
6963a233a4
Added a new command /last5times (for sql scores only)
...
Added index to name in race sql table, so search is faster
2011-02-15 02:27:20 +02:00
Sebastian Wojtowicz
60de0da1c3
Added timestamp into MySQL ranking, and function to have ago time web2.0 like printed on asking for /rank
2011-02-15 02:27:19 +02:00
GreYFoXGTi
604ae5286f
Several Fixes and some more on the way
2011-02-14 23:34:46 +02:00
GreYFoXGTi
d68e853ca7
StickyTeams, TeamStrict Logic and fixed some team bugs
2011-02-14 20:44:02 +02:00
GreYFoXGTi
29c9bf531d
Fixed merge errors
2011-02-14 09:43:44 +02:00
GreYFoXGTi
40a218b5ee
Fixed Braces in /yes and /no
2011-02-13 22:21:17 +02:00
Romain Labolle
806a1babc1
Mute may not affect chat commands (like /pause)
2011-02-13 19:48:54 +02:00
GreYFoXGTi
718d697707
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/collision.cpp
src/game/collision.h
src/game/gamecore.cpp
src/game/server/gamecontext.cpp
2011-02-13 19:36:53 +02:00
GreYFoXGTi
f83132448d
Merged Oy, Isolated Freeze from Deep Freeze
2011-02-13 19:32:06 +02:00
oy
3c7adc6a7f
fixed nethash
2011-02-13 13:06:19 +01:00
GreYFoXGTi
68a1a29db8
Reverted 1 Letter Refactoring or Edited it to a full name.
2011-02-13 12:57:10 +01:00
Choupom
7bfbe24a1c
added flag return message on death tile collision
2011-02-13 12:24:19 +01:00
GreYFoXGTi
cd574d10a7
Added sv_vote_majority, 1 like vanilla, 0 Consider number of yes against Number of Yes + No
2011-02-12 22:31:42 +02:00
GreYFoXGTi
1b2703aaba
Refactoring & fixed WEAPONSPEC_GUN in content.py
2011-02-12 21:18:41 +01:00
oy
3f05289328
fixed a possible problem with occupied spawn points and cleaned up spawn code a bit
2011-02-10 12:05:55 +01:00
GreYFoXGTi
beec56aee0
prevented a useless SendchatTarget
...
added some missing code
2011-02-10 02:50:18 +02:00
GreYFoXGTi
c1ebccd8a2
Fixed infinite Loop
...
Don't tell Oy to add this, he will just say we don't support mods
2011-02-09 01:03:42 +02:00
GreYFoXGTi
c735384b52
If you Edit the Source Don't use the game mode DDRace
2011-02-08 18:35:48 +02:00
GreYFoXGTi
55c368b679
Formatting
...
Raised version for statistical analysis
2011-02-08 14:52:23 +02:00
GreYFoXGTi
ae06076d10
Mute By Fisted
2011-02-08 14:44:59 +02:00
GreYFoXGTi
e5bff28375
Fixed a Stopper bug
...
1 still remains
2011-02-07 04:22:13 +02:00
GreYFoXGTi
6c3698469b
Fixed some bugs
...
fixed a mistake
Official Noobness
2011-02-06 20:38:24 +02:00
GreYFoXGTi
acea19e9b5
Console::PrintResponse instead of SendChatTarget
...
Thanks Julian->Assange for pointing it out
2011-02-05 06:56:21 +02:00
GreYFoXGTi
89889fa1d1
Fixed double jump sound
...
how did i miss this!
2011-02-05 06:33:11 +02:00
GreYFoXGTi
f901fc65fa
Removed DeepFreeze Messages
...
Removed some curl brackets
2011-02-05 06:18:32 +02:00
GreYFoXGTi
693ad89c00
DeepFreeze = EMOTE_PAIN, freeze stays EMOTE_BLINK (eyes closed)
2011-02-05 04:28:05 +02:00
GreYFoXGTi
2c36457b94
Fixed warnings
2011-02-05 03:33:53 +02:00
GreYFoXGTi
30f010593c
Teams with leaders
...
this maybe buggy but i will fix the bugs when they are reported
2011-02-04 18:49:37 +02:00
GreYFoXGTi
ff839af9ba
Fixed a collision error
2011-02-04 18:49:36 +02:00
fisted
addbf8e3d6
automatic mute on spam
2011-02-03 14:39:00 +01:00
fisted
00f47c18c4
player muting by ip
2011-02-03 13:02:32 +01:00
GreYFoXGTi
9d98ce7e72
Version 1.03a
2011-01-30 23:51:14 +02:00
GreYFoXGTi
3223a9d4c5
Few Improvements
2011-01-30 20:07:02 +02:00
GreYFoXGTi
5961edf6ce
Better Performance, Fixed a mistake and added check for next tiles (Left, Right, Bottom and Above).
2011-01-30 01:58:47 +02:00
GreYFoXGTi
57c8739bb9
Show join a team message without spam
2011-01-29 16:31:50 +02:00
GreYFoXGTi
832bad08e6
Cleanup and Added All Left Masks
2011-01-29 16:18:36 +02:00
GreYFoXGTi
b2e96bf9eb
formatting and refactoring
2011-01-26 23:09:54 +02:00
DemonulPierdut/-/Julian /[Assange/]
c98be07e2a
fixed my spam team thing :P
2011-01-26 23:03:38 +02:00
GreYFoXGTi
b59e130037
DeathMask
2011-01-26 23:03:20 +02:00
GreYFoXGTi
4e32aee417
Commented some dbg_msgs
...
may need them in the future
2011-01-26 22:59:55 +02:00
GreYFoXGTi
3356455007
Fixed double hook sounds
2011-01-26 22:57:23 +02:00
SushiTee
d7057ef9e1
fixed server compiling in mac (sql is not working though)
2011-01-26 14:45:44 +02:00
GreYFoXGTi
5b51295185
Added Deep freeze/unfreeze to switch layer so that it can be controlled with switches
...
fixed the freeze command
Added Freeze Tile to switch layer to set freeze tile custom delay
Added sv_freeze_delay to control default freeze time delay
2011-01-25 12:05:53 +02:00
GreYFoXGTi
4e36d2f069
Merge branch 'greyfox' of https://github.com/JulianAssange/DDRaceExtra
2011-01-24 21:25:17 +02:00
GreYFoXGTi
f1a8b6b7ad
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/game/client/gameclient.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h
2011-01-24 14:06:55 +02:00
DemonulPierdut/-/Julian /[Assange/]
2f45abdc40
fixed the sv_team 1 message.. lol it never told u too join a team :D
2011-01-24 22:36:05 +11:00
DemonulPierdut/-/Julian /[Assange/]
8ff2b1a95f
for some reason hooking wasnt masked propley.
2011-01-24 06:23:04 +11:00