GreYFoX
|
5c2d8297fb
|
Revert "Cleaned up bam.lua, added buildbot support"
This reverts commit 5b455dc4a9 .
Conflicts:
bam.lua
|
2012-04-12 16:46:47 +02:00 |
|
eeeee
|
96c1bd513c
|
made cl_showhud 0 hide records
|
2012-04-12 13:02:43 +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 |
|
Learath2
|
d5dcfa3c4f
|
Fixed obligatory Teams (sv_team 2).
|
2012-04-11 16:16:30 +02:00 |
|
Shereef Marzouk
|
53225b718d
|
Version 1.13a
|
2012-04-11 15:44:18 +03:00 |
|
Learath2
|
44d34b0033
|
Fixed paused players getting afk kicks.
|
2012-04-11 14:41:02 +02:00 |
|
Learath2
|
f053fd64a0
|
Forgot a return at can't pause while spectator or dead
|
2012-04-11 14:40:04 +02:00 |
|
heinrich5991
|
5b455dc4a9
|
Cleaned up bam.lua, added buildbot support
|
2012-03-27 22:49:19 +02:00 |
|
heinrich5991
|
9ed9dbb9d3
|
Merge pull request #154 from swick/DDRace
fixes srv crash if typing '/top5 -999999'
|
2012-03-24 00:43:18 -07:00 |
|
Sebastian Wick
|
57d90a16eb
|
fixes srv crash if typing '/top5 -999999'
|
2012-03-23 22:32:20 +01:00 |
|
Shereef Marzouk
|
b560e3135d
|
Merge pull request #151 from Learath2/DDRacePause
Fixed a bug i experienced in a up to date server
|
2012-03-14 12:44:12 -07:00 |
|
Learath2
|
5e6d5a28f0
|
Follow up fix for pause and spec cant spec or pause in spectators.
|
2012-03-08 18:24:23 +02:00 |
|
Learath2
|
e06fd51ec1
|
Fixed a bug i experienced in a up to date server
|
2012-03-07 19:51:30 +02:00 |
|
Shereef Marzouk
|
65bbd53009
|
removed useless ve line
|
2012-03-02 00:53:19 +02:00 |
|
Shereef Marzouk
|
f6ac63593f
|
Merge pull request #149 from Learath2/DDRaceTimer
Simplified usage of timer commands. Fixed new year happy spawn.
|
2012-03-01 14:48:15 -08:00 |
|
Learath2
|
50b2d85abb
|
Fixed according the comment of GreYFoX.
|
2012-02-14 22:38:06 +02:00 |
|
Learath2
|
d64e1796aa
|
Simplifys the usage of timer commands. Fixes new year happy spawn.
|
2012-02-14 20:25:34 +02:00 |
|
Shereef Marzouk
|
6f85e721e4
|
Merge pull request #148 from heinrich5991/ddrace_feature_mobydogskins0
added skins by MobyDog
|
2012-02-14 08:02:41 -08:00 |
|
oy
|
44a47d4253
|
Merge pull request #936 from Teetime/netban_fix
Fix for netban
|
2012-02-13 15:30:34 -08:00 |
|
Teetime
|
ec8dd34a5a
|
fix for saving bans in a file
|
2012-02-13 23:22:40 +01:00 |
|
heinrich5991
|
bddc8c7161
|
added skins by MobyDog
|
2012-02-10 22:50:07 +01:00 |
|
Shereef Marzouk
|
7bd9a687c4
|
Merge pull request #147 from SushiTee/DDRace
fixed showing player spawn effect only to players who should see
|
2012-02-05 14:08:26 -08:00 |
|
oy
|
4dfa00a2f1
|
made make_release script get and add the latest translations and clean up the temporary stuff
|
2012-02-05 17:20:57 +01:00 |
|
oy
|
357be91c6b
|
removed language files
|
2012-02-05 17:06:07 +01:00 |
|
oy
|
be24a30806
|
Merge pull request #933 from Malachite/master
Translated untranslated German and Dutch strings
|
2012-02-05 07:01:22 -08:00 |
|
oy
|
c045071b40
|
always show default country flag on invalid country index
|
2012-02-05 15:53:22 +01:00 |
|
SushiTee
|
1e602bf31b
|
fixed showing player spawn effect only to players who should see
|
2012-02-05 14:48:09 +01:00 |
|
Yared Hufkens
|
c5bc44d02b
|
Removed comment on line 473
|
2012-02-05 13:32:09 +01:00 |
|
oy
|
27daa26b99
|
fixed stuck mouse cursor when loosing fullscreen focus on windows
|
2012-02-05 13:28:35 +01:00 |
|
oy
|
0c05b3bfa1
|
fixed compiling with vs2008 (#932)
|
2012-02-05 13:22:39 +01:00 |
|
Yared Hufkens
|
78a1ef9988
|
Translated untranslated strings in german and dutch lang files
|
2012-02-03 19:57:59 +01:00 |
|
Shereef Marzouk
|
13fce08af8
|
Merge pull request #145 from XXLTomate/FixMute
This fixes mute.
|
2012-02-02 15:23:30 -08:00 |
|
XXLTomate
|
dce5e8434b
|
This fixes mute. Thanks to @heinrich5991 @Learath2 Mo2, the whole #DDRace and my dog.
|
2012-02-03 00:16:22 +01:00 |
|
oy
|
d17ee055a2
|
fixed an issue about resending player info
|
2012-01-29 12:44:33 +01:00 |
|
oy
|
ddbef31cb5
|
updated git ignore file
|
2012-01-29 12:39:00 +01:00 |
|
oy
|
841e0dcb32
|
Merge pull request #927 from fisted/fix_tellport
tell what port might be in use, if we cannot bind
|
2012-01-29 03:33:48 -08:00 |
|
oy
|
35f3944f4a
|
Merge pull request #925 from SushiTee/minor_fixes
Minor fixes with force votes and lock teams
|
2012-01-29 03:33:16 -08:00 |
|
fisted
|
00f580cb91
|
tell what port might be in use, if we cannot bind
|
2012-01-28 23:54:04 +01:00 |
|
Shereef Marzouk
|
8097e96bfb
|
Merge pull request #143 from XXLTomate/DDRaceConsoleFix2
fixing the console
|
2012-01-28 03:07:48 -08:00 |
|
XXLTomate
|
f9e4547b31
|
fixing the console (2)
|
2012-01-28 11:14:31 +01:00 |
|
SushiTee
|
e359f82c69
|
init m_LockTeams with 0 to prevent locked teams on server start
|
2012-01-26 22:18:21 +01:00 |
|
SushiTee
|
4b2a34e1c5
|
force vote only if there is a vote
|
2012-01-26 22:17:26 +01:00 |
|
oy
|
1a1b4a096a
|
Merge pull request #918 from SushiTee/FillSelection_fix
fixed FillSelection so it actually fills the current selection
|
2012-01-12 13:59:04 -08:00 |
|
SushiTee
|
f737910e0a
|
fixed FillSelection so it actually fills the current selection
|
2012-01-12 22:03:55 +01:00 |
|
oy
|
4cce03c6e6
|
Merge pull request #917 from east/mypullrequest
Econ bufferoverflow fix
|
2012-01-12 11:36:14 -08:00 |
|
east
|
28410c00a7
|
Econ bufferoverflow fix
|
2012-01-12 19:59:27 +01:00 |
|
oy
|
96c66c95e9
|
updated build script to the new repo
|
2012-01-12 01:16:34 +01:00 |
|
SushiTee
|
65f4416164
|
added map info
|
2012-01-10 23:14:24 +01:00 |
|
oy
|
fa81141110
|
added demo markers by Choupom. Closes #837
|
2012-01-10 23:13:19 +01:00 |
|
oy
|
e8f9145a0d
|
deactivate player ignore setting if show just friends chat is active and player isn't a friend
|
2012-01-10 23:03:23 +01:00 |
|