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 |
|
oy
|
764ee3fd17
|
optimised chat rendering a bit
|
2010-10-15 19:26:20 +02:00 |
|
heinrich5991
|
9cf90fff77
|
added config for showing client ids in scoreboard
|
2010-10-13 22:47:28 +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
|
5801326ebc
|
fixed line endings
|
2010-10-13 12:59:30 +02:00 |
|
oy
|
e4fe7457c8
|
fixed problems with the mouse movement. Closes #214
|
2010-10-13 12:47:42 +02:00 |
|
oy
|
e4b3c468f2
|
don't show voting hud when playing a demo and added missing localisations. Closes #88
|
2010-10-13 01:19:22 +02:00 |
|
GreYFoXGTi
|
921dd65d3d
|
Added id numbers to the scoreboard. Closes #71.
added shortcuts to the gitignore
|
2010-10-12 15:12:44 +02:00 |
|
GreYFoXGTi
|
e46dd6b5e6
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-10-11 19:45:14 +02:00 |
|
oy
|
cd578a0dc2
|
moved explosions to front layer. Closes #21
|
2010-10-11 12:32:34 +02:00 |
|
oy
|
eb4a56edeb
|
tweaked auto scrolling in the chat window a bit
|
2010-10-11 12:31:45 +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 |
|
oy
|
411db8b885
|
fixed that chat message gets out of the window. Closes #102
|
2010-10-11 02:29:30 +02:00 |
|
oy
|
de7504282c
|
made edit boxes scrollable. Closes #96
|
2010-10-11 01:36:46 +02:00 |
|
oy
|
b65a26fe93
|
fixed last commits
|
2010-10-11 01:06:44 +02:00 |
|
Choupom
|
61201fea13
|
added reason to kick a player in the callvote tab
|
2010-10-11 00:31:21 +02:00 |
|
oy
|
5754812dea
|
clear history of the remote console on disconnect and cleaned up some old stuff in console.cpp
|
2010-10-11 00:30:56 +02:00 |
|
Choupom
|
00c1421034
|
fixed so the rcon password is not in the history (fixes #170)
|
2010-10-11 00:18:04 +02:00 |
|
oy
|
107545da0a
|
localised "REC"-notification
|
2010-10-11 00:16:37 +02:00 |
|
GreYFoXGTi
|
40d2068c70
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/editor/ed_editor.cpp
src/game/editor/ed_editor.h
src/game/editor/ed_layer_tiles.cpp
src/game/server/gamecontroller.cpp
src/game/server/player.cpp
src/game/variables.h
|
2010-10-10 14:36:02 +02:00 |
|
oy
|
85b9c60158
|
added info in the demo browser by Choupom
|
2010-10-09 13:27:21 +02:00 |
|
GreYFoXGTi
|
6ca75f086e
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-10-08 13:37:38 +02:00 |
|
oy
|
a075889312
|
fixed a listing problem in the demo browser
|
2010-10-08 00:13:05 +02:00 |
|
GreYFoXGTi
|
faaa8c241e
|
Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup
|
2010-10-07 15:33:48 +02:00 |
|
GreYFoXGTi
|
cfe7ef6f38
|
Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup
|
2010-10-06 23:48:39 +02:00 |
|
GreYFoXGTi
|
304084434b
|
Created Destructor for Layers and Collision but making them default Destructor didn't work so i made them normal functions and called them as needed, i am not sure this is the right way though. Closes #74, Closes #35.(#35 Needs in depth testing, i tested for 3 minutes copying stuff around)
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-10-06 23:47:23 +02:00 |
|
oy
|
3a98f7a048
|
added mod system. Closes #34
|
2010-10-06 23:07:35 +02:00 |
|
GreYFoXGTi
|
56c4655e55
|
Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup
|
2010-10-01 19:33:39 +02:00 |
|
GreYFoXGTi
|
8a5d1100a5
|
This reverts commit b4b2404303 .
thanks to Speedy-Consoles for pointing out the commit
Closes #54.
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-10-01 19:25:54 +02:00 |
|
SushiTee
|
1f5849f6dc
|
fixed last digit in current time
|
2010-10-01 04:03:08 +02:00 |
|
SushiTee
|
8824d41011
|
race time wasnt in center
|
2010-10-01 04:03:07 +02:00 |
|
GreYFoXGTi
|
b6a17d1e47
|
Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup
|
2010-09-30 23:38:27 +02:00 |
|
GreYFoXGTi
|
c24964ebcd
|
Added tele, speedup, front and switch layer to the client
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-30 23:36:08 +02:00 |
|
GreYFoXGTi
|
e900e7f4db
|
Changes Required by Teams for Client
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-30 23:31:11 +03:00 |
|
GreYFoXGTi
|
896634a061
|
Total Cleanup
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-30 23:28:06 +03:00 |
|
oy
|
2f388139c1
|
fixed auto-scrolling in server browser and listbox
|
2010-09-30 01:13:12 +02:00 |
|
oy
|
68851630ca
|
fixed server browser list. Closes #74
|
2010-09-30 00:32:45 +02:00 |
|
oy
|
b08fdf2fb2
|
fixed initialisation message. Closes #194
|
2010-09-29 19:55:33 +02:00 |
|
oy
|
aaf8e2bc8e
|
cleaned up demo listing and fixed its sorting. Closes #73
|
2010-09-29 00:53:53 +02:00 |
|
GreYFoXGTi
|
526e36f8a0
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/client/components/menus.h
src/game/client/gameclient.cpp
src/game/editor/ed_editor.cpp
src/game/variables.h
|
2010-09-27 06:32:14 +03:00 |
|
GreYFoXGTi
|
ac36e562a5
|
Made Personal Best/Vanilla Score Updated on game enter
|
2010-09-27 00:31:33 +03:00 |
|
SushiTee
|
5faec7c80d
|
changed pickup animation speed for demos according to demospeed (fixes issue 72)
|
2010-09-26 18:00:29 +02:00 |
|
oy
|
7e0b37e06c
|
fixed that it checks the current dir for demos too
|
2010-09-24 13:38:03 +02:00 |
|
Choupom
|
1cbf731fc0
|
improved demos listing
|
2010-09-24 13:22:40 +02:00 |
|
oy
|
27425facff
|
fixed last commit
|
2010-09-24 13:21:03 +02:00 |
|
Choupom
|
aa46c22e10
|
now put skins in an array to save memory
|
2010-09-24 13:13:46 +02:00 |
|
Kaffeine
|
3684621589
|
CGameClient: Removed needless call UpdateRenderInfo and fixed team-checks.
|
2010-09-24 13:02:26 +02:00 |
|
btd
|
e6718e2ede
|
Reset Teams in Client
|
2010-09-24 11:12:26 +04:00 |
|
GreYFoXGTi
|
a02bceafed
|
Added Max Speed
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-22 20:43:23 +03:00 |
|
GreYFoXGTi
|
e56b75090c
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/server/player.cpp
|
2010-09-22 11:46:18 +03:00 |
|
oy
|
5156579d1d
|
fixed sound bug when using in the editor. Closes #136
|
2010-09-22 00:51:32 +02:00 |
|
oy
|
55434a2a57
|
added fix by Sworddragon for stopped loading bar at the beginning
|
2010-09-22 00:30:08 +02:00 |
|
GreYFoXGTi
|
67a5765c9f
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/game/client/components/camera.cpp
src/game/client/components/camera.h
src/game/editor/ed_editor.cpp
src/game/editor/ed_layer_tiles.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-19 21:27:40 +03:00 |
|
oy
|
cf2d46d3ba
|
increased deadzone when seeking through the file in the demo player
|
2010-09-19 16:36:10 +02:00 |
|
oy
|
a730704d10
|
fixed view offset when joining spectator. Closes #101
|
2010-09-19 16:12:18 +02:00 |
|
oy
|
80b570c795
|
fixed view offset when changing from spectator to player. Closes #152
|
2010-09-19 16:00:46 +02:00 |
|
oy
|
0905b7755d
|
localised the language names. Closes #153
|
2010-09-16 13:32:56 +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 |
|
GreYFoXGTi
|
8e066517ad
|
Merge branch 'master' of http://github.com/btd/DDRace
Conflicts:
src/game/server/gamecontext.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-15 05:57:34 +03:00 |
|
GreYFoXGTi
|
3ffbd91fca
|
revert the score board
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-13 07:50:00 +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
|
c52ee7baa9
|
unbind a key with right mouse button in the controls menu. Closes #67
|
2010-09-12 17:15:09 +02:00 |
|
oy
|
5437513a0d
|
use escape key to abort binding a control key in the menu
|
2010-09-12 13:40:24 +02:00 |
|
oy
|
a3337a68e7
|
fixed that player name and ping overlap in the scoreboard. Closes #106
|
2010-09-12 13:26:38 +02:00 |
|
oy
|
9ab3e7e121
|
fixed overlapping voting. Closes #100
|
2010-09-12 13:18:11 +02:00 |
|
oy
|
daab7fdcd4
|
fixed that score overlaps in the scoreboard. Closes #161
|
2010-09-12 13:06:55 +02:00 |
|
oy
|
fa9c8ee77f
|
don't show player specific debug info when the debug graphs are shown to prevent overlapping
|
2010-09-12 12:55:37 +02:00 |
|
oy
|
e226b47212
|
close the emote selector, chat history and the scoreboard when closing the chat, console or ingame menu. Closes #111
|
2010-09-12 12:43:03 +02:00 |
|
oy
|
d913af1ab2
|
renamed demorec files to demo
|
2010-09-12 12:16:51 +02:00 |
|
btd
|
c117f48741
|
Remove rubbish
|
2010-09-12 00:46:30 +04:00 |
|
btd
|
edbef086c1
|
git add src/*git add src/*! Fix character collision bug with additional protocol message, begin to finish ShowOthers
|
2010-09-12 00:45:56 +04:00 |
|
btd
|
bbe66c5f20
|
Revert last not working fix
|
2010-09-11 13:31:36 +04:00 |
|
GreYFoXGTi
|
1119432e60
|
Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2
|
2010-09-09 05:37:45 +02:00 |
|
GreYFoXGTi
|
0b1b949a3c
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamemodes/ctf.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-09 05:37:08 +02:00 |
|
GreYFoXGTi
|
ddb4c2e370
|
Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2
Conflicts:
src/game/server/entities/character.cpp
src/game/server/entities/projectile.cpp
src/game/server/gamecontext.cpp
src/game/server/gamemodes/DDRace.h
src/engine/shared/config_variables.h
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-08 22:22:08 +02:00 |
|
oy
|
e191b2c59e
|
when hooking a player don't use predicted values for rendering the hook. Closes #9
|
2010-09-08 02:54:03 +02:00 |
|
oy
|
e31b125a0d
|
use the numpad enter key as well. Closes #166
|
2010-09-08 02:32:41 +02:00 |
|
oy
|
d4b145a8ee
|
fixed Gui lock while deleting/reading demos. Closes #167
|
2010-09-08 02:27:48 +02:00 |
|
oy
|
cbf07ffa57
|
added fix for don't show cursor while playing demo by Choupom. Closes #128
|
2010-09-08 02:07:36 +02:00 |
|
Choupom
|
71109a98fb
|
fixed chat message with missing name (#110)
|
2010-09-08 00:20:59 +02:00 |
|
GreYFoXGTi
|
d1b3e01892
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-09-07 21:49:12 +02:00 |
|
oy
|
6299f6518a
|
disable emote selector and chat window in the demo player. Closes #126
|
2010-09-07 20:01:51 +02:00 |
|
oy
|
eecdff0cf5
|
fixed overlapping in last commit
|
2010-09-07 19:31:20 +02:00 |
|
ghost
|
56c4081da4
|
Demo name is now showed while playing a demo file
|
2010-09-07 19:12:11 +02:00 |
|
oy
|
ea25972e21
|
added rec notification by ghost91-. Closes #82
|
2010-09-07 19:03:59 +02:00 |
|
GreYFoXGTi
|
0c0c231f13
|
Merge branch 'master' of http://github.com/GreYFoXGTi/teeworlds into master3
Conflicts:
src/game/client/components/maplayers.cpp
src/game/variables.h
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-07 07:59:51 +02:00 |
|
GreYFoXGTi
|
616498e7b1
|
Merge branch 'master' of http://github.com/oy/teeworlds into master
Conflicts:
src/engine/client/input.h
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/engine/shared/network_server.cpp
src/engine/storage.h
src/game/client/components/chat.cpp
src/game/client/gameclient.cpp
src/game/client/gameclient.h
src/game/collision.cpp
src/game/editor/ed_editor.cpp
src/game/editor/ed_editor.h
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/player.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-07 07:57:38 +02:00 |
|
ghost
|
5e1b3c74ef
|
Git does this one automatically, I guess it fixes lineendings.
|
2010-09-07 02:11:52 +02:00 |
|
oy
|
5ff7836638
|
fixed problems with the tilelayer dumping. Closes #86. Closes #149
|
2010-09-07 02:06:11 +02:00 |
|