Commit graph

1134 commits

Author SHA1 Message Date
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 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 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
Choupom c64d3817cf fixed so we can't add a vote option multiple times by oy 2010-11-20 21:41:18 +01:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
GreYFoXGTi d414579247 Added ### after *** to indicate a /me message, and avoid messages that look like the server sent it 2010-11-19 18:57:53 +02:00
GreYFoXGTi ac341b5390 fixed mac compilation 2010-11-18 01:19:44 +02:00
GreYFoXGTi a109e1150d Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/shared/config_variables.h
	src/game/client/components/console.cpp
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
2010-11-18 01:10:59 +02:00
oy 994a44f6e1 simplified change_map command so that it switches to the next map in the maprotation when called without param 2010-11-17 12:50:01 +01:00
GreYFoXGTi ae591407c9 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-17 13:11:40 +02:00
oy 0d1178107e fixed typo in a kick message 2010-11-17 00:44:04 +01:00
GreYFoXGTi b6a4b2b7ba Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-16 22:11:24 +02:00
oy e46cb02089 Made inactivity check ignore authed players. Closes #273 2010-11-16 18:08:19 +01:00
GreYFoXGTi 4cbcbae508 Fixed sv_vote_percentage 2010-11-16 16:59:17 +02:00
GreYFoXGTi 0c6767dd9d Added option to have DDRace Compiled without SQL 2010-11-16 15:44:16 +02:00
GreYFoXGTi 5ee8796381 Removed sql from mac, people who need sql compile the Mac branch
the boost stuff made my working dir very messy and searching through it takes more time
2010-11-16 15:26:19 +02:00
GreYFoXGTi c6f0bf7500 how did that happen 2010-11-14 17:59:28 +02:00
GreYFoXGTi 6f75b661b0 Total Noobness 2010-11-14 17:51:04 +02:00
GreYFoXGTi bf4ed7515c Forgot to parse the tiles from the Switch layer ^^ 2010-11-14 16:00:33 +02:00
GreYFoXGTi bb0d4a5671 Some Fixes 2010-11-14 13:14:18 +02:00
GreYFoXGTi ca54f1d7c7 for got this one 2010-11-14 12:19:41 +02:00
GreYFoXGTi d49eb12120 CLight Flickering 2010-11-14 12:16:27 +02:00
GreYFoXGTi f60817b5c0 Different Flicker for Crazy Bullets 2010-11-14 12:13:11 +02:00
GreYFoXGTi 4486a7abed Added Alive Check 2010-11-14 12:08:21 +02:00
GreYFoXGTi 3c1c045722 Added Flicker effect to NON-Active Entities 2010-11-14 12:01:42 +02:00
GreYFoXGTi bf0b4183cc Fixed bullet wall stuck when de activated and collides with a tee 2010-11-14 11:36:00 +02:00
GreYFoXGTi 79226352af revert teleport useless change 2010-11-14 11:04:13 +02:00
GreYFoXGTi 5ec06369c5 fixed last pull commit 2010-11-14 03:32:23 +02:00
GreYFoXGTi 670e90c7e3 Merge branch 'master' of http://github.com/btd/DDRace
Conflicts:
	src/game/server/entities/door.cpp
2010-11-14 03:32:00 +02:00
GreYFoXGTi 071fb6a5a3 new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02:00
btd 002cf9792f Fix project tile 2010-11-13 18:41:43 +03:00
btd e3fb77f444 Merge branch 'master' of github.com:btd/DDRace 2010-11-13 18:31:25 +03:00
btd 2c44c94c4e Move console staff 2010-11-13 18:31:13 +03:00
btd 9b5235650d Fix mistake 2010-11-13 01:41:43 +03:00
btd 325aa980e9 Fix door issue. Fix explosion-team issue. Fix null pointer bug. Fix predicion bug. Fix crash when character killed and snap in this moment 2010-11-13 00:54:33 +03:00
btd 7fcd245611 Fixes 2010-11-13 00:50:51 +03:00
GreYFoXGTi 30680ddd79 MAX_NAME_LENGTH 2010-11-12 19:23:53 +02:00
Allisone 961a0c8cf0 Repaired MySQL Insert and increased player name length for db from 16 to 64 2010-11-12 17:44:37 +01:00
heinrich5991 c54b824a45 fixed 'cmdlist' rcon command for joining clients 2010-11-11 23:22:09 +01:00
btd cd59d111a8 Fix explosion issue. Dont pull, not tested. Can pull if test both commits=) 2010-11-11 12:12:03 +03:00
btd 748065dbcf Fix door issue. Not tested, dont pull 2010-11-11 11:44:39 +03:00
heinrich5991 40eade2021 removed me commands callback handler in header 2010-11-10 22:50:28 +01:00
heinrich5991 e078d537c2 moved spam protection and re-added it for /rank and /me; some smaller fixes 2010-11-10 22:42:29 +01:00
GreYFoXGTi 17cb8a6ffb Merge branch 'develop' of http://github.com/heinrich5991/DDRace
Conflicts:
	src/game/server/gamecontext.cpp
2010-11-09 17:30:30 +02:00
GreYFoXGTi 50b16e7821 added high sensitivity for Begin and End tiles 2010-11-09 02:51:49 +02:00
GreYFoXGTi 27864ec70d Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-09 00:24:42 +02:00
GreYFoXGTi 86675f7dd7 Able to amend the mute to something less 2010-11-08 11:29:09 +02:00
heinrich5991 50b8d93d6d finished system to generalize rcon commands, sorry for last commit's description 2010-11-07 17:35:11 +01:00
heinrich5991 470e2773ba added system to generalize rcon commands 2010-11-07 17:08:09 +01:00
heinrich5991 678c94b344 removed the senseless parameters of CGameContext::CheatsAvailable 2010-11-07 13:21:25 +01:00
heinrich5991 b9875cefd8 fixed a bit ugly code 2010-11-07 12:03:26 +01:00
btd 5f6e35b418 Finish sv_team 2010-11-07 01:54:35 +03:00
GreYFoXGTi 12dffd5edc Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-06 22:13:01 +02:00
btd ec2387f0e9 Spectator can see all events 2010-11-06 19:54:59 +03:00
heinrich5991 dcb0b0ee1d fixed "you were worse" message after finishing the first time, prevented that you get this message if your time is equal to your record 2010-11-06 09:38:39 +01:00
btd a156d15bd1 Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace 2010-11-05 14:57:15 +03:00
btd 081c5d8bc2 Fix score board and small perfomance improvments 2010-11-05 14:56:44 +03:00
GreYFoXGTi 96e67724f1 Merge branch 'rm_clientdummies' of https://github.com/heinrich5991/DDRace
Conflicts:
	src/game/server/gamecontext.cpp
moved and edited src/game/ddracecommands.h
2010-11-05 01:59:37 +02:00
GreYFoXGTi 6735dce1af Applied Patch by Mo(2) Hammer-fly out of the freeze 2010-11-05 01:52:37 +02:00
GreYFoXGTi 9feef5638e Merge branch 'master' of http://github.com/btd/DDRace 2010-11-04 21:18:55 +02:00
btd 4e5ffed2b5 Cheaters have no timer now 2010-11-04 22:06:47 +03:00
btd 32d80c22d1 score board 2010-11-04 21:33:51 +03:00
GreYFoXGTi 32429ebe31 /me is a number of word, parameter = r not s 2010-11-04 20:24:13 +02:00
GreYFoXGTi 970822f0f0 bad time, better luck next time 2010-11-04 20:20:45 +02:00
GreYFoXGTi 3756c98715 Total IP Scoring Annihilation ( doesn't make sense ), please test this, also delete the old records 2010-11-04 20:10:51 +02:00
GreYFoXGTi 8ac101d60e revised all usages of sv_hide_score in the code 2010-11-04 19:32:54 +02:00
GreYFoXGTi 5efc7d0d9b Fixed Crash on no TELEOUT matching TELEIN tile 2010-11-04 13:49:38 +02:00
GreYFoXGTi 0c2c4e1af7 fixed last commit } missing 2010-11-04 11:19:07 +02:00
GreYFoXGTi 0c7a1afc94 if(Force == 255 && MaxSpeed) act as a speed setter 2010-11-04 11:05:12 +02:00
heinrich5991 60d7639c9b moved ddrace-specific rcon cmds from 'game/server/gamecontext.cpp' to 'game/server/ddracecommands.h' in order to remove renundancy with client-side server dummies for tab-completion 2010-11-02 17:07:45 +01:00
GreYFoXGTi 1d4e9214e6 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-01 23:54:36 +02:00
GreYFoXGTi 6b4d717a69 4 is fine 2010-11-01 23:53:23 +02:00
heinrich5991 d2e24f0318 added rcon commands 'move' and 'move_raw', re-implemented 'up', 'down', 'left', 'right' 2010-11-01 21:09:44 +01:00
heinrich5991 c9dd108e09 added CGameContext::MoveCharacter, fixed CGameContext::ModifyWeapons 2010-11-01 20:44:36 +01:00
GreYFoXGTi 46d66aa06e Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-01 20:07:57 +02:00
heinrich5991 7167cb827c re-implemented rcon weapon functions with the new function CGameContext::ModifyWeapons 2010-11-01 18:22:40 +01:00
heinrich5991 9a38340c57 added CGameContext::ModifyWeapons in order to generalize rcon<-> weapon system 2010-11-01 18:07:09 +01:00
GreYFoXGTi 96eeec6a39 Entities: Fisico 2010-11-01 17:29:09 +02:00
GreYFoXGTi a89da52480 credits update 2010-11-01 16:52:58 +02:00
noother 44592bb247 Since the mapnames are included in the mysql table names, tables with
special chars couldn't get created. Fixed by replacing all special chars
with underscores.
2010-11-01 16:42:30 +02:00
GreYFoXGTi 1620e071d9 Removed a Tile and ensured stopper server side 2010-11-01 16:21:05 +02:00
GreYFoXGTi b6ef98284d Precaution 2010-11-01 14:12:59 +02:00
GreYFoXGTi 1db2f13365 Supposedly fixed a shotgun + stopper bug ( need to test ) 2010-11-01 14:08:48 +02:00
GreYFoXGTi beb5712a79 i thought i added those like 10 years ago 2010-11-01 13:00:37 +02:00
GreYFoXGTi 6ebac7a214 forgot to delete this dbg_msg 2010-11-01 12:19:01 +02:00
GreYFoXGTi e43bcd80db Rotation
FTW
2010-11-01 03:51:17 +02:00
btd f42adf79ef ... 2010-11-01 00:17:36 +03:00
btd 62ef58329d Return DDRace stuff. No need in mistic compatibility 2010-10-31 23:50:40 +03:00
GreYFoXGTi bc2b8cdad2 Currently Max Speed Can't be less than 5 2010-10-31 19:33:45 +02:00
Speedy Consoles 5f568aadb8 beauty matters 2010-10-31 17:42:37 +01:00
Speedy Consoles 7f26212ce2 forgot speeders without max speed 2010-10-31 17:37:30 +01:00
Speedy Consoles 47baea0e62 replaced zeros with very small floats 2010-10-31 17:25:12 +01:00
Speedy Consoles 118cdd924d another try to make the speeders work 2010-10-31 16:36:04 +01:00
GreYFoXGTi 4a2a900b6e Trigonometry
if not going in the pure speed of the max speed, go with them purified direction into the max speed clamped to max speed, if you don't understand then disregard the previous xD
2010-10-31 00:24:42 +02:00
GreYFoXGTi 85df8a047d Fixed btd's last commit and ensured RaceClient Support(tested) 2010-10-30 21:44:46 +02:00
GreYFoXGTi 210ea685b5 Fixed Front layer Checkpoints 2010-10-30 20:49:42 +02:00
GreYFoXGTi 8640930779 Merge branch 'master' of http://github.com/btd/DDRace 2010-10-30 20:23:28 +02:00
GreYFoXGTi 8d88f5d541 Partially Revert "Refactoring" to keep DDRace compatible with SushiTee's Stuff
This partially reverts commit 505a5b4172.
2010-10-30 20:17:59 +02:00
GreYFoXGTi 02c68dea79 Foxed Speeders Thanks Mo(2) For reporting it 2010-10-30 20:02:04 +02:00
btd 86365bedcd Add Race stuff but fully reworked. Still only need to make score board 2010-10-30 18:22:35 +04:00
GreYFoXGTi 505a5b4172 Refactoring 2010-10-29 23:29:07 +02:00
GreYFoXGTi d102267139 Moved stuff around 2010-10-27 12:14:26 +02:00
btd 8a3102233f Plasma for ddrace client 2010-10-26 23:53:55 +04:00
btd b8dd4a32ca Merge https://github.com/GreYFoXGTi/DDRace into others 2010-10-26 23:35:55 +04:00
GreYFoXGTi 4d204d642f Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/console.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
2010-10-26 00:25:36 +02:00
oy 8ca6a28088 parse line on addvote and skip invalid ones 2010-10-25 18:30:35 +02:00
btd a62decbc91 Show others for ddrace clients.
Need to fix entities now.

Signed-off-by: btd <bardadymchik@gmail.com>
2010-10-24 14:47:25 +04:00
btd 61092f7baa Begin show_others
Signed-off-by: btd <bardadymchik@gmail.com>
2010-10-23 23:26:10 +04:00
btd 2bda9dc0c6 Added connection timeout and fix super team in gun. Thanks Mo(2) for report. 2010-10-23 22:11:42 +04:00
btd d4d519c3ef Fix teams show_others 2010-10-23 16:15:29 +04:00
GreYFoXGTi 339c93652e fixed kick vote bug
thanks egoBlend.{626} => EIMER reported
2010-10-20 18:07:44 +02:00
GreYFoXGTi a277c7672c Declared Alpha Testing Stage 2010-10-19 02:03:59 +02:00
GreYFoXGTi 8575edcf63 Re-Arranged Some Names due to in activity 2010-10-19 01:53:00 +02:00
GreYFoXGTi 8ff56340f5 Added Laser sound 2010-10-18 21:10:21 +02:00
heinrich5991 4d6370d890 fixed last commit, removed debug messages 2010-10-18 20:52:29 +02:00
GreYFoXGTi 17408123f5 Some bug fixes 2010-10-18 20:46:00 +02:00
GreYFoXGTi f9ebb2dd6b lol 2010-10-18 10:48:16 +02:00
GreYFoXGTi 04d3ae8173 forgot to add these to make max speed less powerful than normal force 2010-10-18 10:40:49 +02:00
GreYFoXGTi ee3f642fd5 i think i finally fixed the damn speeders with max speed 2010-10-18 00:40:04 +02:00
GreYFoXGTi 59406c83d3 fixed speeders. Closes #89.
I know I am funny.
2010-10-17 22:08:11 +02:00
GreYFoXGTi 7f437f7245 Merge branch 'master' of http://github.com/heinrich5991/DDRace
Conflicts:
	src/game/server/gamecontext.cpp
2010-10-16 22:02:34 +02:00
GreYFoXGTi ddf2883cb2 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/console.cpp
	src/game/server/gamecontext.cpp
2010-10-16 21:59:59 +02:00
heinrich5991 14c0f77c45 added config command "clear votes" 2010-10-14 12:11:17 +02:00
heinrich5991 0cd8390036 Revert "better spam protection. Closes #82. Feedback Please"
This reverts commit daac101024.
2010-10-14 08:42:29 +02:00
oy fa768449e2 fixed issue with reason on forcevotekick 2010-10-13 20:31:21 +02:00
GreYFoXGTi daac101024 better spam protection. Closes #82. Feedback Please 2010-10-12 16:13:56 +02:00
GreYFoXGTi d1129b7fce *whistling*, the obvious cover up. 2010-10-12 11:48:45 +02:00
GreYFoXGTi e9523454f1 Enhanced CMDList but still this causes too weak connection (out of buffer) need to think of a better way 2010-10-12 10:44:24 +02:00
GreYFoXGTi 5cf469fa11 Re-Added Command CMDList 2010-10-12 10:25:48 +02:00
GreYFoXGTi dc12d59a00 registered server dummy commands for tab completion in the client 2010-10-12 10:02:46 +02:00
GreYFoXGTi 84ff10ca48 Changed rcon system a bit like the old one 2010-10-12 09:31:47 +02:00
GreYFoXGTi 602c697717 made broadcast update only when needed 2010-10-11 21:27:35 +02:00
GreYFoXGTi 8df6703224 Fixed Player Scores not being sent in the player snap 2010-10-11 20:53:56 +02:00
GreYFoXGTi ce03f911d8 lol :) 2010-10-11 20:19:13 +02:00
GreYFoXGTi c1b7012dee the offspring of sleepless commits 2010-10-11 19:43:29 +02:00
GreYFoXGTi 01158b0ce1 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-10-11 19:41:52 +02:00
GreYFoXGTi a129e59d7c Fixed Voting 2010-10-11 13:10:39 +02:00
heinrich5991 43cf69596e "admins can call any vote" fixed 2010-10-11 11:18:44 +02:00
heinrich5991 085601eced all old chat commands re-added, admins can call any vote, fixed compare_players, logout level setted to 0 2010-10-11 10:37:33 +02:00
GreYFoXGTi d8e6cfcbdd Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/french.txt
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/game/server/gamecontext.cpp
2010-10-11 03:56:58 +02:00
GreYFoXGTi 954785f75e Can't Leave Spectator's Team if you have done /pause. CLoses #86. 2010-10-11 02:49:20 +02:00
GreYFoXGTi 20bd0567d2 nothing important 2010-10-11 02:42:23 +02:00
GreYFoXGTi 040ba467bf Changed The lowest level to -1 ( has chat but no rcon )
made rcon for level 0 open by default users can use logout or login/auth or in normal consol rcon_auth to raise their level
2010-10-11 02:39:08 +02:00
GreYFoXGTi e934634f4c Should fix death tiles 2010-10-11 01:46:13 +02:00
oy b65a26fe93 fixed last commits 2010-10-11 01:06:44 +02:00
GreYFoXGTi 332fb1de09 chat commands redirect to rcon and vice versa by heinrich5991 2010-10-11 00:40:07 +02:00
Choupom 61201fea13 added reason to kick a player in the callvote tab 2010-10-11 00:31:21 +02:00
GreYFoXGTi ef139eb73a Cleanup (Putting stuff back vanilla like) 2010-10-10 16:11:11 +02:00
GreYFoXGTi e7ab496262 Deleted old afk timer by noother, because it's replaced by a Vanilla feature
Note: we may need to tweak the vanilla features to suite DDRace needs in the future
2010-10-10 14:36:56 +02:00
GreYFoXGTi 40d2068c70 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/player.cpp
	src/game/variables.h
2010-10-10 14:36:02 +02:00
oy cd95f1869e added inactive player kicking. Closes #51 2010-10-09 19:14:42 +02:00
GreYFoXGTi b4699315f3 mm:ss
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-09 00:07:44 +02:00
GreYFoXGTi 90a0ba17f0 Fix change_map. Closes #73.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-08 22:12:12 +02:00
btd 3e97ff2863 Closes #58 2010-10-09 00:07:36 +04:00
GreYFoXGTi 99f044bf88 added kill delay config with default 3 2010-10-08 18:56:56 +02:00
GreYFoXGTi bd32632da2 added configurable suicide penalty with default 0, Closes #61. 2010-10-08 18:52:26 +02:00
GreYFoXGTi 9f7fc48ad7 Fixed Speeders. Closes #79. 2010-10-08 16:45:14 +02:00
GreYFoXGTi a2ddb2d700 Fixed Tick not handling tiles 2010-10-08 15:33:42 +02:00
GreYFoXGTi a1a2a6aa75 Modified Broadcast Message out of Race
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-07 16:32:11 +02:00
GreYFoXGTi 48b205fac4 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-07 15:34:11 +02:00
GreYFoXGTi 5f0cf76e4f Revert "Reworked laser rotation. Opens #59."
This reverts commit be122406ef.
2010-10-07 15:28:29 +02:00
GreYFoXGTi cf08ccb597 Fixed Doors + Switches creation, Closes #77.
DDRace.cpp and gamecontext.cpp cleanup, old comments that are not needed
2010-10-07 15:22:03 +02:00
GreYFoXGTi 76f1dff55e Merge branch 'master' of http://github.com/btd/DDRace 2010-10-07 14:31:50 +02:00
btd fb93343873 Make work chat all and chat team both 2010-10-07 16:10:49 +04:00
GreYFoXGTi c836c7f1f7 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-07 04:02:49 +02:00
GreYFoXGTi ee6cb26e90 Can;t Super again if you are super
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-07 04:02:24 +02:00
GreYFoXGTi d5b758d9c7 Fixed a MaxSpeed Speeder Bug
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-07 01:12:31 +02:00
GreYFoXGTi 59bd0f1c87 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-06 22:48:24 +02:00
btd c4b6094ebb Make team chat working properly.
If you in team 0 your messages for all if not in team 0 your messages only for team members
2010-10-07 00:35:19 +04:00
btd d91690b619 Fix plasma 2010-10-05 00:39:23 +04:00
btd 94cd8159a3 Fix kill tile 2010-10-05 00:11:10 +04:00
btd 538efe273b Clean Tele Layer initialization and holding. 2010-10-04 23:17:56 +04:00
btd 3f7c5c4413 Fix crashing on Mo(2) map, Thanks him 2010-10-04 22:51:16 +04:00
btd cdc2cfe220 Fix destructor 2010-10-04 22:43:25 +04:00
btd 6969851ca3 Clean up Doors and Teleport initialization. 2010-10-04 22:37:39 +04:00
btd b1cadd2d4d See this carefully 2010-10-04 11:59:16 +04:00
btd b07cc717d4 Fix plasmas 2010-10-04 11:45:10 +04:00
btd ecd5f296ef This is good to make so. Maybe this is not bad. Now when you join to any team your cannot use hack with finish status. 2010-10-02 15:54:43 +04:00
GreYFoXGTi dff5a70b91 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup
Conflicts:
	src/game/editor/ed_editor.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
2010-10-02 03:32:44 +02:00
GreYFoXGTi 5bdb8090af Fixed Projectile Team mask
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-02 03:25:42 +02:00
GreYFoXGTi dd500710b5 Reworked Character snap
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-02 03:06:15 +02:00
GreYFoXGTi badfdcb968 you need to be super to be able to unsuper
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-02 02:07:59 +02:00
GreYFoXGTi d20b7360b8 unsuper me now returns you to the previous team
forgot some dbgmsg
2010-10-02 02:06:42 +02:00
GreYFoXGTi 301a9d6953 Enhanced GetMapIndices preformance
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-02 01:40:01 +02:00
GreYFoXGTi 8fc790a4c3 lol.... fixed evil teleporters 2010-10-02 00:52:22 +02:00
GreYFoXGTi 0763a62601 fixed unsafe /team
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-02 00:45:11 +02:00
GreYFoXGTi be122406ef Reworked laser rotation. Closes #59.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-02 00:00:41 +02:00
GreYFoXGTi 34d6f06e9f Updated the time string
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-01 00:40:32 +02:00
GreYFoXGTi 0f95fb3578 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-01 00:32:48 +02:00
GreYFoXGTi 324424f7da Added Server Best and Personal best to broadcast when not in race
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-01 00:30:54 +02:00
GreYFoXGTi 5bc075afe3 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-09-30 23:51:07 +03:00
GreYFoXGTi 2f08f74318 Fixed Projectiles Snapping
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:49:23 +03:00
GreYFoXGTi 8fe9d49cc3 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-09-30 23:36:53 +03:00
GreYFoXGTi 896634a061 Total Cleanup
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:28:06 +03:00
GreYFoXGTi b3747deb60 fixed ninja thanks to btd 2010-09-30 22:31:26 +03:00
GreYFoXGTi 1a5b3f5a24 Ninja sound was commented... i don't know why
Fixed last commit
2010-09-29 23:54:02 +03:00
GreYFoXGTi e38bb14041 Super Should be visible to all now
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-29 04:58:21 +03:00
GreYFoXGTi 81eec1e6b8 Fix Crash Noob Mistake -.-"
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-28 17:54:50 +03:00
GreYFoXGTi 2a966fda05 Fixed crash on Reloading a map that has no telelayer
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-27 22:50:30 +03:00
GreYFoXGTi 9fde901705 Removed multipliers and changed initial layer size
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-27 14:44:57 +03:00
GreYFoXGTi beb2b2802d no need for those to be public
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-27 07:39:01 +03:00
GreYFoXGTi 31892f7475 of course delete[] makes problems for me with 2D array even when i loop on 1D 1st .... so here's my alternative
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-27 07:34:45 +03:00
GreYFoXGTi 526e36f8a0 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/client/components/menus.h
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/variables.h
2010-09-27 06:32:14 +03:00
GreYFoXGTi 5a6a508204 Teleport Randomness now works
in the past if you have many tele out tiles only 1 was working

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-27 06:15:56 +03:00
GreYFoXGTi ac36e562a5 Made Personal Best/Vanilla Score Updated on game enter 2010-09-27 00:31:33 +03:00
GreYFoXGTi 0f9ec23884 Improved score output
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-26 19:07:39 +03:00
btd e039cf6f35 Fix loading client score. Thanks GreYFoX 2010-09-26 18:36:28 +03:00
GreYFoXGTi 7ecae53f6c Some People just don't know when they have to sleep xD
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-26 17:30:43 +03:00
GreYFoXGTi 53d7df9e35 Added Position Protection For Position relative tiles
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-26 07:34:23 +03:00
GreYFoXGTi 2b56fbe5a6 small fix
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-26 07:16:51 +03:00
GreYFoXGTi 65fa246352 Implemented Max Indices ( If needed in the future )
Removed Old Unused Functions

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-26 05:54:37 +03:00
GreYFoXGTi 13c5970479 It's impossible to miss a tile.
in the past when you missed 2 tiles because you are too fast, the 1st tile only were detected the the rest discarded, now none will be discarded
2010-09-26 05:36:45 +03:00
GreYFoXGTi 347870c1da Working on GetMapIndex 2010-09-26 05:25:05 +03:00
GreYFoXGTi 8bff412118 New Doors System 2010-09-26 04:19:08 +03:00
GreYFoXGTi e9083caa1d some little stuff 2010-09-25 18:55:36 +03:00
btd 2c364dbefb Fix hammer hit. Closes #43 2010-09-24 21:10:18 +04:00
btd af843600e7 Add reset in Server OnInit. If i am right this solve issues with collision 2010-09-24 17:37:13 +04:00
btd 24b4c7ac71 Fix not alive team joining. Closes #45 2010-09-24 10:06:16 +04:00
GreYFoXGTi 7f6db8212e Merge branch 'master' of http://github.com/btd/DDRace
Conflicts:
	src/game/server/entities/dragger.cpp
	src/game/server/entities/dragger.h
2010-09-22 22:41:15 +03:00
GreYFoXGTi fda610aef3 MaxSpeed is now somewhat relative to m_Vel but not accurate
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 22:29:01 +03:00
btd 99f5a1d767 Fix projecttile 2010-09-22 23:01:09 +04:00
GreYFoXGTi a02bceafed Added Max Speed
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 20:43:23 +03:00
btd a00e8a76b1 Draggers seems works 2010-09-22 21:36:13 +04:00
GreYFoXGTi c7f897a144 Fixed Resetting position just because in a stopper and going to the opposite direction 2010-09-22 18:17:23 +03:00
GreYFoXGTi 6fe9daf1b6 Refactored Some Function Names
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 18:07:45 +03:00
GreYFoXGTi b1ff25da4c Fixed Dragger + Stopper FTW
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 17:25:32 +03:00
GreYFoXGTi f915cb1854 Commented some forgotten dbg_msg
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 16:33:26 +03:00
GreYFoXGTi 7f325ed21c Changed Speedup collision checks to benefit from high speed check
added checks for index < 0

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 15:17:00 +03:00
GreYFoXGTi d7f5d85362 Made Necessary Changes to IsTeleport for it to to Benefit from GetMapIndex loops to avoid goig through at high speeds 2010-09-22 15:03:59 +03:00
btd 71dd366a49 No need in it 2010-09-22 14:49:48 +04:00
btd fede6df973 No need in it 2010-09-22 14:49:19 +04:00
btd 5db7748af4 Fix ddraggers 2010-09-22 14:43:59 +04:00
GreYFoXGTi 394013374a made position reset with stoppers only when a tee gets past them in 1 tick
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 13:33:56 +03:00
GreYFoXGTi e56b75090c Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/server/player.cpp
2010-09-22 11:46:18 +03:00
GreYFoXGTi e1b072acb6 revert dragger
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 03:04:14 +03:00
GreYFoXGTi 806046fe76 Merge branch 'master' of http://github.com/btd/DDRace
Conflicts:
	src/game/server/entities/dragger.cpp
	src/game/server/gamecontext.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 03:02:49 +03:00
GreYFoXGTi f0a4ae847b i always forget linux needs this
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 02:16:03 +03:00
oy 12233ecdaf fixed that ctf gametype doesn't work if the map has more than 1 flag per team. Closes #124 2010-09-22 01:07:11 +02:00
oy 68ed9154ae don't add player that aren't ingame to the snapshot and don't let them autospawn. Closes #125 2010-09-22 01:00:33 +02:00
btd 2af441b703 Finish super team, fix bug with killing, DDraggers not finished 2010-09-21 23:09:11 +04:00
GreYFoXGTi b32f9d4184 Revereted the reconnect feature because after testing it, i found out that currently it is not so useful, and i don't have time to make it work for dynamic ips atm
so revert it for now maybe later i will fix it

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-19 22:13:28 +03:00
GreYFoXGTi 2058ad4ea7 Annoying dbg_msgs :D
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-19 22:00:29 +03:00
GreYFoXGTi 8f48989f73 Fixed Dragger + Stopper Bug
Fisico ReDrew some entities

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-19 12:01:54 +03:00
GreYFoXGTi 0c0e48ffb5 Fixed vote
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 22:40:37 +03:00
GreYFoXGTi d9af926f6f FiX
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 22:22:28 +03:00
GreYFoXGTi 5a9c1d0dc1 Optimizations and Fixes
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 20:58:49 +03:00
GreYFoXGTi f657cb05a5 Enhanced Console Prints and dbg_msgs 2010-09-17 17:37:03 +03:00
GreYFoXGTi 1eb4441d14 Removed auth and added logout, helper, moder and admin
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 17:23:07 +03:00
GreYFoXGTi b73ce9b42f Implemented auth id 0
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 16:47:31 +03:00
GreYFoXGTi e5bdd8a279 fixed time bug in pause and reconnect
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 15:21:12 +03:00
GreYFoXGTi 82403b81f0 Added sv_vote_percentage
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 14:44:30 +03:00
GreYFoXGTi a0329fece4 Added /Fly for super Players only to make them choose if they want to fly
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 14:35:53 +03:00
GreYFoXGTi 42d3829304 If you are Super You can Fly!!
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 14:26:06 +03:00
GreYFoXGTi b7d5a3f7d2 Improved Reconnection Reload
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 12:58:54 +03:00
GreYFoXGTi e061d84f20 Added Ability to Reconnect in the same place as your disconnect
Decided by sv_max_dc_restore

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 12:34:13 +03:00
GreYFoXGTi 4f22df654e Fixed /pause crash in spectator with out using /pause 1st.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 09:05:27 +03:00
GreYFoXGTi ba65baea2c ignored empty /me
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 05:02:09 +03:00
GreYFoXGTi 86720a99e7 Merge branch 'master' of http://github.com/Speedy-Consoles/DDRace. Closes #40.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 04:15:37 +03:00
Speedy Consoles 80164be172 fixed a description of chat commands 2010-09-17 03:13:47 +02:00
GreYFoXGTi eca172c8b5 removed unused includes
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 04:09:10 +03:00
GreYFoXGTi f0819384e8 added /me
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 03:59:43 +03:00
Speedy Consoles fcb82f1221 changed server commands description and order 2010-09-17 00:58:54 +02:00
Speedy Consoles 0b972b3015 Merge branch 'master' of http://github.com/GreYFoXGTi/DDRace 2010-09-17 00:45:28 +02:00
Speedy Consoles 0b9d6b8465 reworked command description 2010-09-17 00:40:44 +02:00
GreYFoXGTi f4123cbf06 Removed sv_spamprotection and replaced it with more specific commands
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 01:38:39 +03:00
GreYFoXGTi cf1d6d5785 Added sv_info_change_delay
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 01:26:17 +03:00
GreYFoXGTi 3c605e0e7e Fixed ConSetTeam
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 00:57:50 +03:00
GreYFoXGTi 0b5a4382bc Changed cid1 to Victim, more appropriate
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 00:27:44 +03:00
GreYFoXGTi f69dddaaf5 Refactoring and Allman Code Style
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 00:26:03 +03:00
GreYFoXGTi dc64ebba46 Improved Commands
some refactoring

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 00:22:00 +03:00
GreYFoXGTi c17371d2e4 Added command uninvis_me
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-16 23:44:59 +03:00
GreYFoXGTi 427fedb79b Starting to fix Doors
hitted is not a word :p
forgot to change from bool to int
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-16 23:33:16 +03:00
GreYFoXGTi 545171fe91 Added variable sv_emoticon_delay, Closes #37.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-16 23:20:16 +03:00
GreYFoXGTi 410156446b removed debug messages, fixed walking on air on ground bug :D
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-16 23:01:00 +03:00
GreYFoXGTi d20f9f49e5 Fixed Stoppers. Closes #27.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-16 21:48:32 +03:00
GreYFoXGTi 8e066517ad Merge branch 'master' of http://github.com/btd/DDRace
Conflicts:
	src/game/server/gamecontext.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 05:57:34 +03:00
btd d195d5c7bc Fixes for super player. Still dont work collision 2010-09-15 00:36:48 +04:00
btd a75ab04d21 Add Team for super players. They can collide with all players. Not tested 2010-09-14 22:28:50 +04:00
btd 12202f0e08 Kill character if he was not in team 0 but want to join team 0 2010-09-14 21:05:18 +04:00
btd 3a5dca96bc More safe 2010-09-14 20:58:18 +04:00
btd c4fa5c6128 Ugly command invis_me ^_^ seems very funny 2010-09-14 20:56:28 +04:00
btd 3cd72cfb87 Move Sending info to GameContext. Now Teams is finished. Need to test it all 2010-09-14 20:32:17 +04:00
btd 0221f68d35 Disable /show_others (for DDRace-Client instead use menu). Fix sending all teams information to new joiners 2010-09-14 15:38:46 +04:00
GreYFoXGTi fa379a806a Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/server/server.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
2010-09-13 07:49:01 +03:00
btd 83e384892c Fix silly mistake 2010-09-12 23:09:19 +04:00
btd 0e063cbc07 Fix hammer hit ShowOthers and ShowOthers when it unabled 2010-09-12 22:11:25 +04:00
Choupom 901427809f fixed so "reset tunning due to pure server" appears after "x changed to y" 2010-09-12 16:58:10 +02:00
oy 64c9b5c4ab added quotes around player names in the other server messages too and changed it to ' for consistency 2010-09-12 13:34:30 +02:00
oy 16657faf55 end vote on 50% no 2010-09-12 12:51:07 +02:00
btd c117f48741 Remove rubbish 2010-09-12 00:46:30 +04:00
btd edbef086c1 git add src/*git add src/*! Fix character collision bug with additional protocol message, begin to finish ShowOthers 2010-09-12 00:45:56 +04:00
btd 7ed685ee11 Merge 2010-09-11 13:42:35 +04:00
btd bbe66c5f20 Revert last not working fix 2010-09-11 13:31:36 +04:00
GreYFoXGTi 72e05efc53 Added Evil Teleporter,
Added Speed Setters to speedup layer
Added Unfreeze Plasma
Supposedly Fixed Crazy Shotgun (needs Testing)

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-11 02:01:15 +02:00
GreYFoXGTi c7a38950c5 Reported vote enforcing in chat, Closes #25.
Note: cant use chat from CServer so i won't do the kick/ban report.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-09 22:20:15 +02:00
GreYFoXGTi 4984d1b64b fixed some mistakes, Closes #23.
finished some todos.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-09 20:52:17 +02:00
GreYFoXGTi d67a2893ea Merge branch 'master' of http://github.com/Speedy-Consoles/DDRace 2010-09-09 20:14:54 +02:00
Speedy Consoles 73ef7ef2c6 reworked the chat commands 2010-09-09 15:32:14 +02:00
GreYFoXGTi 363cc10d28 /* ..
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-09 15:25:23 +02:00
GreYFoXGTi 1119432e60 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2 2010-09-09 05:37:45 +02:00
GreYFoXGTi 0b1b949a3c Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamemodes/ctf.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-09 05:37:08 +02:00
GreYFoXGTi ddb4c2e370 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/DDRace.h
	src/engine/shared/config_variables.h

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-08 22:22:08 +02:00
btd fec294caee Fix linux compilation. Revert last changes. Add /show_other option (in menu now working) 2010-09-08 20:22:11 +04:00
Choupom 532ea85aeb separated CFlag from ctf 2010-09-07 20:02:46 +02:00
GreYFoXGTi 02d643b599 updated some stuff
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:51:14 +02:00
GreYFoXGTi d62b2917ca Changed /Emote commands
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:51:04 +02:00
GreYFoXGTi f19bcdfa50 Modified Checkpoint behavior
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:50:53 +02:00
GreYFoXGTi 3df855df00 Moved Switch layer Initialization from CGameContext to GameControllerDDRace
i Quote btd "gamecontext as a global rubbish" xD

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:48:20 +02:00
GreYFoXGTi 1fe93f4592 Reworked the Crazy Shotgun, and fixed a bug ( still needs testing )
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:47:10 +02:00
GreYFoXGTi b808d636d5 Revert "Doors can no longer close on Tees"
i quote Tsin Said "Total Cheat" xD

This reverts commit 0f1d20c5d4.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:36:48 +02:00
GreYFoXGTi 0f1d20c5d4 Doors can no longer close on Tees
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:35:30 +02:00
GreYFoXGTi 08040f5487 Added an Option to Disable Eye Emotes
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:15:24 +02:00
GreYFoXGTi 91d65a5e69 Added /kill
but i couldn't make the clients have a suicide penalty for some trivial reason since i am ill.. -.-"

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 06:45:35 +02:00
GreYFoXGTi 290c453a83 Removed useless config variables
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 06:45:35 +02:00
GreYFoXGTi ea6e41036d Fixed Stoppers being ignored when on another tile
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 06:45:35 +02:00
GreYFoXGTi ebb5636fa3 /pause no longer pauses you time by default
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 06:42:42 +02:00
GreYFoXGTi fe20420666 Better Stoppers System
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 06:41:56 +02:00
oy 3857096a20 Put quotes around player names in leave message. 2010-09-07 01:18:06 +02:00
Fujnky 69adb4800e Put quotes around player names in server messages. 2010-09-07 01:11:20 +02:00
btd 5a916948b0 This is better 2010-09-01 14:22:15 +04:00
btd fb2149115c Fix EvalTick in CDoor 2010-09-01 13:50:42 +04:00
btd 4eadf3029b Finish doors. Door hits all characters, check on activating team and send in snapshot only needed information 2010-09-01 12:52:59 +04:00
btd 2214a3cd0a Now lights affects on all hitted characters as doors 2010-08-31 21:32:25 +04:00
btd 3264c57306 Fix crash with explosion. Gun hit closest character from every team 2010-08-31 21:14:33 +04:00
GreYFoXGTi ab3f4b6a15 made return type bool
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 15:22:54 +02:00
GreYFoXGTi 4dcf0d8d3b found an easier and better way :) with much much less processing
tested and working well
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 15:19:01 +02:00
btd 7c6b80304c Fix server crash when character collide with other projectTiles 2010-08-31 16:29:03 +04:00
btd e396813e32 Add new method which find all characters on line. Fix bug of doors, need to test 2010-08-31 15:01:46 +04:00
GreYFoXGTi 3c0cfb73a4 the bug still exists idk why, stopping ddrace going to work -.-"
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 10:26:47 +02:00
GreYFoXGTi e363e7170c ooopps
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 09:51:07 +02:00
GreYFoXGTi 558b03c9e3 The calculation is accurate i still don't know why this happens
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 09:47:41 +02:00
GreYFoXGTi bd90c006e2 The bug still exists but i thought why keep checking for more tees in laser/door wait for 1 tee 1st
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 08:43:44 +02:00
GreYFoXGTi 15542a6c20 Fixed doors and lasers not affect more than 1 player, but there is something wrong, i need sleep, this sometimes compiles and runs perfectly and some times it compiles but runs buggy, need to correct CLight::HitCharacter and CDoor::HitCharacter
also did some refactoring

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 08:25:21 +02:00
btd f46b7a58a9 Forgot again( 2010-08-30 19:08:16 +04:00
btd 6b9bbc2d0c Forgot to save 2010-08-30 16:49:04 +04:00
btd 98a0a8f776 Fix projecttile and laser 2010-08-30 16:46:13 +04:00
btd 86cd59b907 Separate teams data, now i hope collision only in teams. Need to test, i cannot do this at work :'( 2010-08-30 16:13:43 +04:00
GreYFoXGTi 51586d0e05 Reworked and Added more stoppers
added filled entities which can be used to detect if a map has something that is not shown in editor or map_hack if you replace entities.png or entities_clear.png respectively
updated the Test.map to test the new tiles

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-30 06:45:09 +02:00
GreYFoXGTi c7b05e97a1 Changed the client icon to an icon i designed from the logos Landil made //Thanks Landil again :)
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-30 04:37:46 +02:00
btd e611357dd5 I need to think how make it better 2010-08-29 16:28:21 +04:00