bors[bot]
a5096c4de0
Merge #1663
...
1663: Use freeze end tick instead of a flag. Fix #1659 r=def- a=Learath2
I used -1 for deep frozen, and 0 for not frozen. Not really sure if this is the best way.
Co-authored-by: Learath <learath2@gmail.com>
2019-04-27 08:53:38 +00:00
Learath
24408e6f3c
Oops
2019-04-24 19:12:46 +03:00
Learath
67668d7fb2
Use freeze end tick instead of a flag. Fix #1659
2019-04-23 18:57:26 +03:00
trml
0b3f3b03b5
Rewrite of prediction code, with additional prediction
2019-04-21 16:12:20 +02:00
Ryozuki
f37f8a8268
add all character flags to ddnetnetwork character
2019-04-19 11:17:28 +02:00
Ryozuki
3556830b9a
fix solo prediction
2019-04-12 16:29:13 +02:00
Dennis Felsing
13aa154d47
Revert "Rewrite stopper code a bit"
...
This reverts commit 4ee5c5a781
.
2018-08-24 09:34:54 +02:00
Dennis Felsing
d60b0db632
Revert "Add mapbug "stoppers-passthrough@ddnet.tw""
...
This reverts commit 25e86851d3
.
2018-08-22 08:33:21 +02:00
heinrich5991
25e86851d3
Add mapbug "stoppers-passthrough@ddnet.tw"
...
This can be set for maps that rely on actually passing through stoppers.
2018-08-16 17:54:55 +02:00
heinrich5991
4ee5c5a781
Rewrite stopper code a bit
...
Remove the whole copy-and-paste mess.
A seemingly ineffective and apparently code block has been removed.
2018-08-15 17:47:07 +02:00
heinrich5991
9911759314
Revert "Don't divide by 0"
...
This reverts commit 03faa51e28
.
Dividing floats by zero isn't undefined behavior and results in +inf or
-inf depending on the sign of the first operand.
#include <math.h>
#include <stdio.h>
#define PRINT(x) printf("%s = %f\n", #x, x)
int main()
{
PRINT(1.0 / 0.0);
PRINT(-1.0 / 0.0);
PRINT(atanf(1.0 / 0.0));
PRINT(atanf(-1.0 / 0.0));
return 0;
}
prints
1.0 / 0.0 = inf
-1.0 / 0.0 = -inf
atanf(1.0 / 0.0) = 1.570796
atanf(-1.0 / 0.0) = -1.570796
The changed function was problematic for values like (0,1), (-1,0),
(0,-1) where it always returned an angle of 0°.
2017-09-16 18:33:10 +02:00
def
03faa51e28
Don't divide by 0
2017-09-16 12:06:07 +02:00
eeeee
2797227063
also remove references to CGameContext from CServer
2017-06-05 22:31:56 -07:00
necropotame
b8e4e5beea
Fix style in several places
2017-03-22 19:45:14 +01:00
def
3fb7b1520e
Add descriptions for tunings
2015-03-29 03:52:33 +02:00
def
66be23c5d5
Remove unused members
2014-12-29 02:21:10 +01:00
nuborn
9752334e75
convert projectiles back to default format before recording demos
2014-12-01 01:32:51 +01:00
nuborn
03bc769c09
prediction of hammer (hits) and grenade (explosions)
2014-12-01 01:31:58 +01:00
def
627d6386ee
Revert "Revert "Revert "Add antiping for weapons (by nuborn)"""
...
This reverts commit 8f7e24b4db
.
2014-11-02 10:59:22 +01:00
nuborn
8f7e24b4db
Revert "Revert "Add antiping for weapons (by nuborn)""
...
This reverts commit 755e9f4d1c
.
2014-10-28 15:50:28 +01:00
def
755e9f4d1c
Revert "Add antiping for weapons (by nuborn)"
...
This reverts commit 48e66a2ab3
.
Conflicts:
src/game/client/gameclient.cpp
src/game/version.h
2014-10-27 20:03:22 +01:00
def
48e66a2ab3
Add antiping for weapons (by nuborn)
2014-10-23 17:31:29 +02:00
def
dcf5e244b5
Fix walljump after holding a key
2014-06-23 14:46:27 +02:00
def
99c74b5311
Fix wall jumps
2014-06-22 00:50:11 +02:00
def
b3e9041768
Revert "Same hook strength for everyone (by cinaera)"
...
This reverts commit 2b08464527
.
2014-05-01 03:03:31 +02:00
def
2b08464527
Same hook strength for everyone (by cinaera)
2014-04-30 17:36:25 +02:00
def
5eb7a74558
Fix: Tunings and Tunezones with dummies
2014-04-29 03:34:23 +02:00
def
68980e7699
Fix: Ok, proper Jetpack prediction now
2014-04-14 10:56:14 +02:00
def
a4580c4af0
Add speedup prediction (by c)
2014-03-25 01:13:46 +01:00
HMH
b25307ba5f
set CCharacter as a friend of CCharacterCore to correct tunings
2014-03-23 17:10:49 +01:00
def
72bc639a0c
TeleOuts as pointer; Hopefully fixes Visual Studio crash
2013-12-12 14:35:01 +01:00
def
6da8d2146c
New mapping entity: Specify number of jumps
2013-08-24 01:03:45 +02:00
def
40ff09be29
Revert visual studio fix
2013-08-18 22:19:02 +02:00
BeaR
ee6192900c
fix previous commit
2013-08-14 19:56:55 +02:00
def
af69765063
Revert "fix visual studio build"
...
This reverts commit 62409f740a
.
2013-08-14 17:31:15 +02:00
BeaR
62409f740a
fix visual studio build
2013-08-13 14:06:29 +02:00
def
111d5c7f10
Add entities to start and stop: Player collisions, Hooking, Infinite jump
2013-08-05 17:47:04 +02:00
def
d4c0f31b32
Make client compile
2013-07-22 17:20:34 +02:00
def
54b942fa7e
Make hooks go through teleporters
2013-07-19 00:27:17 +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
0df6d0541f
Merge branch 'master' of git://github.com/oy/teeworlds into HEAD
...
Conflicts:
bam.lua
src/engine/console.h
src/engine/server.h
src/engine/server/server.cpp
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/game/client/components/binds.cpp
src/game/client/components/chat.h
src/game/client/components/console.cpp
src/game/client/components/console.h
src/game/client/components/controls.cpp
src/game/client/components/emoticon.h
src/game/client/components/maplayers.cpp
src/game/client/components/menus.h
src/game/client/components/scoreboard.h
src/game/client/components/spectator.h
src/game/client/components/voting.h
src/game/client/gameclient.cpp
src/game/client/gameclient.h
src/game/client/render.h
src/game/collision.cpp
src/game/editor/ed_layer_tiles.cpp
src/game/gamecore.cpp
src/game/gamecore.h
src/game/layers.cpp
src/game/layers.h
src/game/mapitems.h
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/entities/laser.h
src/game/server/entities/pickup.cpp
src/game/server/entities/pickup.h
src/game/server/entities/projectile.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/gameworld.cpp
src/game/server/gameworld.h
src/game/server/player.cpp
src/game/variables.h
2011-04-14 01:27:49 +02:00
oy
06115dd49d
added "Whitespace and line Endings cleanup" by GreYFoX
2011-04-13 20:37:12 +02:00
GreYFoX
f7f6058a92
Merged Oy, Cleaned up, removed some useless features and code parts
...
Added Icon by landil
alot more...
2011-04-09 22:32:17 +02:00
GreYFoXGTi
718d697707
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/collision.cpp
src/game/collision.h
src/game/gamecore.cpp
src/game/server/gamecontext.cpp
2011-02-13 19:36:53 +02:00
GreYFoXGTi
f83132448d
Merged Oy, Isolated Freeze from Deep Freeze
2011-02-13 19:32:06 +02:00
GreYFoXGTi
68a1a29db8
Reverted 1 Letter Refactoring or Edited it to a full name.
2011-02-13 12:57:10 +01:00
GreYFoXGTi
1b2703aaba
Refactoring & fixed WEAPONSPEC_GUN in content.py
2011-02-12 21:18:41 +01:00
GreYFoXGTi
ddc5dd7ab3
Cleaned up & Re-arranged stuff
2011-01-06 05:46:10 +02: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
Sworddragon
fc9211c777
Updated copyrights
2010-11-20 21:26:06 +01:00