Magnus Auvinen
|
0d78e2d2cd
|
Merge remote branch 'fujnky/master'
Conflicts:
data/languages/portuguese.txt
|
2010-06-09 13:01:36 +02:00 |
|
Fujnky
|
7ca5e0fbb1
|
Fixed localizations, most german translation strings fit in buttons now.
|
2010-06-07 16:17:40 +02:00 |
|
Fujnky
|
7cc7c8f84e
|
Merged with master
|
2010-06-07 16:00:01 +02:00 |
|
oy
|
1c041c44a4
|
made unban command work with the banlist index. Closes #102
|
2010-06-07 14:12:06 +02:00 |
|
oy
|
2104835d77
|
update server info for connected clients if map or gametype changes. Closes #108
|
2010-06-07 13:34:47 +02:00 |
|
oy
|
a3545b06b4
|
some cleanup
|
2010-06-07 00:08:40 +02:00 |
|
oy
|
2ba877bc64
|
added update for portuguese translation by slinack
|
2010-06-06 23:44:42 +02:00 |
|
oy
|
1272c4d805
|
prevent that the server gets filtered by "compatible version" in the clients server browser
|
2010-06-06 23:28:34 +02:00 |
|
oy
|
04b6abae93
|
fixed kill messages showing wrong infos
|
2010-06-06 17:17:43 +02:00 |
|
oy
|
a41d930a85
|
fixed some compiler warnings. Closes #76
|
2010-06-06 17:16:52 +02:00 |
|
Magnus Auvinen
|
7d03e70d1e
|
Merge remote branch 'choupom/master'
|
2010-06-06 14:53:55 +02:00 |
|
Magnus Auvinen
|
4ca43196d7
|
Merge remote branch 'xalduin/master'
|
2010-06-06 14:44:32 +02:00 |
|
Magnus Auvinen
|
b37be77dcb
|
Merge remote branch 'vierkant/master'
|
2010-06-06 14:39:05 +02:00 |
|
Magnus Auvinen
|
442e6e1431
|
fixed issue when using +commands in the console
|
2010-06-06 14:31:16 +02:00 |
|
xalduin
|
2d99a0360f
|
Images are now sorted on Append
|
2010-06-05 18:47:30 -04:00 |
|
xalduin
|
80a7c53dec
|
Issue #92 scrollbars added for layer/image toolbars
|
2010-06-05 18:46:47 -04:00 |
|
Fujnky
|
34bd0a09b7
|
minor typo fix
|
2010-06-05 23:37:50 +02:00 |
|
Fujnky
|
bf68f803e3
|
Internationalized editor and updated german localization
|
2010-06-05 23:36:52 +02:00 |
|
Fujnky
|
d000766e9d
|
Merge branch 'master' of git://github.com/matricks/teeworlds
|
2010-06-05 18:50:26 +02:00 |
|
Choupom
|
747d972d38
|
fixed so we can run a map which is in a folder
|
2010-06-05 10:44:50 +02:00 |
|
Choupom
|
848764544f
|
added folders in demo browser (#25)
|
2010-06-04 22:14:02 +02:00 |
|
xalduin
|
ab0d8d0eb8
|
Merge remote branch 'upstream/master'
* upstream/master:
fixed bug with the quick search box. Closes #89
|
2010-06-04 12:01:37 -04:00 |
|
vierkant
|
7b19d24b84
|
better translation
|
2010-06-04 04:20:25 -07:00 |
|
vierkant
|
bd04ae2d77
|
sorted alphabetically
|
2010-06-04 02:41:13 -07:00 |
|
oy
|
3d079a35e9
|
fixed bug with the quick search box. Closes #89
|
2010-06-03 23:32:32 +02:00 |
|
xalduin
|
1f41e7da85
|
Merge branch 'master' of git://github.com/matricks/teeworlds
|
2010-06-03 17:08:12 -04:00 |
|
xalduin
|
9603d676c6
|
Score no longer decreased when switching teams
|
2010-06-03 17:08:05 -04:00 |
|
Fujnky
|
82a30b7b7e
|
Merge branch 'master' of git://github.com/matricks/teeworlds
|
2010-06-03 22:42:10 +02:00 |
|
Magnus Auvinen
|
a48fa5faf2
|
phony commit to test
|
2010-06-03 22:39:40 +02:00 |
|
xalduin
|
825e732c87
|
Merge branch 'master' of git://github.com/matricks/teeworlds
|
2010-06-03 16:36:48 -04:00 |
|
Fujnky
|
4ffab2af80
|
Merge branch 'master' of git://github.com/matricks/teeworlds
|
2010-06-03 22:33:38 +02:00 |
|
xalduin
|
a563c2f322
|
Issue #82 time and date in screenshot filename
|
2010-06-03 22:32:42 +02:00 |
|
xalduin
|
277eeef098
|
Merge branch 'master' of git://github.com/matricks/teeworlds
|
2010-06-03 16:24:41 -04:00 |
|
xalduin
|
3dc9beb7ec
|
Issue #82 time and date in screenshot filename
|
2010-06-03 16:24:31 -04:00 |
|
oy
|
67d4903b9f
|
fixed stuck "error loading demo"-popup. Closes #90
|
2010-06-03 22:03:27 +02:00 |
|
xalduin
|
8b15558f5d
|
Merge remote branch 'upstream/master
|
2010-06-03 13:32:15 -04:00 |
|
vierkant
|
b7a4193467
|
Dutch translation
|
2010-06-03 10:06:34 -07:00 |
|
Fujnky
|
203efa1f27
|
Merge branch 'master' of git://github.com/matricks/teeworlds
|
2010-06-03 17:48:54 +02:00 |
|
Fujnky
|
5849aeb86c
|
Merge branch 'master' of git://github.com/matricks/teeworlds
Conflicts:
src/game/server/gamemodes/ctf.cpp
|
2010-06-03 17:47:32 +02:00 |
|
Fujnky
|
551170656d
|
Fixed localization for 'Error loading demo'-Popup
|
2010-06-03 17:41:45 +02:00 |
|
Magnus Auvinen
|
a6ab379e67
|
fixed so that the same distance is used when leaving off the flag and taking it
|
2010-06-03 17:40:01 +02:00 |
|
Magnus Auvinen
|
9bb6fe48c2
|
cleaned up g_CharPhysSize
|
2010-06-03 17:39:42 +02:00 |
|
Fujnky
|
5a641132e7
|
Fixed localization for 'Error loading demo'-Popup
|
2010-06-03 17:07:15 +02:00 |
|
Fujnky
|
feb8894b4d
|
Flag catch and capture should now be exactly the same
|
2010-06-03 16:42:37 +02:00 |
|
xalduin
|
3fff61d24a
|
Issue #86, don't reset score on team switch
|
2010-06-03 10:35:18 -04:00 |
|
xalduin
|
6baadea5e1
|
Merge branch 'master' of git://github.com/matricks/teeworlds
|
2010-06-03 09:59:06 -04:00 |
|
xalduin
|
8db32a4b8b
|
Issue #88 flag pickup distance reduced
|
2010-06-03 09:56:57 -04:00 |
|
Fujnky
|
00c53adffb
|
Merge branch 'master' of http://github.com/SushiTee/teeworlds-stuff
|
2010-06-03 15:43:52 +02:00 |
|
xalduin
|
6491dfc16c
|
Merge branch 'master' of git://github.com/matricks/teeworlds
|
2010-06-03 09:36:24 -04:00 |
|
Fujnky
|
7b74cd248b
|
made flag catch and capture distances fit
|
2010-06-03 15:30:33 +02:00 |
|