Commit graph

76 commits

Author SHA1 Message Date
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