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 |
|
GreYFoXGTi
|
959b05d557
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2011-01-10 00:45:58 +02:00 |
|
oy
|
91f642fac2
|
fixed cut off broadcast. Closes #398
|
2011-01-09 23:25:07 +01:00 |
|
oy
|
41b8022aa1
|
record a new demo when a game ends. Closes #358
|
2011-01-06 23:21:51 +01:00 |
|
oy
|
f8b1edca64
|
show error message for all content that could not be loaded. Closes #257
|
2011-01-06 22:18:19 +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 |
|
m!nus
|
7b46d386dd
|
requesting serverinfo now uses gie2 instead of the legacy gief.
|
2011-01-05 12:22:45 +01:00 |
|
oy
|
aad2438882
|
fixed outlines for larger font sizes
|
2011-01-05 12:12:23 +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
|
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 |
|
heinrich5991
|
bf62514088
|
added some DDRace flags for the server browser (server-sided), client-sided still needed
|
2010-12-19 14:11:14 +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
|
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
|
ecd7afd9ff
|
added cleaner exit on quit event by Choupom
|
2010-12-11 22:04:50 +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
|
2c51511260
|
Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
Conflicts:
src/engine/client/client.cpp
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/game/client/gameclient.cpp
|
2010-12-10 20:58:53 +02:00 |
|
oy
|
4756c031c5
|
save auto recorded demos in a separate folder and added an option to enable/disable it in the settings menu
|
2010-12-08 01:55:13 +01:00 |
|
oy
|
0fe8cabe78
|
added auto recording support by Batchyx
|
2010-12-08 01:42:32 +01:00 |
|
oy
|
db9dd6b8c9
|
added an optional time stamp to a demo record by Batchyx
|
2010-12-08 00:42:32 +01:00 |
|
oy
|
665934ee09
|
cleaned up several uses of timestamps for filenames
|
2010-12-08 00:32:50 +01:00 |
|
oy
|
bd9850cae2
|
added single function to stop recording by Batchyx
|
2010-12-08 00:02:24 +01: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 |
|
oy
|
e7e2501d1b
|
close map-download-file if the map changes during downloading
|
2010-11-21 01:10:25 +01:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +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
|
3d3572f845
|
fixed some compiler warnings
|
2010-11-17 18:36:19 +01:00 |
|
oy
|
f1ce0d1949
|
improved loading progression in the server browser
|
2010-11-17 12:43:24 +01:00 |
|
Choupom
|
a7f37446b6
|
added loading progression in server browser
|
2010-11-17 12:31:44 +01:00 |
|
GreYFoXGTi
|
d7aced0708
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-11-14 03:25:39 +02:00 |
|
oy
|
4dce645ba8
|
removed unimportant debug message. Closes #264
|
2010-11-13 14:29:02 +01:00 |
|
heinrich5991
|
051172838b
|
fixed commit with the fix of cmdlist
|
2010-11-12 17:56:31 +01:00 |
|
GreYFoXGTi
|
96e67724f1
|
Merge branch 'rm_clientdummies' of https://github.com/heinrich5991/DDRace
Conflicts:
src/game/server/gamecontext.cpp
moved and edited src/game/ddracecommands.h
|
2010-11-05 01:59:37 +02:00 |
|
heinrich5991
|
60d7639c9b
|
moved ddrace-specific rcon cmds from 'game/server/gamecontext.cpp' to 'game/server/ddracecommands.h' in order to remove renundancy with client-side server dummies for tab-completion
|
2010-11-02 17:07:45 +01:00 |
|
heinrich5991
|
133fbfcb13
|
fixed levels of client dummies added by the previous commit
|
2010-11-01 23:08:23 +01:00 |
|
heinrich5991
|
32dd89d97f
|
added client dummies for 'move', 'move_raw', 'addweapon', 'removeweapon'
|
2010-11-01 23:04:16 +01:00 |
|
GreYFoXGTi
|
beb5712a79
|
i thought i added those like 10 years ago
|
2010-11-01 13:00:37 +02:00 |
|
GreYFoXGTi
|
d6b898c84a
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-10-30 00:48:17 +02:00 |
|
oy
|
f1bc96ad09
|
fixed crashes with the font. closes #178
|
2010-10-29 23:49:33 +02:00 |
|
oy
|
9490b6f28d
|
fixed key handling for unicodes > 255
|
2010-10-29 23:01:50 +02:00 |
|
heinrich5991
|
684e1788ed
|
added strict gametype filtering
|
2010-10-19 17:18:32 +02:00 |
|
GreYFoXGTi
|
ddf2883cb2
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/client/client.cpp
src/engine/server/server.cpp
src/engine/shared/console.cpp
src/game/server/gamecontext.cpp
|
2010-10-16 21:59:59 +02:00 |
|
oy
|
fa768449e2
|
fixed issue with reason on forcevotekick
|
2010-10-13 20:31:21 +02:00 |
|
GreYFoXGTi
|
47714c9468
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/variables.h
|
2010-10-13 14:08:35 +02:00 |
|
oy
|
8fb39524a9
|
do not use console in silent mode. Closes #48
|
2010-10-13 12:54:27 +02:00 |
|
oy
|
e4fe7457c8
|
fixed problems with the mouse movement. Closes #214
|
2010-10-13 12:47:42 +02:00 |
|
GreYFoXGTi
|
dc12d59a00
|
registered server dummy commands for tab completion in the client
|
2010-10-12 10:02:46 +02:00 |
|