Commit graph

138 commits

Author SHA1 Message Date
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +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 ec9c0cd601 Updated CCollision::Entity dbg_msg 2010-11-23 12:26:43 +02:00
GreYFoXGTi 4737588827 New Delayed Switches 2010-11-22 23:10:12 +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 59e117292e Removed a useless dbg_msg 2010-11-15 17:30:54 +02:00
GreYFoXGTi 7aaf3193d9 Simple Mistake with a huge impact 2010-11-15 11:34:21 +02:00
GreYFoXGTi 1f43a9a034 forgot this too 2010-11-14 19:54:36 +02:00
GreYFoXGTi bf4ed7515c Forgot to parse the tiles from the Switch layer ^^ 2010-11-14 16:00:33 +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 071fb6a5a3 new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02: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 f16d1a8507 Fixed DemoPlayback 2010-11-04 22:06:12 +02:00
GreYFoXGTi 3db7db558f this is messed up 2010-11-04 21:33:03 +02:00
GreYFoXGTi 1620e071d9 Removed a Tile and ensured stopper server side 2010-11-01 16:21:05 +02:00
GreYFoXGTi e43bcd80db Rotation
FTW
2010-11-01 03:51:17 +02:00
GreYFoXGTi b68e97b354 pi 2010-10-31 19:38:35 +02:00
Speedy Consoles 118cdd924d another try to make the speeders work 2010-10-31 16:36:04 +01:00
GreYFoXGTi 210ea685b5 Fixed Front layer Checkpoints 2010-10-30 20:49:42 +02:00
GreYFoXGTi d102267139 Moved stuff around 2010-10-27 12:14:26 +02:00
GreYFoXGTi 8d481d60f5 idk how i forgot this.
fixes #111.
2010-10-27 11:42:15 +02:00
GreYFoXGTi e051a30787 checked if m_pDoor was still there
i didn't know where else to delete it so ...
2010-10-27 01:25:22 +02:00
GreYFoXGTi e7d6c67446 fixed bam.lua
fixed some compiler warnings
2010-10-27 01:18:28 +02:00
GreYFoXGTi 1ecf9a8524 changed how direction of speeup is calculated. Fixes #95. 2010-10-22 17:09:30 +02:00
btd e83581dd40 Fix 2010-10-09 02:05:17 +04:00
btd 9de4dad6ac Server dislike this map, but dont crash. Closes #12 2010-10-09 00:08:34 +04:00
GreYFoXGTi a6d972eff7 i forgot to remove this i haven't made the propper checks for it 2010-10-08 18:42:38 +02:00
GreYFoXGTi 9f7fc48ad7 Fixed Speeders. Closes #79. 2010-10-08 16:45:14 +02:00
GreYFoXGTi af36c64785 only process tiles that are used in entities.png 2010-10-08 15:48:50 +02:00
GreYFoXGTi a2ddb2d700 Fixed Tick not handling tiles 2010-10-08 15:33:42 +02:00
GreYFoXGTi 304084434b Created Destructor for Layers and Collision but making them default Destructor didn't work so i made them normal functions and called them as needed, i am not sure this is the right way though. Closes #74, Closes #35.(#35 Needs in depth testing, i tested for 3 minutes copying stuff around)
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-06 23:47:23 +02:00
btd 94cd8159a3 Fix kill tile 2010-10-05 00:11:10 +04: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 65830a463d Fixed unsafe check for the client ID being kicked
fixed Super Team collision with doors

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-29 23:24:28 +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 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 2b56fbe5a6 small fix
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-26 07:16:51 +03:00
GreYFoXGTi ea73f56e0c Who said people need sleep ... obviously i don't
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-26 06:43: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 18700326ef Fixed doors for super team
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-26 05:44:03 +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 a02bceafed Added Max Speed
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 20:43: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 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
GreYFoXGTi 51d6670ad9 general enhancements
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 14:32:19 +03: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 04fe91c871 Fixed GetPos
Removed Variable Declared but never used

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 12:58:38 +03: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 dd63ab26a9 Some optimizations and Removed Collision and No Hook from Front Layer to avoid vanilla client prediction errors
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-29 05:46:09 +02:00
GreYFoXGTi 7f0fa6d6b1 Added Switch Layer and it Finally works like it should
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 18:24:56 +02:00
oy 3d23f959b4 fixed that Collision::IntersectLine gets stuck in a loop forever. Closes #6 2010-08-25 00:05:00 +02:00
btd 6fabca9e10 Add checkpoints. Client undestand that it is a DDRace server fully. Need to rework /top5 /rank. Clean rubbish. I want to sleep( 2010-08-23 23:37:27 +04:00
GreYFoXGTi dc7d3f8275 Removed Tiles that wouldn't work correctly 2010-08-22 01:15:20 +02:00
GreYFoXGTi 2cdd2d4421 Added some tiles
tried to make the others work but i get stuck!

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-22 00:57:42 +02:00
GreYFoXGTi 5c880c88a4 All tiles should work in the Front Layer as in Game layer
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-21 21:48:47 +02:00
GreYFoXGTi 91198ee376 i really need to sleep xD
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-21 21:14:57 +02:00
GreYFoXGTi 6167c1a9a4 Revert "Updated GetTile for FrontLayer"
This reverts commit 19e379afdf.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-21 20:50:28 +02:00
GreYFoXGTi 341746441e why do i always forget to press crtl+s
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-21 20:26:39 +02:00
GreYFoXGTi 4d0716f12c When i stop forgetting to hit save before i commit there will be world peace
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-21 19:34:33 +02:00
GreYFoXGTi 3580547297 Fixed NoWall Draggers
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-21 19:32:42 +02:00
GreYFoXGTi 19e379afdf Updated GetTile for FrontLayer
Added dbg_msg check

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-21 19:25:10 +02:00
btd 444a35fe2c Revert last fix 2010-08-21 14:21:51 +04:00
btd 42f48a3b17 Add Checks. Koule XII loaded 2010-08-21 10:40:03 +04:00
GreYFoXGTi e7721811dd Added Fluxid's HookThrough
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-21 04:20:01 +02:00
GreYFoXGTi 6bb5fcf316 Implementing the FrontLayer
Also trimmed the trailings

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-20 23:48:33 +02:00
oy e966cdb334 fixed that Collision::IntersectLine gets stuck in a loop forever. Closes #6 2010-08-16 04:09:21 +02:00
unknown a91d7cfd1f Merge branch 'master' of http://github.com/btd/DDRace 2010-08-15 18:47:13 +03:00
btd 3fa19ee608 Merge 2010-08-15 19:21:18 +04:00
GreYFoXGTi 185db5fb72 Just a test commit of the FrontLayer
i only commited this cause i am not at home and i wanna work on this externally :D

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-15 17:42:40 +03:00
btd e458f02dfe Fix NoLaser Tile. Crazy shotguns work 2010-08-15 16:28:34 +04:00
GreYFoXGTi 9d30803854 code optimization
added stoppers

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-12 17:31:38 +03:00
GreYFoXGTi 3a36be3f58 forgot to edit these
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-12 16:54:43 +03:00
GreYFoXGTi 09b7a1fe1d Fixed the laser problems
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-12 14:15:58 +03:00
GreYFoXGTi 20930ce68b too many stuff to write but the idea is to implement the telelayer&speed thnx to Redix and Sushi Tee
also FrontLayer is ready to be implemented soon

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-08-10 19:32:32 +03:00
btd 9c052398f4 Last changes added. All fixed. Server builded.
Need many test before release.

Signed-off-by: btd <bardadymchik@gmail.com>
2010-07-30 16:50:09 +04:00
GreYFoXGTi 0a9dc07d0c Fixes Issue #5
Changed /info
Fixed anti-rainbowmod

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-07-29 17:54:04 +03:00
GreYFoXGTi 434b4aad86 The Porting of DDRace-Beta to trunk by [BlackTee] den Maps with one and two layer works properly. Laser works. Fix second game layer Re-added logs Readded the rcon commands addvote and scoring system and time Fixed Weapons
Signed-off-by: btd <bardadymchik@gmail.com>
2010-07-29 08:59:32 +03:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen 371e862316 fixed so the laser bounces correctly at low angles 2009-01-11 10:26:17 +00:00
Magnus Auvinen c94b1f22ab added non-hookable tile 2008-09-23 14:38:13 +00:00
Magnus Auvinen 815c55c4ce added death tile 2008-09-23 14:10:05 +00:00
Magnus Auvinen d711dd190c continued with clean up 2008-08-17 08:52:24 +00:00
Renamed from src/game/g_collision.cpp (Browse further)