GreYFoXGTi
a8efcfcb5a
Fixed CrossMap Tiles Copy
2010-12-19 16:10:42 +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
ccbd057255
Revert merge branch 14.11 converter merged by noother
2010-12-19 04:02:59 +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
a3797482da
removed 360 degree rotation in the editor. Closes #352
2010-12-16 04:27:00 +01:00
oy
8aeb3e7ada
enable "Always show nameplats disregarding of distance" on default. Closes #343
2010-12-16 04:22:14 +01:00
oy
ec09fbf23b
let the chat lines disappear gradually. Closes #342
2010-12-16 04:20:50 +01:00
oy
0121f27311
fixed server crash on too many snap items. Closes #317
2010-12-16 03:29:08 +01:00
oy
54f138f894
made broadcast text a bit smaller and cut it off if it's bigger than the screen. Closes #313
2010-12-16 03:17:16 +01:00
GreYFoXGTi
3956c34b6d
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/russian.txt
2010-12-16 04:15:05 +02:00
GreYFoXGTi
73dbc159bc
Merge branch 'master' of github.com:GreYFoXGTi/DDRace
2010-12-16 04:11:02 +02:00
oy
6063b4c14d
added auto completion of nicknames and highlighted nicknames in chat. Closes #218
2010-12-16 02:31:12 +01:00
oy
1d7df01e9a
added map download progress by kaddyd
2010-12-16 01:52:29 +01:00
GreYFoXGTi
2f5f332cbb
Merge branch 'master' into DDRace
...
Conflicts:
src/engine/client/client.cpp
src/engine/shared/config_variables.h
2010-12-13 03:43:22 +02:00
oy
c0530b0d09
added language popup on first start. Closes #336
2010-12-12 19:20:30 +01:00
oy
c75a75b64f
made it possible to automatically take game over screenshots. Closes #339
2010-12-12 16:48:13 +01:00
GreYFoXGTi
bed657d805
Merge branch 'master' into DDRace
2010-12-12 04:32:40 +02:00
GreYFoXGTi
88b1fba6b5
Converted Command kill another player of the server from kill to kill_pl to fix call confusion thanks to josh aka flaminflash aka DemonulPerduit with ping 400
2010-12-12 04:26:40 +02:00
GreYFoXGTi
ade61b33b1
removed useless dbg_msg
2010-12-12 04:06:01 +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
157aafd4dd
Merge branch 'master' into DDRace
...
Conflicts:
src/engine/server/server.cpp
src/game/variables.h
2010-12-11 23:57:41 +02:00
oy
3d54cf0585
nameplates on by default. Closes #322
2010-12-11 22:41:58 +01:00
Choupom
eb569e60bd
fixed clipping on old maps ( fixes #325 )
2010-12-11 21:57:43 +01:00
GreYFoXGTi
46c2225d60
Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
...
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/russian.txt
scripts/make_release.py
src/engine/shared/config_variables.h
2010-12-11 21:28:43 +02:00
oy
a0985314c9
made it possible to "recycle" auto recorded demos
2010-12-11 18:55:28 +01:00
GreYFoXGTi
4510ced422
Merge branch 'DDRace' of github.com:GreYFoXGTi/teeworlds into DDRace
2010-12-10 21:20:34 +02:00
GreYFoXGTi
2c51511260
Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
...
Conflicts:
src/engine/client/client.cpp
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/game/client/gameclient.cpp
2010-12-10 20:58:53 +02:00
oy
4756c031c5
save auto recorded demos in a separate folder and added an option to enable/disable it in the settings menu
2010-12-08 01:55:13 +01:00
oy
db9dd6b8c9
added an optional time stamp to a demo record by Batchyx
2010-12-08 00:42:32 +01:00
oy
665934ee09
cleaned up several uses of timestamps for filenames
2010-12-08 00:32:50 +01:00
oy
bd9850cae2
added single function to stop recording by Batchyx
2010-12-08 00:02:24 +01:00
oy
39b531452a
fixed colour of the particles when a tee dies. Closes #331
2010-12-07 23:54:25 +01:00
oy
3ea00f61cf
removed needless include
2010-12-07 23:51:04 +01:00
oy
7414271309
check the return values of RemoveFile and CreateFolder
2010-12-07 23:47:41 +01:00
GreYFoXGTi
cebbecf632
Some Code Improvements and Compiler warnings
2010-12-07 19:44:23 +02:00
GreYFoXGTi
aa30c29b35
Fixed Some Editor Mistakes
2010-12-07 17:51:59 +02:00
GreYFoXGTi
122c7954d9
Announcement Randomness
2010-12-06 04:27:35 +02:00
GreYFoXGTi
45fa3d49b5
Revert "Client won't vote on comments by Sushi Tee" caused crashes
...
This reverts commit ed7a1d5bcd
.
2010-12-06 03:32:44 +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
ed7a1d5bcd
Client won't vote on comments by Sushi Tee
2010-12-06 00:28:35 +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
Speedy Consoles
645e9f0a5a
reworked ddrace commands
2010-12-05 20:17:16 +01: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
987881c02a
Further More Editor Improvements
2010-12-04 14:05:14 +02:00
GreYFoXGTi
a0a16e0f48
Few Editor Improvements
2010-12-04 13:54:53 +02: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
1d3660c152
Elevated Version to 1.01a
2010-11-29 05:15:37 +02:00
GreYFoXGTi
461abbaa7e
Fixed Scoreboard cl_show_ids
2010-11-29 04:46:45 +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
ae4aebd365
Merge branch 'master' of http://github.com/oy/teeworlds
2010-11-24 02:28:01 +02:00
oy
e6698b1118
apply custom colour to blood colour. Closes #314
2010-11-24 01:11:56 +01:00
oy
bc5f3fc839
fixed client crash when there are lots of particles. Closes #105
2010-11-24 01:08:51 +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
a1f500766e
lalalalalalalalalaaaaaaa
2010-11-23 20:04:36 +02:00
GreYFoXGTi
c4b047a6bb
i do have an excuse, i am ill....
2010-11-23 19:59:36 +02:00
GreYFoXGTi
ec9c0cd601
Updated CCollision::Entity dbg_msg
2010-11-23 12:26:43 +02:00
GreYFoXGTi
4e8a4340b8
Made Old Switches Convert to new Switches
2010-11-23 11:43:52 +02:00
GreYFoXGTi
32c8a349f5
Made An Older Switch Layer Converter
2010-11-23 11:36:57 +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
GreYFoXGTi
4737588827
New Delayed Switches
2010-11-22 23:10:12 +02:00
GreYFoXGTi
eed83bd7cb
Added Announcement
2010-11-22 13:00:43 +02:00
GreYFoXGTi
f1781c0eb4
lol
2010-11-22 11:13:04 +02:00
GreYFoXGTi
b8fe169419
Added Mac Fixes by Allisone (Trust)
2010-11-22 11:09:27 +02:00
GreYFoXGTi
3ceebe2ef4
Forgot to make the map.cfg level 4
2010-11-22 10:32:00 +02:00
GreYFoXGTi
4f3d086b92
Fixed /pause making u return as a Team 0 Player
2010-11-22 09:21:02 +02:00
GreYFoXGTi
a80ac35cb9
Fixed http://ddrace.info/forum/showthread.php?261-DDrace-Trunk-Alpha-Crash-caused-by-teams
2010-11-22 08:59:40 +02:00
GreYFoXGTi
5d9ee1736e
made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/german.txt
data/languages/russian.txt
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamecontext.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/gamemodes/ctf.h
src/game/server/gamemodes/dm.cpp
src/game/server/gamemodes/dm.h
src/game/server/gamemodes/mod.cpp
src/game/server/gamemodes/tdm.cpp
src/game/server/gamemodes/tdm.h
2010-11-22 00:26:00 +02:00
oy
8e3cba8dbf
disable free view when chatting as spectator. Closes #303
2010-11-21 18:05:26 +01:00