GreYFoXGTi
c5648311ed
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/german.txt
src/game/client/components/scoreboard.cpp
src/game/editor/ed_layer_tiles.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/variables.h
2011-01-04 22:37:09 +02:00
oy
a72848e780
added constants for teams by Choupom
2011-01-03 12:50:38 +01:00
GreYFoXGTi
27c3f06f27
dunno who added this or why!
2010-12-24 17:02:02 +02:00
GreYFoXGTi
8f9520b09a
test
2010-12-23 07:57:26 +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
GreYFoXGTi
08a2f47ee8
Added Ability to Restart the race in a team after you have finished <br/>
...
<b>Testers: Please check if this can be abused</b>
2010-12-19 05:48:16 +02:00
GreYFoXGTi
fc323326ec
fixed mute evasion
2010-12-17 13:05:55 +02:00
GreYFoXGTi
0bbdabae97
Merge branch 'master' of https://github.com/noother/DDRace
2010-12-17 01:20:41 +02:00
GreYFoXGTi
a4fa4d2fee
Credits update.
2010-12-17 01:20:26 +02:00
floff
4008a1dc95
spectator votes configurable
2010-12-16 10:06:24 +01:00
floff
4a93c28eb8
added configurable time between pauses, to reduce spam
2010-12-16 10:05:20 +01:00
GreYFoXGTi
e803f30f52
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/server/entities/character.cpp
src/game/server/entities/flag.cpp
src/game/server/player.cpp
src/game/variables.h
2010-12-16 06:06:23 +02:00
oy
0121f27311
fixed server crash on too many snap items. Closes #317
2010-12-16 03:29:08 +01:00
GreYFoXGTi
bed657d805
Merge branch 'master' into DDRace
2010-12-12 04:32:40 +02:00
oy
b4c007778c
fixed that IntersectCharacter picks the character which is closest to the start point and within the radius
2010-12-12 01:55:36 +01:00
GreYFoXGTi
cebbecf632
Some Code Improvements and Compiler warnings
2010-12-07 19:44:23 +02:00
GreYFoXGTi
122c7954d9
Announcement Randomness
2010-12-06 04:27:35 +02:00
GreYFoXGTi
881fd901a6
added Vote comments starting with # and also made announcement comments start with #
2010-12-06 00:38:29 +02:00
GreYFoXGTi
2d581789e1
Merge branch 'master' of github.com:Speedy-Consoles/DDRace into DDRace
...
Conflicts:
src/game/ddracecommands.h
2010-12-06 00:28:15 +02:00
GreYFoXGTi
f9c3f83903
Removed command broadtime since the time is not in the broadcast anymore
2010-12-05 20:29:38 +02:00
noother
e990c94dad
fixed sql injection & added a proper escaper that works like
...
addslashes() in php
2010-12-05 08:18:54 +02:00
GreYFoXGTi
dd849d3915
Merge branch 'master' of http://github.com/heinrich5991/DDRace into DDRace
2010-12-04 23:54:06 +02:00
GreYFoXGTi
bb23e58285
by reading this you have wasted 2 seconds you are not getting back
...
if you looked inside this commit then you have wasted 6 seconds that you are never getting back as well :p
2010-12-04 23:51:03 +02:00
heinrich5991
311d92cf47
removed response message after typing "kill" in chat
2010-12-04 20:52:23 +01:00
GreYFoXGTi
0a0e1df557
i think i fixed the crash
2010-12-04 18:51:14 +02:00
GreYFoXGTi
72c86a112b
Cleaned it up a bit
2010-12-04 18:35:41 +02:00
GreYFoXGTi
a838ad9da6
server_release on windows has no sql by default because my sql on the server_release version of windows doesn't work, but it does on server_debug
2010-12-04 16:31:54 +02:00
Speedy Consoles
b790b5f1bc
Merge branch 'master' of http://github.com/GreYFoXGTi/DDRace
2010-12-04 13:54:36 +01:00
GreYFoXGTi
9803a74664
so now windows mysql is fucked up and i don't know why
2010-12-04 03:12:30 +02:00
GreYFoXGTi
e61d7d1786
Windows mysql connector has a bug even in the latest version with boost no strings over 15 chars
2010-12-04 02:02:50 +02:00
GreYFoXGTi
83cea23373
Reworked some stuff
2010-12-03 14:58:38 +02:00
GreYFoXGTi
fb5a264e9e
Allowing speedup tile skipping
2010-12-02 23:05:10 +02:00
GreYFoXGTi
8542181d9a
Added include recommended by SushiTee to fix the following mac compiling Errors
...
#1 c++ src/game/server/gamecontext.cpp
In file included from src/base/tl/range.h:6,
from src/base/tl/algorithm.h:6,
from src/base/tl/sorted_array.h:6,
from src/game/server/score/file_score.h:6,
from src/game/server/gamecontext.cpp:18:
src/base/tl/base.h:8: error: expected `)' before ‘(’ token
bam: 'objs/game/server/gamecontext.o' error 256
2010-12-02 20:51:21 +02:00
GreYFoXGTi
388ca1288f
Fixed Tile Parsing Error and Added dbg Messages to show map tiles
2010-12-02 01:33:02 +02:00
GreYFoXGTi
af6f96bc7e
Added Tile for the new Map Config
2010-12-02 00:45:36 +02:00
GreYFoXGTi
0a29aae473
added old Laser Behavior Configuration
2010-12-02 00:07:33 +02:00
GreYFoXGTi
c149b17617
FinishTime Difference
2010-11-30 05:04:21 +02:00
GreYFoXGTi
af44a79b03
New Broadcast/Timer System
2010-11-30 04:24:15 +02:00
GreYFoXGTi
b4fd1aaca9
Fixed Announcement System
2010-11-29 05:39:47 +02:00
GreYFoXGTi
94d5351108
Just to be sure this doesn't make an infinite loop
2010-11-29 05:25:27 +02:00
GreYFoXGTi
7f24d0f144
Fixed ID 0 Bug
2010-11-26 20:01:55 +02:00
GreYFoXGTi
5db203a1ed
Mute Evasion
2010-11-26 18:57:18 +02:00
GreYFoXGTi
4f777211a5
Merge branch 'master' of http://github.com/heinrich5991/DDRace
2010-11-25 00:22:02 +02:00
heinrich5991
5204bbe6b7
fixed rcon command "set_team"
2010-11-24 23:17:56 +01:00
heinrich5991
73ca31d168
changed rcon command "cmdlist" nearly completly
2010-11-24 22:09:31 +01:00
GreYFoXGTi
a2896fd660
Commit by Allisone (Trust)
...
* Fixed CSqlScore::ShowRankThread so /rank works properly
* Fixed CSqlScore::Init so CREATE TABLE ends with character set utf8
* Added in CSqlScore more verbose SQLException messages
* Removed all statements that would prevent including and loading the CSqlScore class
* Changed bam.lua so on OSX the mysql lib folder gets linked and the include folders get included
* Changed bam.lua so macosx min version 10.5 and sdk 10.6 are required
* Cleaned CSqlScore and replaced new function calls with equal but backward compatible code
2010-11-24 01:50:02 +02:00
GreYFoXGTi
a3d29d5447
Merge branch 'master' of http://github.com/heinrich5991/DDRace
2010-11-23 03:57:48 +02:00
heinrich5991
077b8bd84d
fixed sv_vote_percentage
2010-11-22 22:30:50 +01:00