edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-15 04:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
3200 commits 1 branch 429 tags 412 MiB
Commit graph

2080 commits

Author SHA1 Message Date
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 8d88f5d541 Partially Revert "Refactoring" to keep DDRace compatible with SushiTee's Stuff 
This partially reverts commit 505a5b4172.
 2010-10-30 20:17:59 +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 d6b898c84a Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-30 00:48:17 +02:00
GreYFoXGTi fb88a8e4e7 Added In-Game Server Browser. Closes #65. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-30 00:44:52 +02:00
oy 476f951ffc added font that provides more characters. closes #56 2010-10-29 23:44:08 +02:00
GreYFoXGTi 505a5b4172 Refactoring 2010-10-29 23:29:07 +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
btd 8a3102233f Plasma for ddrace client 2010-10-26 23:53:55 +04:00
btd b8dd4a32ca Merge https://github.com/GreYFoXGTi/DDRace into others 2010-10-26 23:35:55 +04:00
GreYFoXGTi 4d204d642f Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/console.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
 2010-10-26 00:25:36 +02:00
oy 1209ad9baf fixed a problem with the skin selector 2010-10-25 21:23:05 +02:00
GreYFoXGTi 2f3152691c Revert "ingame browser added (config: cl_serverbrowser, hotkey: ctrl+shift+b" because it's buggy and i never intended to pull it, but btd did 
This reverts commit 5b5eb0b2c0.
 2010-10-25 20:09:08 +02:00
Choupom d2519f7ab9 small ui fixes 2010-10-25 18:59:33 +02:00
oy 8ca6a28088 parse line on addvote and skip invalid ones 2010-10-25 18:30:35 +02: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
GreYFoXGTi 6505e21a0d Merge branch 'master' of http://github.com/btd/DDRace 2010-10-24 02:13:05 +02:00
btd 61092f7baa Begin show_others 
Signed-off-by: btd <bardadymchik@gmail.com>
 2010-10-23 23:26:10 +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 5b81175fb9 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-10-22 19:52:50 +02:00
heinrich5991 5b5eb0b2c0 ingame browser added (config: cl_serverbrowser, hotkey: ctrl+shift+b 2010-10-22 17:29:46 +02:00
GreYFoXGTi 1ecf9a8524 changed how direction of speeup is calculated. Fixes #95. 2010-10-22 17:09:30 +02:00
GreYFoXGTi 68c9323021 fixed shifting for front layer and switch layer 2010-10-22 17:02:11 +02:00
SushiTee 743338ce95 fixed shifting for tele layer and speedup layer 2010-10-22 16:51:34 +02:00
GreYFoXGTi 4197a6ce8b Re-enabled pure tuning check, reset tunings to vanilla values, made server apply DDRace tunings on startup and map change. Closes #97. 
Revert "Now can Join Vanilla servers. Closes #96."

This reverts commit c6fda43369.

Conflicts:

	src/game/client/components/menus_settings.cpp
 2010-10-22 15:22:17 +02:00
GreYFoXGTi 339c93652e fixed kick vote bug 
thanks egoBlend.{626} => EIMER reported
 2010-10-20 18:07:44 +02:00
GreYFoXGTi 43eb6025a1 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-10-20 15:12:37 +02:00
heinrich5991 5df496317b fixed line endings to LF 2010-10-20 08:13:48 +02:00
GreYFoXGTi abafbdd919 Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-20 01:19:06 +02:00
SushiTee 314cda05c7 changed demo animations according to demo speed and added some demo speeds. (fixes #206) 2010-10-19 18:52:16 +02:00
GreYFoXGTi 5ac519f742 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-10-19 18:31:24 +02:00
GreYFoXGTi c6fda43369 Now can Join Vanilla servers. Closes #96. 2010-10-19 18:30:45 +02:00
heinrich5991 684e1788ed added strict gametype filtering 2010-10-19 17:18:32 +02:00
GreYFoXGTi a277c7672c Declared Alpha Testing Stage 2010-10-19 02:03:59 +02:00
GreYFoXGTi 8575edcf63 Re-Arranged Some Names due to in activity 2010-10-19 01:53:00 +02:00
GreYFoXGTi 8ff56340f5 Added Laser sound 2010-10-18 21:10:21 +02:00
heinrich5991 4d6370d890 fixed last commit, removed debug messages 2010-10-18 20:52:29 +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 bfc20da61d Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-18 01:15:24 +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
SushiTee 1127c7b830 fixed compiling error 2010-10-17 17:10:55 +02:00
btd 1f0e49c080 Add my old zoom staff 2010-10-17 12:43:27 +04:00
GreYFoXGTi 7f437f7245 Merge branch 'master' of http://github.com/heinrich5991/DDRace 
Conflicts:
	src/game/server/gamecontext.cpp
 2010-10-16 22:02:34 +02:00
GreYFoXGTi ddf2883cb2 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/console.cpp
	src/game/server/gamecontext.cpp
 2010-10-16 21:59:59 +02:00
oy 0edad8e640 made it possible to specify which layers/groups should be saved within the map 2010-10-16 18:50:05 +02:00
oy 85fd272846 added the possibility to create a new folder within the editor's save file dialog 2010-10-16 18:33:54 +02:00
oy 662f43919c fixed overlapping restart warning 2010-10-16 11:27:49 +02:00
oy 639c32d661 do not show the restart warning in the settings if you change back to actual settings. Closes #90 2010-10-16 11:24:42 +02:00
oy 9c256f69d8 fixed issues with adding and replacing images in the editor. Closes #216 2010-10-16 11:05:42 +02:00
oy 5f7efb465e optimised console rendering a bit 2010-10-16 10:32:56 +02:00
oy 764ee3fd17 optimised chat rendering a bit 2010-10-15 19:26:20 +02:00
heinrich5991 14c0f77c45 added config command "clear votes" 2010-10-14 12:11:17 +02:00
heinrich5991 0cd8390036 Revert "better spam protection. Closes #82. Feedback Please" 
This reverts commit daac101024.
 2010-10-14 08:42:29 +02:00
heinrich5991 9cf90fff77 added config for showing client ids in scoreboard 2010-10-13 22:47:28 +02:00
oy fa768449e2 fixed issue with reason on forcevotekick 2010-10-13 20:31:21 +02:00
oy be315edfc0 fixed clamping mousepos in the editor 2010-10-13 20:21:13 +02:00
GreYFoXGTi 47714c9468 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/variables.h
 2010-10-13 14:08:35 +02:00
oy 5801326ebc fixed line endings 2010-10-13 12:59:30 +02:00
oy e4fe7457c8 fixed problems with the mouse movement. Closes #214 2010-10-13 12:47:42 +02:00
oy c828f7d725 removed unused commands. Closes #60 2010-10-13 01:24:37 +02:00
oy e4b3c468f2 don't show voting hud when playing a demo and added missing localisations. Closes #88 2010-10-13 01:19:22 +02:00
GreYFoXGTi daac101024 better spam protection. Closes #82. Feedback Please 2010-10-12 16:13:56 +02:00
GreYFoXGTi 921dd65d3d Added id numbers to the scoreboard. Closes #71. 
added shortcuts to the gitignore
 2010-10-12 15:12:44 +02:00
GreYFoXGTi d1129b7fce *whistling*, the obvious cover up. 2010-10-12 11:48:45 +02:00
GreYFoXGTi e9523454f1 Enhanced CMDList but still this causes too weak connection (out of buffer) need to think of a better way 2010-10-12 10:44:24 +02:00
GreYFoXGTi 5cf469fa11 Re-Added Command CMDList 2010-10-12 10:25:48 +02:00
GreYFoXGTi dc12d59a00 registered server dummy commands for tab completion in the client 2010-10-12 10:02:46 +02:00
GreYFoXGTi 84ff10ca48 Changed rcon system a bit like the old one 2010-10-12 09:31:47 +02:00
GreYFoXGTi 602c697717 made broadcast update only when needed 2010-10-11 21:27:35 +02:00
GreYFoXGTi 8df6703224 Fixed Player Scores not being sent in the player snap 2010-10-11 20:53:56 +02:00
GreYFoXGTi ce03f911d8 lol :) 2010-10-11 20:19:13 +02:00
GreYFoXGTi e46dd6b5e6 Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-11 19:45:14 +02:00
GreYFoXGTi c1b7012dee the offspring of sleepless commits 2010-10-11 19:43:29 +02:00
GreYFoXGTi 01158b0ce1 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-10-11 19:41:52 +02:00
GreYFoXGTi a129e59d7c Fixed Voting 2010-10-11 13:10:39 +02:00
oy cd578a0dc2 moved explosions to front layer. Closes #21 2010-10-11 12:32:34 +02:00
oy eb4a56edeb tweaked auto scrolling in the chat window a bit 2010-10-11 12:31:45 +02:00
heinrich5991 43cf69596e "admins can call any vote" fixed 2010-10-11 11:18:44 +02:00
heinrich5991 085601eced all old chat commands re-added, admins can call any vote, fixed compare_players, logout level setted to 0 2010-10-11 10:37:33 +02:00
GreYFoXGTi d8e6cfcbdd Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/french.txt
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/game/server/gamecontext.cpp
 2010-10-11 03:56:58 +02:00
GreYFoXGTi 954785f75e Can't Leave Spectator's Team if you have done /pause. CLoses #86. 2010-10-11 02:49:20 +02:00
GreYFoXGTi 20bd0567d2 nothing important 2010-10-11 02:42:23 +02:00
GreYFoXGTi 040ba467bf Changed The lowest level to -1 ( has chat but no rcon ) 
made rcon for level 0 open by default users can use logout or login/auth or in normal consol rcon_auth to raise their level
 2010-10-11 02:39:08 +02:00
oy 411db8b885 fixed that chat message gets out of the window. Closes #102 2010-10-11 02:29:30 +02:00
GreYFoXGTi e934634f4c Should fix death tiles 2010-10-11 01:46:13 +02:00
oy de7504282c made edit boxes scrollable. Closes #96 2010-10-11 01:36:46 +02:00
oy b65a26fe93 fixed last commits 2010-10-11 01:06:44 +02:00
GreYFoXGTi 332fb1de09 chat commands redirect to rcon and vice versa by heinrich5991 2010-10-11 00:40:07 +02:00
Choupom 61201fea13 added reason to kick a player in the callvote tab 2010-10-11 00:31:21 +02:00
oy 5754812dea clear history of the remote console on disconnect and cleaned up some old stuff in console.cpp 2010-10-11 00:30:56 +02:00
Choupom 00c1421034 fixed so the rcon password is not in the history (fixes #170) 2010-10-11 00:18:04 +02:00
Choupom bed7b64457 fixed map selection in map editor 2010-10-11 00:17:46 +02:00
oy 107545da0a localised "REC"-notification 2010-10-11 00:16:37 +02:00
GreYFoXGTi ef139eb73a Cleanup (Putting stuff back vanilla like) 2010-10-10 16:11:11 +02:00
GreYFoXGTi e7ab496262 Deleted old afk timer by noother, because it's replaced by a Vanilla feature 
Note: we may need to tweak the vanilla features to suite DDRace needs in the future
 2010-10-10 14:36:56 +02:00
GreYFoXGTi 40d2068c70 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2010-10-10 14:36:02 +02:00
oy cd95f1869e added inactive player kicking. Closes #51 2010-10-09 19:14:42 +02:00
oy b3c81e7258 added the possibility to shift the tiles of a layer into any direction 2010-10-09 18:38:23 +02:00
oy ab2df14641 made INT_STEP properties in the editor just change by 1 2010-10-09 13:33:33 +02:00
oy 85b9c60158 added info in the demo browser by Choupom 2010-10-09 13:27:21 +02:00
GreYFoXGTi c884380186 Merge branch 'master' of http://github.com/btd/DDRace 2010-10-09 00:08:17 +02:00
GreYFoXGTi b4699315f3 mm:ss 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-09 00:07:44 +02:00
btd e83581dd40 Fix 2010-10-09 02:05:17 +04:00
GreYFoXGTi 90a0ba17f0 Fix change_map. Closes #73. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-08 22:12:12 +02:00
btd 9de4dad6ac Server dislike this map, but dont crash. Closes #12 2010-10-09 00:08:34 +04:00
btd 3e97ff2863 Closes #58 2010-10-09 00:07:36 +04:00
oy 7ad4d3224c use file dialog when saving a map which was not loaded from the maps save path 2010-10-08 22:06:12 +02:00
GreYFoXGTi 99f044bf88 added kill delay config with default 3 2010-10-08 18:56:56 +02:00
GreYFoXGTi bd32632da2 added configurable suicide penalty with default 0, Closes #61. 2010-10-08 18:52:26 +02: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 6ca75f086e Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-08 13:37:38 +02:00
oy a075889312 fixed a listing problem in the demo browser 2010-10-08 00:13:05 +02:00
oy 04234c109e show filename of the map in the editor. Closes #122 2010-10-08 00:04:46 +02:00
oy 6a26cd6621 fixed various problems with the file dialog in the editor 2010-10-07 23:51:07 +02:00
GreYFoXGTi a1a2a6aa75 Modified Broadcast Message out of Race 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-07 16:32:11 +02:00
GreYFoXGTi 48b205fac4 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-07 15:34:11 +02:00
GreYFoXGTi faaa8c241e Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup 2010-10-07 15:33:48 +02:00
GreYFoXGTi 5f0cf76e4f Revert "Reworked laser rotation. Opens #59." 
This reverts commit be122406ef.
 2010-10-07 15:28:29 +02:00
GreYFoXGTi cf08ccb597 Fixed Doors + Switches creation, Closes #77. 
DDRace.cpp and gamecontext.cpp cleanup, old comments that are not needed
 2010-10-07 15:22:03 +02:00
GreYFoXGTi 76f1dff55e Merge branch 'master' of http://github.com/btd/DDRace 2010-10-07 14:31:50 +02:00
btd fb93343873 Make work chat all and chat team both 2010-10-07 16:10:49 +04:00
GreYFoXGTi c836c7f1f7 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-07 04:02:49 +02:00
GreYFoXGTi ee6cb26e90 Can;t Super again if you are super 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-07 04:02:24 +02:00
GreYFoXGTi d5b758d9c7 Fixed a MaxSpeed Speeder Bug 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-07 01:12:31 +02:00
GreYFoXGTi cfe7ef6f38 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-06 23:48:39 +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
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
GreYFoXGTi 59bd0f1c87 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-06 22:48:24 +02:00
btd c4b6094ebb Make team chat working properly. 
If you in team 0 your messages for all if not in team 0 your messages only for team members
 2010-10-07 00:35:19 +04:00
btd d91690b619 Fix plasma 2010-10-05 00:39:23 +04:00
btd 94cd8159a3 Fix kill tile 2010-10-05 00:11:10 +04:00
btd 538efe273b Clean Tele Layer initialization and holding. 2010-10-04 23:17:56 +04:00
btd 3f7c5c4413 Fix crashing on Mo(2) map, Thanks him 2010-10-04 22:51:16 +04:00
btd cdc2cfe220 Fix destructor 2010-10-04 22:43:25 +04:00
btd 6969851ca3 Clean up Doors and Teleport initialization. 2010-10-04 22:37:39 +04:00
btd b1cadd2d4d See this carefully 2010-10-04 11:59:16 +04:00
btd b07cc717d4 Fix plasmas 2010-10-04 11:45:10 +04:00
btd c87a68b2ba Log messages to try undestand client prediction bug 2010-10-02 16:04:39 +04:00
btd ecd5f296ef This is good to make so. Maybe this is not bad. Now when you join to any team your cannot use hack with finish status. 2010-10-02 15:54:43 +04:00
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
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
GreYFoXGTi 181d55f125 Merge branch 'master' of http://github.com/btd/DDRace 2010-08-26 19:57:49 +02:00
GreYFoXGTi 883e0f2222 Trying to fix the crazy shotgun bullets -.-" 2010-08-26 19:55:22 +02:00
btd 510a47a158 Fix Server Best and no needed float -> char* -> int cast 2010-08-26 21:55:04 +04:00
btd 31d6ed6292 Sql Store 2010-08-26 17:27:36 +04:00
btd 909c583d96 End merge 2010-08-26 00:30:21 +04:00
GreYFoXGTi 51b16803d7 Merge branch 'master' of http://github.com/btd/DDRace 2010-08-25 19:16:08 +02:00
GreYFoXGTi 7f8fb7a5a7 Merging the client manually into the server 
but i can't get the client to accept the console class of the server -.-" yet..

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-25 17:31:49 +02:00
btd 091a1125a3 Uncomment things in file_score. Add config variables 2010-08-25 18:33:21 +04:00
oy 41afca6db2 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-25 01:17:02 +02:00
oy 521a028f7c added fixes for compiler errors and warnings by sworddragon 2010-08-25 00:08:28 +02:00
oy 3d23f959b4 fixed that Collision::IntersectLine gets stuck in a loop forever. Closes #6 2010-08-25 00:05:00 +02:00
oy 1cfa122521 fixed that scoreboard overlaps the chat. Closes #14 2010-08-24 23:48:27 +02:00
oy 57f54108b5 fixed a variable name 2010-08-24 23:47:10 +02:00
oy 8cb15be7c0 added fixes for compiler errors and warnings by sworddragon 2010-08-24 23:44:33 +02:00
oy 8cd7093c63 added localisation fixes and map editor tool tips by sworddragon 2010-08-24 23:44:25 +02:00
oy c1611b7ce9 added localisation fixes by sworddragon 2010-08-24 23:44:16 +02:00
btd e04f83b710 D:/Portable Apps/PortableGit-1.7.1-preview20100612/rank, top5. Also need sql store and external records (maybe better to set path? 2010-08-24 21:31:32 +04:00
GreYFoXGTi 03bb17e580 fixed ninja not being remembered after freeze 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-24 17:13:26 +02:00
GreYFoXGTi f7aa9c4c2b ReWorked the Freeze System 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-24 16:32:46 +02:00
GreYFoXGTi f6f7699ef1 btd Fixed compiling 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-24 14:46:44 +02:00
GreYFoXGTi 5794680e3c Revert "Added missing files" 
This reverts commit 572f705a12.
 2010-08-24 03:45:29 +02:00
GreYFoXGTi 572f705a12 Added missing files 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-24 03:41:07 +02:00
GreYFoXGTi 0325c59aa9 Merge branch 'master' of http://github.com/btd/DDRace 2010-08-24 03:38:33 +02:00
GreYFoXGTi ed575f9b0c Fixed 2x and 1.5x boosters 
Removed Unused Vars

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-24 03:30:22 +02:00
GreYFoXGTi 8000f91ec7 Fixed The Crazy Shotguns and added dbg message if detected out of bounds 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-24 01:21:35 +02:00
GreYFoXGTi 51c6af1303 SvShotgunBulletSound 
also added protection to shotgun stucks, needs to be tested when a random crazy shotgun bullet gets stuck
loaded the score file before saving to avoid corruption
added freeze and unfreeze in rcon
added protection in some rcon commands

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-23 23:40:23 +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 05f8edb880 Stop at top tiles now give jumps back 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-23 02:09:34 +02:00
GreYFoXGTi 8b67e70dfb Fixed /pause not saving the time 
made sv_pauseable on by default

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-23 01:59:54 +02:00
GreYFoXGTi 76c6bc7e2f Added option to make super hook endless 
removed RACE_PAUSE

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-23 01:40:05 +02:00
GreYFoXGTi 3cb59795a6 Added Protection against cheating to usage of /pause 
fixed /pause ammo when freezed

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-23 00:46:39 +02:00
GreYFoXGTi 66750a3220 Weapon pickup Sound Spam Disabled 
/Pause Fixed but disabled pause with ninja

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-23 00:04:26 +02:00
GreYFoXGTi 03af9d75bc Added The sad Emotion to EMOTEPAIN 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 22:30:17 +02:00
GreYFoXGTi e82d0b34f2 oops 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 21:36:44 +02:00
GreYFoXGTi 2c0529657f Merge branch 'master' of http://github.com/btd/DDRace 2010-08-22 21:33:02 +02:00
GreYFoXGTi c4d60e93ba NOt needed as you can bind your own emote now 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 21:32:41 +02:00
btd 0e1c80e0d4 Merge 2010-08-22 17:36:41 +04:00
btd 844f3116fe D:/Portable Apps/PortableGit-1.7.1-preview20100612/pause works. Need to delete RACE_PAUSE. And check that character resurect correctly 2010-08-22 17:17:57 +04:00
GreYFoXGTi f2a94d37ea Fixed Ninja When lost in strike to freeze 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 15:12:30 +02:00
GreYFoXGTi 045daea3f9 Changed mood name 
Emotion eye reaction
and spawn proximity check to < 3

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 14:32:52 +02:00
btd 7b05afa76d Begin 2010-08-22 14:17:07 +04:00
GreYFoXGTi 0f9c791ce3 Pointed out the new method of /pause 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 08:24:29 +02:00
GreYFoXGTi e3dffbb741 Making the Mod Cooler ( Pimp My Mod ) xD 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 06:28:14 +02:00
GreYFoXGTi 4a0d787399 Further More Cleanup 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 01:38:58 +02:00
GreYFoXGTi f6c59a118c Fix mapitems.h 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-22 01:21:45 +02: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 0c93fe13fe forgot dragger::drag 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-21 20:24:35 +02:00
GreYFoXGTi dce24aa01d need Sleep T.T 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-21 19:46:54 +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 5a2af8f3ff re worked timer commands fixes issue #11 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-21 05:19:47 +02:00
GreYFoXGTi e7721811dd Added Fluxid's HookThrough 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-21 04:20:01 +02:00
GreYFoXGTi 57712d885f dbg_msg for entity debug 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-21 02:10:54 +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
GreYFoXGTi 8450116185 Merge branch 'master' of http://github.com/btd/DDRace 2010-08-20 20:19:24 +02:00
btd d22052d800 Small improvements 2010-08-20 22:03:51 +04:00
GreYFoXGTi 5cfcee99f9 STL noobness 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-20 19:58:48 +02:00
btd 7e3c10e399 Merge branch 'master' of http://github.com/GreYFoXGTi/DDRace-Server 2010-08-20 21:55:14 +04:00
GreYFoXGTi 26f152e656 Copy&Paste Noobness 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-20 19:51:06 +02:00
GreYFoXGTi 05d81bc49a fixed seg fault on /top5 //thanks nevi 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-20 19:45:25 +02:00
btd 4c52429172 Fix not safe getting character 2010-08-20 21:06:49 +04:00
GreYFoXGTi edd58fba7d fixed hammer_me 2010-08-20 16:57:42 +02:00
oy 538d968349 fixed that scoreboard overlaps the chat. Closes #14 2010-08-18 03:57:35 +02:00
oy cabecb7fa9 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-18 00:06:00 +02:00
oy 16f201794d fixed a variable name 2010-08-16 04:12:03 +02:00
oy e966cdb334 fixed that Collision::IntersectLine gets stuck in a loop forever. Closes #6 2010-08-16 04:09:21 +02:00
oy abc84ac0b0 added fixes for compiler errors and warnings by sworddragon 2010-08-16 02:21:18 +02:00
oy 4c2dcc4f2b added localisation fixes and map editor tool tips by sworddragon 2010-08-16 01:29:11 +02:00
oy 5922cbb56d added localisation fixes by sworddragon 2010-08-16 00:45:04 +02:00
GreYFoXGTi 01cc3f4d68 Merge branch 'master' of http://github.com/oy/teeworlds 
and fixed Conflicts:
	src/engine/server/register.h
	src/game/server/gamemodes/mod.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-08-15 20:46:02 +03: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
btd bbd48810ad Merge branch 'master' of http://github.com/oy/teeworlds 2010-08-15 19:20:39 +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
oy 02c7e3642a clear active motd message when the game is over 2010-08-15 15:48:56 +02:00
oy 0e36b772d4 fixed line endings in some files 2010-08-15 15:34:55 +02:00
btd e458f02dfe Fix NoLaser Tile. Crazy shotguns work 2010-08-15 16:28:34 +04:00
btd 1a559c5d03 More checks in timer 2010-08-14 15:36:12 +04:00
btd 512597f729 Add crazy shotguns. Need to test 2010-08-14 14:46:54 +04:00
btd 619f7cb268 Small fix 2010-08-14 13:45:19 +04:00
btd dfa60a65d2 Merge branch 'master' of http://github.com/GreYFoXGTi/DDRace-Server 2010-08-14 13:40:40 +04:00
Fujnky 4d8c4ffadb Improved the replay control buttons in the demo player a lot. 
* Now there is a combined play/pause button + a reset button
* Replaced the ugly strings with nice graphics
 2010-08-13 03:17:13 +02:00
oy d01fb2eb78 added missing information in debug mode. Closes #77 2010-08-13 03:07:51 +02:00
btd a8a74f558a Trigger and door now work 2010-08-12 22:07:35 +04:00
GreYFoXGTi c9ac55f2cd Merge branch 'master' of http://github.com/btd/DDRace 2010-08-12 20:08:20 +03: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
oy f494d344a9 removed some not longer needed stuff 2010-08-12 15:44:11 +02:00
GreYFoXGTi 465272651d New Layout 2010-08-12 14:30:46 +03:00
GreYFoXGTi 09b7a1fe1d Fixed the laser problems 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-08-12 14:15:58 +03:00
btd 3f2363b27e Fix errors. Server can be builded. Study using editor =( 2010-08-11 22:29:08 +04:00
btd 2cf2a5b1d2 Add Door, connector and trigger. Not tested i need work. 
Signed-off-by: btd <bardadymchik@gmail.com>
 2010-08-11 14:33:37 +04: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
oy d37c83962d fixed weapon change on start bug 2010-08-10 13:54:13 +02:00
oy 9753f62d46 added tool tip for value selector button in the editor 2010-08-10 13:47:33 +02:00
GreYFoXGTi 60b5acbb15 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/server/server.cpp
	src/engine/shared/console.cpp
	src/engine/shared/storage.cpp
	src/game/server/gamecontext.cpp
Alterations:
	src/engine/shared/console.h  | made StoreCommands(,)take also the client id
	src/engine/console.h  | made StoreCommands(,)take also the client id

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-08-09 17:54:42 +03:00
oy 3797eba179 added demo recording button by fujnky 2010-08-09 14:14:15 +02:00
oy d471663913 added localisation fixes by fujnky 2010-08-09 00:35:37 +02:00
SushiTee 866f76727b using PROPTYPE_INT_SCROLL for layer size in editor 2010-08-08 23:46:23 +02:00
oy 6a73c5d77f fixed flickering players on respawn 2010-08-08 18:56:54 +02:00
oy 4322113435 fixed overlapping skin name in the player settings 2010-08-07 20:52:33 +02:00
btd 227c03cbb1 Fix mistake 2010-08-07 22:49:57 +04:00
oy ad9b32b741 added the possibility to store commands within the console and execute them later on when everything is initialised correctly - fixes several possible startup crashes and the "Support bans in server configuration"-ticket 2010-08-07 20:22:25 +02:00
btd 84cf23203d Revert storage.h 2010-08-07 12:02:58 +04:00
oy 3f0ff1fb14 removed ServerDummy function cause it isn't needed anymore(actual console separates client and server commands) and added two missing server commands to the tab completion 2010-08-07 00:01:43 +02:00
oy cac5554bdb prevent that spectators start a vote 2010-08-06 21:03:38 +02:00
oy 2967c57ddc added possibility to delete envelopes and to save their names within a map by sushitee 2010-08-06 20:18:53 +02:00
oy 05f3757491 added optimisations by sworddragon 2010-08-05 20:55:51 +02:00
SushiTee e79bfb243c struct LANGUAGE should be a class CLanguage 2010-08-06 01:48:06 +08:00
btd ecedf0a54f Merge 2010-08-01 00:14:58 +04:00
btd e8018dd712 Optional timer command 2010-07-31 16:58:57 +04:00
btd 7f65d880f3 Fix external records 2010-07-31 15:04:19 +04:00
btd eabe4639c8 Add storage.h. Add config variable for holding records in appSaveDir. I am not sure is it right way 2010-07-31 13:14:20 +04:00
btd 37b0f43d1c Fix strange 0 pointer bug. (very strange bug) 2010-07-31 00:16:36 +04:00
btd 534081a3fe Fix emo color 2010-07-30 20:14:53 +04: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
btd 7f42b6225b To the last DDRace. Need a lot fix 2010-07-29 23:55:33 +04:00
GreYFoXGTi eb9793d89a Moved all used server variables to config_variables.h 
tried to fix /pause and failed cause i can't get the hooked player's character to check if he is paused or not
changed welcome message default.
on join player sees the server's /info

Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-07-29 22:51:58 +03:00
GreYFoXGTi 070927384a save before i commited the last commit xD 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-07-29 18:02:29 +03: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 f41d4851d2 Cleanup a bit and modified the binary name 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
 2010-07-29 10:40:27 +03:00
GreYFoXGTi a9c00caafb Merge branch 'master' of http://github.com/matricks/teeworlds 2010-07-29 09:46:07 +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
oy 3824d885a2 fixed envelope index in the quad popup, so that it fits the envelope menu. Closes #118 2010-07-18 13:57:17 +02:00
oy bc8274f48b fixed last commit 2010-07-18 13:44:30 +02:00
SushiTee 97204482e2 fixed issue #150 
holding CTRL while moving a point allows to be a lot more precise
 2010-07-18 13:33:34 +02:00
SushiTee b6d07edda8 fixed issue #57 2010-07-17 20:05:17 +02:00
oy 22c19f45db fixed hook sound bug in demos. Closes #161 2010-07-17 19:55:17 +02:00
oy 6193f35423 Merge branch 'master' of http://github.com/matricks/teeworlds 2010-07-17 14:10:43 +02:00
Magnus Auvinen a8acf8c6ff fixed missing public 2010-07-05 21:04:19 +02:00
Magnus Auvinen 575f72d978 fixed some compiler errors and warnings with clang 2010-07-05 20:57:07 +02:00
xalduin 052820dc88 Issue #92, fixed scrollbars in editor 2010-07-04 16:59:02 +02:00
SushiTee 882a99b955 kill the player when leaving the game layer too much... will stop never ending fall 2010-07-04 16:50:03 +02:00
oy 5d442ae329 refresh the server browser if the "favorites"-tab is active and a new entry has been added with "add_favorite"-command 2010-07-04 16:10:00 +02:00
oy c42679a10e cut too long player names in the server browser. Closes #151 
fixed overlapping of too long player names in the scoreboard
 2010-07-02 14:14:41 +02:00
oy bd02c2043e fixed editor popups shown outside the screen 2010-06-28 15:12:43 +02:00
oy 7325bdac42 don't consider sv_spectator_slots for team change when already in a team(red, blue). Closes #141 2010-06-27 13:24:47 +02:00
oy ff3eda23ae automatically add the map extension when saving a map with the editor 2010-06-25 19:41:55 +02:00
oy 82f5a56d89 fixed crash in the map editor 2010-06-25 18:56:58 +02:00
oy 822b002344 fixed the ninja tip cut off and made its weapon and pickup sprite equal. Closes #127 2010-06-23 20:09:15 +02:00
oy c9828a2229 fixed display bug in the score hud. Closes #106 2010-06-22 21:27:58 +02:00
oy 6b713157a7 added button to restore the map focus. Closes #116 2010-06-22 14:15:52 +02:00
oy 62ffaa9142 added a lost newline 2010-06-22 02:07:52 +02:00
oy d01776bf3f auto-add background when creating new map. Closes #50 2010-06-22 01:15:12 +02:00
oy c40bc9af3e fixed a possible crash in the client console 2010-06-21 13:45:30 +02:00
oy 3475d2ae1b fixed freeze in the map editor GUI. Closes #138 2010-06-20 15:27:44 +02:00
oy 73bdf657c4 fixed suicide penalty after a restart. Closes #131 2010-06-20 14:35:50 +02:00
oy a5113c6740 added commands to dump the output of the consoles into a file 2010-06-20 14:12:59 +02:00
oy e2c3f744b2 added commands to clear the consoles. Closes #104 2010-06-19 20:51:54 +02:00
oy b790634a2d scroll the possible commands in the console's tab completion if the wanted one is out of sight. Closes #105 2010-06-19 13:48:01 +02:00
oy ea64b0d7b3 made the console use the flagmask when looking for command (FindCommand) and removed double "No such command" console message 2010-06-18 20:32:52 +02:00
oy d7c106ca90 fixed border function in the editor. Closes #117 2010-06-11 13:44:28 +02:00
oy 39853bcf89 fixed walk animation if x-position is negative. Closes #119 2010-06-11 13:20:45 +02:00
oy ec334a9d68 small cleanup 2010-06-11 12:34:11 +02:00
Fujnky f8b9f342d3 Fix for l10n in menus_demo.cpp and sime german l10n tweaks. 2010-06-11 15:50:47 +08:00
Choupom 8e8cbdb562 fix for folders in demo browser 2010-06-10 20:38:16 +08:00
xalduin 22f11d6839 Restore map focus on load map/new map 2010-06-10 20:38:04 +08:00
xalduin 6e1eaa96ec Fixed issue #115, text now fits into columns in server browser 2010-06-10 20:38:04 +08:00
xalduin dc3feaf42c Fixed remaining compiler warnings for gcc on Linux 2010-06-10 20:38:03 +08:00
xalduin 7fa21400d6 Mouse wheel no longer moves layer/image scrollbar 2010-06-09 20:41:00 +08:00
xalduin be5e19d2bd Fixed some compiler warnings 2010-06-09 20:41:00 +08:00
Magnus Auvinen 0d78e2d2cd Merge remote branch 'fujnky/master' 
Conflicts:
	data/languages/portuguese.txt
 2010-06-09 13:01:36 +02:00
Fujnky 7ca5e0fbb1 Fixed localizations, most german translation strings fit in buttons now. 2010-06-07 16:17:40 +02:00
Fujnky 7cc7c8f84e Merged with master 2010-06-07 16:00:01 +02:00
oy 2104835d77 update server info for connected clients if map or gametype changes. Closes #108 2010-06-07 13:34:47 +02:00
oy a3545b06b4 some cleanup 2010-06-07 00:08:40 +02:00
oy 1272c4d805 prevent that the server gets filtered by "compatible version" in the clients server browser 2010-06-06 23:28:34 +02:00
oy 04b6abae93 fixed kill messages showing wrong infos 2010-06-06 17:17:43 +02:00
oy a41d930a85 fixed some compiler warnings. Closes #76 2010-06-06 17:16:52 +02:00
Magnus Auvinen 7d03e70d1e Merge remote branch 'choupom/master' 2010-06-06 14:53:55 +02:00
xalduin 2d99a0360f Images are now sorted on Append 2010-06-05 18:47:30 -04:00
xalduin 80a7c53dec Issue #92 scrollbars added for layer/image toolbars 2010-06-05 18:46:47 -04:00
Fujnky 34bd0a09b7 minor typo fix 2010-06-05 23:37:50 +02:00
Fujnky bf68f803e3 Internationalized editor and updated german localization 2010-06-05 23:36:52 +02:00
Fujnky d000766e9d Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-05 18:50:26 +02:00
Choupom 848764544f added folders in demo browser (#25) 2010-06-04 22:14:02 +02:00
xalduin ab0d8d0eb8 Merge remote branch 'upstream/master' 
* upstream/master:
  fixed bug with the quick search box. Closes #89
 2010-06-04 12:01:37 -04:00
oy 3d079a35e9 fixed bug with the quick search box. Closes #89 2010-06-03 23:32:32 +02:00
xalduin 9603d676c6 Score no longer decreased when switching teams 2010-06-03 17:08:05 -04:00
Fujnky 4ffab2af80 Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-03 22:33:38 +02:00
xalduin 277eeef098 Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-03 16:24:41 -04:00
oy 67d4903b9f fixed stuck "error loading demo"-popup. Closes #90 2010-06-03 22:03:27 +02:00
xalduin 8b15558f5d Merge remote branch 'upstream/master 2010-06-03 13:32:15 -04:00
Fujnky 5849aeb86c Merge branch 'master' of git://github.com/matricks/teeworlds 
Conflicts:
	src/game/server/gamemodes/ctf.cpp
 2010-06-03 17:47:32 +02:00
Fujnky 551170656d Fixed localization for 'Error loading demo'-Popup 2010-06-03 17:41:45 +02:00
Magnus Auvinen a6ab379e67 fixed so that the same distance is used when leaving off the flag and taking it 2010-06-03 17:40:01 +02:00
Magnus Auvinen 9bb6fe48c2 cleaned up g_CharPhysSize 2010-06-03 17:39:42 +02:00
Fujnky 5a641132e7 Fixed localization for 'Error loading demo'-Popup 2010-06-03 17:07:15 +02:00
Fujnky feb8894b4d Flag catch and capture should now be exactly the same 2010-06-03 16:42:37 +02:00
xalduin 3fff61d24a Issue #86, don't reset score on team switch 2010-06-03 10:35:18 -04:00
xalduin 8db32a4b8b Issue #88 flag pickup distance reduced 2010-06-03 09:56:57 -04:00
xalduin 6491dfc16c Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-03 09:36:24 -04:00
Fujnky 7b74cd248b made flag catch and capture distances fit 2010-06-03 15:30:33 +02:00
Fujnky d581e413c8 More localization fixes 2010-06-03 11:30:05 +02:00
xalduin de1a7acfaa Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-03 00:37:46 -04:00
Fujnky 7cbf0f93ca Some localization fixes 2010-06-02 23:15:56 +02:00
Fujnky 64ddee0a21 Merge branch 'master' of git://github.com/matricks/teeworlds 2010-06-02 21:47:47 +02:00
xalduin cc181cda5b Merge remote branch 'upstream/master' 2010-06-02 15:21:31 -04:00
Fujnky 0d4c0ccef5 Some localization fixes 2010-06-02 21:03:15 +02:00
oy 7a1953e60b added fix for editor quad editing by ghost91 Closes #18 2010-06-02 20:50:48 +02:00
oy b2a55766d1 fixed shotbug (#80) 2010-06-02 19:39:28 +02:00
xalduin 9e6c909624 Removed unnecessary SortImages call in RenderImages 2010-06-02 13:26:17 -04:00
xalduin a99cbfc742 Image sorting working, less hackish 2010-06-02 12:12:32 -04:00
NoxNebula 9a5a19e7c7 Admin-Kick-Protection 
Add IsAuthed(int ClientID); function.
Add kickprotection for admins (Remote Console logged in players)
Add Anti-Self-Kick (minor)
 2010-06-02 09:40:08 +02:00
xalduin f2920ea5d8 Sort by map name when opening map 
When opening a map, the list of map names is now sorted alphabetically.
 2010-06-02 05:11:12 +08:00
Tom Adams 54692ceaf1 added fix for editor->append by xalduin 2010-05-31 21:55:45 +00:00
Tom Adams f14e7369f1 fixed movement bug (#741) 2010-05-31 21:40:40 +00:00
Tom Adams c9ff80a17d made balance teams based apun points/minute (#495) 2010-05-31 20:35:47 +00:00
Tom Adams 6fca512a95 added fix for italian language by Lanta and fixed a bug with the id in votekick menu 2010-05-31 20:05:45 +00:00
Tom Adams 23e2d5f424 fixed votekick menu (#807) 2010-05-31 15:36:20 +00:00
Tom Adams 651cd062e6 fixed english localisation bug 2010-05-31 11:07:58 +00:00
Tom Adams 262b566c94 increased the fontsize of the chat messages 2010-05-30 17:08:54 +00:00
Tom Adams 08df0fe63d added fix for italian translation by Lanta 2010-05-30 14:26:04 +00:00
Thomas 361380d630 *some esthetic changes 
*split "CHud::RenderGoals()"
*added "reload" command
*added the ability to show last chat lines (+show_chat)
*updated french.txt
 2010-05-30 12:01:11 +00:00
Tom Adams 659d66104e fixed dump_binds command (#806) 2010-05-30 00:15:26 +00:00
Tom Adams baa57830ad fixed bubble sort loop (#802), 2 entries in the language files and a possible overrun 2010-05-29 23:57:30 +00:00
Tom Adams e16fdc3f3e added clipping to editboxes (#773) and made their cursors blink 2010-05-29 15:53:57 +00:00
Magnus Auvinen fe5a7105c4 fixed the automatic versioning 2010-05-29 15:20:18 +00:00
Magnus Auvinen 4c0886f087 renamned m_pCarryingCCharacter correctly 2010-05-29 11:26:17 +00:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen 878ede3080 major update with stuff 2009-10-27 14:38:53 +00:00
Magnus Auvinen 7b68ff4277 fixed chaining of console commands, allows snatching updates of console variables. cleaned up some code 2009-06-15 14:01:36 +00:00