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
11247 commits 1 branch 429 tags 411 MiB
Commit graph

128 commits

Author SHA1 Message Date
def d9764a7638 Remove useless broadcast messages 2013-12-31 06:23:40 +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 d1a584b4af Add jetpack tile 2013-11-22 15:10:55 +01:00
def 111d5c7f10 Add entities to start and stop: Player collisions, Hooking, Infinite jump 2013-08-05 17:47:04 +02:00
XXLTomate f91f3e61f9 fixed checkpoints 2013-03-18 12:58:29 +01:00
oy 7eddbe0dc9 play only one weapon no ammo sound per second. #993 2013-02-24 18:02:57 +01: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 dfe91338f0 added pause command. Closes #15 2012-01-10 00:49:31 +01:00
Ravomavain 88be9657d2 Enhance pausing system (by @heinrich5991): 
* enhance /pause (@heinrich5991)
 * add /spec command to pause without leaving the game (@heinrich5991)
 * if sv_pauseable is set to 0, /pause behave as /spec (@heinrich5991)
 * should fix #124 and #127 (@ravomavain)
 2011-12-31 01:44:36 +02:00
GreYFoX 799f4de2b3 Added the following settings to Close #123. 
sv_time_in_broadcast, 1, 0, 1, CFGFLAG_SERVER, "Whether to display time in broadcast every interval or not by default, later the choice can be changed by players via chat commands"
sv_time_in_broadcast_interval, 1, 0, 60, CFGFLAG_SERVER, "How often to update the broadcast time"
sv_time_in_gametimer, 0, 0, 1, CFGFLAG_SERVER, "Whether to display time in the round/game timer or not by default, later the choice can be changed by players via chat commands"
Added the following Chat commands to give the player the choice over their settings:
"saytime", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSayTime, this, "Privately messages you your current time in this current running race"
"saytimeall", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSayTimeAll, this, "Publicly messages everyone your current time in this current running race"
"time", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConTime, this, "Privately shows you your current time in this current running race in the broadcast message"
"broadcasttime", "?s", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSetBroadcastTime, this, "Personal Setting of showing time in the broadcast, broadcasttime s, where s = on for on, off for off, toggle for toggle and nothing to show current status"
"servergametime", "?s", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSetServerGameTime, this, "Personal Setting of showing time in the round/game timer, servergametime s, where s = on for on off for off, toggle for toggle and nothing to show current status"
Fixed Chat Command "eyeemote" and made it a set + toggle instead of just toggle for better bin techneques
Moved some vars from CCharacter to CPlayer to keep their status evern after death but not after disconnect.
So now players have the choice to see which timer they wanna see if any.

Note: These changes are all untested Stay away from this update on your main server until they are tested, i don't even know if they will compile propperly
 2011-12-29 14:17:34 +02:00
GreYFoX 4ca0681689 Added chat commands for only chat and available to all users 
Thanks @heinrich5991 for this idea of a separate console object to handle it
 2011-08-27 17:11:39 +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
GreYFoX 74462d4611 enumerated laser types, made it possible to choose which weapon to disable using switch layer delay variable 2011-07-25 22:16:20 +02:00
GreYFoX 1dfd2882d2 Added Hit as a tile 
Entities are in the previous commit
 2011-07-19 23:33:12 +02:00
oy 2cc10fd6f0 fixed that the player keeps action when activating chat. Closes #719 2011-06-09 22:30:03 +02:00
Romain Labolle c17d3cdeda Reworking teams to allow pausing in team 
* Adding wrappers functions to modify character or pause data if player are in game or paused.
* Moved OnFinish() function to teams.cpp so it can also be called on paused players.
* Pause is now enabled for team players.
* Adding bool CPlayer::IsPlaying() function that return true if the player is either in game or in pause. (false if spectator/dead).
 2011-06-07 16:48:48 +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 561ce64666 Renamed cheats to testing commands sv_test_cmds 
Since these are testing commands, anyone can use them and only on their selves no login needed
Revised some rcon commands
cleanup some unwanted codes
 2011-04-15 06:04:21 +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 83e83947cf give ninja players the momentum they had before slicing, after slicing. Closes #120 2011-03-13 19:00:00 +01:00
oy 4bede550be only update the ping if the scoreboard is active. Closes #27 2011-03-01 18:31:20 +01:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
GreYFoXGTi 5961edf6ce Better Performance, Fixed a mistake and added check for next tiles (Left, Right, Bottom and Above). 2011-01-30 01:58:47 +02:00
GreYFoXGTi 57c8739bb9 Show join a team message without spam 2011-01-29 16:31:50 +02:00
GreYFoXGTi 832bad08e6 Cleanup and Added All Left Masks 2011-01-29 16:18:36 +02:00
GreYFoXGTi 1276bebfe1 Fixed Speedup Tiles ( made them skip-able ) 2011-01-21 11:53:58 +02:00
Floff Floffsson 645f31141d deepfreeze tiles 2011-01-17 00:38:24 +02:00
GreYFoXGTi 9c66a2d54c Endless Hook Tile for ingameplay by Floff aka LemonFace 2011-01-17 00:13:21 +02:00
fisted 2a4bb8e631 fixed /emote reset 2011-01-07 23:26:28 +01:00
GreYFoXGTi 08a2f47ee8 Added Ability to Restart the race in a team after you have finished <br/> 
<b>Testers: Please check if this can be abused</b>
 2010-12-19 05:48:16 +02:00
GreYFoXGTi f9c3f83903 Removed command broadtime since the time is not in the broadcast anymore 2010-12-05 20:29:38 +02:00
GreYFoXGTi af44a79b03 New Broadcast/Timer System 2010-11-30 04:24:15 +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 79226352af revert teleport useless change 2010-11-14 11:04:13 +02:00
GreYFoXGTi 071fb6a5a3 new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02:00
GreYFoXGTi 6735dce1af Applied Patch by Mo(2) Hammer-fly out of the freeze 2010-11-05 01:52:37 +02:00
btd 4e5ffed2b5 Cheaters have no timer now 2010-11-04 22:06:47 +03:00
GreYFoXGTi e43bcd80db Rotation 
FTW
 2010-11-01 03:51:17 +02:00
GreYFoXGTi 505a5b4172 Refactoring 2010-10-29 23:29:07 +02:00
GreYFoXGTi 602c697717 made broadcast update only when needed 2010-10-11 21:27:35 +02:00
GreYFoXGTi a2ddb2d700 Fixed Tick not handling tiles 2010-10-08 15:33:42 +02:00
GreYFoXGTi d20b7360b8 unsuper me now returns you to the previous team 
forgot some dbgmsg
 2010-10-02 02:06:42 +02:00
GreYFoXGTi 8bff412118 New Doors System 2010-09-26 04:19:08 +03:00
GreYFoXGTi 806046fe76 Merge branch 'master' of http://github.com/btd/DDRace 
Conflicts:
	src/game/server/entities/dragger.cpp
	src/game/server/gamecontext.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-22 03:02:49 +03:00
btd 2af441b703 Finish super team, fix bug with killing, DDraggers not finished 2010-09-21 23:09:11 +04:00
GreYFoXGTi 8f48989f73 Fixed Dragger + Stopper Bug 
Fisico ReDrew some entities

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-19 12:01:54 +03:00
GreYFoXGTi d9af926f6f FiX 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 22:22:28 +03:00
GreYFoXGTi a0329fece4 Added /Fly for super Players only to make them choose if they want to fly 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 14:35:53 +03:00
GreYFoXGTi 42d3829304 If you are Super You can Fly!! 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 14:26:06 +03:00
GreYFoXGTi 427fedb79b Starting to fix Doors 
hitted is not a word :p
forgot to change from bool to int
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-16 23:33:16 +03:00
GreYFoXGTi d20f9f49e5 Fixed Stoppers. Closes #27. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-16 21:48:32 +03:00
btd 7ed685ee11 Merge 2010-09-11 13:42:35 +04:00
GreYFoXGTi 72e05efc53 Added Evil Teleporter, 
Added Speed Setters to speedup layer
Added Unfreeze Plasma
Supposedly Fixed Crazy Shotgun (needs Testing)

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-11 02:01:15 +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
btd fec294caee Fix linux compilation. Revert last changes. Add /show_other option (in menu now working) 2010-09-08 20:22:11 +04:00
GreYFoXGTi 08040f5487 Added an Option to Disable Eye Emotes 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-07 07:15:24 +02:00
btd b0d8bfca03 Merge 2010-08-29 14:44:15 +04:00
GreYFoXGTi 277ce3b77e Made stop tiles stop you earlier and fixed bug with stoppers + draggers 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-29 02:05:45 +02:00
btd 366e175983 Logic and scores seems done. Next will be collision 2010-08-29 00:53:42 +04:00
GreYFoXGTi b0bf68c3d3 added chat command /time to show or hide time until next spawn 
added chat command /broadcast to show or hide broadcast until next spawn
added rcon shot,shotgun_me,grenade,grenade_me,laser,laser_me
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-27 09:09:47 +02:00
GreYFoXGTi 0325c59aa9 Merge branch 'master' of http://github.com/btd/DDRace 2010-08-24 03:38:33 +02:00
GreYFoXGTi ed575f9b0c Fixed 2x and 1.5x boosters 
Removed Unused Vars

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-24 03:30:22 +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
GreYFoXGTi 76c6bc7e2f Added option to make super hook endless 
removed RACE_PAUSE

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-23 01:40:05 +02:00
btd 844f3116fe D:/Portable Apps/PortableGit-1.7.1-preview20100612/pause works. Need to delete RACE_PAUSE. And check that character resurect correctly 2010-08-22 17:17:57 +04:00
GreYFoXGTi 0f9c791ce3 Pointed out the new method of /pause 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 08:24:29 +02:00
GreYFoXGTi dc7d3f8275 Removed Tiles that wouldn't work correctly 2010-08-22 01:15:20 +02:00
GreYFoXGTi 2cdd2d4421 Added some tiles 
tried to make the others work but i get stuck!

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 00:57:42 +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
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 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
oy a41d930a85 fixed some compiler warnings. Closes #76 2010-06-06 17:16:52 +02:00
Magnus Auvinen 9bb6fe48c2 cleaned up g_CharPhysSize 2010-06-03 17:39:42 +02:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00