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
|
a0a62bcd70
|
fixed econ feature and tcp
|
2011-07-30 13:40:01 +02:00 |
|
oy
|
83d8422c4c
|
added "fixed tcp and added ipv6 tcp support" by SushiTee
|
2011-07-06 18:20:46 +02:00 |
|
oy
|
601509fe8a
|
fixed compiler error on older windows sdk's. Closes #627
|
2011-06-18 17:27:14 +02:00 |
|
oy
|
e1ef01f656
|
made tab completion for names in chat start with the ones that match on the beginning
|
2011-06-09 23:28:20 +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
|
0ea5641df4
|
adding thread_detach to system.h and system.c
|
2011-05-01 15:48:09 +02:00 |
|
heinrich5991
|
e50e103529
|
made net_addr_str give a string without port if it is = 0
|
2011-04-22 19:52:27 +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 |
|
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 |
|
Sworddragon
|
0efa2634f7
|
Fixed some compiler warnings
|
2011-04-03 22:35:11 +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
|
50b266086b
|
made dbg_dumpmem and dbg_lognetwork work again
|
2011-03-05 11:46:24 +01:00 |
|
oy
|
088ec3e2f3
|
made the client's map search work with sub folders. Closes #254
|
2011-02-21 11:23:30 +01: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
|
3c7adc6a7f
|
fixed nethash
|
2011-02-13 13:06:19 +01:00 |
|
oy
|
0698243c6b
|
removed a compiler warning
|
2011-02-10 11:34:59 +01:00 |
|
oy
|
49bea07df7
|
show the path of $CURRENTDIR. Closes #323
|
2010-12-11 23:10:13 +01:00 |
|
oy
|
9ef5e64916
|
added function to add a time stamp string
|
2010-12-08 00:26:55 +01:00 |
|
oy
|
7c26dcbadd
|
moved function to remove files
|
2010-12-08 00:13:59 +01:00 |
|
oy
|
d30dd9da8f
|
added Storage function to move/rename files by Batchyx
|
2010-12-08 00:09:18 +01:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01:00 |
|
oy
|
3d3572f845
|
fixed some compiler warnings
|
2010-11-17 18:36:19 +01:00 |
|
oy
|
295830fcaa
|
removed unneeded include
|
2010-11-16 17:53:09 +01:00 |
|
oy
|
fb5e0671db
|
fixed str_utf8_forward and str_utf8_encode
|
2010-10-29 23:08:23 +02:00 |
|
oy
|
af56496281
|
moved str_skip_to_whitespace function
|
2010-10-25 18:41:15 +02:00 |
|
oy
|
6a26cd6621
|
fixed various problems with the file dialog in the editor
|
2010-10-07 23:51:07 +02:00 |
|
oy
|
67e9f03f23
|
when setting a config string variable check if it's a utf8 string and encode it if the check fails. Closes #10
|
2010-10-01 00:55:16 +02:00 |
|
oy
|
aaf8e2bc8e
|
cleaned up demo listing and fixed its sorting. Closes #73
|
2010-09-29 00:53:53 +02:00 |
|
oy
|
feb7e60bb2
|
fixed map listing
|
2010-09-24 13:48:23 +02:00 |
|
oy
|
7e0b37e06c
|
fixed that it checks the current dir for demos too
|
2010-09-24 13:38:03 +02:00 |
|
oy
|
a2083b31e3
|
fixed last commit
|
2010-09-16 12:48:32 +02:00 |
|
Choupom
|
582763bc21
|
made folders in editor (#80)
|
2010-09-16 12:28:10 +02:00 |
|
Choupom
|
0198e51fa3
|
made demo readable for custom map that user doesn't have (#5)
|
2010-09-05 16:34:39 +02:00 |
|
oy
|
abc84ac0b0
|
added fixes for compiler errors and warnings by sworddragon
|
2010-08-16 02:21:18 +02:00 |
|
oy
|
7503c64237
|
made unpacking of net strings more strict - prevents possible malformed output
|
2010-08-12 15:22:07 +02:00 |
|
oy
|
2a570196ef
|
check for case sensitive filename when trying to open a file for reading under windows. Closes #126
|
2010-06-26 17:53:32 +02:00 |
|
Choupom
|
8e8cbdb562
|
fix for folders in demo browser
|
2010-06-10 20:38:16 +08:00 |
|
Choupom
|
848764544f
|
added folders in demo browser (#25)
|
2010-06-04 22:14:02 +02:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|
Magnus Auvinen
|
8bd49fe30b
|
some clean up. fixed double server side record messages
|
2009-06-15 13:01:04 +00:00 |
|
Magnus Auvinen
|
307cf4aa64
|
done language selector
|
2009-06-15 08:15:53 +00:00 |
|
Magnus Auvinen
|
6d9ccee95d
|
base for the localization system
|
2009-06-13 16:54:04 +00:00 |
|
Magnus Auvinen
|
69511102de
|
improved the font system even futher. utf8 is now used everywhere. it uses less memory as well
|
2009-06-13 08:22:37 +00:00 |
|
Alfred Eriksson
|
272769ecc5
|
fixed the getaddrinfo-issue on win2k. since it doesn't affect other windows versions we don't have to do any recognisation
|
2009-01-17 22:44:20 +00:00 |
|
Magnus Auvinen
|
f8490e6ea6
|
added str_isspace and str_length functions to system
|
2008-11-08 08:27:11 +00:00 |
|
Magnus Auvinen
|
9acb3e5e71
|
continued on ban support. cleaned up settings a bit. reworked the datadir autodetection. introduced engine_openfile, engine_getpath and engine_listdir. never use fs_listdir or io_open directly
|
2008-10-21 18:05:06 +00:00 |
|
Joel de Vahl
|
2b6f991010
|
Better mem_check reporting
|
2008-10-07 16:17:58 +00:00 |
|
Joel de Vahl
|
d1b55351cc
|
Big endian fix.
|
2008-10-06 16:44:34 +00:00 |
|
Joel de Vahl
|
d5b1c93598
|
fixed message box on osx
|
2008-10-02 14:37:48 +00:00 |
|
Magnus Auvinen
|
cebda9790b
|
some cleanups. splitted e_network.c into several files. continued on the ban support
|
2008-10-02 12:29:19 +00:00 |
|
Dominik Geyer
|
397b9a764b
|
data-dir autodetection; data-dir override; compiled-in data-dir; messagebox if detection fails; does chdir into data-dir
|
2008-10-01 17:16:22 +00:00 |
|
Dominik Geyer
|
fb3e8dec79
|
use sizeof instead of fix value
|
2008-09-30 17:10:19 +00:00 |
|
Dominik Geyer
|
9266f242c3
|
implemented gui_messagebox() which displays low-level message-box
|
2008-09-30 15:52:15 +00:00 |
|
Dominik Geyer
|
799e82ba8b
|
removed redundant unistd.h include
|
2008-09-30 14:24:06 +00:00 |
|
Magnus Auvinen
|
171ca682d3
|
added saving of favorites
|
2008-09-03 21:02:30 +00:00 |
|
Magnus Auvinen
|
16912026db
|
added cl_layershot. fixed some bugs in the network
|
2008-08-17 07:05:16 +00:00 |
|
Magnus Auvinen
|
817f431377
|
moved out e_system, e_detect, vmath and math to a little base library
|
2008-08-14 17:19:13 +00:00 |
|