Commit graph

20719 commits

Author SHA1 Message Date
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 27e6fa3ad7 fixed problems with key handling on osx. Closes #45 2010-09-22 00:40:35 +02:00
oy 55434a2a57 added fix by Sworddragon for stopped loading bar at the beginning 2010-09-22 00:30:08 +02:00
oy fc486cb0ab added fix for compiling problems if cl and gcc are installed by Sworddragon. Closes #114 2010-09-22 00:28:14 +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 2ba462158d Removed custom stuff that are now in vanilla tw by defaults
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-19 21:47:25 +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 35e9c76940 fixed empty names of joining players in the server browser. Closes #176 2010-09-19 16:25:57 +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 4a1ad3a701 Removed Duplicate Print
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 17:42:38 +03:00
GreYFoXGTi 21b3bd89d4 oops invalid client xD
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 17:40:11 +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 6fbb61e985 forgot to change those strings
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 05:05:14 +03:00
GreYFoXGTi ba65baea2c ignored empty /me
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 05:02:09 +03:00
GreYFoXGTi b69593e55c Merge branch 'master' of http://github.com/Speedy-Consoles/DDRace 2010-09-17 04:56:23 +03:00
Speedy Consoles 23c40f82c2 reordered server settings 2010-09-17 03:56:34 +02: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 8360713ddd Merge branch 'master' of http://github.com/Speedy-Consoles/DDRace 2010-09-17 03:59:56 +03:00
GreYFoXGTi f0819384e8 added /me
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-17 03:59:43 +03:00
Speedy Consoles 99e6ebc33a reworked server setting descriptions 2010-09-17 02:40:53 +02: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