Commit graph

293 commits

Author SHA1 Message Date
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
east 40e7de63e9 config var renamed 2014-10-27 13:39:33 +01:00
east 630fd4fa07 sending vote options balanced 2014-10-26 19:39:42 +01:00
def 48e66a2ab3 Add antiping for weapons (by nuborn) 2014-10-23 17:31:29 +02:00
def 1d7d511941 Set ed_zoom_target to 0 on default 2014-10-12 02:06:44 +02:00
def c5b796a8f1 ed_zoom_target 1 by default 2014-10-08 15:07:02 +02:00
BeaR 1f4430f3d0 Editor: Add feature to zoom to mouse position 2014-10-07 20:07:46 +02:00
def 038129f9ce Allow disabling custom and new skins in client 2014-08-17 05:34:16 +02:00
def bbe597ef04 Add cl_dummy_resetonswitch 2014-07-08 01:41:45 +02:00
def a7329d0a14 Add random_unfinished_map 2014-06-20 22:40:23 +02:00
def 7875c2ec36 Android support (by Pelya) 2014-06-16 13:29:18 +02:00
def d57634792d Add ping and gametype colorization (Thanks to NooBxGockeL and Gamerclient) 2014-05-03 17:24:34 +02:00
def 7a5f32f155 Add hammerfly for dummies 2014-04-28 22:12:50 +02:00
def 7bcc51d488 Basic updating (thanks to unsigned char* 2014-04-27 05:01:03 +02:00
def 3dce4c9489 Add dummy (Thanks to //toast and Monsta) 2014-04-26 20:29:42 +02:00
def 8be0091d07 Add sv_teleport_hold_hook 2014-04-05 00:35:18 +02:00
def 1287cc3f20 Disable Threaded Sound loading by default (might crash?) 2014-02-17 23:13:42 +01:00
def 096caff08c Saner default settings 2014-02-12 18:51:47 +01:00
def ceeb44ef2e Bring back old DDRace record window as cl_showrecord and add compatibility for current time in race servers 2014-02-06 23:49:25 +01:00
def fe5c26234b add cl_showkillmessages 2014-01-15 15:25:13 +01:00
def 31629b15c1 DDNet Version notice 2014-01-14 23:13:17 +01:00
def bc9e188309 Revert SetPing 2014-01-14 21:44:40 +01:00
def 5353460e84 Make hiding votes window optional 2014-01-14 00:25:25 +01:00
def 3607218f12 Merge ddrace64 from eeeeee 2013-12-31 06:13:57 +01:00
def 9c5031b34f Don't show BB skins by default 2013-12-26 18:02:37 +01:00
def da9ff2a696 Add: Set Ping to any value you want 2013-12-18 16:54:20 +01:00
def 9a1ff10b0a Add button to disable chat 2013-11-14 16:23:15 +01:00
def a90b37544a More HUD control 2013-11-02 03:09:56 +01:00
def 9f45368225 Add antiping_grenade 2013-10-15 18:08:06 +02:00
def dc6d2305d5 Add AntiPing 2013-10-09 16:02:23 +02:00
def bf518df74d New teleport entities 2013-08-13 04:59:25 +02:00
def ae53eb201e Set sv_teleport_hook and sv_teleport_weapons off by default 2013-07-19 01:26:14 +02:00
def 1b68bf65f2 Add server options for sv_teleport_hook and sv_teleport_weapons 2013-07-19 01:23:48 +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
oy 3e918075df added an option to show only chat messages from friends 2012-01-09 23:29:15 +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 ccaec79567 made it possible to automatically swap teams between rounds 2011-12-30 22:47:26 +01:00
GreYFoX de4a95c5d2 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-20 06:50:06 +02:00
oy 7058726236 changed default UiPage to PAGE_INTERNET. Closes #839 2011-08-13 18:50:17 +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 7648ba3024 added a different mouse sens for menus/editor 2011-07-03 00:36:07 +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
oy 957b81af07 made it possible to restrict player information in spectator mode 2011-06-19 11:28:39 +02:00
GreYFoX 1bfcfb7d6f Changed max of force pause to be 360 seconds
Note if force pause was abused once infront of me i would make even admins have to go through a vote
2011-06-07 16:55:06 +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
GreYFoX 9221bce3f4 Rechecked and fixed the afk kicking system. fixes #27 2011-04-20 16:34:03 +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 1d426f1df9 fixed problem with ui_page 2011-04-13 20:45:16 +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 1b69541e7b increased size of UIServerAddress 2011-04-01 23:16:14 +02:00
oy 67b026f65f added an option to disable ingame HUD. Closes #523 2011-03-27 14:40:15 +02:00
oy edf10b8b13 added an option to disable team colors for name plates. Closes #544 2011-03-27 14:30:59 +02:00
oy 722644008f added a respawn delay command for tdm 2011-03-26 22:38:05 +01:00
oy b8f144ba81 added a vote that allows to move a player to spectators. Closes #58 2011-03-26 16:56:59 +01:00
oy ae325c873f added friends feature. Closes #24 2011-03-23 13:06:35 +01:00
GreYFoX 61dcc7b848 Re-Added noother's afk kick
Disabled vanilla afk kick by default
enumerated variables.h
2011-03-22 21:49:12 +02:00
oy 0640acb27e added a command to set a minimum player limit that is needed to start a kick vote 2011-03-04 17:35:50 +01:00
oy 0bc13c91eb made cl_threadsoundloading work again 2011-02-27 17:56:03 +01: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 40f6740742 fixed few spelling mistakes and disabled an unused command 2011-01-17 12:56:49 +01:00
GreYFoXGTi 1719ad554e Moved a var 2011-01-06 01:51:22 +02:00
GreYFoXGTi 1d9190fd5b Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/russian.txt
	readme.txt
	src/game/variables.h
2011-01-06 01:49:58 +02:00
Damian Kaczmarek 073044747b -Working ui_scale parameter.
(doing it properly would require lots of framework/interface job ...)
2011-01-05 12:14:36 +01: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 67f86e3547 added option to change nameplates size by RushPL 2011-01-04 13:11:01 +01:00
GreYFoXGTi e803f30f52 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/flag.cpp
	src/game/server/player.cpp
	src/game/variables.h
2010-12-16 06:06:23 +02:00
oy 8aeb3e7ada enable "Always show nameplats disregarding of distance" on default. Closes #343 2010-12-16 04:22:14 +01:00
GreYFoXGTi 157aafd4dd Merge branch 'master' into DDRace
Conflicts:
	src/engine/server/server.cpp
	src/game/variables.h
2010-12-11 23:57:41 +02:00
oy 3d54cf0585 nameplates on by default. Closes #322 2010-12-11 22:41:58 +01:00
GreYFoXGTi 83cea23373 Reworked some stuff 2010-12-03 14:58:38 +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 505a5b4172 Refactoring 2010-10-29 23:29:07 +02:00
btd 1f0e49c080 Add my old zoom staff 2010-10-17 12:43:27 +04:00
GreYFoXGTi 47714c9468 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/variables.h
2010-10-13 14:08:35 +02:00
oy c828f7d725 removed unused commands. Closes #60 2010-10-13 01:24:37 +02:00
GreYFoXGTi 040ba467bf Changed The lowest level to -1 ( has chat but no rcon )
made rcon for level 0 open by default users can use logout or login/auth or in normal consol rcon_auth to raise their level
2010-10-11 02:39:08 +02:00
GreYFoXGTi ef139eb73a Cleanup (Putting stuff back vanilla like) 2010-10-10 16:11:11 +02:00
GreYFoXGTi 40d2068c70 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/player.cpp
	src/game/variables.h
2010-10-10 14:36:02 +02:00
oy cd95f1869e added inactive player kicking. Closes #51 2010-10-09 19:14:42 +02: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
oy 27425facff fixed last commit 2010-09-24 13:21:03 +02:00
Choupom aa46c22e10 now put skins in an array to save memory 2010-09-24 13:13:46 +02:00
GreYFoXGTi 0c0c231f13 Merge branch 'master' of http://github.com/GreYFoXGTi/teeworlds into master3
Conflicts:
	src/game/client/components/maplayers.cpp
	src/game/variables.h

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:59:51 +02:00
GreYFoXGTi 9499e04fd7 Removed gfx clear from settings file. Closes #15.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 06:45:36 +02:00
GreYFoXGTi f9f780ff28 Fixed lags and crashes on kp0 in-game. Closes #149
Closes #86

Added dbg_layers which is 0 by default to prevent Debug files output when when ingame and pressing kp0

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-05 05:29:27 +02:00
GreYFoXGTi 8901057944 Modified the config variables to have level
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 01:47:55 +02:00
GreYFoXGTi 7f8fb7a5a7 Merging the client manually into the server
but i can't get the client to accept the console class of the server -.-" yet..

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-25 17:31:49 +02:00
GreYFoXGTi eb9793d89a Moved all used server variables to config_variables.h
tried to fix /pause and failed cause i can't get the hooked player's character to check if he is paused or not
changed welcome message default.
on join player sees the server's /info

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-07-29 22:51:58 +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
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00