GreYFoX
ee670118a5
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
...
Conflicts:
src/engine/console.h
src/engine/server/server.cpp
src/engine/server/server.h
src/engine/shared/config.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/engine/shared/network_server.cpp
@heinrich5991 todo
2012-01-01 00:11:56 +02:00
Magnus Auvinen
b31abc4053
fixed so that you can select graphics backend via gfx_threaded
2011-12-31 10:29:25 +01:00
Magnus Auvinen
7a36a103ae
fixed so that the rendering can be done async from the input, network and update
2011-12-31 10:04:46 +01:00
Ravomavain
88be9657d2
Enhance pausing system (by @heinrich5991):
...
* enhance /pause (@heinrich5991)
* add /spec command to pause without leaving the game (@heinrich5991)
* if sv_pauseable is set to 0, /pause behave as /spec (@heinrich5991)
* should fix #124 and #127 (@ravomavain)
2011-12-31 01:44:36 +02:00
oy
ec4bb94537
added logout command for econ
2011-12-30 19:12:31 +01:00
GreYFoX
799f4de2b3
Added the following settings to Close #123 .
...
sv_time_in_broadcast, 1, 0, 1, CFGFLAG_SERVER, "Whether to display time in broadcast every interval or not by default, later the choice can be changed by players via chat commands"
sv_time_in_broadcast_interval, 1, 0, 60, CFGFLAG_SERVER, "How often to update the broadcast time"
sv_time_in_gametimer, 0, 0, 1, CFGFLAG_SERVER, "Whether to display time in the round/game timer or not by default, later the choice can be changed by players via chat commands"
Added the following Chat commands to give the player the choice over their settings:
"saytime", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSayTime, this, "Privately messages you your current time in this current running race"
"saytimeall", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSayTimeAll, this, "Publicly messages everyone your current time in this current running race"
"time", "", CFGFLAG_CHAT|CFGFLAG_SERVER, ConTime, this, "Privately shows you your current time in this current running race in the broadcast message"
"broadcasttime", "?s", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSetBroadcastTime, this, "Personal Setting of showing time in the broadcast, broadcasttime s, where s = on for on, off for off, toggle for toggle and nothing to show current status"
"servergametime", "?s", CFGFLAG_CHAT|CFGFLAG_SERVER, ConSetServerGameTime, this, "Personal Setting of showing time in the round/game timer, servergametime s, where s = on for on off for off, toggle for toggle and nothing to show current status"
Fixed Chat Command "eyeemote" and made it a set + toggle instead of just toggle for better bin techneques
Moved some vars from CCharacter to CPlayer to keep their status evern after death but not after disconnect.
So now players have the choice to see which timer they wanna see if any.
Note: These changes are all untested Stay away from this update on your main server until they are tested, i don't even know if they will compile propperly
2011-12-29 14:17:34 +02:00
GreYFoX
ff6b9609f3
sv_nameless_score default 0 Whether nameless tee has a score or not. Closes #100 .
2011-12-29 11:39:01 +02:00
GreYFoX
66c321c547
Added sv_eye_emote_change_delay default to 1 to Close #94 .
2011-12-27 12:20:12 +02:00
XXLTomate
17e633f00e
Remove two unused config lines
2011-11-08 22:39:36 +01:00
GreYFoX
09232125b4
Ability to disable emotes. Closes #115
2011-11-08 14:09:42 +02:00
GreYFoX
abfd5555b0
DDRace tuning vars reset every map, but default Teeworlds tuning vars don't
2011-09-02 20:37:03 +02:00
GreYFoX
5b27758650
Removed level stuff
...
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
2011-08-13 02:11:06 +02:00
GreYFoX
35d16bd58c
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611
...
Conflicts:
src/engine/console.h
src/engine/server.h
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/engine/shared/network_server.cpp
src/game/client/components/console.cpp
src/game/client/components/console.h
src/game/client/components/menus_browser.cpp
src/game/client/gameclient.cpp
src/game/editor/editor.cpp
src/game/editor/editor.h
src/game/editor/io.cpp
src/game/editor/layer_tiles.cpp
src/game/editor/popups.cpp
src/game/gamecore.cpp
src/game/mapitems.h
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/gamemodes/ctf.cpp
src/game/server/player.cpp
src/game/variables.h
2011-08-13 02:01:40 +02:00
oy
9418802150
protected econ authentication against brute force
2011-07-31 13:05:12 +02:00
Johannes Loher
e2664c1b00
Added server sided automatic demo recording
2011-07-30 18:23:59 +02:00
oy
a0a62bcd70
fixed econ feature and tcp
2011-07-30 13:40:01 +02:00
heinrich5991
2ba6fbd731
added econ functionality
2011-07-29 17:51:14 +02:00
oy
1ae474689d
added moderator support for the remote console. #518
2011-07-05 21:54:10 +02:00
oy
123eab41c8
made it possible to filter by player country in the server browser. Closes #654
2011-06-29 22:27:32 +02:00
GreYFoX
1bfcfb7d6f
Changed max of force pause to be 360 seconds
...
Note if force pause was abused once infront of me i would make even admins have to go through a vote
2011-06-07 16:55:06 +02:00
GreYFoX
c1962bff25
Removed sv_broadcAst
...
this commit is funny cause it was made from my iPhone and it only took 8 minutes
2011-06-03 21:55:57 +02:00
GreYFoX
a121587251
Save connection timeout setting for client
2011-05-27 11:29:35 +02:00
GreYFoX
cc63cf2553
Merge branch 'master' of git://github.com/oy/teeworlds
...
Conflicts:
src/engine/external/pnglite/pnglite.c
src/engine/external/pnglite/pnglite.h
src/engine/shared/config_variables.h
src/game/client/components/menus_browser.cpp
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/gamecontext.cpp
src/game/server/player.cpp
src/game/version.h
2011-05-09 18:36:13 +02:00
heinrich5991
9fb36fd802
added strict game type filter
2011-05-02 19:25:38 +02:00
GreYFoX
0d61c87fa1
Added 0.6.0 banmaster by @heinrich5991 #31
2011-04-26 11:51:02 +02:00
GreYFoX
0584f2b7a2
Added Plasma Gun tweaking
...
made the default 3 plasmas per second more cpu friendly
2011-04-20 15:59:40 +02:00
GreYFoX
65e7e9effe
oops
2011-04-19 17:09:49 +02:00
GreYFoX
e40158ebf4
changed cl_race_cheats to be on by default
2011-04-19 09:59:49 +02:00
GreYFoX
dad66bffc3
General DDRace binds improvements
2011-04-17 19:45:48 +02:00
GreYFoX
561ce64666
Renamed cheats to testing commands sv_test_cmds
...
Since these are testing commands, anyone can use them and only on their selves no login needed
Revised some rcon commands
cleanup some unwanted codes
2011-04-15 06:04:21 +02:00
GreYFoX
0df6d0541f
Merge branch 'master' of git://github.com/oy/teeworlds into HEAD
...
Conflicts:
bam.lua
src/engine/console.h
src/engine/server.h
src/engine/server/server.cpp
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/game/client/components/binds.cpp
src/game/client/components/chat.h
src/game/client/components/console.cpp
src/game/client/components/console.h
src/game/client/components/controls.cpp
src/game/client/components/emoticon.h
src/game/client/components/maplayers.cpp
src/game/client/components/menus.h
src/game/client/components/scoreboard.h
src/game/client/components/spectator.h
src/game/client/components/voting.h
src/game/client/gameclient.cpp
src/game/client/gameclient.h
src/game/client/render.h
src/game/collision.cpp
src/game/editor/ed_layer_tiles.cpp
src/game/gamecore.cpp
src/game/gamecore.h
src/game/layers.cpp
src/game/layers.h
src/game/mapitems.h
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/laser.h
src/game/server/entities/pickup.cpp
src/game/server/entities/pickup.h
src/game/server/entities/projectile.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/gameworld.cpp
src/game/server/gameworld.h
src/game/server/player.cpp
src/game/variables.h
2011-04-14 01:27:49 +02:00
oy
06115dd49d
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 20:37:12 +02:00
oy
e6f0318bdf
added "fixed some header guards and added a script to fix them all!" by Choupom
2011-04-13 20:22:10 +02:00
oy
1a5d70450f
added "reimplemented menu music by teetow-the-great-teetow" by Choupom
2011-04-13 20:00:54 +02:00
GreYFoX
f7f6058a92
Merged Oy, Cleaned up, removed some useless features and code parts
...
Added Icon by landil
alot more...
2011-04-09 22:32:17 +02:00
oy
b3ae1a088e
make the "show friends"-filter just list servers with friends on them
2011-03-31 21:22:12 +02:00
oy
ae325c873f
added friends feature. Closes #24
2011-03-23 13:06:35 +01:00
GreYFoX
61dcc7b848
Re-Added noother's afk kick
...
Disabled vanilla afk kick by default
enumerated variables.h
2011-03-22 21:49:12 +02:00
oy
96808a1145
made it possible to just show the number of player slots of a server (instead of client ones). Closes #68
2011-03-20 15:33:49 +01:00
GreYFoX
ed5c9c1d92
sv_show_other the ability to use the command showothers
2011-03-19 11:22:03 +02:00
oy
a8bf857c68
improved server browser list resorting and made search work on IP addresses. Closes #482
2011-03-18 19:03:13 +01:00
GreYFoX
45f3cf042a
Fixed a login with cheats
...
Renamed a constant
2011-03-18 00:17:01 +02:00
GreYFoX
3bae74f21d
Added Ability to predict old hook through tiles from DDMax
...
fixed a warning
2011-03-16 17:36:54 +02:00
GreYFoX
0cbcdd027a
Removed Helper made Moderators able to moderate only
...
Enumerated levels
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
2011-03-16 16:27:30 +02:00
GreYFoX
cccfb09e32
Reverted Team to it's old state without leader or Strict until it's reworked
2011-03-16 15:14:25 +02:00
GreYFoX
ee178d5a48
Client Cheat showing entities in game
2011-03-16 14:48:16 +02:00
oy
30d9c9f4d9
made network support clan name and country code for players
2011-03-15 11:23:49 +01:00
GreYFoX
90d93ba7b2
Client showothers
2011-02-23 22:22:05 +02:00
GreYFoXGTi
cd998a2a93
sv_reset_pickups 1 to remove weapons on start tiles
2011-02-16 13:08:14 +02:00
GreYFoXGTi
6904956a14
Added some DDRace Menu Items
...
Enforced cl_ddrace_cheats on zoom
2011-02-16 11:20:27 +02:00
XXLTomate
f0201597c6
DDRace Settings-tab
...
Checkbox for DDRace Scoreboard
2011-02-15 02:36:22 +02:00
GreYFoXGTi
604ae5286f
Several Fixes and some more on the way
2011-02-14 23:34:46 +02:00
GreYFoXGTi
d68e853ca7
StickyTeams, TeamStrict Logic and fixed some team bugs
2011-02-14 20:44:02 +02:00
GreYFoXGTi
f83132448d
Merged Oy, Isolated Freeze from Deep Freeze
2011-02-13 19:32:06 +02:00
GreYFoXGTi
cd574d10a7
Added sv_vote_majority, 1 like vanilla, 0 Consider number of yes against Number of Yes + No
2011-02-12 22:31:42 +02:00
GreYFoXGTi
ae06076d10
Mute By Fisted
2011-02-08 14:44:59 +02:00
GreYFoXGTi
d7e4153ec4
Added banmaster by heinrich5991
2011-02-07 08:25:38 +02:00
GreYFoXGTi
24a688b2c3
Added AutoDemoRecord and ghost made by Race mod team, implemented to DDRace by noother
2011-02-04 22:15:02 +02:00
GreYFoXGTi
30f010593c
Teams with leaders
...
this maybe buggy but i will fix the bugs when they are reported
2011-02-04 18:49:37 +02:00
GreYFoXGTi
f1b002e7fa
DDRace flags for the server browser (client-sided).
...
Some fixes in the server sided part.
One task left, Adding the flags to SortHash(), added Todo in the code.
2011-01-30 18:21:41 +02:00
GreYFoXGTi
5b51295185
Added Deep freeze/unfreeze to switch layer so that it can be controlled with switches
...
fixed the freeze command
Added Freeze Tile to switch layer to set freeze tile custom delay
Added sv_freeze_delay to control default freeze time delay
2011-01-25 12:05:53 +02:00
GreYFoXGTi
f1a8b6b7ad
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/game/client/gameclient.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h
2011-01-24 14:06:55 +02:00
oy
7ed5a820c6
increased default value for br_max_requests. Closes #446
2011-01-20 21:22:10 +01:00
GreYFoXGTi
ddc5dd7ab3
Cleaned up & Re-arranged stuff
2011-01-06 05:46:10 +02:00
GreYFoXGTi
1719ad554e
Moved a var
2011-01-06 01:51:22 +02:00
GreYFoXGTi
5e841fcfae
Merge branch 'master' of http://github.com/heinrich5991/DDRace
2010-12-19 15:22:31 +02:00
heinrich5991
bf62514088
added some DDRace flags for the server browser (server-sided), client-sided still needed
2010-12-19 14:11:14 +01:00
floff
4008a1dc95
spectator votes configurable
2010-12-16 10:06:24 +01:00
floff
4a93c28eb8
added configurable time between pauses, to reduce spam
2010-12-16 10:05:20 +01:00
GreYFoXGTi
2f5f332cbb
Merge branch 'master' into DDRace
...
Conflicts:
src/engine/client/client.cpp
src/engine/shared/config_variables.h
2010-12-13 03:43:22 +02:00
oy
c75a75b64f
made it possible to automatically take game over screenshots. Closes #339
2010-12-12 16:48:13 +01:00
GreYFoXGTi
46c2225d60
Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
...
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/russian.txt
scripts/make_release.py
src/engine/shared/config_variables.h
2010-12-11 21:28:43 +02:00
oy
a0985314c9
made it possible to "recycle" auto recorded demos
2010-12-11 18:55:28 +01:00
GreYFoXGTi
2c51511260
Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
...
Conflicts:
src/engine/client/client.cpp
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/game/client/gameclient.cpp
2010-12-10 20:58:53 +02:00
oy
0fe8cabe78
added auto recording support by Batchyx
2010-12-08 01:42:32 +01:00
GreYFoXGTi
122c7954d9
Announcement Randomness
2010-12-06 04:27:35 +02:00
GreYFoXGTi
69ce24b92c
forgot this
2010-12-04 03:13:24 +02:00
GreYFoXGTi
83cea23373
Reworked some stuff
2010-12-03 14:58:38 +02:00
GreYFoXGTi
0a29aae473
added old Laser Behavior Configuration
2010-12-02 00:07:33 +02:00
GreYFoXGTi
7f24d0f144
Fixed ID 0 Bug
2010-11-26 20:01:55 +02:00
GreYFoXGTi
eed83bd7cb
Added Announcement
2010-11-22 13:00:43 +02:00
GreYFoXGTi
b8fe169419
Added Mac Fixes by Allisone (Trust)
2010-11-22 11:09:27 +02:00
GreYFoXGTi
5d9ee1736e
made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/german.txt
data/languages/russian.txt
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamecontext.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/gamemodes/ctf.h
src/game/server/gamemodes/dm.cpp
src/game/server/gamemodes/dm.h
src/game/server/gamemodes/mod.cpp
src/game/server/gamemodes/tdm.cpp
src/game/server/gamemodes/tdm.h
2010-11-22 00:26:00 +02:00
Sworddragon
fc9211c777
Updated copyrights
2010-11-20 21:26:06 +01:00
GreYFoXGTi
6a40aea054
Revert "added hackish challenge-response-alike compatible with 0.5.2 clients. against the slot blocking exploit."
...
This reverts commit 9f8cf21c33
.
Conflicts:
src/engine/shared/config_variables.h
this commit was replaced by "clients are now dropped if they don't act as normal clients (4383e10
4383e10933
)"
2010-11-18 01:32:54 +02:00
oy
c45dc374ff
decreased the default value for maximum players with same IP a bit
2010-11-17 19:05:19 +01:00
GreYFoXGTi
5ee8796381
Removed sql from mac, people who need sql compile the Mac branch
...
the boost stuff made my working dir very messy and searching through it takes more time
2010-11-16 15:26:19 +02:00
btd
5f6e35b418
Finish sv_team
2010-11-07 01:54:35 +03:00
GreYFoXGTi
3756c98715
Total IP Scoring Annihilation ( doesn't make sense ), please test this, also delete the old records
2010-11-04 20:10:51 +02:00
GreYFoXGTi
5f47d105ae
Removed unused config var
2010-11-01 12:37:09 +02:00
btd
728f4a8352
Merge
2010-10-31 23:31:11 +03:00
btd
eae1d1e54b
My special func ^_^
2010-10-31 23:29:41 +03:00
GreYFoXGTi
c704a4ee95
a gift for btd
2010-10-31 19:47:10 +02:00
btd
b8dd4a32ca
Merge https://github.com/GreYFoXGTi/DDRace into others
2010-10-26 23:35:55 +04:00
GreYFoXGTi
c6162b6485
fix
2010-10-26 17:02:36 +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
fisted
9f8cf21c33
added hackish challenge-response-alike compatible with 0.5.2 clients. against the slot blocking exploit.
2010-10-25 20:00:16 +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
161e5dbb7e
Forgot about client
2010-10-23 22:13:37 +04:00