GreYFoXGTi
|
461abbaa7e
|
Fixed Scoreboard cl_show_ids
|
2010-11-29 04:46:45 +02:00 |
|
GreYFoXGTi
|
ae4aebd365
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-11-24 02:28:01 +02:00 |
|
oy
|
e6698b1118
|
apply custom colour to blood colour. Closes #314
|
2010-11-24 01:11:56 +01:00 |
|
oy
|
bc5f3fc839
|
fixed client crash when there are lots of particles. Closes #105
|
2010-11-24 01:08:51 +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
|
8e3cba8dbf
|
disable free view when chatting as spectator. Closes #303
|
2010-11-21 18:05:26 +01:00 |
|
oy
|
ba05ddd0f5
|
removed duplicate entry from the localisation files
|
2010-11-21 14:12:39 +01:00 |
|
oy
|
e4f1e18c4e
|
fixed entry names in the demo browser and the editor's file dialog. Closes #301
|
2010-11-21 12:33:13 +01:00 |
|
oy
|
f75ad090e9
|
fixed a localisation string
|
2010-11-20 23:46:49 +01:00 |
|
oy
|
7a6006087c
|
removed duplicate note in password popup
|
2010-11-20 23:39:17 +01:00 |
|
Choupom
|
0aa0a56990
|
fixed so ui_scale is affected on server's name (fixes #43)
|
2010-11-20 21:37:35 +01:00 |
|
Choupom
|
38c2a1b45c
|
fixed so every demo infos are not loaded when making the demos list
|
2010-11-20 21:34:13 +01:00 |
|
Sworddragon
|
fc9211c777
|
Updated copyrights
|
2010-11-20 21:26:06 +01:00 |
|
GreYFoXGTi
|
a764ebc1a8
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-11-20 11:00:41 +02:00 |
|
oy
|
32e52d51ce
|
added a missing localisation
|
2010-11-19 20:20:51 +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
|
d94355729d
|
added icons in the demo browser and the editor's file dialog. Closes #209
|
2010-11-17 19:46:50 +01:00 |
|
oy
|
8351682edf
|
added constants for console types by Choupom
|
2010-11-17 13:01:46 +01:00 |
|
oy
|
f1ce0d1949
|
improved loading progression in the server browser
|
2010-11-17 12:43:24 +01:00 |
|
Choupom
|
a7f37446b6
|
added loading progression in server browser
|
2010-11-17 12:31:44 +01:00 |
|
GreYFoXGTi
|
ae591407c9
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-11-17 13:11:40 +02:00 |
|
oy
|
9ff7500f30
|
fixed graphic problems with ninja when pausing a demo. Closes #269
|
2010-11-17 00:38:20 +01:00 |
|
btd
|
081c5d8bc2
|
Fix score board and small perfomance improvments
|
2010-11-05 14:56:44 +03:00 |
|
btd
|
418875b5e5
|
Add score board time, need to add in server send time for players if someone enter
|
2010-11-04 19:39:04 +03:00 |
|
btd
|
62ef58329d
|
Return DDRace stuff. No need in mistic compatibility
|
2010-10-31 23:50:40 +03:00 |
|
GreYFoXGTi
|
fc433afd49
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-10-31 20:32:35 +02:00 |
|
oy
|
6c51e864ee
|
deactivated emote selector in spectator mode. Closes #250
|
2010-10-31 19:15:20 +01:00 |
|
GreYFoXGTi
|
85df8a047d
|
Fixed btd's last commit and ensured RaceClient Support(tested)
|
2010-10-30 21:44:46 +02:00 |
|
btd
|
86365bedcd
|
Add Race stuff but fully reworked. Still only need to make score board
|
2010-10-30 18:22:35 +04:00 |
|
GreYFoXGTi
|
fb88a8e4e7
|
Added In-Game Server Browser. Closes #65.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-10-30 00:44:52 +02:00 |
|
GreYFoXGTi
|
505a5b4172
|
Refactoring
|
2010-10-29 23:29:07 +02:00 |
|
GreYFoXGTi
|
4d204d642f
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/console.h
src/engine/shared/console.cpp
src/engine/shared/console.h
|
2010-10-26 00:25:36 +02:00 |
|
oy
|
1209ad9baf
|
fixed a problem with the skin selector
|
2010-10-25 21:23:05 +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 |
|
Choupom
|
d2519f7ab9
|
small ui fixes
|
2010-10-25 18:59:33 +02:00 |
|
heinrich5991
|
5b5eb0b2c0
|
ingame browser added (config: cl_serverbrowser, hotkey: ctrl+shift+b
|
2010-10-22 17:29:46 +02:00 |
|
GreYFoXGTi
|
4197a6ce8b
|
Re-enabled pure tuning check, reset tunings to vanilla values, made server apply DDRace tunings on startup and map change. Closes #97.
Revert "Now can Join Vanilla servers. Closes #96."
This reverts commit c6fda43369 .
Conflicts:
src/game/client/components/menus_settings.cpp
|
2010-10-22 15:22:17 +02:00 |
|
GreYFoXGTi
|
43eb6025a1
|
Merge branch 'master' of http://github.com/heinrich5991/DDRace
|
2010-10-20 15:12:37 +02:00 |
|
heinrich5991
|
5df496317b
|
fixed line endings to LF
|
2010-10-20 08:13:48 +02:00 |
|
GreYFoXGTi
|
abafbdd919
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-10-20 01:19:06 +02:00 |
|
SushiTee
|
314cda05c7
|
changed demo animations according to demo speed and added some demo speeds. (fixes #206)
|
2010-10-19 18:52:16 +02:00 |
|
GreYFoXGTi
|
5ac519f742
|
Merge branch 'master' of http://github.com/heinrich5991/DDRace
|
2010-10-19 18:31:24 +02:00 |
|
GreYFoXGTi
|
c6fda43369
|
Now can Join Vanilla servers. Closes #96.
|
2010-10-19 18:30:45 +02:00 |
|
heinrich5991
|
684e1788ed
|
added strict gametype filtering
|
2010-10-19 17:18:32 +02:00 |
|
btd
|
1f0e49c080
|
Add my old zoom staff
|
2010-10-17 12:43:27 +04:00 |
|
GreYFoXGTi
|
7f437f7245
|
Merge branch 'master' of http://github.com/heinrich5991/DDRace
Conflicts:
src/game/server/gamecontext.cpp
|
2010-10-16 22:02:34 +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
|
662f43919c
|
fixed overlapping restart warning
|
2010-10-16 11:27:49 +02:00 |
|
oy
|
639c32d661
|
do not show the restart warning in the settings if you change back to actual settings. Closes #90
|
2010-10-16 11:24:42 +02:00 |
|
oy
|
5f7efb465e
|
optimised console rendering a bit
|
2010-10-16 10:32:56 +02:00 |
|