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 |
|
BeaR
|
afb1d5e201
|
Swap and Shuffle Teams
|
2011-12-30 21:52:01 +01:00 |
|
GreYFoX
|
7d462b565d
|
Fixed the bugs i know of with the last few commits
|
2011-12-30 16:51:08 +02:00 |
|
oy
|
b44ee3d975
|
reworked ban system
|
2011-12-29 23:36:53 +01:00 |
|
GreYFoX
|
41eed130cd
|
removed TODO
|
2011-12-26 13:56:51 +02:00 |
|
GreYFoX
|
b68f5facea
|
Fixed DDRace hud.cpp
|
2011-12-26 13:56:24 +02:00 |
|
GreYFoX
|
6bedea0c6a
|
DDRace Score in Time Format
|
2011-12-26 13:45:41 +02:00 |
|
Learath2
|
81b34086e2
|
Fix for zoom issue.
|
2011-12-23 10:43:46 +02: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 |
|
Choupom
|
713dd3bc08
|
fixed controls rendering with low ui scale
|
2011-12-04 22:43:41 +01:00 |
|
oy
|
9a03989e84
|
added "Make an option for each envelope: (a) synchronized (b) starting at join" by Choupom
|
2011-12-04 14:39:47 +01:00 |
|
Choupom
|
873c5a77bc
|
some trivial fixes
|
2011-12-04 14:21:20 +01:00 |
|
oy
|
b99ac459be
|
fixed envelope rendering when seeking in the demo player
|
2011-12-04 14:04:12 +01:00 |
|
SushiTee
|
e411d8f591
|
made envelope rendering more smooth
|
2011-12-04 13:15:24 +01:00 |
|
GreYFoX
|
5ebf60891c
|
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
|
2011-12-01 19:48:09 +02:00 |
|
oy
|
df4e11dc82
|
fixed fixed camera position when chatting as spectator. Closes #880
|
2011-11-30 01:47:35 +01:00 |
|
oy
|
05f77f64af
|
added caching for the play command. Closes #891
|
2011-11-30 01:41:00 +01:00 |
|
Ravomavain
|
5b44fae0ce
|
Remove unneeded variables
|
2011-09-02 12:05:14 +02:00 |
|
GreYFoX
|
ff696bad6c
|
Mac Loves Cyclic Includes
|
2011-08-31 13:56:04 +02: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 |
|
oy
|
b1e7797b19
|
fixed compiling with mingw
|
2011-08-19 00:12:30 +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
|
2b2ddde04f
|
sort players in kick/move to spec vote and player options by team. Closes #809
|
2011-08-05 19:52:38 +02:00 |
|
SushiTee
|
83652c91ec
|
fixed a warning in client (mac)
|
2011-08-01 21:03:51 +02:00 |
|
oy
|
10c3e844d7
|
show alpha2 country code strings next to the flag in the country code selectors. Closes #805
|
2011-07-31 02:04:46 +02:00 |
|
oy
|
a0a62bcd70
|
fixed econ feature and tcp
|
2011-07-30 13:40:01 +02:00 |
|
oy
|
65d312fd06
|
fixed problem with lineinput. Closes #802
|
2011-07-28 22:01:14 +02:00 |
|
Choupom
|
84e5c53432
|
added color envelope feature for tilemaps
|
2011-07-20 22:04:13 +02:00 |
|
oy
|
571dff6216
|
made rcon auto completion serverside. Closes #97
|
2011-07-14 22:07:21 +02:00 |
|
oy
|
5f4a5b3366
|
added country flags to language selectors
|
2011-07-12 20:33:53 +02:00 |
|
oy
|
f4ce34f01c
|
close spectator/emoticon menu when changing to team/spectator via bind. Closes #768
|
2011-07-11 12:02:45 +02:00 |
|
oy
|
e18390fea8
|
fixed that client resets tuning. Closes #746
|
2011-07-05 23:32:32 +02:00 |
|
oy
|
20fbe2f92c
|
fixed that player friends are marked as online in the friends list if they match a clan friend
|
2011-07-05 23:23:33 +02:00 |
|
oy
|
ac9c3b8f7f
|
made the dropped flag sign blink faster the last 5 seconds to indicate that it's about to return. Closes #631
|
2011-07-05 23:15:24 +02:00 |
|
oy
|
7648ba3024
|
added a different mouse sens for menus/editor
|
2011-07-03 00:36:07 +02:00 |
|
Choupom
|
4a5c13d1de
|
fixed so Reset Filter button resets all filters
|
2011-07-02 19:23:36 +02:00 |
|
Johannes Loher
|
3f583d44f9
|
fixed so there can't be a negative time being displayed when timelimit runs out while there is warmup. If warmup is active, the time will be displayed as if there was no timelimit.
|
2011-07-01 18:34:28 +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
|
8035e022fd
|
fixed cursor positioning by mouse in edit boxes
|
2011-06-29 18:39:58 +02:00 |
|
oy
|
fdf6db5fd6
|
fixed that music resets on password prompt. Closes #695
|
2011-06-27 23:26:01 +02:00 |
|
oy
|
47cdd2524b
|
do not try to play sound when it isn't enabled
|
2011-06-27 22:57:06 +02:00 |
|
oy
|
e8938e3d80
|
set the minimum of seconds remaining in map downloading popup to 1
|
2011-06-27 22:35:23 +02:00 |
|
Johannes Loher
|
14f98a9ded
|
Added possibility to deny changing of team after a set_team for a certain amount of time. Added server setting to do this automatically for spec votes. fixes #640.
|
2011-06-27 17:07:23 +02:00 |
|
oy
|
1239150846
|
fixed password popup UI issue. Closes #583
|
2011-06-27 16:39:23 +02:00 |
|
oy
|
fb309436b4
|
improved friends feature
|
2011-06-26 17:10:13 +02:00 |
|