edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-11 10:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
5269 commits 1 branch 429 tags 411 MiB
Commit graph

109 commits

Author SHA1 Message Date
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 8acea035bd DDRaceNetwork -> DDraceNetwork 2013-08-13 18:32:33 +02:00
def fd757e1e19 Change name to DDRaceNetwork 2013-07-31 19:08:07 +02:00
def 1cee48f6c1 Can only set sv_test_cmds at start, then it stays, and determines whether gametype is DDRace (no cheats) or TestDDRace (cheats) 2013-07-23 00:15:50 +02:00
Teetime 61671f3bcd Fixed a missing check if killer is alive in tdm 2013-04-07 14:41:53 +02:00
oy 0e92dd5603 fixed some merge problems 2013-02-24 18:55:55 +01:00
GreYFoX ee670118a5 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
Conflicts:
	src/engine/console.h
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/config.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
@heinrich5991 todo
 2012-01-01 00:11:56 +02:00
oy 353f5cc8d6 fixed that the flag grab sound is played several times in a server side demo. Closes #901 2011-12-29 13:56:24 +01:00
GreYFoX cdab951296 Increasing the Readability on primitive editors of DDRace Specific files (All files that does not exist in oy/teeworlds) 2011-12-25 15:51:47 +02:00
GreYFoX bfed5bad1a Added License INfo to missing files and updated the old ones 2011-12-25 15:33:05 +02:00
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 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 
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
 2011-08-13 02:01:40 +02:00
oy c10c7d9ac3 improved sudden death in ctf. Closes #617 2011-06-19 17:32:00 +02:00
Choupom c1ebda73e3 fixed #687 Bug with the ctf score when the round starts, fixed so you can't grab the flag if the game is over 2011-06-11 18:34:05 +02:00
Choupom 558b110504 fixed #633 Correct sound effects in following spectactor mode 2011-06-11 18:33:30 +02:00
Romain Labolle 38f1db1c4f Adding a checkpoint system for teleporters : 
* Player go through a Checkpoint tile (29 in tele layer)
* He fall in a Check-Teleporter tile (31 in tele layer)
* Player is teleported to the check-TO (30 in tele layer) that have the same number as the last Checkpoint.
Thus players are teleported to the last checkpoint he passed, regardless of whether he made ​​the map in the right direction or not.

Tele tileset may need some improvement.
Closes Pull Request #52
 2011-06-01 17:03:04 +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 722644008f added a respawn delay command for tdm 2011-03-26 22:38:05 +01:00
oy 1f10c1e8bf fixed problem with ctf if there're no flags 2011-03-10 10:14:41 +01:00
oy 9811c2396b made network clip flags. Closes #131 2011-03-04 17:08:10 +01:00
Sebastian Wojtowicz 60de0da1c3 Added timestamp into MySQL ranking, and function to have ago time web2.0 like printed on asking for /rank 2011-02-15 02:27:19 +02:00
GreYFoXGTi 718d697707 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/collision.cpp
	src/game/collision.h
	src/game/gamecore.cpp
	src/game/server/gamecontext.cpp
 2011-02-13 19:36:53 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
Choupom 7bfbe24a1c added flag return message on death tile collision 2011-02-13 12:24:19 +01:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
GreYFoXGTi c735384b52 If you Edit the Source Don't use the game mode DDRace 2011-02-08 18:35:48 +02:00
GreYFoXGTi 30f010593c Teams with leaders 
this maybe buggy but i will fix the bugs when they are reported
 2011-02-04 18:49:37 +02:00
GreYFoXGTi 2151883b43 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/gamecore.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/pickup.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/entity.h
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-01-20 16:10:32 +02:00
oy 19a9462fe8 removed double entity list in gameworld and cleaned up connected stuff 2011-01-19 18:27:50 +01:00
GreYFoXGTi 2ec0e0eec4 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/console.cpp
	src/game/client/components/hud.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
 2011-01-12 11:08:17 +02:00
oy df47aedbfe reset flags and projectiles when leaving the game layer too much. Closes #385 2011-01-08 11:34:19 +01:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi c5648311ed Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/german.txt
	src/game/client/components/scoreboard.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/variables.h
 2011-01-04 22:37:09 +02:00
oy a72848e780 added constants for teams by Choupom 2011-01-03 12:50:38 +01:00
GreYFoXGTi cebbecf632 Some Code Improvements and Compiler warnings 2010-12-07 19:44:23 +02: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 071fb6a5a3 new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02:00
GreYFoXGTi 505a5b4172 Refactoring 2010-10-29 23:29:07 +02:00
GreYFoXGTi cf08ccb597 Fixed Doors + Switches creation, Closes #77. 
DDRace.cpp and gamecontext.cpp cleanup, old comments that are not needed
 2010-10-07 15:22:03 +02:00
btd 538efe273b Clean Tele Layer initialization and holding. 2010-10-04 23:17:56 +04:00
btd 3f7c5c4413 Fix crashing on Mo(2) map, Thanks him 2010-10-04 22:51:16 +04:00
btd cdc2cfe220 Fix destructor 2010-10-04 22:43:25 +04:00
btd 6969851ca3 Clean up Doors and Teleport initialization. 2010-10-04 22:37:39 +04:00
btd b1cadd2d4d See this carefully 2010-10-04 11:59:16 +04:00
GreYFoXGTi 81eec1e6b8 Fix Crash Noob Mistake -.-" 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-28 17:54:50 +03:00
GreYFoXGTi 2a966fda05 Fixed crash on Reloading a map that has no telelayer 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-27 22:50:30 +03:00
GreYFoXGTi beb2b2802d no need for those to be public 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-27 07:39:01 +03:00