Commit graph

374 commits

Author SHA1 Message Date
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 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
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 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 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 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 0121f27311 fixed server crash on too many snap items. Closes #317 2010-12-16 03:29:08 +01:00
GreYFoXGTi cebbecf632 Some Code Improvements and Compiler warnings 2010-12-07 19:44:23 +02:00
GreYFoXGTi 122c7954d9 Announcement Randomness 2010-12-06 04:27: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
GreYFoXGTi f9c3f83903 Removed command broadtime since the time is not in the broadcast anymore 2010-12-05 20:29:38 +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
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 fb5a264e9e Allowing speedup tile skipping 2010-12-02 23:05:10 +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 7f24d0f144 Fixed ID 0 Bug 2010-11-26 20:01:55 +02:00
GreYFoXGTi 4737588827 New Delayed Switches 2010-11-22 23:10:12 +02:00
GreYFoXGTi b8fe169419 Added Mac Fixes by Allisone (Trust) 2010-11-22 11:09:27 +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
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01: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 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
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
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
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
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 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
GreYFoXGTi 970822f0f0 bad time, better luck next time 2010-11-04 20:20:45 +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
GreYFoXGTi 6b4d717a69 4 is fine 2010-11-01 23:53:23 +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 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 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
btd 8a3102233f Plasma for ddrace client 2010-10-26 23:53:55 +04: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 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 8ff56340f5 Added Laser sound 2010-10-18 21:10:21 +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 602c697717 made broadcast update only when needed 2010-10-11 21:27:35 +02:00
GreYFoXGTi ce03f911d8 lol :) 2010-10-11 20:19:13 +02:00
GreYFoXGTi 20bd0567d2 nothing important 2010-10-11 02:42:23 +02:00
GreYFoXGTi e934634f4c Should fix death tiles 2010-10-11 01:46:13 +02:00