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
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
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
16657faf55
end vote on 50% no
2010-09-12 12:51:07 +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
Choupom
532ea85aeb
separated CFlag from ctf
2010-09-07 20:02:46 +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
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
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
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
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
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
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
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
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
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
8cb15be7c0
added fixes for compiler errors and warnings by sworddragon
2010-08-24 23:44:33 +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