SushiTee
d7057ef9e1
fixed server compiling in mac (sql is not working though)
2011-01-26 14:45:44 +02:00
GreYFoXGTi
5b51295185
Added Deep freeze/unfreeze to switch layer so that it can be controlled with switches
...
fixed the freeze command
Added Freeze Tile to switch layer to set freeze tile custom delay
Added sv_freeze_delay to control default freeze time delay
2011-01-25 12:05:53 +02:00
GreYFoXGTi
4e36d2f069
Merge branch 'greyfox' of https://github.com/JulianAssange/DDRaceExtra
2011-01-24 21:25:17 +02:00
GreYFoXGTi
f1a8b6b7ad
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/game/client/gameclient.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h
2011-01-24 14:06:55 +02:00
DemonulPierdut/-/Julian /[Assange/]
2f45abdc40
fixed the sv_team 1 message.. lol it never told u too join a team :D
2011-01-24 22:36:05 +11:00
DemonulPierdut/-/Julian /[Assange/]
8ff2b1a95f
for some reason hooking wasnt masked propley.
2011-01-24 06:23:04 +11:00
DemonulPierdut/-/Julian /[Assange/]
422b6c7c0d
added more team mask's.. The sounds were fucking annoying lol
2011-01-24 05:56:20 +11:00
oy
83fc81092f
fixed position of the hammer damage effect. Closes #448
2011-01-23 17:58:28 +01:00
heinrich5991
43b67aaa57
added server command to clear the votes. this fixes #47 partially
2011-01-23 17:53:53 +01:00
GreYFoXGTi
e0bb8731a7
minor changes
2011-01-21 19:59:52 +02:00
GreYFoXGTi
0a08e1ca06
blocked voting invalid votes, by Floff aka LemonFace
2011-01-21 15:40:39 +02:00
GreYFoXGTi
1f302ea22a
Made doors check for Collision or NoLaser
...
* Renamed a Function
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2011-01-21 15:18:50 +02:00
GreYFoXGTi
1276bebfe1
Fixed Speedup Tiles ( made them skip-able )
2011-01-21 11:53:58 +02:00
GreYFoXGTi
a1fc979867
fixed grammar mistake, thanks fisted
2011-01-20 22:30:22 +02:00
Floff Floffsson
8c32c01653
added unmute + some minor fix
2011-01-20 22:27:54 +02:00
GreYFoXGTi
9891ab8a10
Added timer to reduce join-spam when loading a new map by Floff aka LemonFace
...
removed an extra line
2011-01-20 22:25:09 +02:00
GreYFoXGTi
7d6c546fcb
DDRace entities no longer uses NETOBJTYPE but instead CGameWorld::ENTTYPE
2011-01-20 22:01:21 +02: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
7c67a1334c
fixed a typo
2011-01-20 01:35:21 +01:00
oy
1701241636
added hammerhit simplification by fisted. Closes #443
2011-01-19 22:41:44 +01:00
oy
19a9462fe8
removed double entity list in gameworld and cleaned up connected stuff
2011-01-19 18:27:50 +01:00
oy
1359db5476
prevent that removing an entity aborts traversing the entity list in gameworld
2011-01-19 15:31:42 +01:00
oy
68faba809c
made dbg dummies work again
2011-01-18 19:09:53 +01:00
oy
99e9d4910a
fixed that team mates are regarded when evaluating the spawn position. Closes #426
2011-01-17 15:55:23 +01:00
Floff Floffsson
2edeeadce0
Team messages fixed
2011-01-17 14:59:28 +01:00
Floff Floffsson
3e530ac02d
SetClientAuthed() moved
2011-01-17 14:59:12 +01:00
oy
40f6740742
fixed few spelling mistakes and disabled an unused command
2011-01-17 12:56:49 +01:00
Floff Floffsson
645f31141d
deepfreeze tiles
2011-01-17 00:38:24 +02:00
GreYFoXGTi
9c66a2d54c
Endless Hook Tile for ingameplay by Floff aka LemonFace
2011-01-17 00:13:21 +02:00
GreYFoXGTi
2ec0e0eec4
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/shared/console.cpp
src/game/client/components/hud.cpp
src/game/client/components/scoreboard.cpp
src/game/server/entities/character.cpp
src/game/server/entities/projectile.cpp
2011-01-12 11:08:17 +02:00
Patafix
a9f7f3a3ea
just formatting
2011-01-09 23:29:56 +01:00
oy
df47aedbfe
reset flags and projectiles when leaving the game layer too much. Closes #385
2011-01-08 11:34:19 +01:00
fisted
2a4bb8e631
fixed /emote reset
2011-01-07 23:26:28 +01:00
GreYFoXGTi
395c87a7ad
woops
2011-01-07 20:37:21 +02:00
GreYFoXGTi
6889adc0bb
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
.gitignore
src/game/client/gameclient.cpp
src/game/editor/ed_editor.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h & Cleaned it up
2011-01-06 23:32:19 +02:00
GreYFoXGTi
802dc7a73d
Revert "dunno who added this or why!", i seem to have confused Spectator/In-Game with teams system
...
used team constants
This reverts commit 27c3f06f27
.
2011-01-06 15:49:05 +02:00
oy
1306b62ce2
added command to move all players to a team. Closes #384
2011-01-06 13:37:28 +01:00
GreYFoXGTi
21994e017f
fixed warnings
2011-01-06 14:21:44 +02:00
GreYFoXGTi
af160c8401
Can't pause while you are in a team
2011-01-06 07:58:37 +02:00
GreYFoXGTi
22aa8940a7
Code Style of some files converted from K&R to BSD/Allman
2011-01-06 07:30:19 +02:00
GreYFoXGTi
b909829b61
Fixed team state sending, it was illogical
2011-01-06 07:22:08 +02:00
GreYFoXGTi
babe838cab
Added /ShowOthers
2011-01-06 07:08:12 +02:00
GreYFoXGTi
ddc5dd7ab3
Cleaned up & Re-arranged stuff
2011-01-06 05:46:10 +02: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
a72848e780
added constants for teams by Choupom
2011-01-03 12:50:38 +01:00
GreYFoXGTi
27c3f06f27
dunno who added this or why!
2010-12-24 17:02:02 +02:00
GreYFoXGTi
8f9520b09a
test
2010-12-23 07:57:26 +02:00
GreYFoXGTi
5e841fcfae
Merge branch 'master' of http://github.com/heinrich5991/DDRace
2010-12-19 15:22:31 +02:00
heinrich5991
bf62514088
added some DDRace flags for the server browser (server-sided), client-sided still needed
2010-12-19 14:11:14 +01:00
GreYFoXGTi
63961ecf1a
fixed mute evasion + kick
2010-12-19 07:25:01 +02:00