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
|
8e3cba8dbf
|
disable free view when chatting as spectator. Closes #303
|
2010-11-21 18:05:26 +01:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01:00 |
|
GreYFoXGTi
|
896634a061
|
Total Cleanup
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-30 23:28:06 +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 |
|
oy
|
80b570c795
|
fixed view offset when changing from spectator to player. Closes #152
|
2010-09-19 16:00:46 +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
|
d37c83962d
|
fixed weapon change on start bug
|
2010-08-10 13:54:13 +02:00 |
|
oy
|
ad1ce01446
|
fixed shotbug (#80)
|
2010-06-03 02:57:46 +08:00 |
|
Tom Adams
|
f14e7369f1
|
fixed movement bug (#741)
|
2010-05-31 21:40:40 +00:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +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 |
|
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 |
|
Magnus Auvinen
|
9d51d47cea
|
added tab completion to the console. works for local and remote
|
2009-01-24 12:16:02 +00:00 |
|
Magnus Auvinen
|
24899a13e8
|
improved the prediction timer to handle crappy connections better
|
2009-01-21 00:05:07 +00:00 |
|
Alfred Eriksson
|
397804cdc4
|
fixed dynamic nameplates bug #674
|
2009-01-17 17:06:24 +00:00 |
|
Magnus Auvinen
|
1dc158bb78
|
fixed so when you are in not in playing mode, the input snapping drops to 1hz to save even more bandwidth
|
2009-01-10 13:34:01 +00:00 |
|
Magnus Auvinen
|
c79402d075
|
increased input snapping rate from 5hz to 10hz inorder to predict the network latency better
|
2009-01-10 11:50:31 +00:00 |
|
Alfred Eriksson
|
00794899d6
|
paused the aiming when game is paused
|
2008-11-16 15:39:22 +00:00 |
|
Magnus Auvinen
|
9f7a6a04b0
|
correctly paused input for game when chatting or in menu
|
2008-10-20 22:53:42 +00:00 |
|
Magnus Auvinen
|
ed4d4bfdc4
|
fixed cursor problems
|
2008-09-13 05:57:11 +00:00 |
|
Dominik Geyer
|
51a9d23dae
|
fixed spectator mode freeview
|
2008-09-09 15:50:41 +00:00 |
|
Magnus Auvinen
|
fa266334fd
|
fixed on_console_init and on_save
|
2008-09-04 21:36:44 +00:00 |
|
Magnus Auvinen
|
04eddacd65
|
setting of correct game type in game controller. fixed gametype filter in browser. various cleanups
|
2008-08-31 21:50:14 +00:00 |
|
Magnus Auvinen
|
cd7a3519a7
|
added the loading screen again
|
2008-08-30 22:38:56 +00:00 |
|
Magnus Auvinen
|
72ec4f1a9d
|
fixed weapon switching
|
2008-08-27 20:04:07 +00:00 |
|
Magnus Auvinen
|
ae364d4d29
|
scoreboard fixed
|
2008-08-27 19:50:33 +00:00 |
|
Magnus Auvinen
|
dfe499248f
|
major commit. game client restructure. not complete, loads of stuff not working, but the structure is there
|
2008-08-27 15:48:50 +00:00 |
|