Commit graph

182 commits

Author SHA1 Message Date
laxa c9244d6386 Better and cleaner fix thanks to @heinrich5991 2015-12-09 21:33:06 +01:00
laxa c177a90f35 Fix some VS2015 compiler warnings 2015-12-05 16:52:12 +01:00
def 19a8ec914c Oops, add SPEC_FREEVIEW to datasrc 2015-07-26 19:21:53 +02:00
BeaR 09f8630b68 Add editor icon for audio source 2014-10-21 12:07:09 +02:00
def 3ea1bab617 Fix: Allow any tick (fixes #35) 2014-09-12 12:13:46 +02:00
def 3439fefbd3 Fix clamping in network objects to prevent many crashes 2014-09-11 20:08:06 +02:00
east 65b2426349 CDemoEditor: added new buttons to demo player 2014-08-13 16:35:15 +02:00
def 378d613de9 Add tee directions 2014-04-26 21:00:14 +02:00
def d8533eea67 Proper Client Version numbers and more visible whispers 2014-01-30 16:49:15 +01:00
def f0d79b8388 Trying to get better team support 2014-01-22 00:08:30 +01:00
def c60c3e14e9 Allow spaces at start of chat messages 2014-01-08 18:21:07 +01:00
def 28980ef2ba Hopefully fix 64 players 2014-01-02 01:56:09 +01:00
def 74c09a19f9 Fix netmessage order 2014-01-02 00:34:05 +01:00
def 3607218f12 Merge ddrace64 from eeeeee 2013-12-31 06:13:57 +01:00
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
2013-12-26 18:02:22 +01:00
def 9028d77471 Add +showhookcoll from H-Client 2013-08-24 01:50:35 +02:00
oy f0e09f50d9 improved chat msg spam protection 2013-04-01 20:30:58 +02:00
BeaR d266229e73 Fixing network compatibility issue for older ddrace clients.. 2013-02-15 12:34:02 +01:00
BeaR 6d74d52c22 Fix problem with show other players: (Closes DDRace/teeworlds#210)
sending packet on setting change
2013-02-03 20:23:44 +02:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
2012-04-12 02:09:31 +02:00
oy 0b0f8e2f1c moved the player gun a bit down so it matches the projectile animation. Closes #854 2012-01-09 22:55:08 +01:00
GreYFoX bee10fda8f Merge branch 'master' of git://github.com/oy/teeworlds
Conflicts:
	src/game/server/gamecontext.cpp
2011-06-02 19:13:40 +02:00
Choupom 603071ee92 fixed data struct names 2011-06-02 17:42:30 +02:00
Choupom deff0ce7c4 fixed netevent struct names 2011-06-02 17:40:08 +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 63e059b8ff Emoticons Enum has emoticons names instead of numbers 2011-04-13 20:31:16 +02:00
oy 1a5d70450f added "reimplemented menu music by teetow-the-great-teetow" by Choupom 2011-04-13 20:00:54 +02:00
GreYFoX aaac8a3f77 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/version.h
2011-04-09 22:33:06 +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 05889f3e3e fixed problem with the hammer hit particle 2011-04-09 00:02:08 +02:00
oy 9643fc36ae added new hammer hit effect by SushiTee and Crises 2011-04-08 19:11:41 +02:00
oy e63683e649 added new friends/mute icons and buttons by Crises 2011-04-08 18:45:57 +02:00
oy b985fdc20a added new friend/mute buttons by Crises and reworked the player options like Landil suggested. Closes #579 2011-04-06 20:18:31 +02:00
oy 867f944459 added graphic buttons for remove/add friend and chat ignore/notice 2011-03-28 21:10:37 +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 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
oy 18e5412358 added sound for highlighted chat message. Closes #508 2011-03-20 15:58:59 +01:00
oy 30d9c9f4d9 made network support clan name and country code for players 2011-03-15 11:23:49 +01:00
oy 1f10c1e8bf fixed problem with ctf if there're no flags 2011-03-10 10:14:41 +01:00
oy ee2f625754 added extended spectator mode. Closes #28 2011-03-10 10:08:14 +01:00
oy 9811c2396b made network clip flags. Closes #131 2011-03-04 17:08:10 +01:00
oy 4bede550be only update the ping if the scoreboard is active. Closes #27 2011-03-01 18:31:20 +01:00
oy 927954a53b added new emoticons. Closes #362 2011-02-16 11:45:19 +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 3da1860654 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/dutch.txt
2011-02-04 18:54:54 +02:00
oy 9c6843946c added Python 2.5 - Python 3.2 support by Sworddragon 2011-01-29 18:55:21 +01:00