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
oy
b94c70d351
close the scoreboard when opening the menu in the demo player. Closes #407
2011-01-12 01:33:16 +01:00
oy
3f4556a861
hide the broadcast when the scoreboard is active. Closes #408
2011-01-12 01:18:07 +01:00
oy
1f55237919
made the end game message in team games a bit smaller so it doesn't overlap the scoreboard. Closes #406
2011-01-12 01:10:40 +01:00
oy
d79fd3d4c0
added dm score hud. Closes #356
2011-01-12 01:01:05 +01:00
oy
b60d6deb51
made m_paInfoByScore within gameclient's snap state work and cleaned up render scoreboard
2011-01-11 23:03:01 +01:00
oy
8f999837c6
improved the count down timer. Closes #391
2011-01-10 00:58:03 +01:00
oy
9819163c5f
fixed some overlapping in the server browser. Closes #376
2011-01-10 00:18:30 +01:00
GreYFoXGTi
959b05d557
Merge branch 'master' of http://github.com/oy/teeworlds
2011-01-10 00:45:58 +02:00
oy
9358b24113
reset demo player on end and when pressing the stop button. Closes #401
2011-01-09 23:42:37 +01:00
oy
91f642fac2
fixed cut off broadcast. Closes #398
2011-01-09 23:25:07 +01:00
oy
eedaf62d97
fixed that the client crashes if it has no skins
2011-01-06 22:55:57 +01:00
GreYFoXGTi
6889adc0bb
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
.gitignore
src/game/client/gameclient.cpp
src/game/editor/ed_editor.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h & Cleaned it up
2011-01-06 23:32:19 +02:00
oy
418dd8eccc
added fix by CarmineZ for missing option in the control settings. Closes #395
2011-01-06 13:17:54 +01:00
GreYFoXGTi
82eac5cf3b
ScoreBoard now is different for DDRace only
2011-01-06 06:45:53 +02: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
oy
13902fef6c
show an error popup when demo deletion fails
2011-01-05 22:22:07 +01:00
oy
18461535fd
changed time left localisation in the map download popup to allow better translations
2011-01-05 17:28:53 +01:00
oy
2992d9a6c6
scale control settings as well
2011-01-05 12:19:06 +01:00
Damian Kaczmarek
073044747b
-Working ui_scale parameter.
...
(doing it properly would require lots of framework/interface job ...)
2011-01-05 12:14:36 +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
67f86e3547
added option to change nameplates size by RushPL
2011-01-04 13:11:01 +01:00
oy
bcba9e5c89
moved HslToRgb stuff
2011-01-04 11:58:25 +01:00
oy
336f00ae89
added colours for tile layers by Choupom
2011-01-04 11:38:14 +01:00
Choupom
533d28e35a
made team colors for nameplates ( fixes #207 )
2011-01-03 12:54:58 +01:00
oy
a72848e780
added constants for teams by Choupom
2011-01-03 12:50:38 +01:00
Yoyo117
d9c71f49f3
minor improvement
2011-01-02 19:58:06 +01:00
GreYFoXGTi
e803f30f52
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/server/entities/character.cpp
src/game/server/entities/flag.cpp
src/game/server/player.cpp
src/game/variables.h
2010-12-16 06:06:23 +02:00
oy
ec09fbf23b
let the chat lines disappear gradually. Closes #342
2010-12-16 04:20:50 +01:00
oy
54f138f894
made broadcast text a bit smaller and cut it off if it's bigger than the screen. Closes #313
2010-12-16 03:17:16 +01:00
GreYFoXGTi
3956c34b6d
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/russian.txt
2010-12-16 04:15:05 +02:00
oy
6063b4c14d
added auto completion of nicknames and highlighted nicknames in chat. Closes #218
2010-12-16 02:31:12 +01:00
oy
1d7df01e9a
added map download progress by kaddyd
2010-12-16 01:52:29 +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
c0530b0d09
added language popup on first start. Closes #336
2010-12-12 19:20:30 +01:00
oy
c75a75b64f
made it possible to automatically take game over screenshots. Closes #339
2010-12-12 16:48:13 +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
4510ced422
Merge branch 'DDRace' of github.com:GreYFoXGTi/teeworlds into DDRace
2010-12-10 21:20:34 +02: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
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
oy
39b531452a
fixed colour of the particles when a tee dies. Closes #331
2010-12-07 23:54:25 +01:00
oy
7414271309
check the return values of RemoveFile and CreateFolder
2010-12-07 23:47:41 +01:00
GreYFoXGTi
cebbecf632
Some Code Improvements and Compiler warnings
2010-12-07 19:44:23 +02:00
GreYFoXGTi
45fa3d49b5
Revert "Client won't vote on comments by Sushi Tee" caused crashes
...
This reverts commit ed7a1d5bcd
.
2010-12-06 03:32:44 +02:00
GreYFoXGTi
ed7a1d5bcd
Client won't vote on comments by Sushi Tee
2010-12-06 00:28:35 +02:00
GreYFoXGTi
c149b17617
FinishTime Difference
2010-11-30 05:04:21 +02:00
GreYFoXGTi
af44a79b03
New Broadcast/Timer System
2010-11-30 04:24:15 +02:00
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