Commit graph

1379 commits

Author SHA1 Message Date
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 16bb3621c3 Not only the main game layer is always on top, all game layers are on top of other layers, but in a specified order to each other. Closes #38. again 2010-10-01 21:28:56 +02:00
GreYFoXGTi 56c4655e55 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-01 19:33:39 +02:00
GreYFoXGTi 8a5d1100a5 This reverts commit b4b2404303.
thanks to Speedy-Consoles for pointing out the commit

Closes #54.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-10-01 19:25:54 +02:00
SushiTee 1f5849f6dc fixed last digit in current time 2010-10-01 04:03:08 +02:00
SushiTee 8824d41011 race time wasnt in center 2010-10-01 04:03:07 +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 b6a17d1e47 Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup 2010-09-30 23:38:27 +02:00
GreYFoXGTi c24964ebcd Added tele, speedup, front and switch layer to the client
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:36:08 +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 e900e7f4db Changes Required by Teams for Client
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:31:11 +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
oy 2f388139c1 fixed auto-scrolling in server browser and listbox 2010-09-30 01:13:12 +02:00
oy 68851630ca fixed server browser list. Closes #74 2010-09-30 00:32:45 +02:00
GreYFoXGTi 1a5b3f5a24 Ninja sound was commented... i don't know why
Fixed last commit
2010-09-29 23:54:02 +03: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
oy b08fdf2fb2 fixed initialisation message. Closes #194 2010-09-29 19:55:33 +02:00
GreYFoXGTi 33c8265110 Properly Fixed the Stopper + Hook bug
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-29 17:45:54 +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
oy aaf8e2bc8e cleaned up demo listing and fixed its sorting. Closes #73 2010-09-29 00:53:53 +02:00
GreYFoXGTi 81eec1e6b8 Fix Crash Noob Mistake -.-"
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-28 17:54:50 +03:00
GreYFoXGTi 68d00cf441 thanks Mo(2)
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-28 08:06:06 +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
SushiTee 5faec7c80d changed pickup animation speed for demos according to demospeed (fixes issue 72) 2010-09-26 18:00:29 +02: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 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 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
oy feb7e60bb2 fixed map listing 2010-09-24 13:48:23 +02:00
oy 7e0b37e06c fixed that it checks the current dir for demos too 2010-09-24 13:38:03 +02:00
Choupom 1cbf731fc0 improved demos listing 2010-09-24 13:22:40 +02:00
oy 27425facff fixed last commit 2010-09-24 13:21:03 +02:00
Choupom aa46c22e10 now put skins in an array to save memory 2010-09-24 13:13:46 +02:00
Kaffeine 3684621589 CGameClient: Removed needless call UpdateRenderInfo and fixed team-checks. 2010-09-24 13:02:26 +02:00
btd e6718e2ede Reset Teams in Client 2010-09-24 11:12:26 +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 bf53d85a14 Fixed merge mistake
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-22 16:30:40 +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
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 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 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
oy 5156579d1d fixed sound bug when using in the editor. Closes #136 2010-09-22 00:51:32 +02:00
oy 55434a2a57 added fix by Sworddragon for stopped loading bar at the beginning 2010-09-22 00:30:08 +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 67a5765c9f Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/game/client/components/camera.cpp
	src/game/client/components/camera.h
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_layer_tiles.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-19 21:27:40 +03:00
oy 08f6e7dd07 added button to resize a quad based on the aspect ratio of the image. Closes #169 2010-09-19 17:12:09 +02:00
oy cf2d46d3ba increased deadzone when seeking through the file in the demo player 2010-09-19 16:36:10 +02:00
oy a730704d10 fixed view offset when joining spectator. Closes #101 2010-09-19 16:12:18 +02:00
oy 80b570c795 fixed view offset when changing from spectator to player. Closes #152 2010-09-19 16:00:46 +02: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