Commit graph

1067 commits

Author SHA1 Message Date
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
Shereef Marzouk c6fd4a2cc5 General whitespace and tab cleanup 2011-08-11 10:59:14 +02:00
oy 2aee50d5b1 fixed a nasty noise problem. Closes #812 2011-08-05 18:37:59 +02:00
oy dfd9e142d5 Merge pull request #801 from fisted/fix_srs
here is clevar solution for serious design flaw
2011-08-03 13:54:48 -07:00
oy 435639636e Merge pull request #808 from SushiTee/master
fixed a warning
2011-08-03 13:53:18 -07:00
Shereef Marzouk c1b23535ff fixed typo 2011-08-02 12:14:23 +02:00
SushiTee 370b93d8e1 fixed a warning 2011-08-01 12:11:10 +02:00
oy b25fc26c1c zero out client memory on startup to prevent more bad surprises 2011-07-31 18:39:48 +02:00
oy 9cf4facd05 fixed a client crash in debug. Closes #806 2011-07-31 17:07:10 +02:00
oy 3209aec45f fixed compiling error on osx 2011-07-31 13:17:38 +02:00
oy 9418802150 protected econ authentication against brute force 2011-07-31 13:05:12 +02:00
oy 1705c90e14 fixed ban for life on the server 2011-07-31 12:43:35 +02:00
oy aabac3dcfc send notification to enter a password when a client connects to econ. Closes #803 2011-07-31 02:25:55 +02:00
oy 9349af0085 clean up econ sockets on shutdown. Closes #804 2011-07-31 02:20:46 +02:00
oy 8d0cc2a825 reduced stack memory usage of CDataFileWriter 2011-07-31 01:40:28 +02:00
oy 34132ce244 fixed client crash in debug 2011-07-31 01:38:45 +02:00
oy 94bdd95957 added missing newlines at end of 2 files 2011-07-30 18:29:40 +02:00
Johannes Loher e2664c1b00 Added server sided automatic demo recording 2011-07-30 18:23:59 +02:00
oy 0f11cf014c increased length for help string of temporary commands 2011-07-30 18:19:15 +02:00
oy b3e8506f20 create client on heap. Closes #744 2011-07-30 13:50:22 +02:00
oy a0a62bcd70 fixed econ feature and tcp 2011-07-30 13:40:01 +02:00
heinrich5991 b0fdc40959 deleted unnecessary empty files 2011-07-29 17:51:19 +02:00
heinrich5991 2ba6fbd731 added econ functionality 2011-07-29 17:51:14 +02:00
fisted 7197d7bc13 extensive source layout enhancement 2011-07-25 18:28:02 +02:00
Choupom 6b2dc40570 fixed a rcon authentication issue 2011-07-20 21:49:38 +02:00
SushiTee a3fec2f9f3 fixed clipping on some machines 2011-07-15 00:39:37 +02:00
oy 571dff6216 made rcon auto completion serverside. Closes #97 2011-07-14 22:07:21 +02:00
oy d28108b8ad fixed few issues with masters.cfg 2011-07-11 12:00:13 +02:00
oy f440944905 fixed problem with rcon authentication 2011-07-08 00:00:38 +02:00
oy e37d536fdf fixed some NETTYPE usage based on the socket state 2011-07-07 01:48:00 +02:00
oy 1ae474689d added moderator support for the remote console. #518 2011-07-05 21:54:10 +02:00
Choupom 520683c0aa made so background musics restart where they got stopped 2011-07-02 19:24:21 +02:00
oy 123eab41c8 made it possible to filter by player country in the server browser. Closes #654 2011-06-29 22:27:32 +02:00
oy 47cdd2524b do not try to play sound when it isn't enabled 2011-06-27 22:57:06 +02:00
Choupom 99c2c53c0b fixed some dbg_assert 2011-06-27 16:45:40 +02:00
oy 557c906390 fixed compiling problem 2011-06-27 16:44:35 +02:00
Choupom b17a7be286 fixed #2 Too big textures 2011-06-27 16:32:52 +02:00
oy fb309436b4 improved friends feature 2011-06-26 17:10:13 +02:00
fisted d5b3804804 fixed "no such cmd ''" on whole-line comments in cfg 2011-06-11 19:13:27 +02:00
oy 9845d757ef removed file extension from the demo name in the demo player 2011-06-09 22:44:22 +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
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
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 a121587251 Save connection timeout setting for client 2011-05-27 11:29:35 +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
oy 5fbf6d0bfd fixed compiler warnings. Closes #679 2011-05-05 01:43:27 +02:00
Choupom 7f15b3ac57 fixed several stuffs 2011-05-03 19:25:11 +02:00
Choupom c2f75b0017 structs are structs, classes are classes 2011-05-03 19:23:33 +02:00
Choupom 694be7dfb5 fixed the pnglite fix 2011-05-03 18:44:55 +02:00
Choupom f1df704d78 fixed pnglite requiring a std header include 2011-05-03 18:44:46 +02:00
Choupom bbd7a75849 fixed a pnglite crash on save if the image is too small 2011-05-03 18:43:26 +02:00
heinrich5991 9fb36fd802 added strict game type filter 2011-05-02 19:25:38 +02:00
GreYFoX 0d61c87fa1 Added 0.6.0 banmaster by @heinrich5991 #31 2011-04-26 11:51:02 +02:00
GreYFoX f322f65f45 fixed ban for life 2011-04-20 21:25:59 +02:00
GreYFoX 87dc38ee06 fixed hiding reserved slots from server browser by @heinrich5991 2011-04-20 17:04:34 +02:00
GreYFoX 0584f2b7a2 Added Plasma Gun tweaking
made the default 3 plasmas per second more cpu friendly
2011-04-20 15:59:40 +02:00
GreYFoX 65e7e9effe oops 2011-04-19 17:09:49 +02:00
GreYFoX e40158ebf4 changed cl_race_cheats to be on by default 2011-04-19 09:59:49 +02:00
GreYFoX dad66bffc3 General DDRace binds improvements 2011-04-17 19:45:48 +02:00
GreYFoX 5924b5a8bf Fixed blank squares and cl_show_entities to show other layers
P.S. this might introduce a client crash bug, but it needs to happen for me to trace it
2011-04-17 19:14:49 +02:00
GreYFoX 768e6b9291 Added todo 2011-04-17 19:13:55 +02:00
oy 73bc6afb67 decreased the length of built in client names 2011-04-16 18:41:44 +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 3f0ad1ab65 Cleaned up helper commands, @heinrich5991 please revise this commit 2011-04-15 05:20:52 +02:00
GreYFoX a2e4e9c050 Fixed CServer::SetRconLevel 2011-04-15 05:19:11 +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
GreYFoX fd6388a9d8 Cheats are on unregistered servers only, added warning message about records not getting saved 2011-04-14 00:50:57 +02:00
heinrich5991 f0735554ec fixed the reworked IConsole::PrintResponse 2011-04-14 00:34:11 +02:00
heinrich5991 c83c7b1a19 reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print) 2011-04-14 00:34:10 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
oy e6f0318bdf added "fixed some header guards and added a script to fix them all!" by Choupom 2011-04-13 20:22:10 +02:00
oy 1a5d70450f added "reimplemented menu music by teetow-the-great-teetow" by Choupom 2011-04-13 20:00:54 +02:00
GreYFoX 32a85dabe3 Fixed some merge mistakes, NOTE: This will be be buggy to say the least 2011-04-09 23:01:10 +02:00
GreYFoX aaac8a3f77 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/version.h
2011-04-09 22:33:06 +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 4d8c9d1c0d updated standard map filter in the server browser with new maps 2011-04-09 00:08:32 +02:00
oy b6118ae9fe mapped IPv4 addresses within master servers server list to IPv6 to decrease the size of an entry and increased the servers per packet 2011-04-08 23:56:15 +02:00
oy de1e8fc851 improved FindFile so it stops on a match 2011-04-07 18:45:24 +02:00
oy f38fc81d78 fixed a possible client crash on map change 2011-04-07 18:23:03 +02:00
oy c27a634089 fixed and show error message if the crc doesn't match on map load 2011-04-07 18:07:22 +02:00
oy 3fc6e2d2eb prevent empty nicknames. Closes #616 2011-04-06 17:53:05 +02:00
oy caf6e98ccb fixed server crash on "bans" command 2011-04-06 17:30:50 +02:00
oy 4ad6d2f01e fixed problem with sv_bindaddr on the server 2011-04-04 18:20:05 +02:00
oy 9cb2f07b80 fixed clients search for maps within subfolders 2011-04-04 16:53:02 +02:00
oy ab810cab25 fixed that player options just show players as friends not clans 2011-04-02 19:51:05 +02:00
m!nus 3ebdc2a4ce added downward compatibility to mastersrv for 0.5 (and earlier) 2011-04-02 17:35:50 +02:00
oy 04a3b7be00 fixed problem with recorded demo files. Closes #570 2011-04-02 11:55:37 +02:00
heinrich5991 b6fa69cedb the server shows the disconnect reason of clients now 2011-04-01 00:05:35 +02:00
oy 85e9fb1e63 made it possible to add just a clan as friend 2011-03-31 21:30:28 +02:00
oy b3ae1a088e make the "show friends"-filter just list servers with friends on them 2011-03-31 21:22:12 +02:00
oy 98eaaf2e23 fixed 2 compiler warnings 2011-03-31 19:07:21 +02:00
oy 2a72c0b38b added a mechanism to check for a valid standard map. Closes #132 2011-03-31 15:13:49 +02:00
oy 59d56cd332 finished IPv6 support (master servers aren't compatible with 0.5 and older). Closes #233 2011-03-30 12:08:33 +02:00
oy 9d930e15f8 fixed some compiler warnings 2011-03-28 22:08:52 +02:00
oy 34a9ca20a7 added ipv6 support from the old lua branch 2011-03-28 20:11:28 +02:00
oy 7bd79f9f43 added remove_favorite command by Choupom 2011-03-27 18:05:11 +02:00
oy a583633cde added renaming of srvbrowse so it matches with the interface filename by Choupom 2011-03-27 18:00:54 +02: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