GreYFoXGTi
395c87a7ad
woops
2011-01-07 20:37:21 +02:00
GreYFoXGTi
6889adc0bb
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
.gitignore
src/game/client/gameclient.cpp
src/game/editor/ed_editor.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h & Cleaned it up
2011-01-06 23:32:19 +02:00
oy
7487a22956
added better texture moving in the editor by nsinreal. Closes #372
2011-01-06 21:58:42 +01:00
GreYFoXGTi
802dc7a73d
Revert "dunno who added this or why!", i seem to have confused Spectator/In-Game with teams system
...
used team constants
This reverts commit 27c3f06f27
.
2011-01-06 15:49:05 +02:00
oy
1306b62ce2
added command to move all players to a team. Closes #384
2011-01-06 13:37:28 +01:00
GreYFoXGTi
b5f545f0e7
Fixed Mistake
2011-01-06 14:24:30 +02:00
GreYFoXGTi
21994e017f
fixed warnings
2011-01-06 14:21:44 +02:00
oy
73010e7d2e
removed a debug message. Closes #373
2011-01-06 13:21:13 +01:00
oy
418dd8eccc
added fix by CarmineZ for missing option in the control settings. Closes #395
2011-01-06 13:17:54 +01:00
oy
e71263d686
fixed last commit
2011-01-06 12:41:24 +01:00
Sworddragon
4ff61fcdaa
Made compiling process Python 3 compatible
2011-01-06 12:27:50 +01:00
Sworddragon
b90a015daf
Added entries in .gitignore
2011-01-06 12:22:07 +01:00
GreYFoXGTi
af160c8401
Can't pause while you are in a team
2011-01-06 07:58:37 +02:00
GreYFoXGTi
22aa8940a7
Code Style of some files converted from K&R to BSD/Allman
2011-01-06 07:30:19 +02:00
GreYFoXGTi
b909829b61
Fixed team state sending, it was illogical
2011-01-06 07:22:08 +02:00
GreYFoXGTi
babe838cab
Added /ShowOthers
2011-01-06 07:08:12 +02:00
GreYFoXGTi
82eac5cf3b
ScoreBoard now is different for DDRace only
2011-01-06 06:45:53 +02:00
GreYFoXGTi
ddc5dd7ab3
Cleaned up & Re-arranged stuff
2011-01-06 05:46:10 +02:00
GreYFoXGTi
1719ad554e
Moved a var
2011-01-06 01:51:22 +02:00
GreYFoXGTi
1d9190fd5b
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/russian.txt
readme.txt
src/game/variables.h
2011-01-06 01:49:58 +02:00
oy
13902fef6c
show an error popup when demo deletion fails
2011-01-05 22:22:07 +01:00
oy
64e36b5095
updated french l10n by Choupom
2011-01-05 22:13:44 +01:00
Choupom
ebd93382ea
updated copyright
2011-01-05 22:01:33 +01:00
oy
6bf5c0bef2
added updated Bosnian translation by ***
2011-01-05 18:48:00 +01:00
oy
18461535fd
changed time left localisation in the map download popup to allow better translations
2011-01-05 17:28:53 +01:00
m!nus
7b46d386dd
requesting serverinfo now uses gie2 instead of the legacy gief.
2011-01-05 12:22:45 +01:00
oy
2992d9a6c6
scale control settings as well
2011-01-05 12:19:06 +01:00
Damian Kaczmarek
073044747b
-Working ui_scale parameter.
...
(doing it properly would require lots of framework/interface job ...)
2011-01-05 12:14:36 +01:00
oy
aad2438882
fixed outlines for larger font sizes
2011-01-05 12:12:23 +01:00
oy
023763e1a4
updated localisations based on last commit
2011-01-05 12:08:38 +01:00
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