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
ghost
5e1b3c74ef
Git does this one automatically, I guess it fixes lineendings.
2010-09-07 02:11:52 +02:00
oy
5ff7836638
fixed problems with the tilelayer dumping. Closes #86 . Closes #149
2010-09-07 02:06:11 +02:00
oy
0cfd1de760
fixed line endings
2010-09-05 19:06:27 +02:00
oy
995d63d7f4
added the possibility to rotate tiles in the editor by SushiTee
2010-09-05 19:01:01 +02:00
oy
5588e1ec8c
fixed selected index when deleting a demo and added a popup to confirm the deletion
2010-09-05 17:53:31 +02:00
Choupom
fcfaa8389f
added Remove button in demos browser ( #66 )
2010-09-05 17:40:51 +02:00
oy
62fe7cd5b2
link selected item in the demo list to the first entry (if available) on startup and browse
2010-09-05 14:28:08 +02:00
Choupom
8f3e98208e
fixed demo browser ( #61 )
2010-09-05 14:13:42 +02:00
Choupom
25be8b1be3
fixed so clicking 3 times doesn't generate 2 double-clicks
2010-09-05 13:50:10 +02:00
GreYFoXGTi
f9f780ff28
Fixed lags and crashes on kp0 in-game. Closes #149
...
Closes #86
Added dbg_layers which is 0 by default to prevent Debug files output when when ingame and pressing kp0
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-05 05:29:27 +02:00
Fujnky
4123f28bba
Improved demo player another bit.
...
* Replaced the reset button by more common stop button
* Made the demo player automatically reset after demo ended
2010-09-04 16:23:20 +02:00
btd
4544b91d2f
Teams collision a works fine... But i broke collision with tiles
2010-08-30 23:25:04 +04:00
GreYFoXGTi
11f480a79b
Changed the Loading String to Loading DDRace Client
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 19:59:24 +02:00
GreYFoXGTi
7f0fa6d6b1
Added Switch Layer and it Finally works like it should
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 18:24:56 +02:00
GreYFoXGTi
b3736dded4
Bye Bye Client-Side Front Layer T.T ( getting ready for a full rework of the front layer )
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-27 06:23:34 +02:00
btd
909c583d96
End merge
2010-08-26 00:30:21 +04:00
GreYFoXGTi
7f8fb7a5a7
Merging the client manually into the server
...
but i can't get the client to accept the console class of the server -.-" yet..
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-25 17:31:49 +02:00
oy
41afca6db2
added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8
2010-08-25 01:17:02 +02:00
oy
521a028f7c
added fixes for compiler errors and warnings by sworddragon
2010-08-25 00:08:28 +02:00
oy
1cfa122521
fixed that scoreboard overlaps the chat. Closes #14
2010-08-24 23:48:27 +02:00
oy
57f54108b5
fixed a variable name
2010-08-24 23:47:10 +02:00
oy
8cb15be7c0
added fixes for compiler errors and warnings by sworddragon
2010-08-24 23:44:33 +02:00
GreYFoXGTi
5c880c88a4
All tiles should work in the Front Layer as in Game layer
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-21 21:48:47 +02:00
oy
538d968349
fixed that scoreboard overlaps the chat. Closes #14
2010-08-18 03:57:35 +02:00
oy
cabecb7fa9
added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8
2010-08-18 00:06:00 +02:00
oy
16f201794d
fixed a variable name
2010-08-16 04:12:03 +02:00
oy
abc84ac0b0
added fixes for compiler errors and warnings by sworddragon
2010-08-16 02:21:18 +02:00
oy
02c7e3642a
clear active motd message when the game is over
2010-08-15 15:48:56 +02:00
Fujnky
4d8c4ffadb
Improved the replay control buttons in the demo player a lot.
...
* Now there is a combined play/pause button + a reset button
* Replaced the ugly strings with nice graphics
2010-08-13 03:17:13 +02:00
oy
d01fb2eb78
added missing information in debug mode. Closes #77
2010-08-13 03:07:51 +02:00
oy
d37c83962d
fixed weapon change on start bug
2010-08-10 13:54:13 +02:00
oy
3797eba179
added demo recording button by fujnky
2010-08-09 14:14:15 +02:00
oy
d471663913
added localisation fixes by fujnky
2010-08-09 00:35:37 +02:00
oy
4322113435
fixed overlapping skin name in the player settings
2010-08-07 20:52:33 +02:00
oy
3f0ff1fb14
removed ServerDummy function cause it isn't needed anymore(actual console separates client and server commands) and added two missing server commands to the tab completion
2010-08-07 00:01:43 +02:00
oy
05f3757491
added optimisations by sworddragon
2010-08-05 20:55:51 +02:00
SushiTee
e79bfb243c
struct LANGUAGE should be a class CLanguage
2010-08-06 01:48:06 +08:00
oy
22c19f45db
fixed hook sound bug in demos. Closes #161
2010-07-17 19:55:17 +02:00
oy
6193f35423
Merge branch 'master' of http://github.com/matricks/teeworlds
2010-07-17 14:10:43 +02:00
Magnus Auvinen
575f72d978
fixed some compiler errors and warnings with clang
2010-07-05 20:57:07 +02:00
oy
5d442ae329
refresh the server browser if the "favorites"-tab is active and a new entry has been added with "add_favorite"-command
2010-07-04 16:10:00 +02:00
oy
c42679a10e
cut too long player names in the server browser. Closes #151
...
fixed overlapping of too long player names in the scoreboard
2010-07-02 14:14:41 +02:00
oy
822b002344
fixed the ninja tip cut off and made its weapon and pickup sprite equal. Closes #127
2010-06-23 20:09:15 +02:00
oy
c9828a2229
fixed display bug in the score hud. Closes #106
2010-06-22 21:27:58 +02:00
oy
c40bc9af3e
fixed a possible crash in the client console
2010-06-21 13:45:30 +02:00
oy
a5113c6740
added commands to dump the output of the consoles into a file
2010-06-20 14:12:59 +02:00
oy
e2c3f744b2
added commands to clear the consoles. Closes #104
2010-06-19 20:51:54 +02:00
oy
b790634a2d
scroll the possible commands in the console's tab completion if the wanted one is out of sight. Closes #105
2010-06-19 13:48:01 +02:00
oy
ea64b0d7b3
made the console use the flagmask when looking for command (FindCommand) and removed double "No such command" console message
2010-06-18 20:32:52 +02:00
oy
39853bcf89
fixed walk animation if x-position is negative. Closes #119
2010-06-11 13:20:45 +02:00
oy
ec334a9d68
small cleanup
2010-06-11 12:34:11 +02:00
Fujnky
f8b9f342d3
Fix for l10n in menus_demo.cpp and sime german l10n tweaks.
2010-06-11 15:50:47 +08:00
Choupom
8e8cbdb562
fix for folders in demo browser
2010-06-10 20:38:16 +08:00
xalduin
6e1eaa96ec
Fixed issue #115 , text now fits into columns in server browser
2010-06-10 20:38:04 +08:00
xalduin
dc3feaf42c
Fixed remaining compiler warnings for gcc on Linux
2010-06-10 20:38:03 +08:00
xalduin
be5e19d2bd
Fixed some compiler warnings
2010-06-09 20:41:00 +08: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
Choupom
848764544f
added folders in demo browser ( #25 )
2010-06-04 22:14:02 +02:00
oy
3d079a35e9
fixed bug with the quick search box. Closes #89
2010-06-03 23:32:32 +02:00
oy
67d4903b9f
fixed stuck "error loading demo"-popup. Closes #90
2010-06-03 22:03:27 +02:00
Fujnky
551170656d
Fixed localization for 'Error loading demo'-Popup
2010-06-03 17:41:45 +02:00
Fujnky
d581e413c8
More localization fixes
2010-06-03 11:30:05 +02:00
Fujnky
64ddee0a21
Merge branch 'master' of git://github.com/matricks/teeworlds
2010-06-02 21:47:47 +02:00
Fujnky
0d4c0ccef5
Some localization fixes
2010-06-02 21:03:15 +02:00
oy
b2a55766d1
fixed shotbug ( #80 )
2010-06-02 19:39:28 +02:00
Tom Adams
f14e7369f1
fixed movement bug ( #741 )
2010-05-31 21:40:40 +00:00
Tom Adams
6fca512a95
added fix for italian language by Lanta and fixed a bug with the id in votekick menu
2010-05-31 20:05:45 +00:00
Tom Adams
23e2d5f424
fixed votekick menu ( #807 )
2010-05-31 15:36:20 +00:00
Tom Adams
651cd062e6
fixed english localisation bug
2010-05-31 11:07:58 +00:00
Tom Adams
262b566c94
increased the fontsize of the chat messages
2010-05-30 17:08:54 +00:00
Tom Adams
08df0fe63d
added fix for italian translation by Lanta
2010-05-30 14:26:04 +00:00
Thomas
361380d630
*some esthetic changes
...
*split "CHud::RenderGoals()"
*added "reload" command
*added the ability to show last chat lines (+show_chat)
*updated french.txt
2010-05-30 12:01:11 +00:00
Tom Adams
659d66104e
fixed dump_binds command ( #806 )
2010-05-30 00:15:26 +00:00
Tom Adams
baa57830ad
fixed bubble sort loop ( #802 ), 2 entries in the language files and a possible overrun
2010-05-29 23:57:30 +00:00
Tom Adams
e16fdc3f3e
added clipping to editboxes ( #773 ) and made their cursors blink
2010-05-29 15:53:57 +00:00
Magnus Auvinen
72c06a2589
copied refactor to trunk
2010-05-29 07:25:38 +00:00
Magnus Auvinen
878ede3080
major update with stuff
2009-10-27 14:38:53 +00:00
Magnus Auvinen
7b68ff4277
fixed chaining of console commands, allows snatching updates of console variables. cleaned up some code
2009-06-15 14:01:36 +00:00
Magnus Auvinen
57b2c49d57
fixed so that the demo player doesn't crash when the map isn't found
2009-06-15 13:16:33 +00:00
Magnus Auvinen
8bd49fe30b
some clean up. fixed double server side record messages
2009-06-15 13:01:04 +00:00
Magnus Auvinen
d023c72256
fixed demo browser so it's ordered and shows all files
2009-06-15 10:12:16 +00:00
Magnus Auvinen
b31243d271
tweaked checkboxes
2009-06-15 09:48:18 +00:00
Magnus Auvinen
b3c1bae2e9
cleaned up localization. fixed motd so it shows when connecting to a server
2009-06-15 09:46:25 +00:00
Magnus Auvinen
21c1c3866f
translation update
2009-06-15 08:20:29 +00:00
Magnus Auvinen
307cf4aa64
done language selector
2009-06-15 08:15:53 +00:00
Magnus Auvinen
ab171f8f30
updated localization
2009-06-15 07:34:25 +00:00
Magnus Auvinen
6309d7ad56
continued with localization
2009-06-15 06:45:44 +00:00
Magnus Auvinen
bc20e9c433
localization update
2009-06-13 17:18:06 +00:00
Magnus Auvinen
6d9ccee95d
base for the localization system
2009-06-13 16:54:04 +00:00
Magnus Auvinen
c2f8d0e07a
minor cleanup of out commented clode
2009-06-13 08:25:50 +00:00
Magnus Auvinen
69511102de
improved the font system even futher. utf8 is now used everywhere. it uses less memory as well
2009-06-13 08:22:37 +00:00
Magnus Auvinen
9254ca61f1
fixed utf8 support
2009-06-07 16:06:03 +00:00
Magnus Auvinen
cdc5f26900
new font rendering system using freetype2. only compiles under linux for now
2009-06-07 14:36:54 +00:00
Magnus Auvinen
4bb1df3189
moved 0.5 branch to trunk
2009-05-31 09:44:20 +00:00
Alfred Eriksson
b28ede2da2
changed chatmsgs to use time instead of ticks
2009-01-24 16:09:20 +00:00
Magnus Auvinen
01d74a6d4d
fixed div by zero bug
2009-01-24 15:22:40 +00:00
Alfred Eriksson
82f9be8ce0
added help messages for all commands. added syntax in the help msg
2009-01-24 14:10:26 +00:00
Magnus Auvinen
5f186c8906
fixed so the console show help for each command. not all commands have descriptions however
2009-01-24 13:12:04 +00:00