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 |
|
SushiTee
|
0115161463
|
mergend stuff
|
2010-06-03 15:21:12 +02:00 |
|
oy
|
5988b9d388
|
- show connecting players with rcon status command
- make it possible to limit the number of clients with the same ip that can connect to the server
|
2010-06-03 14:48:32 +02:00 |
|
Fujnky
|
d581e413c8
|
More localization fixes
|
2010-06-03 11:30:05 +02:00 |
|
Fujnky
|
0deba5a1aa
|
Merge branch 'master' of git://github.com/matricks/teeworlds
|
2010-06-03 10:40:42 +02:00 |
|
xalduin
|
de1a7acfaa
|
Merge branch 'master' of git://github.com/matricks/teeworlds
|
2010-06-03 00:37:46 -04:00 |
|
Fujnky
|
7cbf0f93ca
|
Some localization fixes
|
2010-06-02 23:15:56 +02:00 |
|
Fujnky
|
64ddee0a21
|
Merge branch 'master' of git://github.com/matricks/teeworlds
|
2010-06-02 21:47:47 +02:00 |
|
SushiTee
|
c37335b115
|
shortened IsAuthed a bit
|
2010-06-02 21:33:19 +02:00 |
|
NoxNebula
|
dd19074deb
|
Admin-Kick-Protection
Add IsAuthed(int ClientID); function.
Add kickprotection for admins (Remote Console logged in players)
Add Anti-Self-Kick (minor)
|
2010-06-03 03:27:34 +08:00 |
|
Magnus Auvinen
|
979f8d8765
|
cleaned up the configure.lua a little bit
|
2010-06-03 03:26:31 +08:00 |
|
xalduin
|
cc181cda5b
|
Merge remote branch 'upstream/master'
|
2010-06-02 15:21:31 -04:00 |
|
Fujnky
|
0d4c0ccef5
|
Some localization fixes
|
2010-06-02 21:03:15 +02:00 |
|
oy
|
bed67b156c
|
added fix for portuguese translation by slinack
|
2010-06-03 02:57:46 +08:00 |
|
oy
|
ad1ce01446
|
fixed shotbug (#80)
|
2010-06-03 02:57:46 +08:00 |
|
oy
|
7a1953e60b
|
added fix for editor quad editing by ghost91 Closes #18
|
2010-06-02 20:50:48 +02:00 |
|
oy
|
25408a102b
|
added fix for portuguese translation by slinack
|
2010-06-02 20:27:53 +02:00 |
|
oy
|
b2a55766d1
|
fixed shotbug (#80)
|
2010-06-02 19:39:28 +02:00 |
|
xalduin
|
9e6c909624
|
Removed unnecessary SortImages call in RenderImages
|
2010-06-02 13:26:17 -04:00 |
|
xalduin
|
9ff2cb6744
|
Merge branch 'experimental'
|
2010-06-02 13:19:03 -04:00 |
|
xalduin
|
b1774d8713
|
Merge remote branch 'upstream/master'
|
2010-06-02 13:18:46 -04:00 |
|
xalduin
|
ba543c9df4
|
Reset to non image sort version
|
2010-06-02 13:17:51 -04:00 |
|
xalduin
|
a99cbfc742
|
Image sorting working, less hackish
|
2010-06-02 12:12:32 -04:00 |
|
xalduin
|
fee651735f
|
Merge remote branch 'upstream/master' into experimental
|
2010-06-02 11:26:42 -04:00 |
|
Magnus Auvinen
|
edcfbc2f28
|
cleaned up the configure.lua a little bit
|
2010-06-02 11:46:07 +02:00 |
|
NoxNebula
|
9a5a19e7c7
|
Admin-Kick-Protection
Add IsAuthed(int ClientID); function.
Add kickprotection for admins (Remote Console logged in players)
Add Anti-Self-Kick (minor)
|
2010-06-02 09:40:08 +02:00 |
|
xalduin
|
79263efe87
|
Images should be sorted throughout. Fixed problems since last commit.
|
2010-06-01 23:25:13 -04:00 |
|
xalduin
|
b066bb07e1
|
Sorting images somewhat working, save is bugged
|
2010-06-01 23:04:56 -04:00 |
|
xalduin
|
4d35f63174
|
Images are now sorted in the editor
|
2010-06-01 21:36:10 -04:00 |
|
xalduin
|
7454cec57e
|
Start of image sorting
|
2010-06-01 20:47:10 -04:00 |
|
xalduin
|
8e1712c744
|
Sort by map name when opening map
When opening a map, the list of map names is now sorted alphabetically.
|
2010-06-02 06:39:05 +08:00 |
|
xalduin
|
f963189dc4
|
Merge remote branch 'upstream/master'
|
2010-06-01 17:49:31 -04:00 |
|
xalduin
|
f2920ea5d8
|
Sort by map name when opening map
When opening a map, the list of map names is now sorted alphabetically.
|
2010-06-02 05:11:12 +08:00 |
|
xalduin
|
be5b6aa4de
|
Sort by map name when opening map
When opening a map, the list of map names is now sorted alphabetically.
|
2010-06-01 16:49:35 -04:00 |
|
Magnus Auvinen
|
b851bc8799
|
fixed so that SDL_main is declared as a C function so linking gets done correctly
|
2010-06-02 04:09:39 +08:00 |
|
Magnus Auvinen
|
b12ae69fee
|
fixed compile errors for osx
|
2010-06-02 04:00:05 +08:00 |
|
Magnus Auvinen
|
61fdee3367
|
fixed so that SDL_main is declared as a C function so linking gets done correctly
|
2010-06-01 21:59:04 +02:00 |
|