Commit graph

544 commits

Author SHA1 Message Date
timgame b53009db7c improved refill jumps tile 2015-01-19 22:14:49 +01:00
timgame 2ee0ca0648 added refill jumps tile and cleaned tile detection 2015-01-19 22:14:49 +01:00
def f0d830021a Fix old bug 2014-12-29 20:06:00 +01:00
def 292c18a1e0 Make prediction work with unsolo command 2014-12-25 11:37:44 +01:00
def fe86eef7d8 Disable hook when /spec is used 2014-12-15 20:49:16 +01:00
def a6b4adb5d8 Minor cleanups 2014-12-15 20:48:58 +01:00
nuborn 03bc769c09 prediction of hammer (hits) and grenade (explosions) 2014-12-01 01:31:58 +01:00
def 627d6386ee Revert "Revert "Revert "Add antiping for weapons (by nuborn)"""
This reverts commit 8f7e24b4db.
2014-11-02 10:59:22 +01:00
def 0802177658 Revert "fix bug in weapons antiping (getting lasered in freeze)"
This reverts commit ff8791681f.
2014-11-02 10:59:03 +01:00
nuborn ff8791681f fix bug in weapons antiping (getting lasered in freeze) 2014-10-28 17:23:48 +01:00
nuborn 8f7e24b4db Revert "Revert "Add antiping for weapons (by nuborn)""
This reverts commit 755e9f4d1c.
2014-10-28 15:50:28 +01:00
def 755e9f4d1c Revert "Add antiping for weapons (by nuborn)"
This reverts commit 48e66a2ab3.

Conflicts:
	src/game/client/gameclient.cpp
	src/game/version.h
2014-10-27 20:03:22 +01:00
def 4ed3ce8070 Revert "No fucking gunfire sound when using jetpack"
This reverts commit 4a11befaf4.
2014-10-26 00:50:10 +02:00
def 4a11befaf4 No fucking gunfire sound when using jetpack 2014-10-25 03:01:55 +02:00
def 48e66a2ab3 Add antiping for weapons (by nuborn) 2014-10-23 17:31:29 +02:00
def 084b59d9b6 Show sleepy eyes when a player is paused 2014-10-16 23:22:53 +02:00
def a670348b88 Wording 2014-09-27 19:10:15 +02:00
def 3804c16f02 Fix a bunch of crashes on server demo recording 2014-09-26 03:20:47 +02:00
def 416ae46730 Reset recording on player death 2014-09-26 02:25:53 +02:00
def b4f77c4b71 Add sv_player_demo_record (mostly from Teerace) 2014-09-26 02:05:31 +02:00
def d38bf7f83a typo 2014-09-23 17:33:33 +02:00
def fbd87e7370 Fix potential server crashes 2014-09-22 18:56:59 +02:00
def 741cf8f8c7 Cleanup & Halloween event 2014-09-18 12:14:00 +02:00
def 8a4e3d9605 Revert "Only set active weapon when it actually has ammo (Thanks Saavik)"
This reverts commit c88a4f00d2.
2014-09-07 00:15:03 +02:00
def c88a4f00d2 Only set active weapon when it actually has ammo (Thanks Saavik) 2014-09-05 21:12:33 +02:00
def 2980bd77e8 Add /specteam 2014-08-09 19:53:38 +02:00
def eaeaf54250 Add freezehammer/unfreezehammer for blocker 2014-07-16 02:59:39 +02:00
def 4c71b8cf56 Fix: Walljump works properly even in maps without double jump 2014-06-24 23:47:33 +02:00
def 7a4e5ed746 Fix "You can jump 1 time" 2014-06-24 23:32:29 +02:00
def dcf5e244b5 Fix walljump after holding a key 2014-06-23 14:46:27 +02:00
def 99c74b5311 Fix wall jumps 2014-06-22 00:50:11 +02:00
def d768eb4908 Try wall jumps 2014-06-21 18:14:22 +02:00
def a6e8a787ee Fix: Jetpack works with tunezones (oops) 2014-06-04 20:16:44 +02:00
def 4c87cedd4d Better make sure that something exists before using it 2014-05-19 01:57:52 +02:00
def b3e9041768 Revert "Same hook strength for everyone (by cinaera)"
This reverts commit 2b08464527.
2014-05-01 03:03:31 +02:00
def 2b08464527 Same hook strength for everyone (by cinaera) 2014-04-30 17:36:25 +02:00
def 5eb7a74558 Fix: Tunings and Tunezones with dummies 2014-04-29 03:34:23 +02:00
HMH 4a8011ced4 determine tunings to send with the players viewpos 2014-04-18 14:43:33 +02:00
HMH b9d72d5efe TuneZone enter msg also on spawn 2014-04-18 14:43:33 +02:00
def 68980e7699 Fix: Ok, proper Jetpack prediction now 2014-04-14 10:56:14 +02:00
def 38b16ee5c0 Jetpack prediction (Thanks to v) 2014-04-14 01:34:50 +02:00
def 29db455131 Multiline tune zone messages 2014-04-13 19:27:08 +02:00
def f8b15e1e62 Add hammer_strength tuning 2014-04-13 19:11:21 +02:00
def 6e33858cab Code cleanup 2014-04-13 16:49:58 +02:00
def 83201c9003 More extended tunings 2014-04-13 16:41:02 +02:00
def 7fd799f894 Timeouts, disconnects and game leaves no longer kill your entire locked team 2014-04-12 12:08:20 +02:00
def 7ae973af0d Make jetpack strength a tuning 2014-04-12 11:12:29 +02:00
def 327aa4e196 Fake tunings for NPC and NPH and tuning cleanup 2014-04-06 12:22:27 +02:00
def 8be0091d07 Add sv_teleport_hold_hook 2014-04-05 00:35:18 +02:00
def b8775d27c4 Revert "sv_pistol_damage"
This reverts commit a5449c9af0.
2014-04-02 19:55:42 +02:00
def a5449c9af0 sv_pistol_damage 2014-03-31 20:34:54 +02:00
HMH 3d607eaf16 fix: correct zone at spawn 2014-03-27 01:48:21 +01:00
HMH e393e966d0 fix: send tunings on spawn not on death 2014-03-27 01:33:37 +01:00
def a4580c4af0 Add speedup prediction (by c) 2014-03-25 01:13:46 +01:00
HMH 6b1b4f2bcb fix: correct tunezones for faketunings 2014-03-24 21:07:10 +01:00
HMH 0177b8a4b5 fix: stupid laser tunings + projectile security fix 2014-03-23 17:10:49 +01:00
HMH e25f0ba074 added TuneZoneHandler, replaced projectile-lifetime and laserreach with zone specific tunings when creating 2014-03-23 17:10:49 +01:00
def b72df908a1 Add faketunings for 0 jumps 2014-03-01 14:29:14 +01:00
def 220f5269c4 Fix: Reset ninja properly to prevent it from autoshooting 2014-02-25 21:51:10 +01:00
def 6406e77e9c Disable faketuning for freeze for now because it looks really weird in some situations 2014-02-23 01:10:43 +01:00
def e9db91e953 Add solo fake tunes 2014-02-19 22:30:57 +01:00
def 40651924bf Make Fake Tunings a bit nicer and less resource intensive 2014-02-19 22:30:34 +01:00
def 92e0b5fe3c Add fake tunings so that freeze prediction is correct (by HMH) 2014-02-19 21:55:37 +01:00
def 99a086200f Only keep holding hook, reset all other keys on /pause and chat 2014-02-18 22:26:17 +01:00
def 1b76f57750 Allow /showothers on solo server 2014-02-14 03:08:20 +01:00
def 4a2eaaf1cc Less strict spam filtering 2014-02-14 00:26:05 +01:00
def 334a739534 Fix penalty for teams 2014-02-10 00:17:56 +01:00
def 42ed2807cb Add penalty tile 2014-02-09 23:31:29 +01:00
def 823a04333a Add /showall 2014-02-02 19:56:10 +01:00
def 391232017a Add evil checkpoint teleports 2014-02-01 22:20:41 +01:00
def 7347afa5dc Even Super has to die! 2014-01-31 23:24:45 +01:00
def 3e7d077722 Fix: See other players on solo server 2014-01-31 12:26:17 +01:00
def 2f4820f9ae Don't show players in solo part, even with /showothers 2014-01-30 18:39:39 +01:00
def d8533eea67 Proper Client Version numbers and more visible whispers 2014-01-30 16:49:15 +01:00
def bf652416d4 Don't send team state too often (causes lags when people kill) 2014-01-24 15:12:46 +01:00
def 61b056f9f7 Hold input while paused 2014-01-22 14:04:46 +01:00
def 663da084db Make players look sleepy if afk 2014-01-22 01:46:15 +01:00
def beb74082b3 Send initial team state 2014-01-22 00:35:02 +01:00
def d158267e92 Better broadcasting for spectators 2014-01-13 17:00:49 +01:00
def 6126ad50c4 Fix range of team related bugs by actually removing people from team when they spectate 2014-01-11 15:19:34 +01:00
def 2af9d9f423 Switchable ninjajetpack 2014-01-11 13:59:20 +01:00
def f4b961ecad Final fix 2014-01-11 13:39:35 +01:00
def b768cb1e81 Fix: Solo server crash 2014-01-11 00:52:13 +01:00
def 5d23a38f66 Allow players to see players at every distance, but not effects 2014-01-10 22:54:07 +01:00
def 7a3a8f1485 Fix doors in team 0 for solo server 2014-01-09 21:57:44 +01:00
def 86468f2c06 Emote fix 2014-01-09 19:51:26 +01:00
def 9770382007 New Jetpack animation 2014-01-09 19:00:41 +01:00
def 6af20de3e8 Also reset team 0 2014-01-08 02:24:31 +01:00
def 37badd724b Another go at the door opening bug 2014-01-06 18:27:38 +01:00
def 8d4301b2e3 Next try to prevent DDRace problems 2014-01-02 02:15:19 +01:00
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 da2cdf7acd Fix: Reset switches when team is locked 2013-12-30 22:30:07 +01:00
def 605bd0f81c Only show freeze indication once when still frozen 2013-12-26 19:46:44 +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 d0d8aaa56c Fix: Proper jetpack strength 2013-12-23 20:40:43 +01:00
def ec4a83eb1a Fix: Don't change tune parameters 2013-12-23 20:33:01 +01:00
def 72bc639a0c TeleOuts as pointer; Hopefully fixes Visual Studio crash 2013-12-12 14:35:01 +01:00
def bfc6558a32 Indicate when ninja ends 2013-12-09 13:53:26 +01:00
def d1a584b4af Add jetpack tile 2013-11-22 15:10:55 +01:00
def eba45c4f0a Add /lock 2013-11-16 00:44:49 +01:00
def 0b305471d2 Add jetpack 2013-11-13 13:25:26 +01:00
def a4296f4bb7 Fix: Super can always jump 2013-09-29 17:16:49 +02:00
def 1cc6977611 Fix jumping 2013-08-24 02:25:58 +02:00
def 6da8d2146c New mapping entity: Specify number of jumps 2013-08-24 01:03:45 +02:00
def 48d84b2784 More correct door reset 2013-08-22 06:07:31 +02:00
def 40ff09be29 Revert visual studio fix 2013-08-18 22:19:02 +02:00
BeaR ee6192900c fix previous commit 2013-08-14 19:56:55 +02:00
def af69765063 Revert "fix visual studio build"
This reverts commit 62409f740a.
2013-08-14 17:31:15 +02:00
BeaR 62409f740a fix visual studio build 2013-08-13 14:06:29 +02:00
def bf518df74d New teleport entities 2013-08-13 04:59:25 +02:00
def 4987b26b7b Fix prediction 2013-08-05 19:58:51 +02:00
def 111d5c7f10 Add entities to start and stop: Player collisions, Hooking, Infinite jump 2013-08-05 17:47:04 +02:00
def 02ac497531 Fix: No ninja in solo 2013-08-04 22:50:14 +02:00
def e4201940cd Fix: Don't reset doors for spectators 2013-08-04 04:46:26 +02:00
def 3cfe974092 Make ninja work only on team mebers 2013-08-02 21:10:43 +02:00
def 8f9a1c24fb Remove iostream 2013-08-01 22:28:11 +02:00
def 6935a9678b Fix: team 0 doesn't count players 2013-08-01 22:27:19 +02:00
def 796548ff65 Don't reset hook pos in red teleports, allow holding hook while going through tele 2013-07-22 18:03:32 +02:00
def 3a80c5f5fb Make evil (red) teleports work as normal (blue) teleports when weapons- or hook-through-teleport are activated 2013-07-22 17:37:14 +02:00
def 54b942fa7e Make hooks go through teleporters 2013-07-19 00:27:17 +02:00
def 9c145fcc35 Don't try to reset doors when there are none 2013-07-11 02:06:15 +02:00
def 5e83eff2ce Revert "Don't try to reset doors when there are none"
This reverts commit 7bf704a6ed.
2013-07-11 02:02:14 +02:00
def 7bf704a6ed Don't try to reset doors when there are none 2013-07-11 01:56:03 +02:00
def 6d33fcc5a6 Fix door opening cheat 2013-06-23 02:51:04 +02:00
XXLTomate 8521e088fd removed dbg_msg 2013-03-18 13:02:14 +01: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
Shereef Marzouk b000c9e4e1 Fixed team blocking by disconnect (Closes #206) 2013-02-01 13:08:23 +02:00
aelio_ru b68840b30b Fixes inactive dragger after map change or server start, Fixes #181. 2012-08-26 09:23:11 +02:00
Ravomavain cd5046a1a9 Prevent laser draggers from dragging paused players. Fix XXLTomate#16
Reset velocity on resume to avoid other bugs.
2012-05-01 21:57:09 +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
Learath2 d5dcfa3c4f Fixed obligatory Teams (sv_team 2). 2012-04-11 16:16:30 +02:00
Learath2 50b2d85abb Fixed according the comment of GreYFoX. 2012-02-14 22:38:06 +02:00
Learath2 d64e1796aa Simplifys the usage of timer commands. Fixes new year happy spawn. 2012-02-14 20:25:34 +02:00
oy dfe91338f0 added pause command. Closes #15 2012-01-10 00:49:31 +01:00
Ravomavain ebf64758b1 Make spectators see the same thing as the player they spectate 2012-01-01 00:15:16 +02: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 7d462b565d Fixed the bugs i know of with the last few commits 2011-12-30 16:51:08 +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
Shereef Marzouk c496bf3c4e Merge branch 'master' of https://github.com/oy/teeworlds into DDRace
Conflicts:
	bam.lua
	scripts/make_release.py
2011-12-14 17:01:47 +02:00
oy 99f04a7f87 let the server check if the input aims the center. Closes #889 2011-12-10 18:21:12 +01:00
Ravomavain 7b8575f755 There is a variable for that, use it! :p 2011-09-03 01:08:37 +02:00
Ravomavain 04981004d5 Improve Checkpoint-teleporters: if no matching destination is found for the current checkpoint, check previous ones 2011-09-03 01:08:37 +02:00
GreYFoX 8c103b8c13 * Added a new tile to facilitate solo parts ( works with teams )
* Can now put tiles with the same indexes as in tele or switch layer i game layer but it will drawn to the correct image
* Adjusted Masking to account for Solo players
2011-09-02 20:04:18 +02:00
GreYFoX 5035506825 Fixed team collision and 0.6 trunk, 1.094a 2011-09-01 20:29:08 +02:00
GreYFoX b7e3bbb824 added fix for #82 by BeaR 2011-08-31 23:36:41 +02:00
eeeee cfde5a20ec allow usage of eyeemotes in freeze 2011-08-31 02:36:47 +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 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