Commit graph

2302 commits

Author SHA1 Message Date
GreYFoXGTi 3356455007 Fixed double hook sounds 2011-01-26 22:57:23 +02:00
heinrich5991 dc8ec160e5 removed the usage of std::string in scoreboard 2011-01-26 20:54:19 +01:00
heinrich5991 0288655395 Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace 2011-01-26 20:11:49 +01:00
SushiTee d7057ef9e1 fixed server compiling in mac (sql is not working though) 2011-01-26 14:45:44 +02:00
SushiTee c0b905f852 -fixed compiler warnings
-fixed mac compiling
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 23a74424ea fixed master servers compilation 2011-01-24 14:17:53 +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 fa2cd82335 clamp maximum ping value in the server browser filters 2011-01-23 18:04:31 +01:00
oy 83fc81092f fixed position of the hammer damage effect. Closes #448 2011-01-23 17:58:28 +01:00
m!nus 3eb1c64428 Fixed ban adding in mastersrv (check for existing ban) 2011-01-23 17:54:32 +01:00
m!nus 05d274444a Add banning to mastersrv: any packet from a banned IP (and optionally a fixed port) will be dropped (also affects clients. Put your bans into master.cfg: "ban 127.0.0.1" or "ban 127.0.0.1:8303". It's reloaded every 5 minutes. This change also adds IStorage, IConsole and IKernel to mastersrv. 2011-01-23 17:54:27 +01:00
oy 3727deee43 increased mouse scroll value from 1 to 3 in the other listboxes too 2011-01-23 17:54:19 +01:00
Carmine 0c43e6f906 increase scroll value in the server list broswer, from 1 to 3 2011-01-23 17:53:58 +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 109cbd4e28 The DDRace scoreboard is now for all Race types 2011-01-21 10:07:32 +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
oy 7ed5a820c6 increased default value for br_max_requests. Closes #446 2011-01-20 21:22:10 +01:00
oy ce42fa68ff fixed possible CRLF line ending problem in the linereader 2011-01-20 21:17:11 +01: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
fisted 372b62566b fixed tower bug 2011-01-20 00:15:18 +01:00
oy 1701241636 added hammerhit simplification by fisted. Closes #443 2011-01-19 22:41:44 +01:00
oy 9a9c10b1a3 added a missing close handle 2011-01-19 22:14:40 +01:00
oy 82749dedf0 fixed beginning of gametime margin graph 2011-01-19 19:29:10 +01:00
oy 19a9462fe8 removed double entity list in gameworld and cleaned up connected stuff 2011-01-19 18:27:50 +01:00
oy 7ca7c95bc0 limit the latency within server browser entries to a maximum of 999 2011-01-19 15:54:50 +01:00
oy 7a20c313ee made some output just show up on debug 2011-01-19 15:39:04 +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 da84771345 removed some old checks 2011-01-18 18:53:19 +01:00
oy 8cdabb890f fixed that the server crashes on too many snap items (Closes #317), optimised snapshot hashing 2011-01-18 18:09:09 +01:00
oy 0b14286c7f skip spectators in dm hud 2011-01-18 17:56:09 +01:00
oy 3b3ca9cd67 rearranged the goals within the scoreboard a bit 2011-01-17 16:31:24 +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 e0c02eb691 functioncall not needed, dunno why its there anyway 2011-01-17 14:59:21 +01:00
Floff Floffsson 3e530ac02d SetClientAuthed() moved 2011-01-17 14:59:12 +01:00
oy 02db5bfe66 decreased the height of the scoreboard a bit. Closes #417 2011-01-17 13:55:14 +01:00
oy 99c6b87c1a hide broadcast when motd is active. Closes #420 2011-01-17 13:46:59 +01:00
oy 813f0797d8 fixed scoreboard active check. Closes #423 2011-01-17 13:42:40 +01:00
oy bf6fcc20f4 added an error popup on startup when the sound couldn't be initialised. Closes #425 2011-01-17 13:28:15 +01:00
oy 40f6740742 fixed few spelling mistakes and disabled an unused command 2011-01-17 12:56:49 +01:00
oy 216967c3bf release gameclient components when opening the editor. Closes #429 2011-01-17 12:28:37 +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 b502e6fd28 Fixed warnings and some white spaces 2011-01-12 11:10:57 +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
oy b94c70d351 close the scoreboard when opening the menu in the demo player. Closes #407 2011-01-12 01:33:16 +01:00
oy 3f4556a861 hide the broadcast when the scoreboard is active. Closes #408 2011-01-12 01:18:07 +01:00
oy 1f55237919 made the end game message in team games a bit smaller so it doesn't overlap the scoreboard. Closes #406 2011-01-12 01:10:40 +01:00
oy d79fd3d4c0 added dm score hud. Closes #356 2011-01-12 01:01:05 +01:00
oy b60d6deb51 made m_paInfoByScore within gameclient's snap state work and cleaned up render scoreboard 2011-01-11 23:03:01 +01:00
oy 4a79e575a0 fixed a compiler warning 2011-01-11 00:57:44 +01:00
heinrich5991 dd474fec3b Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace 2011-01-10 20:25:46 +01:00
oy 8f999837c6 improved the count down timer. Closes #391 2011-01-10 00:58:03 +01:00
oy 9819163c5f fixed some overlapping in the server browser. Closes #376 2011-01-10 00:18:30 +01:00
GreYFoXGTi 959b05d557 Merge branch 'master' of http://github.com/oy/teeworlds 2011-01-10 00:45:58 +02:00
oy 9358b24113 reset demo player on end and when pressing the stop button. Closes #401 2011-01-09 23:42:37 +01:00
Patafix a9f7f3a3ea just formatting 2011-01-09 23:29:56 +01:00
oy 91f642fac2 fixed cut off broadcast. Closes #398 2011-01-09 23:25:07 +01:00
heinrich5991 6064096847 (hopefully) fixed /cmdlist for windows 2011-01-09 15:38:26 +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
GreYFoXGTi 3c5a430135 Merge branch 'ddrace-emotefix' of https://github.com/fisted/teeworlds 2011-01-08 08:17:28 +02:00
GreYFoXGTi 544eb124c1 yet another woops 2011-01-08 01:31:29 +02: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
oy 26f7c67895 fixed console parsing when using the exec command. Closes #381 2011-01-07 19:33:29 +01:00
oy 41b8022aa1 record a new demo when a game ends. Closes #358 2011-01-06 23:21:51 +01:00
oy eedaf62d97 fixed that the client crashes if it has no skins 2011-01-06 22:55:57 +01: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
oy f8b1edca64 show error message for all content that could not be loaded. Closes #257 2011-01-06 22:18:19 +01:00
oy 7487a22956 added better texture moving in the editor by nsinreal. Closes #372 2011-01-06 21:58:42 +01: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
oy 73010e7d2e removed a debug message. Closes #373 2011-01-06 13:21:13 +01:00
oy 418dd8eccc added fix by CarmineZ for missing option in the control settings. Closes #395 2011-01-06 13:17:54 +01: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 82eac5cf3b ScoreBoard now is different for DDRace only 2011-01-06 06:45:53 +02:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02: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
oy 13902fef6c show an error popup when demo deletion fails 2011-01-05 22:22:07 +01:00
oy 18461535fd changed time left localisation in the map download popup to allow better translations 2011-01-05 17:28:53 +01:00
m!nus 7b46d386dd requesting serverinfo now uses gie2 instead of the legacy gief. 2011-01-05 12:22:45 +01:00