GreYFoX
|
5b27758650
|
Removed level stuff
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
|
2011-08-13 02:11:06 +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
|
06115dd49d
|
added "Whitespace and line Endings cleanup" by GreYFoX
|
2011-04-13 20:37:12 +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
|
5b328e5484
|
added a limit for the number of votes that can be added to the server and send options as lists when a client joins. Closes #459
|
2011-03-26 22:06:29 +01:00 |
|
|
oy
|
6e1b6b102a
|
added menu to add/remove a vote on the server
|
2011-03-26 18:43:43 +01:00 |
|
|
oy
|
fbeace5272
|
cleaned up some voting code
|
2011-03-26 17:44:34 +01:00 |
|
|
oy
|
b8f144ba81
|
added a vote that allows to move a player to spectators. Closes #58
|
2011-03-26 16:56:59 +01:00 |
|
|
oy
|
6ece07ee74
|
added force_vote command
|
2011-03-25 12:06:45 +01:00 |
|
|
oy
|
359b806e95
|
added remove_vote command. Closes #47
|
2011-03-25 11:49:35 +01:00 |
|
|
oy
|
a4580d451f
|
added reasons to vote in general and show reason in vote hud. Closes #219
|
2011-03-25 10:26:59 +01:00 |
|
|
oy
|
8ad3def65e
|
added aliases for votes. Closes #144
|
2011-03-25 09:49:21 +01:00 |
|
|
GreYFoXGTi
|
f83132448d
|
Merged Oy, Isolated Freeze from Deep Freeze
|
2011-02-13 19:32:06 +02:00 |
|
|
GreYFoXGTi
|
1b2703aaba
|
Refactoring & fixed WEAPONSPEC_GUN in content.py
|
2011-02-12 21:18:41 +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 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01: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
|
61201fea13
|
added reason to kick a player in the callvote tab
|
2010-10-11 00:31:21 +02:00 |
|
btd
|
909c583d96
|
End merge
|
2010-08-26 00:30:21 +04:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|