Commit graph

1510 commits

Author SHA1 Message Date
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
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 2ac229f228 Partially Revert "Changed the way Layers are rendered."Closes #38.
This reverts commit bfd7d11a99.
2010-09-16 23:08:55 +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
oy 0905b7755d localised the language names. Closes #153 2010-09-16 13:32:56 +02:00
oy 9727cd25ec do not rotate/flip gamelayer tiles. Closes #155 2010-09-16 13:13:53 +02:00
oy a2083b31e3 fixed last commit 2010-09-16 12:48:32 +02:00
Choupom 582763bc21 made folders in editor (#80) 2010-09-16 12:28:10 +02:00
GreYFoXGTi 37d9bbf7c5 Brush is never cleared on layer change.
there are enough checks if it has tiles that doesn't belong.
Closes #33.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 12:11:32 +03:00
GreYFoXGTi 229106a2bf Made BrushDraw always put the editor variables. Closes #32.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 12:06:02 +03:00
GreYFoXGTi 5d4f50e2d5 Fixed when copying empty tiles in special game layers
editor variables were set to 0 ( like force in speedup )

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 12:00:11 +03:00
GreYFoXGTi bfd7d11a99 Changed the way Layers are rendered. Closes #31.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-15 11:47:45 +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 3ffbd91fca revert the score board
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-13 07:50:00 +03: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
oy c52ee7baa9 unbind a key with right mouse button in the controls menu. Closes #67 2010-09-12 17:15:09 +02: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 5437513a0d use escape key to abort binding a control key in the menu 2010-09-12 13:40:24 +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 a3337a68e7 fixed that player name and ping overlap in the scoreboard. Closes #106 2010-09-12 13:26:38 +02:00
oy 9ab3e7e121 fixed overlapping voting. Closes #100 2010-09-12 13:18:11 +02:00
oy daab7fdcd4 fixed that score overlaps in the scoreboard. Closes #161 2010-09-12 13:06:55 +02:00
oy fa9c8ee77f don't show player specific debug info when the debug graphs are shown to prevent overlapping 2010-09-12 12:55:37 +02:00
oy 16657faf55 end vote on 50% no 2010-09-12 12:51:07 +02:00
oy e226b47212 close the emote selector, chat history and the scoreboard when closing the chat, console or ingame menu. Closes #111 2010-09-12 12:43:03 +02:00
oy d913af1ab2 renamed demorec files to demo 2010-09-12 12:16:51 +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
oy e191b2c59e when hooking a player don't use predicted values for rendering the hook. Closes #9 2010-09-08 02:54:03 +02:00
oy e31b125a0d use the numpad enter key as well. Closes #166 2010-09-08 02:32:41 +02:00
oy d4b145a8ee fixed Gui lock while deleting/reading demos. Closes #167 2010-09-08 02:27:48 +02:00
oy cbf07ffa57 added fix for don't show cursor while playing demo by Choupom. Closes #128 2010-09-08 02:07:36 +02:00
Choupom 71109a98fb fixed chat message with missing name (#110) 2010-09-08 00:20:59 +02:00
GreYFoXGTi d1b3e01892 Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-07 21:49:12 +02:00
Choupom 532ea85aeb separated CFlag from ctf 2010-09-07 20:02:46 +02:00
oy 6299f6518a disable emote selector and chat window in the demo player. Closes #126 2010-09-07 20:01:51 +02:00
oy eecdff0cf5 fixed overlapping in last commit 2010-09-07 19:31:20 +02:00
ghost 56c4081da4 Demo name is now showed while playing a demo file 2010-09-07 19:12:11 +02:00
oy ea25972e21 added rec notification by ghost91-. Closes #82 2010-09-07 19:03:59 +02:00
GreYFoXGTi 0c0c231f13 Merge branch 'master' of http://github.com/GreYFoXGTi/teeworlds into master3
Conflicts:
	src/game/client/components/maplayers.cpp
	src/game/variables.h

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:59:51 +02:00
GreYFoXGTi 616498e7b1 Merge branch 'master' of http://github.com/oy/teeworlds into master
Conflicts:
	src/engine/client/input.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/network_server.cpp
	src/engine/storage.h
	src/game/client/components/chat.cpp
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/collision.cpp
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:57:38 +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 9499e04fd7 Removed gfx clear from settings file. Closes #15.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 06:45:36 +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
ghost 5e1b3c74ef Git does this one automatically, I guess it fixes lineendings. 2010-09-07 02:11:52 +02:00
oy 5ff7836638 fixed problems with the tilelayer dumping. Closes #86. Closes #149 2010-09-07 02:06:11 +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
oy 0cfd1de760 fixed line endings 2010-09-05 19:06:27 +02:00
oy 995d63d7f4 added the possibility to rotate tiles in the editor by SushiTee 2010-09-05 19:01:01 +02:00
oy 5588e1ec8c fixed selected index when deleting a demo and added a popup to confirm the deletion 2010-09-05 17:53:31 +02:00
Choupom fcfaa8389f added Remove button in demos browser (#66) 2010-09-05 17:40:51 +02:00
oy 62fe7cd5b2 link selected item in the demo list to the first entry (if available) on startup and browse 2010-09-05 14:28:08 +02:00
Choupom 8f3e98208e fixed demo browser (#61) 2010-09-05 14:13:42 +02:00
Choupom 25be8b1be3 fixed so clicking 3 times doesn't generate 2 double-clicks 2010-09-05 13:50:10 +02:00
GreYFoXGTi f9f780ff28 Fixed lags and crashes on kp0 in-game. Closes #149
Closes #86

Added dbg_layers which is 0 by default to prevent Debug files output when when ingame and pressing kp0

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-05 05:29:27 +02:00
Fujnky 4123f28bba Improved demo player another bit.
* Replaced the reset button by more common stop button
* Made the demo player automatically reset after demo ended
2010-09-04 16:23: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
GreYFoXGTi bba6e8c827 When grabbing a tile it copies it's data to the editor
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 20:07:00 +02: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
GreYFoXGTi 8901057944 Modified the config variables to have level
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 01:47:55 +02:00
btd 4544b91d2f Teams collision a works fine... But i broke collision with tiles 2010-08-30 23:25:04 +04: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 d4363d7ae3 Removed Moving objects check points from front layer to avoid confusion
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-30 06:57:29 +02: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
btd b0d8bfca03 Merge 2010-08-29 14:44:15 +04:00
btd 06773a004c Comments 2010-08-29 11:59:16 +04:00
GreYFoXGTi 517a22800d fixed door count which caused crashes
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-29 09:08:31 +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 22fc13c692 Fixed crazy shotgun bullets explosion collision when sv_hit = 0
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-29 04:24:43 +02:00
GreYFoXGTi b895547979 Fixed sv_hit 0 affecting game weapons on character
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-29 04:00:21 +02:00
GreYFoXGTi 3497dd18d7 Made Plasma Exp+Freeze do explosions even when directly hitting a tee
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-29 03:35:14 +02:00
GreYFoXGTi 277ce3b77e Made stop tiles stop you earlier and fixed bug with stoppers + draggers
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-29 02:05:45 +02:00
btd faf743b02a Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace into teams 2010-08-29 01:05:02 +04:00
btd 366e175983 Logic and scores seems done. Next will be collision 2010-08-29 00:53:42 +04:00
GreYFoXGTi 8426442936 Separated Freezing Plasma gun from Explosive Plasma gun and added one with both
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 22:32:16 +02:00
GreYFoXGTi c6803b405f Removed Old Door System
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 21:38:13 +02:00
GreYFoXGTi eab7ad207b Added Check for map options tile
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 21:34:21 +02:00
GreYFoXGTi 11f480a79b Changed the Loading String to Loading DDRace Client
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 19:59:24 +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
btd fa6a79b309 Continue teams 2010-08-28 17:47:52 +04:00
btd f769741f8f Merge 2010-08-28 16:14:36 +04:00
GreYFoXGTi 206f7376d4 Fixed small mistake that was already fixed in the lost commit
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-27 19:39:44 +02:00
btd 397d8634c7 Fix 2010-08-27 18:37:14 +04:00
btd b67de28a0c Revert conversion float=> char*=>int 2010-08-27 18:28:01 +04:00
GreYFoXGTi b0bf68c3d3 added chat command /time to show or hide time until next spawn
added chat command /broadcast to show or hide broadcast until next spawn
added rcon shot,shotgun_me,grenade,grenade_me,laser,laser_me
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-27 09:09:47 +02:00
GreYFoXGTi fd7c0c39ac Reworked the Front Layer after reworking the front layer a similar bug was found, but this time fixed on double save, so i added a work around that double saves ( I'm not proud of this T.T )
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-27 08:14:47 +02:00
GreYFoXGTi b3736dded4 Bye Bye Client-Side Front Layer T.T ( getting ready for a full rework of the front layer )
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-27 06:23:34 +02:00
GreYFoXGTi 1c491666fa Weapons are all automatic for Super
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-27 05:45:51 +02:00
GreYFoXGTi 029ea6ee9e made a checkpoint accessible only once during a race
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-26 20:28:41 +02:00
GreYFoXGTi c5a8160e4d Updated Git Ignore and reset FreezeTick
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-26 20:14:14 +02:00