Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611

Browse source

Conflicts:
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/menus_browser.cpp
	src/game/client/gameclient.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
	src/game/editor/io.cpp
	src/game/editor/layer_tiles.cpp
	src/game/editor/popups.cpp
	src/game/gamecore.cpp
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp
	src/game/variables.h

...

This commit is contained in:

GreYFoX 2011-08-13 02:01:40 +02:00

parent 74462d4611 c56cfa12d5

commit 35d16bd58c

378 changed files with 9292 additions and 2961 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

BIN

data/countryflags/AD.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.7 KiB

BIN

data/countryflags/AE.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 816 B

BIN

data/countryflags/AF.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

data/countryflags/AG.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

data/countryflags/AI.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

data/countryflags/AL.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.3 KiB

BIN

data/countryflags/AM.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 740 B

BIN

data/countryflags/AO.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.7 KiB

BIN

data/countryflags/AR.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

BIN

data/countryflags/AS.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.9 KiB

BIN

data/countryflags/AT.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 798 B

BIN

data/countryflags/AU.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 2.4 KiB

BIN

data/countryflags/AW.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.3 KiB

BIN

data/countryflags/AX.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 985 B

BIN

data/countryflags/AZ.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.3 KiB

BIN

data/countryflags/BA.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.1 KiB

BIN

data/countryflags/BB.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.3 KiB

BIN

data/countryflags/BD.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

data/countryflags/BE.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 879 B After Width:  |  Height:  |  Size: 678 B

BIN

data/countryflags/BF.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1 KiB

BIN

data/countryflags/BG.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1,006 B After Width:  |  Height:  |  Size: 789 B

BIN

data/countryflags/BH.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

data/countryflags/BI.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

data/countryflags/BJ.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 851 B

BIN

data/countryflags/BL.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 6.7 KiB

BIN

data/countryflags/BM.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

data/countryflags/BN.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.8 KiB

BIN

data/countryflags/BO.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

data/countryflags/BR.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.8 KiB After Width:  |  Height:  |  Size: 2.6 KiB

BIN

data/countryflags/BS.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

data/countryflags/BT.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.1 KiB

BIN

data/countryflags/BW.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 719 B

BIN

data/countryflags/BY.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 1.8 KiB

BIN

data/countryflags/BZ.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 5.1 KiB

BIN

data/countryflags/CA.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 1.4 KiB

BIN

data/countryflags/CC.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2 KiB

BIN

data/countryflags/CD.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

data/countryflags/CF.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

data/countryflags/CG.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

data/countryflags/CH.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 896 B

BIN

data/countryflags/CI.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 818 B

BIN

data/countryflags/CK.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

data/countryflags/CL.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 984 B

BIN

data/countryflags/CM.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

data/countryflags/CN.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.3 KiB

BIN

data/countryflags/CO.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 993 B After Width:  |  Height:  |  Size: 784 B

BIN

data/countryflags/CR.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

data/countryflags/CU.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

data/countryflags/CV.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

data/countryflags/CW.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

data/countryflags/CX.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

data/countryflags/CY.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

data/countryflags/CZ.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 962 B

BIN

data/countryflags/DE.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 863 B After Width:  |  Height:  |  Size: 666 B

BIN

data/countryflags/DJ.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.7 KiB

BIN

data/countryflags/DK.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 863 B

BIN

data/countryflags/DM.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

data/countryflags/DO.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

data/countryflags/DZ.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

data/countryflags/EC.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

data/countryflags/EE.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 887 B After Width:  |  Height:  |  Size: 632 B

BIN

data/countryflags/EG.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.4 KiB

BIN

data/countryflags/EH.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

data/countryflags/ER.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.3 KiB

BIN

data/countryflags/ES.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.1 KiB

BIN

data/countryflags/ET.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

data/countryflags/FI.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 832 B

BIN

data/countryflags/FJ.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 3.1 KiB

BIN

data/countryflags/FK.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4 KiB

BIN

data/countryflags/FM.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

data/countryflags/FO.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 994 B

BIN

data/countryflags/FR.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 814 B

BIN

data/countryflags/GA.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 857 B

BIN

data/countryflags/GB.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 4.7 KiB After Width:  |  Height:  |  Size: 2.8 KiB

BIN

data/countryflags/GD.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.6 KiB

BIN

data/countryflags/GE.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

data/countryflags/GF.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

data/countryflags/GG.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

data/countryflags/GH.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

data/countryflags/GI.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.4 KiB

BIN

data/countryflags/GL.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

data/countryflags/GM.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 789 B

BIN

data/countryflags/GN.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 822 B

BIN

data/countryflags/GP.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

data/countryflags/GQ.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.6 KiB

BIN

data/countryflags/GR.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1,011 B

BIN

data/countryflags/GS.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 4.7 KiB

BIN

data/countryflags/GT.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

data/countryflags/GU.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

data/countryflags/GW.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

data/countryflags/GY.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

data/countryflags/HK.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2 KiB

BIN

data/countryflags/HN.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.2 KiB

BIN

data/countryflags/HR.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.6 KiB After Width:  |  Height:  |  Size: 2.3 KiB

BIN

data/countryflags/HT.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

data/countryflags/HU.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1 KiB After Width:  |  Height:  |  Size: 838 B

BIN

data/countryflags/ID.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1,017 B After Width:  |  Height:  |  Size: 787 B

BIN

data/countryflags/IE.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 847 B

BIN

data/countryflags/IL.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 1.5 KiB

BIN

data/countryflags/IM.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2 KiB

Some files were not shown because too many files have changed in this diff Show more