Commit graph

1099 commits

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