GreYFoX
1d8f3fffe4
Merge branch 'master' of git://github.com/oy/teeworlds
2011-06-01 16:35:05 +02:00
Nicolae Crefelean
9f323857af
Edited data/languages/romanian.txt via GitHub
2011-05-25 18:36:32 +02:00
GreYFoX
cc63cf2553
Merge branch 'master' of git://github.com/oy/teeworlds
...
Conflicts:
src/engine/external/pnglite/pnglite.c
src/engine/external/pnglite/pnglite.h
src/engine/shared/config_variables.h
src/game/client/components/menus_browser.cpp
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/gamecontext.cpp
src/game/server/player.cpp
src/game/version.h
2011-05-09 18:36:13 +02:00
Isadora Queiroz
019eb146a7
update of portuguese translation
2011-05-09 17:26:02 +02:00
oy
ed7af20dab
added German translation update by andi103
2011-05-03 23:25:20 +02:00
oy
e85c4cb5db
updated language files
2011-05-02 19:31:20 +02:00
oy
96f94a3155
added German translation update by andi103
2011-05-02 19:12:27 +02:00
oy
a4e5228725
added Russian translation update by BotanEgg
2011-05-02 19:07:35 +02:00
oy
26d014ad4f
cleaned up last commit
2011-05-02 18:31:44 +02:00
Learath2
d2cbcbfcf4
Added turkish translation
2011-05-02 18:29:22 +02:00
oy
dd05015321
added "minor fix and update of portuguese translation" by Slinack
2011-05-02 18:24:12 +02:00
oy
1bdc68318a
added "Italian translation review" by Otacon
2011-05-02 18:21:08 +02:00
oy
25c2af4fa4
added "updated dutch language file" by Vijfhoek
2011-05-02 18:09:31 +02:00
oy
d5e065b6c7
added tileset bugfixes by Crises
2011-05-02 18:00:02 +02:00
GreYFoX
8b5135c359
Removed Text from evil teleporter
...
people should check the documentation to know what it does
p.s. @Speedy-Consoles please update the Documentation to say it also cuts the hook of the hookers
2011-04-20 21:37:53 +02:00
oy
726bbbbdb0
added missing localisation in the demo player
2011-04-16 18:37:57 +02:00
GreYFoX
0df6d0541f
Merge branch 'master' of git://github.com/oy/teeworlds into HEAD
...
Conflicts:
bam.lua
src/engine/console.h
src/engine/server.h
src/engine/server/server.cpp
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/game/client/components/binds.cpp
src/game/client/components/chat.h
src/game/client/components/console.cpp
src/game/client/components/console.h
src/game/client/components/controls.cpp
src/game/client/components/emoticon.h
src/game/client/components/maplayers.cpp
src/game/client/components/menus.h
src/game/client/components/scoreboard.h
src/game/client/components/spectator.h
src/game/client/components/voting.h
src/game/client/gameclient.cpp
src/game/client/gameclient.h
src/game/client/render.h
src/game/collision.cpp
src/game/editor/ed_layer_tiles.cpp
src/game/gamecore.cpp
src/game/gamecore.h
src/game/layers.cpp
src/game/layers.h
src/game/mapitems.h
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/laser.h
src/game/server/entities/pickup.cpp
src/game/server/entities/pickup.h
src/game/server/entities/projectile.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/gameworld.cpp
src/game/server/gameworld.h
src/game/server/player.cpp
src/game/variables.h
2011-04-14 01:27:49 +02:00
oy
2f99b4e324
forgot to add the music file
2011-04-13 21:08:34 +02:00
oy
aeec62266b
added Danish translation by SnOrKilll
2011-04-13 20:19:37 +02:00
oy
1a5d70450f
added "reimplemented menu music by teetow-the-great-teetow" by Choupom
2011-04-13 20:00:54 +02:00
oy
537e5fa7b6
added default keys for spectator next/previous and updated localisations
2011-04-13 17:39:26 +02:00
GreYFoX
e3cc1c405e
Merge branch 'master' of git://github.com/oy/teeworlds
2011-04-12 21:05:55 +02:00
oy
ad5eeb14b3
added Norwegian translation by MertenNor
2011-04-12 20:35:28 +02:00
oy
62e816e847
fixed an entry within Russian translation
2011-04-12 20:31:47 +02:00
oy
0cfdd96b02
added flag for Bosnia and Herzegovina
2011-04-12 20:21:23 +02:00
oy
b5070bac70
added update for Russian translation by RaZeR[RT]
2011-04-12 17:57:02 +02:00
oy
2a12516268
added update for Bosnian translation by ***
2011-04-12 17:53:42 +02:00
GreYFoX
91a1a6f23b
hmm
2011-04-11 17:14:24 +02:00
GreYFoX
25f229de38
the latest but not the last merge mistake
2011-04-11 16:54:43 +02:00
GreYFoX
75f8a95a75
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/version.h
2011-04-10 14:43:55 +02:00
oy
3788d2392d
moved to trunk version again and added update for Portuguese translation by Slinack
2011-04-10 02:23:39 +02:00
GreYFoX
aaac8a3f77
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/version.h
2011-04-09 22:33:06 +02:00
GreYFoX
f7f6058a92
Merged Oy, Cleaned up, removed some useless features and code parts
...
Added Icon by landil
alot more...
2011-04-09 22:32:17 +02:00
oy
aecb97fa0a
fixed problem with jungle_main
2011-04-09 21:15:25 +02:00
oy
9d01effb9f
fixed editor entities
2011-04-09 20:35:34 +02:00
oy
1d7a91909c
ctf2 update
2011-04-09 18:32:01 +02:00
oy
caf1a9f912
made translations ready for 0.6 release and added fixed friends/mute icons
2011-04-09 18:08:11 +02:00
oy
42fdd6540c
added new graphics and maps
2011-04-09 16:48:51 +02:00
oy
05889f3e3e
fixed problem with the hammer hit particle
2011-04-09 00:02:08 +02:00
oy
9643fc36ae
added new hammer hit effect by SushiTee and Crises
2011-04-08 19:11:41 +02:00
oy
e63683e649
added new friends/mute icons and buttons by Crises
2011-04-08 18:45:57 +02:00
oy
8acd47e3b8
added update for Finnish translation by ziltoide
2011-04-06 23:56:54 +02:00
oy
d4bc8f8b27
Added fix for overlapping German translation
2011-04-06 23:36:51 +02:00
oy
a2af5cbae2
added update for Spanish translation by Ninja Style. Closes #610
2011-04-06 23:22:06 +02:00
oy
205a09a158
added Bulgarian translation by Hip-Hop_Blond. Closes #607
2011-04-06 23:19:51 +02:00
oy
5bc6bfdecc
added fix for overlapping polish translation by Tsin. Closes #621
2011-04-06 23:15:58 +02:00
oy
b985fdc20a
added new friend/mute buttons by Crises and reworked the player options like Landil suggested. Closes #579
2011-04-06 20:18:31 +02:00
oy
ebca792975
improved call vote tab. Closes #573
2011-04-06 11:41:40 +02:00
oy
923153ca70
added update for Russian translation by carzil
2011-04-05 19:19:06 +02:00
oy
656d8a6301
commented out unused country flags in the index file
2011-04-05 18:41:24 +02:00
oy
02e15ef9f1
added a fix for French translation by Ubu
2011-04-04 21:09:05 +02:00
Johannes Loher
8b7bba083e
Corrected the german localisation a bit
2011-04-04 20:47:01 +02:00
oy
5c6e274a88
added more and resized flags by Crises and made them show up smaller and less of an eye-catcher. Closes #566
2011-04-04 20:37:12 +02:00
oy
9da43765f3
added update for German translation by heinrich5991
2011-04-03 23:46:51 +02:00
oy
afb7de6327
removed strange characters from index.txt
2011-04-03 23:05:39 +02:00
Choupom
65f7b45207
fixed french l10n
2011-04-03 23:00:57 +02:00
Choupom
1cc89dba5c
updated romanian l10n by kneekoo
2011-04-03 23:00:38 +02:00
Choupom
a267d474c0
added slovak l10n by Limit and Petr
2011-04-03 23:00:18 +02:00
oy
5beae41043
added update for Czech translation by Petr
2011-04-02 23:02:33 +02:00
vierkant
f57824bae9
small addition
2011-04-02 22:19:37 +02:00
vierkant
80826be7a6
Translated and arranged missing strings to Dutch.
2011-04-02 22:19:30 +02:00
Martin Pola
dfcdb9d439
Edited data/languages/polish.txt via GitHub
2011-04-02 22:18:00 +02:00
Choupom
878055ece8
updated french l10n
2011-04-02 19:53:54 +02:00
Choupom
b3cb33eec0
replace team name by clan name if possible
2011-04-02 18:11:43 +02:00
oy
f6597bfa6c
changed flag of Ireland to Northern Ireland
2011-04-02 17:51:20 +02:00
oy
30c45b7899
removed newline from a localisation. Closes #572
2011-04-02 12:08:46 +02:00
Martin Pola
81453bd09c
Translated the new variables.
2011-04-02 11:17:09 +02:00
oy
053a1d19ec
added another editor entity by Crises
2011-04-01 21:08:06 +02:00
oy
593a8ee6ec
improved settings menu. Closes #564
2011-04-01 19:36:44 +02:00
oy
25a0069bf0
added new editor entities by Crisis
2011-04-01 18:23:25 +02:00
oy
0e6aca2b28
fixed a missing translation
2011-03-31 18:24:02 +02:00
oy
08c03104b4
changed ingame vote menu so it fits the other tabs and it's makes localisations easier
2011-03-31 15:43:12 +02:00
oy
0307138950
added better headlines for tabs in vote menu
2011-03-28 23:51:46 +02:00
oy
867f944459
added graphic buttons for remove/add friend and chat ignore/notice
2011-03-28 21:10:37 +02:00
oy
6e1b6b102a
added menu to add/remove a vote on the server
2011-03-26 18:43:43 +01:00
oy
ae325c873f
added friends feature. Closes #24
2011-03-23 13:06:35 +01:00
oy
eaef2ce48a
added notification for unsaved map data and a confirmation for overwriting an existing map in the editor. Closes #115
2011-03-22 00:31:42 +01:00
oy
8d159ce65a
removed localisation in the editor
2011-03-20 17:04:03 +01:00
oy
18e5412358
added sound for highlighted chat message. Closes #508
2011-03-20 15:58:59 +01:00
oy
3a7d93e182
added few more flags
2011-03-20 11:06:52 +01:00
oy
3d63afacc2
fixed a problem with the country flag selector, changed a localisation and the format of a file
2011-03-19 19:31:00 +01:00
oy
cb7ce30398
added country flags
2011-03-19 19:23:56 +01:00
oy
a8bf857c68
improved server browser list resorting and made search work on IP addresses. Closes #482
2011-03-18 19:03:13 +01:00
oy
5d04c5cd8e
updated localisations
2011-03-17 17:53:13 +01:00
oy
2740a7f2ee
changed a French translation
2011-03-17 17:51:40 +01:00
GreYFoX
87cde802b1
Added a new entities_clear
...
Fixed cl_ddrace_cheats not controlling cl_show_entities
attempted to make cl_show_entities show other layers than the game layer
2011-03-16 19:48:16 +02:00
oy
156e23b592
added loading/support for country flags to the client
2011-03-16 12:09:22 +01:00
oy
be8f669333
added extended demo infos in the demo browser
2011-03-13 10:41:10 +01:00
oy
a04eb45354
added rename button to the demo browser and updated localisation entries
2011-03-12 19:08:44 +01:00
oy
740242a2c8
added missing localisation entries
2011-03-10 10:22:47 +01:00
oy
4f91026a01
added an editor function to show tile informations (index, flip/rotate status)
2011-02-18 11:41:27 +01:00
oy
ae94c36f54
made game tile construction in the editor more usable
2011-02-18 10:49:54 +01:00
oy
927954a53b
added new emoticons. Closes #362
2011-02-16 11:45:19 +01:00
GreYFoXGTi
718d697707
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/collision.cpp
src/game/collision.h
src/game/gamecore.cpp
src/game/server/gamecontext.cpp
2011-02-13 19:36:53 +02:00
GreYFoXGTi
f83132448d
Merged Oy, Isolated Freeze from Deep Freeze
2011-02-13 19:32:06 +02:00
Choupom
7ef9c0e7be
fixed french translation
2011-02-13 12:24:15 +01:00
oy
b8e3795bfa
added update for French translation by clecle226
2011-02-12 23:43:59 +01:00
oy
d12db45c48
added editor function to construct different game tiles from a layer. Closes #460
2011-02-12 19:10:45 +01:00
root
20f186b0d2
Updated german translation
2011-02-09 12:54:50 +01:00
oy
f5de59451a
fixed a french translation and disarrangement
2011-02-09 12:37:19 +01:00