Commit graph

109 commits

Author SHA1 Message Date
GreYFoXGTi 31892f7475 of course delete[] makes problems for me with 2D array even when i loop on 1D 1st .... so here's my alternative
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-27 07:34:45 +03:00
GreYFoXGTi 526e36f8a0 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/client/components/menus.h
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/variables.h
2010-09-27 06:32:14 +03:00
GreYFoXGTi 5a6a508204 Teleport Randomness now works
in the past if you have many tele out tiles only 1 was working

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-27 06:15:56 +03:00
GreYFoXGTi e56b75090c Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/server/player.cpp
2010-09-22 11:46:18 +03:00
oy 12233ecdaf fixed that ctf gametype doesn't work if the map has more than 1 flag per team. Closes #124 2010-09-22 01:07:11 +02:00
GreYFoXGTi 8e066517ad Merge branch 'master' of http://github.com/btd/DDRace
Conflicts:
	src/game/server/gamecontext.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 05:57:34 +03:00
GreYFoXGTi fa379a806a Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/server/server.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
2010-09-13 07:49:01 +03:00
oy 64c9b5c4ab added quotes around player names in the other server messages too and changed it to ' for consistency 2010-09-12 13:34:30 +02:00
btd 7ed685ee11 Merge 2010-09-11 13:42:35 +04:00
btd bbe66c5f20 Revert last not working fix 2010-09-11 13:31:36 +04:00
GreYFoXGTi 363cc10d28 /* ..
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-09 15:25:23 +02:00
GreYFoXGTi 1119432e60 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2 2010-09-09 05:37:45 +02:00
GreYFoXGTi 0b1b949a3c Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamemodes/ctf.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-09 05:37:08 +02:00
GreYFoXGTi ddb4c2e370 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/DDRace.h
	src/engine/shared/config_variables.h

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-08 22:22:08 +02:00
Choupom 532ea85aeb separated CFlag from ctf 2010-09-07 20:02:46 +02:00
GreYFoXGTi 3df855df00 Moved Switch layer Initialization from CGameContext to GameControllerDDRace
i Quote btd "gamecontext as a global rubbish" xD

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:48:20 +02:00
Fujnky 69adb4800e Put quotes around player names in server messages. 2010-09-07 01:11:20 +02:00
btd 86cd59b907 Separate teams data, now i hope collision only in teams. Need to test, i cannot do this at work :'( 2010-08-30 16:13:43 +04:00
btd e611357dd5 I need to think how make it better 2010-08-29 16:28:21 +04:00
btd faf743b02a Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace into teams 2010-08-29 01:05:02 +04:00
btd 366e175983 Logic and scores seems done. Next will be collision 2010-08-29 00:53:42 +04: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
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
btd 6fabca9e10 Add checkpoints. Client undestand that it is a DDRace server fully. Need to rework /top5 /rank. Clean rubbish. I want to sleep( 2010-08-23 23:37:27 +04: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 0e36b772d4 fixed line endings in some files 2010-08-15 15:34:55 +02:00
GreYFoXGTi 20930ce68b too many stuff to write but the idea is to implement the telelayer&speed thnx to Redix and Sushi Tee
also FrontLayer is ready to be implemented soon

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-10 19:32:32 +03:00
btd 9c052398f4 Last changes added. All fixed. Server builded.
Need many test before release.

Signed-off-by: btd <bardadymchik@gmail.com>
2010-07-30 16:50:09 +04:00
GreYFoXGTi 0a9dc07d0c Fixes Issue #5
Changed /info
Fixed anti-rainbowmod

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-07-29 17:54:04 +03:00
GreYFoXGTi f41d4851d2 Cleanup a bit and modified the binary name
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-07-29 10:40:27 +03:00
GreYFoXGTi 434b4aad86 The Porting of DDRace-Beta to trunk by [BlackTee] den Maps with one and two layer works properly. Laser works. Fix second game layer Re-added logs Readded the rcon commands addvote and scoring system and time Fixed Weapons
Signed-off-by: btd <bardadymchik@gmail.com>
2010-07-29 08:59:32 +03:00
Fujnky 5849aeb86c Merge branch 'master' of git://github.com/matricks/teeworlds
Conflicts:
	src/game/server/gamemodes/ctf.cpp
2010-06-03 17:47:32 +02:00
Magnus Auvinen a6ab379e67 fixed so that the same distance is used when leaving off the flag and taking it 2010-06-03 17:40:01 +02:00
Fujnky feb8894b4d Flag catch and capture should now be exactly the same 2010-06-03 16:42:37 +02:00
Fujnky 7b74cd248b made flag catch and capture distances fit 2010-06-03 15:30:33 +02:00
Magnus Auvinen 4c0886f087 renamned m_pCarryingCCharacter correctly 2010-05-29 11:26:17 +00:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen 4bb1df3189 moved 0.5 branch to trunk 2009-05-31 09:44:20 +00:00
Magnus Auvinen bd1556ce76 added missing ctf return sound 2009-01-21 00:00:04 +00:00
Alfred Eriksson 335aa0feb2 flag position is only sent when player is near 2009-01-17 17:26:56 +00:00
Magnus Auvinen 123c5b5b99 introduced 3 special pseudo weapons. game, self and world to make a difference on how you got killed 2009-01-12 21:41:16 +00:00
Magnus Auvinen 172463b2bb fixed so your team gets -1 if you kill yourself. drawback, team looses one point when you switch team as well. good enough for now 2009-01-11 14:16:49 +00:00
Magnus Auvinen 7c0413ebac added some modding comments 2009-01-11 13:23:40 +00:00
Magnus Auvinen 371e862316 fixed so the laser bounces correctly at low angles 2009-01-11 10:26:17 +00:00
Alfred Eriksson 9a65b577ad added mod gamemode 2009-01-11 09:29:15 +00:00
scosu 579065bb22 Chat message for capture timing. ticket #278 2008-11-08 15:17:59 +00:00
scosu cd1c92c41b a nicer solution for changeset:1669 2008-11-08 09:02:35 +00:00
Dominik Geyer 1adbddccca do not take/reset the flag if character is dead or spectator; ticket #556 2008-11-04 16:35:48 +00:00
Dominik Geyer 0259e5c3e5 fixed null-pointer server-crash 2008-11-04 13:19:05 +00:00
Dominik Geyer d37c54a995 tdm: fix team-scoring on teammate-kill; ticket #557 2008-11-04 11:55:26 +00:00
scosu e1807ea08a fix for ticket #549 by using col_intersect_line 2008-11-04 07:20:24 +00:00
Dominik Geyer 3cdb90c10c reset flag when it hits a death-tile; ticket #513 2008-10-18 20:37:41 +00:00
Alfred Eriksson 2c274fcd19 fixed server crash when disconnecting in ctf 2008-10-05 15:40:36 +00:00
Magnus Auvinen d9d37b945e some server restructure. added hook no attach sound 2008-09-23 18:08:19 +00:00
Alfred Eriksson 554089b018 fixed #470 2008-09-13 19:53:13 +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 0a48454a55 removed the GAMETYPE_ enum 2008-08-31 14:37:35 +00:00
Magnus Auvinen d711dd190c continued with clean up 2008-08-17 08:52:24 +00:00
Magnus Auvinen a420eb543f moved alot of stuff to their own cpp/hpp files 2008-08-14 18:25:44 +00:00