Magnus Auvinen
|
666401e309
|
added osx implementation. not tested, not even compiled once. hope it works
|
2012-01-03 22:49:31 +01:00 |
|
Magnus Auvinen
|
2991f4071e
|
fixed kicking of command buffer if it's full when rendering. fixed compile error on windows
|
2012-01-03 22:01:37 +01:00 |
|
Magnus Auvinen
|
50d872531a
|
cleaned up the code. fixed so that SDL is inited on main thread and then transfers the gl context to the render thread
|
2012-01-03 21:39:10 +01:00 |
|
Magnus Auvinen
|
c31c82a584
|
added support for video modes
|
2012-01-01 14:30:45 +01:00 |
|
Magnus Auvinen
|
d7fe3ddaab
|
fixed shutdown and screenshot functionallity
|
2012-01-01 14:15:35 +01:00 |
|
Magnus Auvinen
|
c1942ca6cb
|
fixed the render frame time and cleaned up some more code
|
2012-01-01 13:38:46 +01: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
|
8b76105cfa
|
cleaned up some of the code
|
2011-12-31 14:00:49 +01:00 |
|
Magnus Auvinen
|
6e57620c2c
|
added flags for mipmap generation on textures. fixes missing texts
|
2011-12-31 11:18:55 +01: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 |
|
Magnus Auvinen
|
8a91bfa1dd
|
fixed texture upload support. removed raw gl calls from the text render
|
2011-12-31 09:40:11 +01:00 |
|
Magnus Auvinen
|
50e75da333
|
fixed so that the resolusion is set correctly on init
|
2011-12-31 01:23:04 +01:00 |
|
Magnus Auvinen
|
09b785a290
|
splitted out the graphics threaded into a separate header
|
2011-12-31 01:11:24 +01:00 |
|
Magnus Auvinen
|
8e56885795
|
initial commit of the threaded graphics. can start game and render the gui. no textures at the moment. still waits for the swap for now
|
2011-12-31 01:06:04 +01:00 |
|
oy
|
de3e94d901
|
clean up temp commands on logout in the client
|
2011-12-30 19:21:00 +01:00 |
|
Magnus Auvinen
|
8ffe582615
|
ugly incomplete hack to put the rendering into another thread so we don't have to wait for the flip
|
2011-12-30 16:02:22 +01:00 |
|
oy
|
b44ee3d975
|
reworked ban system
|
2011-12-29 23:36:53 +01:00 |
|
oy
|
988b1c22cf
|
fixed that the server browser list gets sorted twice on a new entry
|
2011-12-29 13:06:53 +01:00 |
|
oy
|
af9775f400
|
fixed texture increasing in the text renderer
|
2011-12-29 13:03:06 +01:00 |
|
Shereef Marzouk
|
c496bf3c4e
|
Merge branch 'master' of https://github.com/oy/teeworlds into DDRace
Conflicts:
bam.lua
scripts/make_release.py
|
2011-12-14 17:01:47 +02:00 |
|
oy
|
6e20c32859
|
removed some resource loading spam. Closes #894
|
2011-12-10 18:23:29 +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
|
0fdc9c1b8e
|
cleaned up few things
|
2011-12-04 14:17:05 +01:00 |
|
GreYFoX
|
5ebf60891c
|
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
|
2011-12-01 19:48:09 +02:00 |
|
oy
|
05f77f64af
|
added caching for the play command. Closes #891
|
2011-11-30 01:41:00 +01:00 |
|
oy
|
48d367db20
|
added faster way of inverting the sorted serverlist by KillaBilla. Closes #885
|
2011-11-29 22:34:47 +01:00 |
|
oy
|
8238853b8c
|
added a todo note
|
2011-11-29 22:18:40 +01:00 |
|
eeeee
|
1452b6811c
|
Replaced sorting implementation with stable one to prevent annoying flickering on server browser update.
|
2011-11-29 22:16:41 +01:00 |
|
GreYFoX
|
7e24be5d83
|
Version 1.091a
|
2011-08-31 12:10:15 +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
|
2aee50d5b1
|
fixed a nasty noise problem. Closes #812
|
2011-08-05 18:37:59 +02:00 |
|
oy
|
b25fc26c1c
|
zero out client memory on startup to prevent more bad surprises
|
2011-07-31 18:39:48 +02:00 |
|
oy
|
9cf4facd05
|
fixed a client crash in debug. Closes #806
|
2011-07-31 17:07:10 +02:00 |
|
oy
|
34132ce244
|
fixed client crash in debug
|
2011-07-31 01:38:45 +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
|
b3e8506f20
|
create client on heap. Closes #744
|
2011-07-30 13:50:22 +02:00 |
|
SushiTee
|
a3fec2f9f3
|
fixed clipping on some machines
|
2011-07-15 00:39:37 +02:00 |
|
oy
|
571dff6216
|
made rcon auto completion serverside. Closes #97
|
2011-07-14 22:07:21 +02:00 |
|
oy
|
e37d536fdf
|
fixed some NETTYPE usage based on the socket state
|
2011-07-07 01:48:00 +02:00 |
|
Choupom
|
520683c0aa
|
made so background musics restart where they got stopped
|
2011-07-02 19:24:21 +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 |
|
oy
|
47cdd2524b
|
do not try to play sound when it isn't enabled
|
2011-06-27 22:57:06 +02:00 |
|
Choupom
|
99c2c53c0b
|
fixed some dbg_assert
|
2011-06-27 16:45:40 +02:00 |
|
oy
|
557c906390
|
fixed compiling problem
|
2011-06-27 16:44:35 +02:00 |
|
Choupom
|
b17a7be286
|
fixed #2 Too big textures
|
2011-06-27 16:32:52 +02:00 |
|
oy
|
fb309436b4
|
improved friends feature
|
2011-06-26 17:10:13 +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 |
|
heinrich5991
|
9fb36fd802
|
added strict game type filter
|
2011-05-02 19:25:38 +02:00 |
|
GreYFoX
|
5924b5a8bf
|
Fixed blank squares and cl_show_entities to show other layers
P.S. this might introduce a client crash bug, but it needs to happen for me to trace it
|
2011-04-17 19:14:49 +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 |
|
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
|
1a5d70450f
|
added "reimplemented menu music by teetow-the-great-teetow" by Choupom
|
2011-04-13 20:00:54 +02:00 |
|
GreYFoX
|
aaac8a3f77
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/version.h
|
2011-04-09 22:33:06 +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
|
4d8c9d1c0d
|
updated standard map filter in the server browser with new maps
|
2011-04-09 00:08:32 +02:00 |
|
oy
|
b6118ae9fe
|
mapped IPv4 addresses within master servers server list to IPv6 to decrease the size of an entry and increased the servers per packet
|
2011-04-08 23:56:15 +02:00 |
|
oy
|
f38fc81d78
|
fixed a possible client crash on map change
|
2011-04-07 18:23:03 +02:00 |
|
oy
|
c27a634089
|
fixed and show error message if the crc doesn't match on map load
|
2011-04-07 18:07:22 +02:00 |
|
oy
|
4ad6d2f01e
|
fixed problem with sv_bindaddr on the server
|
2011-04-04 18:20:05 +02:00 |
|
oy
|
9cb2f07b80
|
fixed clients search for maps within subfolders
|
2011-04-04 16:53:02 +02:00 |
|
oy
|
ab810cab25
|
fixed that player options just show players as friends not clans
|
2011-04-02 19:51:05 +02:00 |
|
oy
|
04a3b7be00
|
fixed problem with recorded demo files. Closes #570
|
2011-04-02 11:55:37 +02:00 |
|
oy
|
85e9fb1e63
|
made it possible to add just a clan as friend
|
2011-03-31 21:30:28 +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
|
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
|
34a9ca20a7
|
added ipv6 support from the old lua branch
|
2011-03-28 20:11:28 +02:00 |
|
oy
|
7bd79f9f43
|
added remove_favorite command by Choupom
|
2011-03-27 18:05:11 +02:00 |
|
oy
|
a583633cde
|
added renaming of srvbrowse so it matches with the interface filename by Choupom
|
2011-03-27 18:00:54 +02:00 |
|
oy
|
ae325c873f
|
added friends feature. Closes #24
|
2011-03-23 13:06:35 +01:00 |
|
Sebastian Wojtowicz
|
55ce870597
|
Client utf8 converting (servernames,playernames) in Internet tab and (playernames,playermessage) in chat and hud
|
2011-03-22 21:11:10 +02:00 |
|
oy
|
192d6a0b13
|
fixed that spectator filter updates the server browser
|
2011-03-20 16:09:44 +01: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 |
|
oy
|
79aa9d640e
|
fixed that server browser shows the correct country flag
|
2011-03-20 11:15:24 +01: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 |
|
oy
|
f8ae9f7732
|
made server browser show clan name and country code for players
|
2011-03-18 17:59:48 +01:00 |
|
oy
|
b939d38228
|
made the client check for valid address on connectionless packets from master/version server
|
2011-03-17 17:41:57 +01:00 |
|
GreYFoX
|
87cde802b1
|
Added a new entities_clear
Fixed cl_ddrace_cheats not controlling cl_show_entities
attempted to make cl_show_entities show other layers than the game layer
|
2011-03-16 19:48:16 +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
|
ee178d5a48
|
Client Cheat showing entities in game
|
2011-03-16 14:48:16 +02:00 |
|
oy
|
7412fabb9c
|
made serverinfo use clan name and country code for players
|
2011-03-16 12:37:41 +01:00 |
|
oy
|
27e5a6af0d
|
made clients sending startinfo a requirement to prevent empty player infos
|
2011-03-15 09:58:57 +01:00 |
|
oy
|
09dc08859d
|
added a function to set the text outline colour and increased readability of nameplates on bright backgrounds. Closes #205
|
2011-03-13 12:55:00 +01:00 |
|
oy
|
be8f669333
|
added extended demo infos in the demo browser
|
2011-03-13 10:41:10 +01:00 |
|
oy
|
50b266086b
|
made dbg_dumpmem and dbg_lognetwork work again
|
2011-03-05 11:46:24 +01:00 |
|
oy
|
fc692d85c8
|
decreased server info timeouts for now
|
2011-03-04 18:32:12 +01:00 |
|
oy
|
0ae19e1339
|
removed support for old server infos
|
2011-03-04 18:14:08 +01:00 |
|
oy
|
d9ce720387
|
made engine an interface
|
2011-02-27 15:03:57 +01:00 |
|
oy
|
088ec3e2f3
|
made the client's map search work with sub folders. Closes #254
|
2011-02-21 11:23:30 +01:00 |
|
oy
|
4f91026a01
|
added an editor function to show tile informations (index, flip/rotate status)
|
2011-02-18 11:41:27 +01:00 |
|
oy
|
169efb129f
|
enabled debug rendering in the editor
|
2011-02-18 11:25:55 +01:00 |
|
oy
|
6a6e7b702e
|
removed double utf8 decoding in text rendering
|
2011-02-18 11:08:38 +01:00 |
|
oy
|
d939b84125
|
removed no longer needed progression browse info
|
2011-02-16 12:31:47 +01:00 |
|
oy
|
b63dbfede5
|
fixed problems with map downloading if the map changes during download. Closes #236
|
2011-02-16 12:07:54 +01:00 |
|
GreYFoXGTi
|
78ee6148f8
|
SortHash
Loading String
|
2011-02-16 12:22:55 +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 |
|
oy
|
818cf464e3
|
added missing disconnect for stress testing
|
2011-02-13 17:59:51 +01:00 |
|
GreYFoXGTi
|
1b2703aaba
|
Refactoring & fixed WEAPONSPEC_GUN in content.py
|
2011-02-12 21:18:41 +01: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
|
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
|
3da1860654
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/dutch.txt
|
2011-02-04 18:54:54 +02:00 |
|
GreYFoXGTi
|
0aa3e8f546
|
Forgot to do this with the other DDRace Flags
|
2011-01-30 21:11:32 +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 |
|
oy
|
be68a4f516
|
added fix by CarmineZ about missing tool tips in the editor
|
2011-01-29 18:48:55 +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
|
82749dedf0
|
fixed beginning of gametime margin graph
|
2011-01-19 19:29:10 +01:00 |
|
oy
|
7ca7c95bc0
|
limit the latency within server browser entries to a maximum of 999
|
2011-01-19 15:54:50 +01:00 |
|
oy
|
bf6fcc20f4
|
added an error popup on startup when the sound couldn't be initialised. Closes #425
|
2011-01-17 13:28:15 +01:00 |
|
oy
|
216967c3bf
|
release gameclient components when opening the editor. Closes #429
|
2011-01-17 12:28:37 +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 |
|
GreYFoXGTi
|
959b05d557
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2011-01-10 00:45:58 +02:00 |
|
oy
|
91f642fac2
|
fixed cut off broadcast. Closes #398
|
2011-01-09 23:25:07 +01:00 |
|
oy
|
41b8022aa1
|
record a new demo when a game ends. Closes #358
|
2011-01-06 23:21:51 +01:00 |
|
oy
|
f8b1edca64
|
show error message for all content that could not be loaded. Closes #257
|
2011-01-06 22:18:19 +01:00 |
|
GreYFoXGTi
|
ddc5dd7ab3
|
Cleaned up & Re-arranged stuff
|
2011-01-06 05:46:10 +02:00 |
|
GreYFoXGTi
|
1d9190fd5b
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/russian.txt
readme.txt
src/game/variables.h
|
2011-01-06 01:49:58 +02:00 |
|
m!nus
|
7b46d386dd
|
requesting serverinfo now uses gie2 instead of the legacy gief.
|
2011-01-05 12:22:45 +01:00 |
|
oy
|
aad2438882
|
fixed outlines for larger font sizes
|
2011-01-05 12:12:23 +01:00 |
|
GreYFoXGTi
|
c5648311ed
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/german.txt
src/game/client/components/scoreboard.cpp
src/game/editor/ed_layer_tiles.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/variables.h
|
2011-01-04 22:37:09 +02:00 |
|
oy
|
1928a757c6
|
added fix for rendering big fonts on large resolutions by RushPL
|
2011-01-04 12:30:40 +01:00 |
|
oy
|
5dbe75fd7b
|
removed duplicate stuff
|
2011-01-04 12:00:34 +01: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 |
|
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
|
157aafd4dd
|
Merge branch 'master' into DDRace
Conflicts:
src/engine/server/server.cpp
src/game/variables.h
|
2010-12-11 23:57:41 +02:00 |
|
oy
|
ecd7afd9ff
|
added cleaner exit on quit event by Choupom
|
2010-12-11 22:04:50 +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
|
4756c031c5
|
save auto recorded demos in a separate folder and added an option to enable/disable it in the settings menu
|
2010-12-08 01:55:13 +01:00 |
|
oy
|
0fe8cabe78
|
added auto recording support by Batchyx
|
2010-12-08 01:42:32 +01:00 |
|
oy
|
db9dd6b8c9
|
added an optional time stamp to a demo record by Batchyx
|
2010-12-08 00:42:32 +01:00 |
|
oy
|
665934ee09
|
cleaned up several uses of timestamps for filenames
|
2010-12-08 00:32:50 +01:00 |
|
oy
|
bd9850cae2
|
added single function to stop recording by Batchyx
|
2010-12-08 00:02:24 +01: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 |
|
oy
|
e7e2501d1b
|
close map-download-file if the map changes during downloading
|
2010-11-21 01:10:25 +01:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01:00 |
|
GreYFoXGTi
|
a109e1150d
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/shared/config_variables.h
src/game/client/components/console.cpp
src/game/client/gameclient.cpp
src/game/editor/ed_editor.h
src/game/server/gamecontext.cpp
|
2010-11-18 01:10:59 +02:00 |
|
oy
|
3d3572f845
|
fixed some compiler warnings
|
2010-11-17 18:36:19 +01:00 |
|
oy
|
f1ce0d1949
|
improved loading progression in the server browser
|
2010-11-17 12:43:24 +01:00 |
|