edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-21 10:04:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3160 commits 1 branch 424 tags 416 MiB
Commit graph

2055 commits

Author SHA1 Message Date
GreYFoXGTi 0ec755ee74 Reverted In-accurate naming 2011-02-13 12:58:04 +01:00
GreYFoXGTi 68a1a29db8 Reverted 1 Letter Refactoring or Edited it to a full name. 2011-02-13 12:57:10 +01:00
Choupom 7bfbe24a1c added flag return message on death tile collision 2011-02-13 12:24:19 +01:00
GreYFoXGTi cd574d10a7 Added sv_vote_majority, 1 like vanilla, 0 Consider number of yes against Number of Yes + No 2011-02-12 22:31:42 +02:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
Carmine e45ad2a085 only a simple wrong name 2011-02-12 19:30:56 +01:00
oy d12db45c48 added editor function to construct different game tiles from a layer. Closes #460 2011-02-12 19:10:45 +01:00
GreYFoXGTi 21816e5bbf Checked and updated Ghost and Autorecord from Racemod updates, by Redix and Sushi Tee 
Old Ghosts are no longer compatible
 2011-02-11 08:01:10 +02:00
oy c2ad73cfe8 fixed negative download speed. Closes #473 2011-02-10 12:38:20 +01:00
oy 0c119ba99b fixed possible problem with localisations if the linereader flushes its memory between reading the origin and the replacement string 2011-02-10 12:07:00 +01:00
oy 3f05289328 fixed a possible problem with occupied spawn points and cleaned up spawn code a bit 2011-02-10 12:05:55 +01:00
GreYFoXGTi cf881cb74c Fixed Switch layer tiles loading 2011-02-10 09:00:56 +02:00
GreYFoXGTi a7c512bd82 oops forgot those braces 2011-02-10 04:47:11 +02:00
GreYFoXGTi beec56aee0 prevented a useless SendchatTarget 
added some missing code
 2011-02-10 02:50:18 +02:00
GreYFoXGTi 127abaeed9 Added checks for normal stoppers 
All stopper Bugs are now fixed
Removed elses, it's not like the return is gonna let it go to the next if
 2011-02-10 02:24:10 +02:00
GreYFoXGTi 870fd3b246 Readability and performance Improvement 2011-02-10 02:08:13 +02:00
GreYFoXGTi c1ebccd8a2 Fixed infinite Loop 
Don't tell Oy to add this, he will just say we don't support mods
 2011-02-09 01:03:42 +02:00
GreYFoXGTi c735384b52 If you Edit the Source Don't use the game mode DDRace 2011-02-08 18:35:48 +02:00
GreYFoXGTi 55c368b679 Formatting 
Raised version for statistical analysis
 2011-02-08 14:52:23 +02:00
GreYFoXGTi ae06076d10 Mute By Fisted 2011-02-08 14:44:59 +02:00
GreYFoXGTi e5bff28375 Fixed a Stopper bug 
1 still remains
 2011-02-07 04:22:13 +02:00
GreYFoXGTi 6c3698469b Fixed some bugs 
fixed a mistake
Official Noobness
 2011-02-06 20:38:24 +02:00
GreYFoXGTi acea19e9b5 Console::PrintResponse instead of SendChatTarget 
Thanks Julian->Assange for pointing it out
 2011-02-05 06:56:21 +02:00
GreYFoXGTi 89889fa1d1 Fixed double jump sound 
how did i miss this!
 2011-02-05 06:33:11 +02:00
GreYFoXGTi ec7c64ac0b Fixed some warnings 2011-02-05 06:23:56 +02:00
GreYFoXGTi f901fc65fa Removed DeepFreeze Messages 
Removed some curl brackets
 2011-02-05 06:18:32 +02:00
GreYFoXGTi 4ca79188dc DDRace Flags Finalized 2011-02-05 06:13:32 +02:00
GreYFoXGTi 693ad89c00 DeepFreeze = EMOTE_PAIN, freeze stays EMOTE_BLINK (eyes closed) 2011-02-05 04:28:05 +02:00
GreYFoXGTi 2c36457b94 Fixed warnings 2011-02-05 03:33:53 +02:00
GreYFoXGTi 24a688b2c3 Added AutoDemoRecord and ghost made by Race mod team, implemented to DDRace by noother 2011-02-04 22:15:02 +02:00
GreYFoXGTi 3da1860654 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/dutch.txt
 2011-02-04 18:54:54 +02:00
GreYFoXGTi 30f010593c Teams with leaders 
this maybe buggy but i will fix the bugs when they are reported
 2011-02-04 18:49:37 +02:00
GreYFoXGTi ff839af9ba Fixed a collision error 2011-02-04 18:49:36 +02:00
fisted addbf8e3d6 automatic mute on spam 2011-02-03 14:39:00 +01:00
fisted 00f47c18c4 player muting by ip 2011-02-03 13:02:32 +01:00
GreYFoXGTi 984d10970e Localization and Cooler Browser Filter 2011-01-31 00:30:53 +02:00
GreYFoXGTi 9d98ce7e72 Version 1.03a 2011-01-30 23:51:14 +02:00
GreYFoXGTi 0aa3e8f546 Forgot to do this with the other DDRace Flags 2011-01-30 21:11:32 +02:00
GreYFoXGTi 3223a9d4c5 Few Improvements 2011-01-30 20:07:02 +02:00
GreYFoXGTi 82d01c6166 Added Extra checks for m_pDoor and a new function TileExists(int) 2011-01-30 19:03:22 +02:00
GreYFoXGTi f1b002e7fa DDRace flags for the server browser (client-sided). 
Some fixes in the server sided part.
One task left, Adding the flags to SortHash(), added Todo in the code.
 2011-01-30 18:21:41 +02:00
GreYFoXGTi 5961edf6ce Better Performance, Fixed a mistake and added check for next tiles (Left, Right, Bottom and Above). 2011-01-30 01:58:47 +02:00
oy be68a4f516 added fix by CarmineZ about missing tool tips in the editor 2011-01-29 18:48:55 +01:00
GreYFoXGTi 57c8739bb9 Show join a team message without spam 2011-01-29 16:31:50 +02:00
GreYFoXGTi 832bad08e6 Cleanup and Added All Left Masks 2011-01-29 16:18:36 +02:00
GreYFoXGTi e16bd4d000 Mac Compilation 
This may appear un-important, but it's important for mac compilation!
 2011-01-29 02:53:33 +02:00
GreYFoXGTi b2e96bf9eb formatting and refactoring 2011-01-26 23:09:54 +02:00
DemonulPierdut/-/Julian /[Assange/] c98be07e2a fixed my spam team thing :P 2011-01-26 23:03:38 +02:00
GreYFoXGTi b59e130037 DeathMask 2011-01-26 23:03:20 +02:00
GreYFoXGTi 4e32aee417 Commented some dbg_msgs 
may need them in the future
 2011-01-26 22:59:55 +02:00
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
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 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
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
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 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 da84771345 removed some old checks 2011-01-18 18:53:19 +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 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 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
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 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
oy 2992d9a6c6 scale control settings as well 2011-01-05 12:19:06 +01:00
Damian Kaczmarek 073044747b -Working ui_scale parameter. 
(doing it properly would require lots of framework/interface job ...)
 2011-01-05 12:14:36 +01: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 67f86e3547 added option to change nameplates size by RushPL 2011-01-04 13:11:01 +01:00
oy bcba9e5c89 moved HslToRgb stuff 2011-01-04 11:58:25 +01:00
oy 336f00ae89 added colours for tile layers by Choupom 2011-01-04 11:38:14 +01:00
Choupom 533d28e35a made team colors for nameplates (fixes #207) 2011-01-03 12:54:58 +01:00
Choupom b565d4ab18 fixed so Make/Clear Collision buttons are hidden on game layer 2011-01-03 12:54:29 +01:00
oy a72848e780 added constants for teams by Choupom 2011-01-03 12:50:38 +01:00
Yoyo117 d9c71f49f3 minor improvement 2011-01-02 19:58:06 +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 a8efcfcb5a Fixed CrossMap Tiles Copy 2010-12-19 16:10:42 +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
GreYFoXGTi 08a2f47ee8 Added Ability to Restart the race in a team after you have finished <br/> 
<b>Testers: Please check if this can be abused</b>
 2010-12-19 05:48:16 +02:00
GreYFoXGTi ccbd057255 Revert merge branch 14.11 converter merged by noother 2010-12-19 04:02:59 +02:00
GreYFoXGTi fc323326ec fixed mute evasion 2010-12-17 13:05:55 +02:00
GreYFoXGTi 0bbdabae97 Merge branch 'master' of https://github.com/noother/DDRace 2010-12-17 01:20:41 +02:00
GreYFoXGTi a4fa4d2fee Credits update. 2010-12-17 01:20:26 +02:00
floff 4008a1dc95 spectator votes configurable 2010-12-16 10:06:24 +01:00
floff 4a93c28eb8 added configurable time between pauses, to reduce spam 2010-12-16 10:05:20 +01:00
GreYFoXGTi e803f30f52 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/flag.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2010-12-16 06:06:23 +02:00
oy a3797482da removed 360 degree rotation in the editor. Closes #352 2010-12-16 04:27:00 +01:00
oy 8aeb3e7ada enable "Always show nameplats disregarding of distance" on default. Closes #343 2010-12-16 04:22:14 +01:00
oy ec09fbf23b let the chat lines disappear gradually. Closes #342 2010-12-16 04:20:50 +01:00
oy 0121f27311 fixed server crash on too many snap items. Closes #317 2010-12-16 03:29:08 +01:00
oy 54f138f894 made broadcast text a bit smaller and cut it off if it's bigger than the screen. Closes #313 2010-12-16 03:17:16 +01:00
GreYFoXGTi 3956c34b6d Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/russian.txt
 2010-12-16 04:15:05 +02:00
GreYFoXGTi 73dbc159bc Merge branch 'master' of github.com:GreYFoXGTi/DDRace 2010-12-16 04:11:02 +02:00
oy 6063b4c14d added auto completion of nicknames and highlighted nicknames in chat. Closes #218 2010-12-16 02:31:12 +01:00
oy 1d7df01e9a added map download progress by kaddyd 2010-12-16 01:52:29 +01:00
GreYFoXGTi 2f5f332cbb Merge branch 'master' into DDRace 
Conflicts:
	src/engine/client/client.cpp
	src/engine/shared/config_variables.h
 2010-12-13 03:43:22 +02:00
oy c0530b0d09 added language popup on first start. Closes #336 2010-12-12 19:20:30 +01:00
oy c75a75b64f made it possible to automatically take game over screenshots. Closes #339 2010-12-12 16:48:13 +01:00
GreYFoXGTi bed657d805 Merge branch 'master' into DDRace 2010-12-12 04:32:40 +02:00
GreYFoXGTi 88b1fba6b5 Converted Command kill another player of the server from kill to kill_pl to fix call confusion thanks to josh aka flaminflash aka DemonulPerduit with ping 400 2010-12-12 04:26:40 +02:00
GreYFoXGTi ade61b33b1 removed useless dbg_msg 2010-12-12 04:06:01 +02:00
oy b4c007778c fixed that IntersectCharacter picks the character which is closest to the start point and within the radius 2010-12-12 01:55:36 +01:00
GreYFoXGTi 157aafd4dd Merge branch 'master' into DDRace 
Conflicts:
	src/engine/server/server.cpp
	src/game/variables.h
 2010-12-11 23:57:41 +02:00
oy 3d54cf0585 nameplates on by default. Closes #322 2010-12-11 22:41:58 +01:00
Choupom eb569e60bd fixed clipping on old maps (fixes #325) 2010-12-11 21:57:43 +01:00
GreYFoXGTi 46c2225d60 Merge branch 'master' of http://github.com/oy/teeworlds into DDRace 
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/russian.txt
	scripts/make_release.py
	src/engine/shared/config_variables.h
 2010-12-11 21:28:43 +02:00
oy a0985314c9 made it possible to "recycle" auto recorded demos 2010-12-11 18:55:28 +01:00
GreYFoXGTi 4510ced422 Merge branch 'DDRace' of github.com:GreYFoXGTi/teeworlds into DDRace 2010-12-10 21:20:34 +02:00
GreYFoXGTi 2c51511260 Merge branch 'master' of http://github.com/oy/teeworlds into DDRace 
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/game/client/gameclient.cpp
 2010-12-10 20:58:53 +02:00
oy 4756c031c5 save auto recorded demos in a separate folder and added an option to enable/disable it in the settings menu 2010-12-08 01:55:13 +01:00
oy db9dd6b8c9 added an optional time stamp to a demo record by Batchyx 2010-12-08 00:42:32 +01:00
oy 665934ee09 cleaned up several uses of timestamps for filenames 2010-12-08 00:32:50 +01:00
oy bd9850cae2 added single function to stop recording by Batchyx 2010-12-08 00:02:24 +01:00
oy 39b531452a fixed colour of the particles when a tee dies. Closes #331 2010-12-07 23:54:25 +01:00
oy 3ea00f61cf removed needless include 2010-12-07 23:51:04 +01:00
oy 7414271309 check the return values of RemoveFile and CreateFolder 2010-12-07 23:47:41 +01:00
GreYFoXGTi cebbecf632 Some Code Improvements and Compiler warnings 2010-12-07 19:44:23 +02:00
GreYFoXGTi aa30c29b35 Fixed Some Editor Mistakes 2010-12-07 17:51:59 +02:00
GreYFoXGTi 122c7954d9 Announcement Randomness 2010-12-06 04:27:35 +02:00
GreYFoXGTi 45fa3d49b5 Revert "Client won't vote on comments by Sushi Tee" caused crashes 
This reverts commit ed7a1d5bcd.
 2010-12-06 03:32:44 +02:00
GreYFoXGTi 881fd901a6 added Vote comments starting with # and also made announcement comments start with # 2010-12-06 00:38:29 +02:00
GreYFoXGTi ed7a1d5bcd Client won't vote on comments by Sushi Tee 2010-12-06 00:28:35 +02:00
GreYFoXGTi 2d581789e1 Merge branch 'master' of github.com:Speedy-Consoles/DDRace into DDRace 
Conflicts:
	src/game/ddracecommands.h
 2010-12-06 00:28:15 +02:00
Speedy Consoles 645e9f0a5a reworked ddrace commands 2010-12-05 20:17:16 +01:00
GreYFoXGTi f9c3f83903 Removed command broadtime since the time is not in the broadcast anymore 2010-12-05 20:29:38 +02:00
noother e990c94dad fixed sql injection & added a proper escaper that works like 
addslashes() in php
 2010-12-05 08:18:54 +02:00
GreYFoXGTi dd849d3915 Merge branch 'master' of http://github.com/heinrich5991/DDRace into DDRace 2010-12-04 23:54:06 +02:00
GreYFoXGTi bb23e58285 by reading this you have wasted 2 seconds you are not getting back 
if you looked inside this commit then you have wasted 6 seconds that you are never getting back as well :p
 2010-12-04 23:51:03 +02:00
heinrich5991 311d92cf47 removed response message after typing "kill" in chat 2010-12-04 20:52:23 +01:00
GreYFoXGTi 0a0e1df557 i think i fixed the crash 2010-12-04 18:51:14 +02:00
GreYFoXGTi 72c86a112b Cleaned it up a bit 2010-12-04 18:35:41 +02:00
GreYFoXGTi a838ad9da6 server_release on windows has no sql by default because my sql on the server_release version of windows doesn't work, but it does on server_debug 2010-12-04 16:31:54 +02:00
Speedy Consoles b790b5f1bc Merge branch 'master' of http://github.com/GreYFoXGTi/DDRace 2010-12-04 13:54:36 +01:00
GreYFoXGTi 987881c02a Further More Editor Improvements 2010-12-04 14:05:14 +02:00
GreYFoXGTi a0a16e0f48 Few Editor Improvements 2010-12-04 13:54:53 +02:00
GreYFoXGTi 9803a74664 so now windows mysql is fucked up and i don't know why 2010-12-04 03:12:30 +02:00
GreYFoXGTi e61d7d1786 Windows mysql connector has a bug even in the latest version with boost no strings over 15 chars 2010-12-04 02:02:50 +02:00
GreYFoXGTi 83cea23373 Reworked some stuff 2010-12-03 14:58:38 +02:00
GreYFoXGTi fb5a264e9e Allowing speedup tile skipping 2010-12-02 23:05:10 +02:00
GreYFoXGTi 8542181d9a Added include recommended by SushiTee to fix the following mac compiling Errors 
#1 c++ src/game/server/gamecontext.cpp
In file included from src/base/tl/range.h:6,
                 from src/base/tl/algorithm.h:6,
                 from src/base/tl/sorted_array.h:6,
                 from src/game/server/score/file_score.h:6,
                 from src/game/server/gamecontext.cpp:18:
src/base/tl/base.h:8: error: expected `)' before ‘(’ token
bam: 'objs/game/server/gamecontext.o' error 256
 2010-12-02 20:51:21 +02:00
GreYFoXGTi 388ca1288f Fixed Tile Parsing Error and Added dbg Messages to show map tiles 2010-12-02 01:33:02 +02:00
GreYFoXGTi af6f96bc7e Added Tile for the new Map Config 2010-12-02 00:45:36 +02:00
GreYFoXGTi 0a29aae473 added old Laser Behavior Configuration 2010-12-02 00:07:33 +02:00
GreYFoXGTi c149b17617 FinishTime Difference 2010-11-30 05:04:21 +02:00
GreYFoXGTi af44a79b03 New Broadcast/Timer System 2010-11-30 04:24:15 +02:00
GreYFoXGTi b4fd1aaca9 Fixed Announcement System 2010-11-29 05:39:47 +02:00
GreYFoXGTi 94d5351108 Just to be sure this doesn't make an infinite loop 2010-11-29 05:25:27 +02:00
GreYFoXGTi 1d3660c152 Elevated Version to 1.01a 2010-11-29 05:15:37 +02:00
GreYFoXGTi 461abbaa7e Fixed Scoreboard cl_show_ids 2010-11-29 04:46:45 +02:00
GreYFoXGTi 7f24d0f144 Fixed ID 0 Bug 2010-11-26 20:01:55 +02:00
GreYFoXGTi 5db203a1ed Mute Evasion 2010-11-26 18:57:18 +02:00
GreYFoXGTi 4f777211a5 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-25 00:22:02 +02:00
heinrich5991 5204bbe6b7 fixed rcon command "set_team" 2010-11-24 23:17:56 +01:00
heinrich5991 73ca31d168 changed rcon command "cmdlist" nearly completly 2010-11-24 22:09:31 +01:00
GreYFoXGTi ae4aebd365 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-24 02:28:01 +02:00
oy e6698b1118 apply custom colour to blood colour. Closes #314 2010-11-24 01:11:56 +01:00
oy bc5f3fc839 fixed client crash when there are lots of particles. Closes #105 2010-11-24 01:08:51 +01:00
GreYFoXGTi a2896fd660 Commit by Allisone (Trust) 
* Fixed CSqlScore::ShowRankThread so /rank works properly
* Fixed CSqlScore::Init so CREATE TABLE ends with  character set utf8
* Added in CSqlScore more verbose SQLException messages
* Removed all statements that would prevent including and loading the CSqlScore class
* Changed bam.lua so on OSX the mysql lib folder gets linked and the include folders get included
* Changed bam.lua so macosx min version 10.5 and sdk 10.6 are required
* Cleaned CSqlScore and replaced new function calls with equal but backward compatible code
 2010-11-24 01:50:02 +02:00
GreYFoXGTi a1f500766e lalalalalalalalalaaaaaaa 2010-11-23 20:04:36 +02:00
GreYFoXGTi c4b047a6bb i do have an excuse, i am ill.... 2010-11-23 19:59:36 +02:00
GreYFoXGTi ec9c0cd601 Updated CCollision::Entity dbg_msg 2010-11-23 12:26:43 +02:00
GreYFoXGTi 4e8a4340b8 Made Old Switches Convert to new Switches 2010-11-23 11:43:52 +02:00
GreYFoXGTi 32c8a349f5 Made An Older Switch Layer Converter 2010-11-23 11:36:57 +02:00
GreYFoXGTi a3d29d5447 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-23 03:57:48 +02:00
heinrich5991 077b8bd84d fixed sv_vote_percentage 2010-11-22 22:30:50 +01:00
GreYFoXGTi 4737588827 New Delayed Switches 2010-11-22 23:10:12 +02:00
GreYFoXGTi eed83bd7cb Added Announcement 2010-11-22 13:00:43 +02:00
GreYFoXGTi f1781c0eb4 lol 2010-11-22 11:13:04 +02:00
GreYFoXGTi b8fe169419 Added Mac Fixes by Allisone (Trust) 2010-11-22 11:09:27 +02:00
GreYFoXGTi 3ceebe2ef4 Forgot to make the map.cfg level 4 2010-11-22 10:32:00 +02:00
GreYFoXGTi 4f3d086b92 Fixed /pause making u return as a Team 0 Player 2010-11-22 09:21:02 +02:00
GreYFoXGTi a80ac35cb9 Fixed http://ddrace.info/forum/showthread.php?261-DDrace-Trunk-Alpha-Crash-caused-by-teams 2010-11-22 08:59:40 +02:00
GreYFoXGTi 5d9ee1736e made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/german.txt
	data/languages/russian.txt
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/gamemodes/ctf.h
	src/game/server/gamemodes/dm.cpp
	src/game/server/gamemodes/dm.h
	src/game/server/gamemodes/mod.cpp
	src/game/server/gamemodes/tdm.cpp
	src/game/server/gamemodes/tdm.h
 2010-11-22 00:26:00 +02:00
oy 8e3cba8dbf disable free view when chatting as spectator. Closes #303 2010-11-21 18:05:26 +01:00
oy 97a7dea152 added localisation updates by Sworddragon 2010-11-21 14:25:00 +01:00
oy ba05ddd0f5 removed duplicate entry from the localisation files 2010-11-21 14:12:39 +01:00
oy e4f1e18c4e fixed entry names in the demo browser and the editor's file dialog. Closes #301 2010-11-21 12:33:13 +01:00
oy e447de38ba use original string as localisation if there's no replacement 2010-11-21 00:27:38 +01:00