Commit by Rudolf Polzer on master :: r22a6a0616741 /divVerent@xonotic-data.pk3dir.git/qcsrc/server/g_damage.qc:

fix typo in comment (yes, really)

Commit by Rudolf Polzer on master :: r68cc746746b9 /divVerent@xonotic-data.pk3dir.git/qcsrc/server/g_damage.qc:

explain :P

Commit by Rudolf Polzer on master :: r75df1eafcb4c /divVerent@xonotic-data.pk3dir.git/ (38 files in 10 dirs):

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

Commit by Rudolf Polzer on master :: r52a9f8bea2f4 /divVerent@xonotic-data.pk3dir.git/qcsrc/server/g_damage.qc:

equivalent rewrite of fireball code

Commit by terencehill on terencehill/itemstime :: r47e28b63d682 /terencehill@xonotic-data.pk3dir.git/qcsrc/ (6 files in 3 dirs):

Items time now supports superweapons too

Commit by terencehill on terencehill/itemstime :: r3c175f70e768 /terencehill@xonotic-data.pk3dir.git/qcsrc/client/hud_config.qc:

_progressbar_reduced in hud_config.qc too

Commit by terencehill on terencehill/itemstime :: r9c3843c2f743 /terencehill@xonotic-data.pk3dir.git/_hud_descriptions.cfg:

Rename hud_panel_itemstime_progressbar_xoffset to hud_panel_itemstime_progressbar_reduced in _hud_descriptions.cfg too

Commit by terencehill on terencehill/itemstime :: r41e9b002169c /terencehill@xonotic-data.pk3dir.git/ (528 files in 46 dirs):

Merge branch 'master' into terencehill/itemstime

Commit by cbrutail on cbrutail/map-vociferous :: r1d56d6f3d2db /cbrutail@xonotic-maps.pk3dir.git/maps/vociferous_alpha.map:

forgot the water

Commit by cbrutail on cbrutail/map-vociferous :: r4ba6c593c0a2 /cbrutail@xonotic-maps.pk3dir.git/maps/ (2 files):

reworked nexroom, added new path from 3rd floor. floodlight +sRGB

Commit by MirceaKitsune on mirceakitsune/func_train_beizer_curve :: r61b2c7ea4159 /mirceakitsune@xonotic-maps.pk3dir.git/maps/city_new-york.map:

More progress on the train. Re-textured interior, moved it to the proper location by default. Also gave it the proper height so now it stops at the same level as the subway station floor. With the latest bezier func_train code, the train will behave normally and can pretty much be tested (still far from ready)

Commit by MirceaKitsune on mirceakitsune/func_train_beizer_curve :: r90ba70c8ca7f /mirceakitsune@xonotic-maps.pk3dir.git/maps/city_new-york.map:

More work on the train. Also made the walls a little thicker and added some player clips to reduce the change of falling through in case you get stuck

Commit by Mircea Kitsune on mirceakitsune/func_train_beizer_curve :: r1d6c06f3081c /mirceakitsune@xonotic-data.pk3dir.git/qcsrc/server/g_subs.qc:

Add sys_frametime dependency for avelocity and properly name a float. Also reduce a duplicated line of code. Still doesn't fix angles not going quite all the way

Commit by Mircea Kitsune on mirceakitsune/func_train_beizer_curve :: rbe8953501dbe /mirceakitsune@xonotic-data.pk3dir.git/qcsrc/server/g_subs.qc:

Fix a comment that wasn't in the correct location

Commit by Mircea Kitsune on mirceakitsune/func_train_beizer_curve :: r0c411f346958 /mirceakitsune@xonotic-data.pk3dir.git/qcsrc/server/g_subs.qc:

Set .avelocity instead of .angles for bezier curves rotation. For one this might be smoother, but the reason is to fix players falling off trains and becoming stuck entities as they rotate (which happens when changing angles / origin directly on push entities). This does not work right yet, but brings the train almost near its correct anagular destination

Commit by Mircea Kitsune on mirceakitsune/func_train_beizer_curve :: r178332f75148 /mirceakitsune@xonotic-data.pk3dir.git/qcsrc/server/t_plats.qc:

Always use SUB_CalcAngleMove, even when instant turning

Commit by Mircea Kitsune on mirceakitsune/func_train_beizer_curve :: r59883b7deef8 /mirceakitsune@xonotic-data.pk3dir.git/qcsrc/server/t_plats.qc:

Don't offset with self.mins when the train is rotating. Now trains will center properly to each path_corner

Commit by Jakob MG on tzork/overkill :: ra119cdd0598f /tzork@xonotic-data.pk3dir.git/qcsrc/ (5 files in 4 dirs):

Basic multikill sprites for grenades

Commit by MirceaKitsune on mirceakitsune/donotmerge-city_hubs :: rff2702a23515 /mirceakitsune@xonotic-maps.pk3dir.git/maps/city_new-york.map:

Add experimental train to the rails. It requires a currently new code for func_train with bezier movement. Among other things, this is to be used as a debug case for the new train code

Commit by Mircea Kitsune on mirceakitsune/func_train_beizer_curve :: r2c960a8eaf5e /mirceakitsune@xonotic-data.pk3dir.git/qcsrc/server/ (g_subs.qc t_plats.qc):

Name angle floats more correctly