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
|
67f86e3547
|
added option to change nameplates size by RushPL
|
2011-01-04 13:11:01 +01:00 |
|
oy
|
1928a757c6
|
added fix for rendering big fonts on large resolutions by RushPL
|
2011-01-04 12:30:40 +01:00 |
|
oy
|
5dbe75fd7b
|
removed duplicate stuff
|
2011-01-04 12:00:34 +01:00 |
|
oy
|
bcba9e5c89
|
moved HslToRgb stuff
|
2011-01-04 11:58:25 +01:00 |
|
oy
|
336f00ae89
|
added colours for tile layers by Choupom
|
2011-01-04 11:38:14 +01:00 |
|
Choupom
|
533d28e35a
|
made team colors for nameplates (fixes #207)
|
2011-01-03 12:54:58 +01:00 |
|
Choupom
|
b565d4ab18
|
fixed so Make/Clear Collision buttons are hidden on game layer
|
2011-01-03 12:54:29 +01:00 |
|
oy
|
a72848e780
|
added constants for teams by Choupom
|
2011-01-03 12:50:38 +01:00 |
|
vierkant
|
b29b6d0bcf
|
Difference made for disconnect and quit
|
2011-01-03 12:22:05 +01:00 |
|
vierkant
|
3f1fa001a5
|
Dutch translation updated.
"seconds and minutes left" in map download in Dutch can better be translated as "left seconds and minutes'" with left in front of the time unit.
|
2011-01-03 12:21:42 +01:00 |
|
Yoyo117
|
d9c71f49f3
|
minor improvement
|
2011-01-02 19:58:06 +01:00 |
|
Lars Funke
|
cbc76c9247
|
Updated german l10n
|
2011-01-02 19:49:22 +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
|
41236a3413
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-12-22 13:42:36 +02:00 |
|
oy
|
26546585f7
|
fixed path for make_release in build.py
|
2010-12-22 12:34:48 +01:00 |
|
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
|
5b56598056
|
Edited build.py for DDRace
|
2010-12-16 06:36:18 +02: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 |
|
oy
|
c6848cd229
|
fixed build.py on windows
|
2010-12-16 03:14:31 +01:00 |
|
GreYFoXGTi
|
73dbc159bc
|
Merge branch 'master' of github.com:GreYFoXGTi/DDRace
|
2010-12-16 04:11:02 +02:00 |
|
Sworddragon
|
9852ec658c
|
Updated build.py
|
2010-12-16 03:08:45 +01: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 |
|
GreYFoXGTi
|
cf33700597
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-12-13 03:41:36 +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
|
c3b43ee5ba
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-12-12 04:32:32 +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 |
|
GreYFoXGTi
|
22192c1047
|
Applied Oy's Changes to bam.lua on the parts i modified in DDRace
|
2010-12-12 03:42:50 +02:00 |
|