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
|
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 |
|
heinrich5991
|
051172838b
|
fixed commit with the fix of cmdlist
|
2010-11-12 17:56:31 +01:00 |
|
GreYFoXGTi
|
96e67724f1
|
Merge branch 'rm_clientdummies' of https://github.com/heinrich5991/DDRace
Conflicts:
src/game/server/gamecontext.cpp
moved and edited src/game/ddracecommands.h
|
2010-11-05 01:59:37 +02:00 |
|
heinrich5991
|
60d7639c9b
|
moved ddrace-specific rcon cmds from 'game/server/gamecontext.cpp' to 'game/server/ddracecommands.h' in order to remove renundancy with client-side server dummies for tab-completion
|
2010-11-02 17:07:45 +01:00 |
|
heinrich5991
|
133fbfcb13
|
fixed levels of client dummies added by the previous commit
|
2010-11-01 23:08:23 +01:00 |
|
heinrich5991
|
32dd89d97f
|
added client dummies for 'move', 'move_raw', 'addweapon', 'removeweapon'
|
2010-11-01 23:04:16 +01:00 |
|
GreYFoXGTi
|
beb5712a79
|
i thought i added those like 10 years ago
|
2010-11-01 13:00:37 +02:00 |
|
GreYFoXGTi
|
ddf2883cb2
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/client/client.cpp
src/engine/server/server.cpp
src/engine/shared/console.cpp
src/game/server/gamecontext.cpp
|
2010-10-16 21:59:59 +02:00 |
|
oy
|
fa768449e2
|
fixed issue with reason on forcevotekick
|
2010-10-13 20:31:21 +02:00 |
|
GreYFoXGTi
|
47714c9468
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/variables.h
|
2010-10-13 14:08:35 +02:00 |
|
oy
|
8fb39524a9
|
do not use console in silent mode. Closes #48
|
2010-10-13 12:54:27 +02:00 |
|
GreYFoXGTi
|
dc12d59a00
|
registered server dummy commands for tab completion in the client
|
2010-10-12 10:02:46 +02:00 |
|
GreYFoXGTi
|
d8e6cfcbdd
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/french.txt
src/engine/client/client.cpp
src/engine/server/server.cpp
src/game/server/gamecontext.cpp
|
2010-10-11 03:56:58 +02:00 |
|
Choupom
|
7aefbca742
|
made so we can add the reason for a kick/ban (fixes #123)
|
2010-10-11 00:31:14 +02:00 |
|
GreYFoXGTi
|
faaa8c241e
|
Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup
|
2010-10-07 15:33:48 +02:00 |
|
oy
|
3a98f7a048
|
added mod system. Closes #34
|
2010-10-06 23:07:35 +02:00 |
|
GreYFoXGTi
|
896634a061
|
Total Cleanup
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-30 23:28:06 +03:00 |
|
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 |
|
oy
|
d913af1ab2
|
renamed demorec files to demo
|
2010-09-12 12:16:51 +02:00 |
|
GreYFoXGTi
|
d1b3e01892
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-09-07 21:49:12 +02:00 |
|
ghost
|
3baf522330
|
added the option to hide the console window on the client, too. Fixes #48
|
2010-09-07 19:32:33 +02:00 |
|
btd
|
909c583d96
|
End merge
|
2010-08-26 00:30:21 +04: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 |
|
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
|
cabecb7fa9
|
added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8
|
2010-08-18 00:06:00 +02:00 |
|
oy
|
94b28c8c97
|
fixed quit/exit command problem on startup
|
2010-08-15 15:41:04 +02:00 |
|
oy
|
7503c64237
|
made unpacking of net strings more strict - prevents possible malformed output
|
2010-08-12 15:22:07 +02:00 |
|
oy
|
1cde96ef79
|
restore empty strings in the config to their defaults on startup
|
2010-08-11 00:31:42 +02:00 |
|
oy
|
3797eba179
|
added demo recording button by fujnky
|
2010-08-09 14:14:15 +02:00 |
|
oy
|
ad9b32b741
|
added the possibility to store commands within the console and execute them later on when everything is initialised correctly - fixes several possible startup crashes and the "Support bans in server configuration"-ticket
|
2010-08-07 20:22:25 +02:00 |
|
oy
|
3f0ff1fb14
|
removed ServerDummy function cause it isn't needed anymore(actual console separates client and server commands) and added two missing server commands to the tab completion
|
2010-08-07 00:01:43 +02:00 |
|
oy
|
3c082b6441
|
changed the client configuration initialisation
|
2010-08-06 20:47:45 +02:00 |
|
oy
|
49cefa406b
|
added lost logfile feature
|
2010-08-06 20:38:13 +02:00 |
|
oy
|
665205327d
|
added lost datadir override feature
|
2010-08-05 20:26:03 +02:00 |
|
oy
|
31b63e488a
|
fixed connecting to localhost if the client couldn't find the address and small cleanup
|
2010-07-02 13:15:35 +02:00 |
|
oy
|
ea64b0d7b3
|
made the console use the flagmask when looking for command (FindCommand) and removed double "No such command" console message
|
2010-06-18 20:32:52 +02:00 |
|
xalduin
|
dc3feaf42c
|
Fixed remaining compiler warnings for gcc on Linux
|
2010-06-10 20:38:03 +08:00 |
|
Magnus Auvinen
|
b851bc8799
|
fixed so that SDL_main is declared as a C function so linking gets done correctly
|
2010-06-02 04:09:39 +08:00 |
|
Thomas
|
361380d630
|
*some esthetic changes
*split "CHud::RenderGoals()"
*added "reload" command
*added the ability to show last chat lines (+show_chat)
*updated french.txt
|
2010-05-30 12:01:11 +00:00 |
|
Tom Adams
|
47b68170ad
|
auto capture mouse on focus (#728)
|
2010-05-30 01:00:17 +00:00 |
|
Magnus Auvinen
|
f41fa4baba
|
cleaned up some code
|
2010-05-29 11:23:06 +00:00 |
|
Magnus Auvinen
|
d0e0d5b043
|
cleaned up some comments
|
2010-05-29 11:21:39 +00:00 |
|
Magnus Auvinen
|
6ff27c56e8
|
fixed crash with related to player count
|
2010-05-29 11:12:52 +00:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|
Magnus Auvinen
|
8b3c16e615
|
major engine cleanup. dependency on baselib removed. engine is now C code (not ansi tho). some other cruft removed aswell
|
2007-08-22 07:52:33 +00:00 |
|
Jakob Fries
|
a49f78b66b
|
improved emoticon selector
|
2007-08-15 10:18:01 +00:00 |
|
Magnus Auvinen
|
acd2b1beb8
|
merge error, snapshot got applied twice
|
2007-08-14 22:16:40 +00:00 |
|
Magnus Auvinen
|
2cde04ddce
|
merged over all stuff from 0.2 to trunk
|
2007-08-14 18:37:16 +00:00 |
|
Jakob Fries
|
204a66b610
|
dissapearing sounds and effects are no longer dissapearing
|
2007-08-08 23:30:55 +00:00 |
|
Johan Althoff
|
0c7e1fc6ab
|
fixed window focusing stuff, much better now.
|
2007-08-07 18:28:51 +00:00 |
|
Johan Althoff
|
f38f0f49d5
|
fixed so that the client doesn't spam screenshots
|
2007-08-07 18:07:34 +00:00 |
|
Joel de Vahl
|
53b25fdab4
|
fixed endian problams in server list
|
2007-08-06 17:52:17 +00:00 |
|
Joel de Vahl
|
ffcdc63ded
|
stupid missed return
|
2007-08-05 23:05:38 +00:00 |
|
Joel de Vahl
|
313781b365
|
scroll wheel for weapon switch
|
2007-08-05 23:00:32 +00:00 |
|
Jakob Fries
|
e4829981b1
|
|
2007-08-05 15:56:32 +00:00 |
|
Jakob Fries
|
6ec3e70bab
|
config is now stored in ~/teewars on macs
|
2007-08-05 15:23:23 +00:00 |
|
Magnus Auvinen
|
640b2bd953
|
made so that you can bind the server to a specific address
|
2007-08-05 14:19:13 +00:00 |
|
Magnus Auvinen
|
43ceec0f9c
|
removed some debug keys
|
2007-08-04 22:02:38 +00:00 |
|
Magnus Auvinen
|
1eadf9942a
|
fixed handling of versions. added error messages when disconnected. updated the connecting gui. fixed no streched clouds
|
2007-08-04 18:23:26 +00:00 |
|
Magnus Auvinen
|
c2b65c73de
|
added screenshot button to F10
|
2007-08-04 09:20:59 +00:00 |
|
Magnus Auvinen
|
3c1d46c048
|
made everything as const on the client so its more clear that you shouldn't change the snapshots
|
2007-07-31 06:23:24 +00:00 |
|
Magnus Auvinen
|
3014707fe5
|
fixed problem with server and client getting out of sync
|
2007-07-30 22:57:35 +00:00 |
|
Magnus Auvinen
|
f826bc6cac
|
larger update. reduced the amount of video memory used from ~60 to ~36mb on a typical map
|
2007-07-30 19:46:31 +00:00 |
|
Magnus Auvinen
|
8233a44b60
|
an update :D
|
2007-07-29 22:09:15 +00:00 |
|
Magnus Auvinen
|
7699e4b400
|
removed the batch functions as it did next to nothing. changed some of the default values. cleaned up some of the config variables. added options in the menu to control gfx quality of the game.
|
2007-07-29 15:55:04 +00:00 |
|
Magnus Auvinen
|
e6c4db94d8
|
fixed some problems with the snapshot handling. added fps meter. fixed error when connecting to several servers
|
2007-07-29 13:21:33 +00:00 |
|
Magnus Auvinen
|
2cd3f5b023
|
fixed so that you can press esc when connecting
|
2007-07-28 17:06:47 +00:00 |
|
Magnus Auvinen
|
1d34666164
|
fixed latency stuff, some gfx stuff
|
2007-07-26 19:09:31 +00:00 |
|
Magnus Auvinen
|
1aecc644de
|
fixed errors in the network code
|
2007-07-25 07:24:57 +00:00 |
|
Magnus Auvinen
|
5bd2c434f6
|
epic commit. removed tga support, removed BGR support. fixed one config for editor, server and client, optimized tilemap rendering (this needs some cleanup), added tools to fix alpha outline quirk and glitches in the tilemap reindering
|
2007-07-24 22:53:43 +00:00 |
|
Magnus Auvinen
|
40eaf9431b
|
fixed some serverbrosers related stuff
|
2007-07-23 21:21:30 +00:00 |
|
Olle Rosenquist
|
26dd1c20ce
|
Updated stuff
|
2007-07-22 11:53:15 +00:00 |
|
Magnus Auvinen
|
3b1871499c
|
laggometer, smaller gfx fixes
|
2007-07-22 09:15:34 +00:00 |
|
Magnus Auvinen
|
9ef96af054
|
fixed alot of masterserver fixes
|
2007-07-21 21:28:56 +00:00 |
|
Magnus Auvinen
|
0c786f6002
|
fixed nasty error in the network
|
2007-07-21 19:02:47 +00:00 |
|
Magnus Auvinen
|
44794521c9
|
fixed non-inited variables
|
2007-07-21 18:13:20 +00:00 |
|
Magnus Auvinen
|
9e4aea97bd
|
lots of cool new features :D new master server
|
2007-07-21 18:07:27 +00:00 |
|
Jakob Fries
|
d3986a36a7
|
|
2007-07-21 17:43:00 +00:00 |
|
Jakob Fries
|
d40868e913
|
|
2007-07-21 16:33:01 +00:00 |
|
Jakob Fries
|
a622421cf3
|
|
2007-07-21 15:48:35 +00:00 |
|
Magnus Auvinen
|
dd5afa751d
|
clean up
|
2007-07-15 23:51:51 +00:00 |
|
Magnus Auvinen
|
f2611cad8b
|
fixed so that the editor works again
|
2007-07-15 13:25:10 +00:00 |
|
Magnus Auvinen
|
8a4cd7627e
|
added score and time limit. cleaned up the code aswell abit
|
2007-07-15 10:47:50 +00:00 |
|
Magnus Auvinen
|
94fe893150
|
kill messages and other fixes and features
|
2007-07-14 22:35:00 +00:00 |
|
Magnus Auvinen
|
568b9f1f4a
|
added chat, better damage indicators
|
2007-07-14 13:09:42 +00:00 |
|
Magnus Auvinen
|
125d04e51f
|
large rewrite and code cleanup
|
2007-07-13 13:40:04 +00:00 |
|
Jakob Fries
|
7ad13ccb12
|
new input thingies
|
2007-06-10 15:19:04 +00:00 |
|