Commit graph

1214 commits

Author SHA1 Message Date
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
2011-12-05 11:32:01 +02:00
oy 8e0ce38e29 fixed sv_max_client usage 2011-12-04 16:51:33 +01:00
XXLTomate 9a59dd4158 victims at force_vote; cmd description updated 2011-11-08 22:08:37 +01:00
GreYFoX 323e63453b fixed team cheat. Closes #103 2011-11-08 15:21:03 +02:00
GreYFoX df0798a673 Fixed pickup sounds. Closes #111 2011-11-08 14:15:31 +02:00
GreYFoX 09232125b4 Ability to disable emotes. Closes #115 2011-11-08 14:09:42 +02:00
GreYFoX d6845f0502 Vote enforcer as command executer
Force pause doesn't need the client id to be positive
Fixed force pause parameter reading

partially helps #124
2011-11-08 13:56:08 +02:00
XXLTomate 137a447065 Victims without callback(s) 2011-11-08 12:30:54 +02:00
Ravomavain 24fc16543c Fix chat commands being too verbose if console_output_level is set on config file. Close #116 2011-10-31 19:16:43 +01:00
XXLTomate 771293a922 Fixing muteID 2011-10-12 21:31:33 +02:00
Shereef Marzouk b5f8738acd Merge pull request #118 from XXLTomate/ddracePullSqlFix
fixing sql score by @Laxa
unrevised untested @XXLTomate thanks but please test and maintain i didn't even see the changed code
2011-10-12 10:29:12 -07:00
XXLTomate a2cec1b990 fixing sql score by @Laxa 2011-10-12 19:17:48 +02:00
GreYFoX 1837c76a07 fixed a crash 2011-09-08 01:02:09 +02:00
GreYFoX d9f973b8da SQL Fix 2011-09-08 00:51:55 +02:00
GreYFoX 9f16db0969 Fixed tuning reset 2011-09-05 13:55:47 +02:00
Sergey b326fc245f Count change_map in sv_vote_map_delay too. 2011-09-04 22:24:40 +02:00
GreYFoX df5a63948a Fixed warning: src/game/server/teams.cpp:206: suggest parentheses around && within || 2011-09-03 01:10:08 +02: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 fe5e9f4ad7 Removed redundant command from console 2011-09-03 00:28:56 +02:00
GreYFoX abfd5555b0 DDRace tuning vars reset every map, but default Teeworlds tuning vars don't 2011-09-02 20:37:03 +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
Ravomavain 5b44fae0ce Remove unneeded variables 2011-09-02 12:05:14 +02:00
Ravomavain b24b67518a Allow chat commands to be used in remote console 2011-09-02 12:05:14 +02:00
GreYFoX 5035506825 Fixed team collision and 0.6 trunk, 1.094a 2011-09-01 20:29:08 +02:00
GreYFoX d960765552 fixed warning: src/game/server/entities/laser.cpp:93: 'f' may be used uninitialized in this function 2011-09-01 02:14:05 +02:00
GreYFoX f845f271ad Fixed warning: src/game/server/ddracechat.cpp:267: unused variable 'pSelf' 2011-09-01 00:30:37 +02:00
GreYFoX b7e3bbb824 added fix for #82 by BeaR 2011-08-31 23:36:41 +02:00
Ravomavain 7d1a392f03 Fix chat command and close #81 2011-08-31 22:58:48 +02:00
GreYFoX ff696bad6c Mac Loves Cyclic Includes 2011-08-31 13:56:04 +02:00
GreYFoX 3ad8284716 Fixed #77. top5 2011-08-31 12:30:18 +02:00
GreYFoX 7e24be5d83 Version 1.091a 2011-08-31 12:10:15 +02:00
GreYFoX bf5374adbf Reverted a change 2011-08-31 02:48:58 +02:00
GreYFoX f2e34075b8 Fixed the /cmd crash Fixes #76
deleted the chat console on destruction
2011-08-31 02:39:08 +02:00
eeeee cfde5a20ec allow usage of eyeemotes in freeze 2011-08-31 02:36:47 +02:00
GreYFoX 03bd3823ec Fixed SQL Compilation 2011-08-27 23:32:40 +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
eeeee 2d4c965c7e prevent excess draggers snapping to save loads of traffic 2011-08-27 14:09:06 +02:00
eeeee 9f8ba5cf45 it was possible to avoid being kicked by afk stuff by opening chat 2011-08-27 14:09:06 +02:00
GreYFoX 9fe96f6b04 Test Commands check and feedback on command not executed 2011-08-26 23:24:46 +02:00
GreYFoX 94c0088c1b Set the AccessLevel at login 2011-08-26 20:23:47 +02:00
GreYFoX b75a26eed9 Fixed the console 2011-08-26 20:03:30 +02:00
Ravomavain e8229f537f Fix loading of old maps 2011-08-26 16:34:25 +02:00
Ravomavain 15d0a40825 Add user level access and use this level for /cmds if player is not authed. 2011-08-26 16:28:14 +02:00
Ravomavain 5912395554 Clarify this if statement. 2011-08-26 16:28:14 +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 709c05bb37 improved description for restart command. Closes #796 2011-08-05 19:52:32 +02:00
Shereef Marzouk 8877cf2293 Refactored some pointers 2011-08-02 12:35:14 +02:00
Johannes Loher e2664c1b00 Added server sided automatic demo recording 2011-07-30 18:23:59 +02:00
oy 7db6d1e056 fixed problem with player collision. Closes #722 2011-07-30 18:08:24 +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 831aea796e Saving hitting status on pause 2011-07-25 21:15:51 +02:00
Choupom b7aa8af7aa thats why magic values sux 2011-07-23 18:42:51 +02:00
GreYFoX 344944c9d4 --b * 2 2011-07-22 16:23:03 +02:00
GreYFoX d965eb7453 utter noobness 2011-07-22 16:15:39 +02:00
GreYFoX cdbbf9e74b Removed a useless line
ps. commiting from the car while driving via iPhone xD
2011-07-22 16:02:56 +02:00
GreYFoX dd015c33c0 Fixing the sound for the laser when a player DCs after shooting it 2011-07-22 15:03:15 +02:00
GreYFoX 8f927a6033 Fixed a crash 2011-07-22 14:52:28 +02:00
GreYFoX 2964919bf2 Some logic fixes 2011-07-22 14:29:27 +02:00
GreYFoX b0420e66ee used Teams() instead of ((CGameControllerDDRace*)GameServer()->m_pController)->m_Teams 2011-07-22 00:01:12 +02:00
GreYFoX 3d07ffdbdd Added the Missing Single Tee No Hitting Logic 2011-07-21 03:13:59 +02:00
GreYFoX 959b11b13d Admin protection closes #59 2011-07-20 03:18:03 +02:00
GreYFoX 1dfd2882d2 Added Hit as a tile
Entities are in the previous commit
2011-07-19 23:33:12 +02:00
oy 571dff6216 made rcon auto completion serverside. Closes #97 2011-07-14 22:07:21 +02:00
Romain Labolle a6dc6f34b6 Display a message when an admin forces a vote. Closes #759 2011-07-11 11:28:04 +02:00
oy ab1f7d6f95 clamped information flow when moving as spectator in free-view. Closes #551 2011-07-05 22:58:54 +02:00
oy b153003b0b fixed dm wincheck 2011-07-04 18:30:24 +02:00
oy 08b6ffd52c fixed possible server stressing 2011-06-27 17:20:46 +02:00
Johannes Loher f80c46e24d fixed so you can use whatever time you want on set_team and so that it uses minutes 2011-06-27 17:07:51 +02:00
Johannes Loher 14f98a9ded Added possibility to deny changing of team after a set_team for a certain amount of time. Added server setting to do this automatically for spec votes. fixes #640. 2011-06-27 17:07:23 +02:00
nsinreal 66a8000620 Fixed ninja: always set last active weapon after ninja's end 2011-06-27 16:28:49 +02:00
oy c10c7d9ac3 improved sudden death in ctf. Closes #617 2011-06-19 17:32:00 +02:00
oy 957b81af07 made it possible to restrict player information in spectator mode 2011-06-19 11:28:39 +02:00
oy 4dc79a9ec1 fixed spawn bug. Closes #634 2011-06-15 01:03:14 +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
oy 348806d993 abort "move to spectator"-vote when the player disconnects 2011-06-09 22:31:55 +02:00
oy 2cc10fd6f0 fixed that the player keeps action when activating chat. Closes #719 2011-06-09 22:30:03 +02:00
GreYFoX 9c4b1c9892 fixed a crash, closes #56 2011-06-07 17:21:47 +02:00
GreYFoX 457fee998d Refactored a variable 2011-06-07 17:05:19 +02:00
GreYFoX e6189d05c4 On name change relaod scores, fixes %55 2011-06-07 17:05:07 +02:00
Romain Labolle 3f2dc36151 Fixing Force-pause:
* sv_vote_pause_time : maximum 15s, default 10s
* Removing sv_vote_pause_auto (so afk stay in pause)
* force_pause require config level
* force_unpause set force-pause timer to 0
2011-06-07 16:49:36 +02:00
Romain Labolle bb971bdcf0 Adding vote to force-pause players (instead of just moving them to spectators).
* Add the following config variables :
  * sv_vote_pause: Allow voting to pause players (instead of moving to spectators) (default: 1)
  * sv_vote_pause_time: The time (in seconds) players have to wait in pause when paused by vote (default: 60)
  * sv_vote_pause_auto: Automatically unpaused players after the force-pause delay or not (default: 0)
* Add the following functions :
  * force_pause v?i : Force v to pause for i seconds
  * force_unpause v : Force v to unpause
2011-06-07 16:48:49 +02:00
Romain Labolle 0ae0b0bb83 Adding pause specific message when players use /pause (instead of joined the game/spectators). 2011-06-07 16:48:48 +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
GreYFoX 413bf4a39e Credits and version 1.08a 2011-06-07 16:48:01 +02:00
GreYFoX c3df972fe3 Optimized checkpoint code 2011-06-05 13:56:04 +02:00
GreYFoX c1962bff25 Removed sv_broadcAst
this commit is funny cause it was made from my iPhone and it only took 8 minutes
2011-06-03 21:55:57 +02: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 deff0ce7c4 fixed netevent struct names 2011-06-02 17:40:08 +02:00
Choupom 1a02017094 fixed some strings 2011-06-02 17:39:05 +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
Romain Labolle 813f689957 Tune reset clean up (fix #50)
* Removing old unused DDRaceTunesReset() function.
* Adding ResetTuning() function to reset tunes.
* Adding ResetTuning() and some settings reset (sv_hit/sv_endless_drag/sv_old_laser) to CGameContext::OnInit() which is loaded on each map load.
GreYFoX:
Repositioned the new Functions
2011-06-01 16:43:20 +02:00
GreYFoX a232cdc90a Unified SetTeam Time with Pause time fixing a CRTITCAL cheat reported by TbMa P.S. He is NOT a Rogue ;-), Thanks very much Mr.TbMa 2011-06-01 16:12:35 +02:00
Romain Labolle 5fad119b5f nethash.c moved to nethash.cpp fix GreYFox/DDRace#48 2011-05-09 23:59:58 +02:00
GreYFoX 2ab15cc752 fixed 1 line merge mistake. fixes #45 2011-05-09 18:45:35 +02:00
GreYFoX ee97bfcad3 fixed last merge 2011-05-09 18:40:14 +02:00
GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds
Conflicts:
	src/engine/external/pnglite/pnglite.c
	src/engine/external/pnglite/pnglite.h
	src/engine/shared/config_variables.h
	src/game/client/components/menus_browser.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/version.h
2011-05-09 18:36:13 +02:00
eeeee a58996b6bf return from afk handling code immediately if player got kicked, as player struct is zeroed out
closes #47
2011-05-09 18:22:05 +02:00