GreYFoXGTi
06415ee6e6
Fixed a merge mistake
2010-11-18 01:35:29 +02:00
GreYFoXGTi
6a40aea054
Revert "added hackish challenge-response-alike compatible with 0.5.2 clients. against the slot blocking exploit."
...
This reverts commit 9f8cf21c33
.
Conflicts:
src/engine/shared/config_variables.h
this commit was replaced by "clients are now dropped if they don't act as normal clients (4383e10
4383e10933
)"
2010-11-18 01:32:54 +02:00
GreYFoXGTi
ac341b5390
fixed mac compilation
2010-11-18 01:19:44 +02:00
GreYFoXGTi
a109e1150d
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/shared/config_variables.h
src/game/client/components/console.cpp
src/game/client/gameclient.cpp
src/game/editor/ed_editor.h
src/game/server/gamecontext.cpp
2010-11-18 01:10:59 +02:00
oy
d94355729d
added icons in the demo browser and the editor's file dialog. Closes #209
2010-11-17 19:46:50 +01:00
Choupom
4383e10933
clients are now dropped if they don't act as normal clients ( fixes #235 )
2010-11-17 19:11:28 +01:00
oy
c45dc374ff
decreased the default value for maximum players with same IP a bit
2010-11-17 19:05:19 +01:00
oy
3d3572f845
fixed some compiler warnings
2010-11-17 18:36:19 +01:00
oy
d32b93d3ec
added file icons by Landil
2010-11-17 18:28:28 +01:00
oy
ca80d2a347
reload the map on save just when the map name is equal
2010-11-17 13:08:29 +01:00
oy
8351682edf
added constants for console types by Choupom
2010-11-17 13:01:46 +01:00
oy
994a44f6e1
simplified change_map command so that it switches to the next map in the maprotation when called without param
2010-11-17 12:50:01 +01:00
oy
f1ce0d1949
improved loading progression in the server browser
2010-11-17 12:43:24 +01:00
Choupom
a7f37446b6
added loading progression in server browser
2010-11-17 12:31:44 +01:00
Choupom
57a9235997
reload the map on save if you are authed
2010-11-17 12:30:42 +01:00
GreYFoXGTi
1721955b11
fixed a previous merge
2010-11-17 13:20:48 +02:00
GreYFoXGTi
ae591407c9
Merge branch 'master' of http://github.com/oy/teeworlds
2010-11-17 13:11:40 +02:00
oy
fd3d01ef14
removed no longer needed data-dir override param - mods system should be used instead. Closes #267
2010-11-17 01:02:29 +01:00
oy
0d1178107e
fixed typo in a kick message
2010-11-17 00:44:04 +01:00
oy
9ff7500f30
fixed graphic problems with ninja when pausing a demo. Closes #269
2010-11-17 00:38:20 +01:00
GreYFoXGTi
b6a4b2b7ba
Merge branch 'master' of http://github.com/oy/teeworlds
2010-11-16 22:11:24 +02:00
oy
e46cb02089
Made inactivity check ignore authed players. Closes #273
2010-11-16 18:08:19 +01:00
oy
295830fcaa
removed unneeded include
2010-11-16 17:53:09 +01:00
Sworddragon
30fd715fc2
Cleaned up bam.lua a bit
2010-11-16 17:49:03 +01:00
Sworddragon
96a1b130fa
Fixed missing teeworlds icon for gcc
2010-11-16 17:48:29 +01:00
GreYFoXGTi
b17e19ff57
Merge branch 'master' of http://github.com/heinrich5991/DDRace
2010-11-16 17:28:42 +02:00
heinrich5991
daeb395e25
rcon victim system: replaced constants by enums
2010-11-16 16:07:45 +01:00
GreYFoXGTi
4cbcbae508
Fixed sv_vote_percentage
2010-11-16 16:59:17 +02:00
GreYFoXGTi
0c6767dd9d
Added option to have DDRace Compiled without SQL
2010-11-16 15:44:16 +02:00
GreYFoXGTi
5ee8796381
Removed sql from mac, people who need sql compile the Mac branch
...
the boost stuff made my working dir very messy and searching through it takes more time
2010-11-16 15:26:19 +02:00
heinrich5991
89ef2a0928
fixed CServer::ConKick because of the new victim system, fixed the victim system for cases with at least one parameter after the victim
2010-11-15 18:58:44 +01:00
heinrich5991
797be2817c
reverted needless check of "helpers can use me commands"
2010-11-15 18:14:31 +01:00
GreYFoXGTi
59e117292e
Removed a useless dbg_msg
2010-11-15 17:30:54 +02:00
GreYFoXGTi
7aaf3193d9
Simple Mistake with a huge impact
2010-11-15 11:34:21 +02:00
GreYFoXGTi
1f43a9a034
forgot this too
2010-11-14 19:54:36 +02:00
GreYFoXGTi
c6f0bf7500
how did that happen
2010-11-14 17:59:28 +02:00
GreYFoXGTi
6f75b661b0
Total Noobness
2010-11-14 17:51:04 +02:00
GreYFoXGTi
bf4ed7515c
Forgot to parse the tiles from the Switch layer ^^
2010-11-14 16:00:33 +02:00
GreYFoXGTi
bb0d4a5671
Some Fixes
2010-11-14 13:14:18 +02:00
GreYFoXGTi
ca54f1d7c7
for got this one
2010-11-14 12:19:41 +02:00
GreYFoXGTi
d49eb12120
CLight Flickering
2010-11-14 12:16:27 +02:00
GreYFoXGTi
f60817b5c0
Different Flicker for Crazy Bullets
2010-11-14 12:13:11 +02:00
GreYFoXGTi
4486a7abed
Added Alive Check
2010-11-14 12:08:21 +02:00
GreYFoXGTi
3c1c045722
Added Flicker effect to NON-Active Entities
2010-11-14 12:01:42 +02:00
GreYFoXGTi
bf0b4183cc
Fixed bullet wall stuck when de activated and collides with a tee
2010-11-14 11:36:00 +02:00
GreYFoXGTi
2d7eae757e
Fixed Switch layer Saving
...
Next Ticks and Rotations Fix
2010-11-14 11:18:29 +02:00
GreYFoXGTi
79226352af
revert teleport useless change
2010-11-14 11:04:13 +02:00
GreYFoXGTi
5ec06369c5
fixed last pull commit
2010-11-14 03:32:23 +02:00
GreYFoXGTi
670e90c7e3
Merge branch 'master' of http://github.com/btd/DDRace
...
Conflicts:
src/game/server/entities/door.cpp
2010-11-14 03:32:00 +02:00
GreYFoXGTi
d7aced0708
Merge branch 'master' of http://github.com/oy/teeworlds
2010-11-14 03:25:39 +02:00