east
28410c00a7
Econ bufferoverflow fix
2012-01-12 19:59:27 +01:00
oy
fa81141110
added demo markers by Choupom. Closes #837
2012-01-10 23:13:19 +01:00
oy
4073520214
cleaned up content folder creation. Closes #845
2012-01-09 01:38:45 +01:00
oy
de8c9b23eb
added command to toggle config values. Closes #888
2012-01-09 01:25:18 +01:00
oy
e960cbdff3
added a config to display the code string of a country flag instead of the image. Closes #897
2012-01-08 18:16:38 +01:00
oy
bafd22ebe7
show path in the editor file dialog. Closes #786
2012-01-08 13:14:02 +01:00
oy
6ad6d59b6f
fixed memory corruption with snd_buffer_size config
2012-01-06 19:27:18 +01:00
oy
29738552a6
made bindaddr config work for client and master too. Closes #909
2012-01-06 19:17:14 +01:00
GreYFoX
c46f3e06e7
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
2012-01-04 20:10:07 +02:00
oy
f14c0e2359
fixed linking for older gcc versions
2012-01-04 01:19:54 +01:00
oy
7328098f8d
Merge pull request #912 from matricks/threadedflip
...
Threadedflip
2012-01-03 15:40:30 -08:00
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
GreYFoX
7820e48ec6
Minor changes
2011-12-31 01:33:11 +02:00
oy
ec4bb94537
added logout command for econ
2011-12-30 19:12:31 +01:00
oy
b44ee3d975
reworked ban system
2011-12-29 23:36:53 +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
eeeee
385be8a716
updating existing bans' expiration would break ordering in bans sorted list
2011-12-14 13:48:41 +01:00
eeeee
8f5f45c18f
keep lifebans at the tail of bans list. Fixes #131
2011-12-14 13:47:23 +01:00
GreYFoX
1446d0980b
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
...
* Version 1.098a
Conflicts:
bam.lua
src/game/client/gameclient.h
src/game/mapitems.h
2011-12-05 11:32:01 +02:00
oy
8e0ce38e29
fixed sv_max_client usage
2011-12-04 16:51:33 +01:00
Choupom
b2a825652d
added a command to unban all
2011-12-04 14:22:59 +01: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
XXLTomate
137a447065
Victims without callback(s)
2011-11-08 12:30:54 +02:00
GreYFoX
6c99ea2104
CMDList
2011-09-02 22:25:16 +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
Ravomavain
7d1a392f03
Fix chat command and close #81
2011-08-31 22:58:48 +02:00
GreYFoX
3ad8284716
Fixed #77 . top5
2011-08-31 12:30:18 +02:00
GreYFoX
7e24be5d83
Version 1.091a
2011-08-31 12:10:15 +02:00
GreYFoX
bf5374adbf
Reverted a change
2011-08-31 02:48:58 +02:00
GreYFoX
4ca0681689
Added chat commands for only chat and available to all users
...
Thanks @heinrich5991 for this idea of a separate console object to handle it
2011-08-27 17:11:39 +02:00
GreYFoX
7e6f6465b7
typo
2011-08-27 14:12:13 +02:00
GreYFoX
c7d9b289e7
Added a command to check user status commands
2011-08-26 23:37:10 +02:00
GreYFoX
9fe96f6b04
Test Commands check and feedback on command not executed
2011-08-26 23:24:46 +02:00
GreYFoX
b75a26eed9
Fixed the console
2011-08-26 20:03:30 +02:00
Ravomavain
15d0a40825
Add user level access and use this level for /cmds if player is not authed.
2011-08-26 16:28:14 +02:00
GreYFoX
de4a95c5d2
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611
2011-08-20 06:50:06 +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
Shereef Marzouk
c6fd4a2cc5
General whitespace and tab cleanup
2011-08-11 10:59:14 +02:00
oy
9418802150
protected econ authentication against brute force
2011-07-31 13:05:12 +02:00
oy
1705c90e14
fixed ban for life on the server
2011-07-31 12:43:35 +02:00
oy
aabac3dcfc
send notification to enter a password when a client connects to econ. Closes #803
2011-07-31 02:25:55 +02:00
oy
9349af0085
clean up econ sockets on shutdown. Closes #804
2011-07-31 02:20:46 +02:00
oy
8d0cc2a825
reduced stack memory usage of CDataFileWriter
2011-07-31 01:40:28 +02:00
oy
94bdd95957
added missing newlines at end of 2 files
2011-07-30 18:29:40 +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
571dff6216
made rcon auto completion serverside. Closes #97
2011-07-14 22:07:21 +02:00
oy
d28108b8ad
fixed few issues with masters.cfg
2011-07-11 12:00:13 +02:00
oy
e37d536fdf
fixed some NETTYPE usage based on the socket state
2011-07-07 01:48:00 +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
fisted
d5b3804804
fixed "no such cmd ''" on whole-line comments in cfg
2011-06-11 19:13:27 +02:00
oy
9845d757ef
removed file extension from the demo name in the demo player
2011-06-09 22:44:22 +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
oy
5fbf6d0bfd
fixed compiler warnings. Closes #679
2011-05-05 01:43:27 +02:00
Choupom
7f15b3ac57
fixed several stuffs
2011-05-03 19:25:11 +02:00
Choupom
c2f75b0017
structs are structs, classes are classes
2011-05-03 19:23:33 +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
f322f65f45
fixed ban for life
2011-04-20 21:25:59 +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
3f0ad1ab65
Cleaned up helper commands, @heinrich5991 please revise this commit
2011-04-15 05:20:52 +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
GreYFoX
fd6388a9d8
Cheats are on unregistered servers only, added warning message about records not getting saved
2011-04-14 00:50:57 +02:00
heinrich5991
f0735554ec
fixed the reworked IConsole::PrintResponse
2011-04-14 00:34:11 +02:00
heinrich5991
c83c7b1a19
reworked IConsole::PrintResponse to IResult::Print (and obviously CConsole::PrintResponse to CResult::Print)
2011-04-14 00:34:10 +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
de1e8fc851
improved FindFile so it stops on a match
2011-04-07 18:45:24 +02:00
oy
4ad6d2f01e
fixed problem with sv_bindaddr on the server
2011-04-04 18:20:05 +02:00
m!nus
3ebdc2a4ce
added downward compatibility to mastersrv for 0.5 (and earlier)
2011-04-02 17:35:50 +02:00
oy
04a3b7be00
fixed problem with recorded demo files. Closes #570
2011-04-02 11:55:37 +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
98eaaf2e23
fixed 2 compiler warnings
2011-03-31 19:07:21 +02:00
oy
2a72c0b38b
added a mechanism to check for a valid standard map. Closes #132
2011-03-31 15:13:49 +02:00
oy
59d56cd332
finished IPv6 support (master servers aren't compatible with 0.5 and older). Closes #233
2011-03-30 12:08:33 +02:00
oy
9d930e15f8
fixed some compiler warnings
2011-03-28 22:08:52 +02:00
oy
34a9ca20a7
added ipv6 support from the old lua branch
2011-03-28 20:11:28 +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
oy
1628118de3
fixed a bug that messes up demos recorded by the server
2011-03-17 17:58:10 +01: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
16c074741f
To have Cheats you must set a password and sv_register 0
...
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 15:41:26 +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
oy
27e5a6af0d
made clients sending startinfo a requirement to prevent empty player infos
2011-03-15 09:58:57 +01:00
oy
d1e8707c6c
fixed demo length info and let the demo recorder search within sub folders for maps
2011-03-13 11:07:21 +01:00
oy
be8f669333
added extended demo infos in the demo browser
2011-03-13 10:41:10 +01:00
oy
5c723f5d2f
added info about the actual recorded demo length in the notification box
2011-03-12 18:34:16 +01:00
oy
b834426548
fixed several problems with spectator view in game and demo player. Closes #83
2011-03-12 18:07:57 +01:00
oy
50b266086b
made dbg_dumpmem and dbg_lognetwork work again
2011-03-05 11:46:24 +01:00
oy
0bc13c91eb
made cl_threadsoundloading work again
2011-02-27 17:56:03 +01:00
oy
d9ce720387
made engine an interface
2011-02-27 15:03:57 +01:00
heinrich5991
d506be71ea
added standard 'me' for victim console argument
2011-02-26 20:45:01 +02:00
GreYFoX
90d93ba7b2
Client showothers
2011-02-23 22:22:05 +02:00
heinrich5991
9e15232e20
increased the version number of flags
2011-02-23 17:26:39 +02:00
oy
088ec3e2f3
made the client's map search work with sub folders. Closes #254
2011-02-21 11:23:30 +01: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
heinrich5991
fabf0bc65f
made 0xF3F3F71 0x703F3F71, because 0xF3F3F71 isnt backward-compatible
2011-02-13 21:17:20 +02:00
GreYFoXGTi
718d697707
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/collision.cpp
src/game/collision.h
src/game/gamecore.cpp
src/game/server/gamecontext.cpp
2011-02-13 19:36:53 +02:00
GreYFoXGTi
f83132448d
Merged Oy, Isolated Freeze from Deep Freeze
2011-02-13 19:32:06 +02:00
heinrich5991
825eca4bab
added saving of the banreason.
2011-02-13 13:31:58 +01: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
1b2703aaba
Refactoring & fixed WEAPONSPEC_GUN in content.py
2011-02-12 21:18:41 +01:00
GreYFoXGTi
4e2ccdbeb9
fixed compiler warnings
...
made 0xF03F3F71 0xF3F3F71 because 0xF03F3F71 = 4026531840 needs unsigned screwed the whole enum
2011-02-10 04:39:45 +02:00
heinrich5991
88c0d6cfa8
filter all "no-ddrace-flags server" when a flag is required or forbidden, strictly use the flag version, fixed flag version handling
2011-02-09 23:06:14 +01: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
4ca79188dc
DDRace Flags Finalized
2011-02-05 06:13:32 +02:00
GreYFoXGTi
9db333dfee
Re-enabled flag sending
2011-02-05 03:14:17 +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
heinrich5991
0288655395
Merge branch 'master' of git://github.com/GreYFoXGTi/DDRace
2011-01-26 20:11:49 +01: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
m!nus
05d274444a
Add banning to mastersrv: any packet from a banned IP (and optionally a fixed port) will be dropped (also affects clients. Put your bans into master.cfg: "ban 127.0.0.1" or "ban 127.0.0.1:8303". It's reloaded every 5 minutes. This change also adds IStorage, IConsole and IKernel to mastersrv.
2011-01-23 17:54:27 +01:00
oy
7ed5a820c6
increased default value for br_max_requests. Closes #446
2011-01-20 21:22:10 +01:00
oy
ce42fa68ff
fixed possible CRLF line ending problem in the linereader
2011-01-20 21:17:11 +01:00
GreYFoXGTi
2151883b43
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/gamecore.cpp
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/pickup.cpp
src/game/server/entities/projectile.cpp
src/game/server/entity.h
src/game/server/gamecontext.cpp
src/game/server/player.cpp
src/game/variables.h
2011-01-20 16:10:32 +02:00
oy
8cdabb890f
fixed that the server crashes on too many snap items ( Closes #317 ), optimised snapshot hashing
2011-01-18 18:09:09 +01:00
GreYFoXGTi
2ec0e0eec4
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/engine/shared/console.cpp
src/game/client/components/hud.cpp
src/game/client/components/scoreboard.cpp
src/game/server/entities/character.cpp
src/game/server/entities/projectile.cpp
2011-01-12 11:08:17 +02:00
oy
4a79e575a0
fixed a compiler warning
2011-01-11 00:57:44 +01:00