Commit graph

1516 commits

Author SHA1 Message Date
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