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 |
|
clecle226
|
4ba5980204
|
added translation
|
2011-02-09 12:28:39 +01:00 |
|
oy
|
6d9d92f418
|
added update for Romanian translation by kneekoo
|
2011-02-09 12:23:47 +01:00 |
|
GreYFoXGTi
|
3da1860654
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/dutch.txt
|
2011-02-04 18:54:54 +02:00 |
|
GreYFoXGTi
|
984d10970e
|
Localization and Cooler Browser Filter
|
2011-01-31 00:30:53 +02:00 |
|
vierkant
|
55cc93f4af
|
Rearranged alphabetically
|
2011-01-29 18:40:53 +01:00 |
|
vierkant
|
f6a467094c
|
Dutch language file update
|
2011-01-29 18:40:28 +01:00 |
|
GreYFoXGTi
|
5b51295185
|
Added Deep freeze/unfreeze to switch layer so that it can be controlled with switches
fixed the freeze command
Added Freeze Tile to switch layer to set freeze tile custom delay
Added sv_freeze_delay to control default freeze time delay
|
2011-01-25 12:05:53 +02:00 |
|
GreYFoXGTi
|
f1a8b6b7ad
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/game/client/gameclient.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h
|
2011-01-24 14:06:55 +02:00 |
|
oy
|
53a0f9e78b
|
added Spanish translation by ReGnuM
|
2011-01-23 17:54:37 +01:00 |
|
oy
|
12e29d7efd
|
fixed Italian language file
|
2011-01-23 17:54:12 +01:00 |
|
Carmine
|
c7ddd5f8ed
|
update italian translation
|
2011-01-23 17:54:06 +01:00 |
|
heinrich5991
|
fbe1f9cedf
|
updated german localization, fixed one too big string
|
2011-01-23 17:53:42 +01:00 |
|
GreYFoXGTi
|
2151883b43
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/gamecore.cpp
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/pickup.cpp
src/game/server/entities/projectile.cpp
src/game/server/entity.h
src/game/server/gamecontext.cpp
src/game/server/player.cpp
src/game/variables.h
|
2011-01-20 16:10:32 +02:00 |
|
oy
|
9c5477a6e8
|
added romanian translation update by kneekoo
|
2011-01-18 18:26:02 +01:00 |
|
oy
|
bf6fcc20f4
|
added an error popup on startup when the sound couldn't be initialised. Closes #425
|
2011-01-17 13:28:15 +01:00 |
|
Floff Floffsson
|
645f31141d
|
deepfreeze tiles
|
2011-01-17 00:38:24 +02:00 |
|
GreYFoXGTi
|
9c66a2d54c
|
Endless Hook Tile for ingameplay by Floff aka LemonFace
|
2011-01-17 00:13:21 +02:00 |
|
GreYFoXGTi
|
2ec0e0eec4
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/shared/console.cpp
src/game/client/components/hud.cpp
src/game/client/components/scoreboard.cpp
src/game/server/entities/character.cpp
src/game/server/entities/projectile.cpp
|
2011-01-12 11:08:17 +02:00 |
|
oy
|
308dd0304d
|
added Romanian translation by kneekoo
|
2011-01-11 01:09:46 +01:00 |
|
GreYFoXGTi
|
ddc5dd7ab3
|
Cleaned up & Re-arranged stuff
|
2011-01-06 05:46:10 +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
|
64e36b5095
|
updated french l10n by Choupom
|
2011-01-05 22:13:44 +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 |
|
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 |
|
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 |
|
Lars Funke
|
cbc76c9247
|
Updated german l10n
|
2011-01-02 19:49:22 +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
|
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 |
|
oy
|
c75a75b64f
|
made it possible to automatically take game over screenshots. Closes #339
|
2010-12-12 16:48:13 +01:00 |
|
GreYFoXGTi
|
c97105a113
|
fixed missing tile from Fisico
|
2010-12-12 01:16:39 +02:00 |
|
GreYFoXGTi
|
a25bbce836
|
New Entities by Fisico, I split them and reworked into separate files
|
2010-12-12 01:05:11 +02:00 |
|
GreYFoXGTi
|
157aafd4dd
|
Merge branch 'master' into DDRace
Conflicts:
src/engine/server/server.cpp
src/game/variables.h
|
2010-12-11 23:57:41 +02:00 |
|
oy
|
32806bf057
|
added Ukrainian translation by .ua and Ivan. Closes #338
|
2010-12-11 21:53:46 +01:00 |
|
GreYFoXGTi
|
46c2225d60
|
Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/russian.txt
scripts/make_release.py
src/engine/shared/config_variables.h
|
2010-12-11 21:28:43 +02:00 |
|
oy
|
a0985314c9
|
made it possible to "recycle" auto recorded demos
|
2010-12-11 18:55:28 +01:00 |
|
GreYFoXGTi
|
af6f96bc7e
|
Added Tile for the new Map Config
|
2010-12-02 00:45:36 +02:00 |
|
GreYFoXGTi
|
4737588827
|
New Delayed Switches
|
2010-11-22 23:10:12 +02:00 |
|
GreYFoXGTi
|
5d9ee1736e
|
made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/german.txt
data/languages/russian.txt
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamecontext.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/gamemodes/ctf.h
src/game/server/gamemodes/dm.cpp
src/game/server/gamemodes/dm.h
src/game/server/gamemodes/mod.cpp
src/game/server/gamemodes/tdm.cpp
src/game/server/gamemodes/tdm.h
|
2010-11-22 00:26:00 +02:00 |
|
vierkant
|
ebd45829ce
|
Improved dutch language file. Translated more in context.
|
2010-11-21 18:30:33 +01:00 |
|
oy
|
456fc7e9b6
|
cleaned up last commit
|
2010-11-21 17:42:58 +01:00 |
|
Sijmen Schoon
|
c2405d03b6
|
Improved Dutch translation
|
2010-11-21 17:39:54 +01:00 |
|
oy
|
97a7dea152
|
added localisation updates by Sworddragon
|
2010-11-21 14:25:00 +01:00 |
|
oy
|
ba05ddd0f5
|
removed duplicate entry from the localisation files
|
2010-11-21 14:12:39 +01:00 |
|
Choupom
|
faee45d928
|
updated french localization
|
2010-11-21 14:07:30 +01:00 |
|
oy
|
f62a1c3818
|
updated language files
|
2010-11-21 00:49:10 +01:00 |
|
GreYFoXGTi
|
a764ebc1a8
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-11-20 11:00:41 +02:00 |
|
Łukasz D
|
101f1da207
|
Added Polish translation
|
2010-11-19 20:04:58 +01:00 |
|
GreYFoXGTi
|
4aca32ed6f
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/russian.txt
|
2010-11-19 12:05:30 +02:00 |
|
oy
|
114649446e
|
added Russian translation by kaddyd. Closes #280
|
2010-11-18 20:30:30 +01:00 |
|
GreYFoXGTi
|
a109e1150d
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/shared/config_variables.h
src/game/client/components/console.cpp
src/game/client/gameclient.cpp
src/game/editor/ed_editor.h
src/game/server/gamecontext.cpp
|
2010-11-18 01:10:59 +02:00 |
|
oy
|
d32b93d3ec
|
added file icons by Landil
|
2010-11-17 18:28:28 +01:00 |
|
GreYFoXGTi
|
209078c85e
|
Different Entities Picture
|
2010-11-14 03:03:24 +02:00 |
|
GreYFoXGTi
|
071fb6a5a3
|
new Switch System //TODO Rendering Rotation
|
2010-11-14 02:39:04 +02:00 |
|
GreYFoXGTi
|
5837b71a73
|
added pdb to gitignore
Helpers can now use me as victim as well
|
2010-11-13 11:55:17 +02:00 |
|
GreYFoXGTi
|
4a86135170
|
pepsi_tee.png
|
2010-11-02 17:23:21 +02:00 |
|
GreYFoXGTi
|
1620e071d9
|
Removed a Tile and ensured stopper server side
|
2010-11-01 16:21:05 +02:00 |
|
GreYFoXGTi
|
e43bcd80db
|
Rotation
FTW
|
2010-11-01 03:51:17 +02:00 |
|
GreYFoXGTi
|
fc433afd49
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-10-31 20:32:35 +02:00 |
|
oy
|
eace936869
|
fixed an entry in some language files
|
2010-10-31 02:55:35 +02:00 |
|
oy
|
133d293490
|
added Finnish translation by ziltoide
|
2010-10-31 02:20:47 +02:00 |
|
GreYFoXGTi
|
d6b898c84a
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-10-30 00:48:17 +02:00 |
|
oy
|
476f951ffc
|
added font that provides more characters. closes #56
|
2010-10-29 23:44:08 +02:00 |
|
btd
|
b8dd4a32ca
|
Merge https://github.com/GreYFoXGTi/DDRace into others
|
2010-10-26 23:35:55 +04:00 |
|
GreYFoXGTi
|
4d204d642f
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/console.h
src/engine/shared/console.cpp
src/engine/shared/console.h
|
2010-10-26 00:25:36 +02:00 |
|
oy
|
9cf31a272a
|
added Bosnian translation by ***
|
2010-10-25 22:21:05 +02:00 |
|
oy
|
ca99bec385
|
added Serbian translation by DNR
|
2010-10-25 22:18:19 +02:00 |
|
Choupom
|
65be8e5750
|
fixed error reading localizations
|
2010-10-25 18:57:30 +02:00 |
|
btd
|
dab31de735
|
Special present for my old friends
Signed-off-by: btd <bardadymchik@gmail.com>
|
2010-10-23 23:26:44 +04:00 |
|
heinrich5991
|
e0b0e08ded
|
fixed german translation
|
2010-10-20 08:58:21 +02:00 |
|
heinrich5991
|
c6c4a4ed1b
|
re-added standard maps for ddrace client
|
2010-10-19 15:38:06 +02:00 |
|
GreYFoXGTi
|
51f5241e63
|
new entities.png
|
2010-10-16 21:25:08 +02:00 |
|
GreYFoXGTi
|
d8e6cfcbdd
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/french.txt
src/engine/client/client.cpp
src/engine/server/server.cpp
src/game/server/gamecontext.cpp
|
2010-10-11 03:56:58 +02:00 |
|
oy
|
b65a26fe93
|
fixed last commits
|
2010-10-11 01:06:44 +02:00 |
|
Choupom
|
8557d3a022
|
updated french translation
|
2010-10-11 00:32:54 +02:00 |
|
GreYFoXGTi
|
59bd0f1c87
|
Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup
|
2010-10-06 22:48:24 +02:00 |
|
btd
|
4571836f25
|
New entities, Thanks Fisico.
|
2010-10-04 23:55:36 +04:00 |
|
GreYFoXGTi
|
fca713a13c
|
forgot to delete this
|
2010-09-30 23:37:41 +02:00 |
|
GreYFoXGTi
|
8fe9d49cc3
|
Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup
|
2010-09-30 23:36:53 +03:00 |
|
GreYFoXGTi
|
896634a061
|
Total Cleanup
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-30 23:28:06 +03:00 |
|
GreYFoXGTi
|
39376e1c16
|
the speedup layer has been modified lots of time and never rebuilt
all people must remove it and re add it again
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-30 00:01:57 +03:00 |
|
GreYFoXGTi
|
9fde901705
|
Removed multipliers and changed initial layer size
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-27 14:44:57 +03:00 |
|
GreYFoXGTi
|
cf852b2640
|
Added some skins for selfish reasons :D
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-25 15:07:56 +03:00 |
|
GreYFoXGTi
|
67a5765c9f
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/game/client/components/camera.cpp
src/game/client/components/camera.h
src/game/editor/ed_editor.cpp
src/game/editor/ed_layer_tiles.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-19 21:27:40 +03:00 |
|
GreYFoXGTi
|
8f48989f73
|
Fixed Dragger + Stopper Bug
Fisico ReDrew some entities
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-19 12:01:54 +03:00 |
|
oy
|
0905b7755d
|
localised the language names. Closes #153
|
2010-09-16 13:32:56 +02:00 |
|
GreYFoXGTi
|
72e05efc53
|
Added Evil Teleporter,
Added Speed Setters to speedup layer
Added Unfreeze Plasma
Supposedly Fixed Crazy Shotgun (needs Testing)
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-11 02:01:15 +02:00 |
|
GreYFoXGTi
|
616498e7b1
|
Merge branch 'master' of http://github.com/oy/teeworlds into master
Conflicts:
src/engine/client/input.h
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/engine/shared/network_server.cpp
src/engine/storage.h
src/game/client/components/chat.cpp
src/game/client/gameclient.cpp
src/game/client/gameclient.h
src/game/collision.cpp
src/game/editor/ed_editor.cpp
src/game/editor/ed_editor.h
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/player.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-07 07:57:38 +02:00 |
|