Commit graph

174 commits

Author SHA1 Message Date
Learath 546016092d Consistently determine OtherTeam 2019-05-14 00:00:28 +02:00
trml 672b4aef02 Fix ninja animation with antiping off 2019-05-13 01:46:50 +02:00
trml 53fe0a56f8 Fix predicted weapon animation 2019-05-13 01:46:50 +02:00
Learath2 def36acce1 Apply alpha properly, fix refactoring fails 2019-05-10 01:00:24 +02:00
trml 00ab99aa2e Add prediction for weapon switches and gunfire animation 2019-05-05 12:33:26 +02:00
bors[bot] a2f44299e0 Merge #1678
1678: Handle colors in console r=def- a=Learath2

DEPENDS: #1654 

A better way to fix #1581 possibly deprecates #1597 

Co-authored-by: Learath <learath2@gmail.com>
2019-04-30 19:39:56 +00:00
bors[bot] d8964ceedb Merge #1654 #1685
1654: Try working on colors a bit r=def- a=Learath2

There were color functions everywhere, I tried cleaning it up a little. I still couldn't get the roundtrip from Hsl to Rgb to be exactly the same, but I think this is the best possible.

1685: Work on compound binds r=def- a=Learath2

Closes #1417 

Co-authored-by: Learath <learath2@gmail.com>
2019-04-29 15:56:16 +00:00
Learath 93d14a1eca Inconvenience for windows 2019-04-26 22:36:49 +03:00
Learath 65a17599e1 Add ColorHSVA, phase out more vec3's 2019-04-26 15:06:32 +03:00
Learath cc36af73be Cleanup colors 2019-04-24 23:53:26 +03:00
Ryozuki 42a5d7a9c1 fix conflicts 2019-04-23 20:42:07 +02:00
Dennis Felsing 3f99dfdbcd
Merge pull request #1666 from Ryozuki/pr_fix_solo_spec
fix ghosts in spec
2019-04-23 20:03:01 +02:00
Ryozuki 87c797e84d fix ghosts in spec 2019-04-23 19:22:58 +02:00
Ryozuki d6cc94f839
fix hook col a bit 2019-04-21 19:35:07 +02:00
trml 0b3f3b03b5 Rewrite of prediction code, with additional prediction 2019-04-21 16:12:20 +02:00
Ryozuki 6bfdad9771
fix super and solo 2019-04-21 14:57:45 +02:00
Ryozuki fb84bd1f0b
fix prediction when antiping is on 2019-04-12 17:08:06 +02:00
Ryozuki c686ceea53
Merge branch 'master' into pr_fix_solo 2019-04-12 16:34:43 +02:00
Ryozuki 7e43120b6e
make the client aware of other players solo status 2019-04-12 16:16:21 +02:00
Dennis Felsing cde07b420b Implement changes suggested by -Wuseless-cast
But don't enable it yet because I'm not sure what the best way is.
2019-04-11 19:54:43 +02:00
Ryozuki 0138dd32e3
apply alpha to solo players 2019-04-07 19:42:26 +02:00
def 0518769500 fix cl_show_nameplates_own with antiping off ingame 2018-08-03 23:40:03 +02:00
Dennis Felsing e561498617 fix... 2018-04-25 14:12:49 +02:00
Dennis Felsing 96ecbfcfa8 Add cl_show_hook_coll_always 2018-04-25 12:03:27 +02:00
Jupeyy a59d7401b5 add buffering for dmg indicator, map items, particles and players 2018-03-13 21:52:44 +01:00
yangfl 1620fc9b0f Fix typo 2018-02-07 16:10:40 +08:00
def 7ae5f33bdd fix cl_show_direction (thanks jupeyy) 2018-01-14 20:51:02 +01:00
def 484325f493 Fix nameplates with antiping (fixes #943) 2018-01-12 19:24:44 +01:00
def 77a999c0b1 Add cl_showemotes 2018-01-05 20:17:22 +01:00
heinrich5991 ef0c1b266f Fix 3 / 2 using integer division 2017-11-03 22:10:04 +01:00
Redix 491cfdb93e A few fixes in ghost and race recorder code 2017-09-28 16:02:00 +02:00
Redix d09e825065 Use existing code for rendering the ghost 2017-09-28 16:01:58 +02:00
heinrich5991 42934fe102 Remove statically detectable float divisions by zero
This should fix the warning in MSVS.
2017-09-16 18:34:26 +02:00
def c2400c79cf Rename cl_show_other_hook_coll to cl_show_hook_coll_other and add cl_show_hook_coll_own (fixes #741) 2017-05-14 12:03:09 +02:00
trml 1211746491 Don't use predicted position for the hook when spectating 2017-04-02 18:41:55 +02:00
necropotame b8e4e5beea Fix style in several places 2017-03-22 19:45:14 +01:00
H-M-H e351080dd3 removed double semicolons 2016-05-04 00:24:54 +02:00
def 67bff95a72 Merge remote-tracking branch 'timakro/new_hookthrough' 2016-04-27 18:59:51 +02:00
heinrich5991 31d9b8d001 Cleanup of #369 2015-11-15 14:40:07 +00:00
user578 403114906a Changed comment. 2015-11-15 02:44:40 +03:00
user578 2c48229370 Fix wrong calculation of weapon Angle in demo player. Changed constants to pi. 2015-11-14 19:34:48 +03:00
user578 670a028815 Fix wrong calculation of weapon Angle in demo player 2015-11-13 23:38:49 +03:00
timgame dc89301292 clean up intersect line code 2015-11-08 10:20:44 +01:00
timgame 988a8f591a remove colflags 2015-11-08 10:20:10 +01:00
heinrich5991 ba4eab1f1c Don't reset antiping subconfiguration on startup 2015-09-10 12:09:38 +01:00
def 6e8ada1ac8 Fix whitespaces a bit 2015-07-09 02:12:35 +02:00
def 4c3b97d6ba Add size variable for clan plates 2015-06-29 02:06:27 +02:00
def b91ff8a9fc Also with antiping 2015-06-22 00:44:26 +02:00
def eb12370db0 Rename cl_antiping to cl_antiping_players and add cl_antiping metasetting 2014-12-08 13:49:39 +01:00
def 8d230306d8 Fix sound enabling and disabling (fixes #82) 2014-10-25 02:52:08 +02:00
def 607a27718e Revert "Removed InputData Array"
This reverts commit 83f6fc70fa.
2014-10-12 17:52:53 +02:00
Tomew 83f6fc70fa Removed InputData Array 2014-10-12 17:19:09 +02:00
east c3eeeaadcd don't render hooks to non-active character cores 2014-08-25 16:53:11 +02:00
def 4617157754 Half transparent chat and emoticons 2014-08-22 02:32:05 +02:00
def 15ff17d8f8 Cleanup of some menus, added editor button, added disconnect question 2014-07-08 20:21:19 +02:00
def e85d594f81 Other teams alpha settable 2014-05-17 23:00:52 +02:00
def 5b1c866b35 Feature: Separate inputs for dummy and player 2014-05-10 14:31:00 +02:00
def 9e53ed5367 Minor code cleanup 2014-05-07 03:50:23 +02:00
def a79b6079fa Add cl_old_gun_position 2014-05-06 16:25:00 +02:00
def 26cb3030c3 Draw +showhookline with alpha too 2014-05-06 16:17:41 +02:00
def 147e8176e3 Make player direction arrows transparent when player is in other team 2014-05-06 13:48:08 +02:00
def e213ea27b4 Fix: Draw player direction arrows at different positions 2014-05-01 01:42:44 +02:00
def 5eb7a74558 Fix: Tunings and Tunezones with dummies 2014-04-29 03:34:23 +02:00
def 378d613de9 Add tee directions 2014-04-26 21:00:14 +02:00
def 3dce4c9489 Add dummy (Thanks to //toast and Monsta) 2014-04-26 20:29:42 +02:00
def b731221b2a Better team differentiation ingame (colored nameplates and more transparency 2014-04-12 16:55:01 +02:00
def af66d26bd5 Add cl_show_other_hook_coll 2014-04-10 20:33:05 +02:00
def 92dffdbbcc Add cl_show_ninja 2014-03-28 13:39:30 +01:00
def 61a5d9429d Add cl_unpredicted_shadow 2014-03-21 14:01:14 +01:00
def d1493d8c3e Fix: Hook prediction should never loop forever 2014-02-17 23:12:29 +01:00
def 182c5aefc9 Fix +showhookcoll in demo 2014-02-08 19:06:24 +01:00
def c4e0cca046 Fix +showhookcoll when player hooking is disabled 2014-02-05 03:39:09 +01:00
def e97d3ba788 Fix: +showhookcoll fixes 2014-01-30 04:10:52 +01:00
def 3e5bcb0213 Absolutely perfect +showhookcoll 2014-01-27 05:06:23 +01:00
def 237b6c189a Better transparency for /showothers 2014-01-24 23:11:33 +01:00
def 97d7037011 Render transparency properly when spectating 2014-01-22 00:31:17 +01:00
def 6e67cd0540 Render players in other teams half transparent 2014-01-22 00:24:26 +01:00
def 693d68841c More exact showhookcoll 2014-01-12 00:45:25 +01:00
def 51321c6011 Tab 2013-11-13 13:25:12 +01:00
def 2a70aefc63 Show correct nameplates without antiping 2013-10-09 16:23:18 +02:00
def dc6d2305d5 Add AntiPing 2013-10-09 16:02:23 +02:00
def 9028d77471 Add +showhookcoll from H-Client 2013-08-24 01:50:35 +02:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
2012-04-12 02:09:31 +02:00
oy dfe91338f0 added pause command. Closes #15 2012-01-10 00:49:31 +01:00
oy 9251796c3a fixed rendering on pause/specific speed for damage indicators and muzzle in the demo player 2012-01-09 23:43:53 +01:00
oy 3811476c6e removed multiple updating of the renderinfo for ninjas. Closes #855 2012-01-08 15:44:49 +01:00
oy b592d7a591 cleaned up playing of global sounds 2012-01-06 19:38:40 +01:00
GreYFoX ff696bad6c Mac Loves Cyclic Includes 2011-08-31 13:56:04 +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 9397c4a55f some make release changes for adding sql server files
Servers are no longer build with SQL by default.
fixed compilation on Mac OS X 10.5
2011-04-15 04:32:53 +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
oy 9811c2396b made network clip flags. Closes #131 2011-03-04 17:08:10 +01:00
oy 4bede550be only update the ping if the scoreboard is active. Closes #27 2011-03-01 18:31:20 +01:00
oy 0bc13c91eb made cl_threadsoundloading work again 2011-02-27 17:56:03 +01:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
SushiTee c0b905f852 -fixed compiler warnings
-fixed mac compiling
2011-01-26 14:45:44 +02:00
oy da84771345 removed some old checks 2011-01-18 18:53:19 +01:00