about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2012-10-22Merge branch 'banmaster_v2' into zCatchTeetime
Conflicts: .gitignore banmasters.cfg src/banmaster/banmaster.cpp src/engine/server/server.cpp src/engine/shared/network.h src/engine/shared/network_server.cpp
2012-08-03Some cleanupTeetime
2012-08-03Teamchat works now properly with caught and living players and those who are ↵Teetime
explicit in spectators
2012-08-03renamed fileTeetime
2012-08-03Made amount of grenade-bullets adjustableTeetime
2012-06-13some changes...Teetime
2012-03-10Extended banmaster, now its easier and more comfortable to ban"Teetime
2012-03-07Merge remote-tracking branch 'heinrich5991/banmaster' into banmaster_v2Teetime
Conflicts: src/engine/server/server.cpp src/engine/server/server.h src/engine/shared/config_variables.h src/engine/shared/network.h src/engine/shared/network_server.cpp
2012-03-05show IP of banned client when message get displayedTeetime
2012-02-250.4.6 releaseTeetime
2012-02-23reduced max. amount of bonus-points to 100Teetime
2012-02-23fixed spelling mistakes, some refractoring etc.Teetime
2012-02-22updated banmaster (fixed some errors etc.)Teetime
2012-02-19fix that server sends bans correctly to banmastersTeetime
2012-02-18updated server versionTeetime
2012-02-18no endless ammo for grenade and all weapons, so player cannot shoot anymore ↵Teetime
all the time
2012-02-18small fix for better looking in other clientsTeetime
2012-02-18added laserjumps and cleaned up some codeTeetime
2012-02-18better automelt displayTeetime
2012-02-18banmaster doesnt add same IPs nowTeetime
2012-02-17extended banmaster and added more functionsTeetime
2012-02-17added banmaster into the sourceTeetime
2012-02-17Merge branch 'master' into zCatch-ExpTeetime
Conflicts: src/engine/server.h src/engine/server/server.cpp src/engine/server/server.h src/engine/shared/network.h src/engine/shared/network_server.cpp src/game/server/player.h
2012-02-13Merge pull request #936 from Teetime/netban_fixoy
Fix for netban
2012-02-13fix for saving bans in a fileTeetime
2012-02-05made make_release script get and add the latest translations and clean up ↵oy
the temporary stuff
2012-02-05removed language filesoy
2012-02-05Merge pull request #933 from Malachite/masteroy
Translated untranslated German and Dutch strings
2012-02-05always show default country flag on invalid country indexoy
2012-02-05Removed comment on line 473Yared Hufkens
2012-02-05fixed stuck mouse cursor when loosing fullscreen focus on windowsoy
2012-02-05fixed compiling with vs2008 (#932)oy
2012-02-03Translated untranslated strings in german and dutch lang filesYared Hufkens
2012-01-29fixed an issue about resending player infooy
2012-01-29updated git ignore fileoy
2012-01-29Merge pull request #927 from fisted/fix_tellportoy
tell what port might be in use, if we cannot bind
2012-01-29Merge pull request #925 from SushiTee/minor_fixesoy
Minor fixes with force votes and lock teams
2012-01-28tell what port might be in use, if we cannot bindfisted
2012-01-26init m_LockTeams with 0 to prevent locked teams on server startSushiTee
2012-01-26force vote only if there is a voteSushiTee
2012-01-12Merge pull request #918 from SushiTee/FillSelection_fixoy
fixed FillSelection so it actually fills the current selection
2012-01-12fixed FillSelection so it actually fills the current selectionSushiTee
2012-01-12Merge pull request #917 from east/mypullrequestoy
Econ bufferoverflow fix
2012-01-12Econ bufferoverflow fixeast
2012-01-12updated build script to the new repooy
2012-01-10added map infoSushiTee
2012-01-10added demo markers by Choupom. Closes #837oy
2012-01-10deactivate player ignore setting if show just friends chat is active and ↵oy
player isn't a friend
2012-01-10show notification when game is pausedoy
2012-01-10added missing localisationsoy