]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/log
xonotic/xonotic-data.pk3dir.git
9 years agoRemove `-Wno-double-declaration`
TimePath [Wed, 28 Jan 2015 00:08:39 +0000 (11:08 +1100)]
Remove `-Wno-double-declaration`

9 years agoDeclare more ints as ints
TimePath [Tue, 27 Jan 2015 22:10:55 +0000 (09:10 +1100)]
Declare more ints as ints

9 years agoRevert a deleted `#define`
TimePath [Mon, 26 Jan 2015 09:10:42 +0000 (20:10 +1100)]
Revert a deleted `#define`

9 years agoCheck features, not compilers
TimePath [Mon, 26 Jan 2015 08:56:51 +0000 (19:56 +1100)]
Check features, not compilers

9 years agoClean up macros
TimePath [Mon, 26 Jan 2015 08:51:39 +0000 (19:51 +1100)]
Clean up macros

9 years agoRemove redundant uses of `var`
TimePath [Mon, 26 Jan 2015 07:59:39 +0000 (18:59 +1100)]
Remove redundant uses of `var`

9 years agoClean up macro hell
TimePath [Mon, 26 Jan 2015 07:41:06 +0000 (18:41 +1100)]
Clean up macro hell

9 years agoDeclare more ints as ints
TimePath [Mon, 26 Jan 2015 00:28:05 +0000 (11:28 +1100)]
Declare more ints as ints

9 years agoUnify boolean constants
TimePath [Sun, 25 Jan 2015 23:48:07 +0000 (10:48 +1100)]
Unify boolean constants
TRUE -> true
FALSE -> false

9 years agoReplace `vector_[xyz]` with `vector.[xyz]` where possible
TimePath [Sun, 25 Jan 2015 11:27:23 +0000 (22:27 +1100)]
Replace `vector_[xyz]` with `vector.[xyz]` where possible

9 years agoWork around a gmqcc bug
TimePath [Sun, 25 Jan 2015 04:26:33 +0000 (15:26 +1100)]
Work around a gmqcc bug

9 years agoRename menu files to be consistent
TimePath [Sun, 25 Jan 2015 04:02:50 +0000 (15:02 +1100)]
Rename menu files to be consistent
*.h -> *.qh
*.c -> *.qc

9 years agoDelete empty files
TimePath [Sun, 25 Jan 2015 03:44:56 +0000 (14:44 +1100)]
Delete empty files

9 years agoRemove some `#ifdef GMQCC` conditionals
TimePath [Sun, 25 Jan 2015 03:41:51 +0000 (14:41 +1100)]
Remove some `#ifdef GMQCC` conditionals

9 years agoKill uses of `local` and `noref`
TimePath [Sun, 25 Jan 2015 03:33:33 +0000 (14:33 +1100)]
Kill uses of `local` and `noref`

9 years agoDeclare more ints as ints
TimePath [Sun, 25 Jan 2015 03:19:06 +0000 (14:19 +1100)]
Declare more ints as ints

9 years agoDeclare more ints as ints
TimePath [Sun, 25 Jan 2015 01:19:14 +0000 (12:19 +1100)]
Declare more ints as ints

9 years agoBegin fixing the monster (only 700 more lines to go, yay)
Mario [Sat, 24 Jan 2015 11:32:53 +0000 (22:32 +1100)]
Begin fixing the monster (only 700 more lines to go, yay)

9 years agoDeclare more ints as ints
TimePath [Sat, 24 Jan 2015 11:01:58 +0000 (22:01 +1100)]
Declare more ints as ints

9 years agoDeclare more ints as ints
TimePath [Sat, 24 Jan 2015 10:51:09 +0000 (21:51 +1100)]
Declare more ints as ints

9 years agoFix some more things
Mario [Sat, 24 Jan 2015 10:42:24 +0000 (21:42 +1100)]
Fix some more things

9 years agoFix some cases of noref
Mario [Sat, 24 Jan 2015 10:20:18 +0000 (21:20 +1100)]
Fix some cases of noref

9 years agoRemove some cases of local noref
Mario [Sat, 24 Jan 2015 10:17:00 +0000 (21:17 +1100)]
Remove some cases of local noref

9 years agoWhy wasn't this done in the first place, instead of blaming the compiler...
Mario [Sat, 24 Jan 2015 10:13:34 +0000 (21:13 +1100)]
Why wasn't this done in the first place, instead of blaming the compiler...

9 years agoMake TRUE and FALSE booleans
Mario [Sat, 24 Jan 2015 08:46:03 +0000 (19:46 +1100)]
Make TRUE and FALSE booleans

9 years agoMerge remote-tracking branch 'origin/Mario/qc_updates' into Mario/qc_updates
TimePath [Sat, 24 Jan 2015 08:42:29 +0000 (19:42 +1100)]
Merge remote-tracking branch 'origin/Mario/qc_updates' into Mario/qc_updates

9 years agoDeclare ints as ints
TimePath [Sat, 24 Jan 2015 08:26:47 +0000 (19:26 +1100)]
Declare ints as ints

9 years agoFix compile and add more fun
Mario [Sat, 24 Jan 2015 08:35:38 +0000 (19:35 +1100)]
Fix compile and add more fun

9 years agoMore fun stuff
Mario [Sat, 24 Jan 2015 08:29:38 +0000 (19:29 +1100)]
More fun stuff

9 years agoFigured out why it crashed, time to fix the other leaks
Mario [Sat, 24 Jan 2015 07:47:09 +0000 (18:47 +1100)]
Figured out why it crashed, time to fix the other leaks

9 years agoFix a weird crash (hoping there aren't any more of these, looks like a very specific...
Mario [Sat, 24 Jan 2015 07:43:39 +0000 (18:43 +1100)]
Fix a weird crash (hoping there aren't any more of these, looks like a very specific function causing issues)

9 years agoTurn #define'd constants into actual constants
Mario [Sat, 24 Jan 2015 07:05:57 +0000 (18:05 +1100)]
Turn #define'd constants into actual constants

9 years agoCan only hope there's no mistakes in this
Mario [Sat, 24 Jan 2015 05:06:35 +0000 (16:06 +1100)]
Can only hope there's no mistakes in this

9 years agoNot much to do in announcer.qc
Mario [Sat, 24 Jan 2015 04:03:02 +0000 (15:03 +1100)]
Not much to do in announcer.qc

9 years agoClient projectiles
Mario [Sat, 24 Jan 2015 04:01:19 +0000 (15:01 +1100)]
Client projectiles

9 years agoFix compile
Mario [Sat, 24 Jan 2015 03:57:58 +0000 (14:57 +1100)]
Fix compile

9 years agoIntegerize client's vehicles.qc
Mario [Sat, 24 Jan 2015 03:57:15 +0000 (14:57 +1100)]
Integerize client's vehicles.qc

9 years agoAlso do functions
Mario [Sat, 24 Jan 2015 03:49:57 +0000 (14:49 +1100)]
Also do functions

9 years agocl_cmd.qc
Mario [Sat, 24 Jan 2015 03:48:41 +0000 (14:48 +1100)]
cl_cmd.qc

9 years agoOne file down, a few hundred to go
Mario [Sat, 24 Jan 2015 03:37:51 +0000 (14:37 +1100)]
One file down, a few hundred to go

9 years agoLet's not make them macros
Mario [Fri, 23 Jan 2015 05:11:20 +0000 (16:11 +1100)]
Let's not make them macros

9 years agoMove TRUE and FALSE definitions to util-pre.qh and hide them under a definition check...
Mario [Fri, 23 Jan 2015 05:08:11 +0000 (16:08 +1100)]
Move TRUE and FALSE definitions to util-pre.qh and hide them under a definition check for bool support

9 years agoMerge branch 'sev/hud_weapon_panel' into 'master'
Mario [Fri, 23 Jan 2015 01:44:17 +0000 (01:44 +0000)]
Merge branch 'sev/hud_weapon_panel' into 'master'

A few HUD weapon panel improvements

Currently, the HUD weapon panel distributes the weapon icons very akwardly. The scaling is especially off when arranged vertically, sometimes leaving a gap on either side. So I've made to following changes:

- Reimplemented the distribution of the icons to better use the available space, and to be more predictable.
- Added a new cvar *hud_panel_weapons_label_scale*, to change the label size.
- Lastly, I've tightened up the HUD editor selection border for all panels, to more closely resemble the selection border in editors like GIMP or Inkscape.

![hud_weapons_v](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/0c951a653d/hud_weapons_v.png)

![hud_weapons_h](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/e494180790/hud_weapons_h.png)

See merge request !85

9 years agoMerge branch 'sev/menu_play_char' into 'master'
Mario [Fri, 23 Jan 2015 01:42:09 +0000 (01:42 +0000)]
Merge branch 'sev/menu_play_char' into 'master'

Two small menu fixes

Use Unicode character for the playlist play symbol.
Same character as used for the >>> downloading sign on the scoreboard.

*Edit*
I've added another small bugfix to this MR.

See merge request !86

9 years agoMerge branch 'terencehill/cvar_updates' into 'master'
Mario [Fri, 23 Jan 2015 01:37:37 +0000 (01:37 +0000)]
Merge branch 'terencehill/cvar_updates' into 'master'

Terencehill/cvar updates

cvar updates

See merge request !82

9 years agoMerge branch 'terencehill/ready_restart_tweaks' into 'master'
Mario [Fri, 23 Jan 2015 01:34:35 +0000 (01:34 +0000)]
Merge branch 'terencehill/ready_restart_tweaks' into 'master'

Terencehill/ready restart tweaks

Improve behaviour when sv_ready_restart and sv_ready_restart_after_countdown are enabled:

* Don't play "Prepare for battle" announcement twice in games made of rounds

* Block players while the countdown to game start is going even if sv_ready_restart_after_countdown is enabled
This is to avoid that a player roaming in the map gets confused by the sudden respawn when the game begins; it also helps to more clearly separate pre-game time from pre-round time (in the latter players are allowed to move depending on the game mode, e.g. CA allows it, FT doesn't)

See merge request !88

9 years agoMerge branch 'sev/menu_listbox_doubleclick'
Mario [Fri, 23 Jan 2015 01:31:09 +0000 (12:31 +1100)]
Merge branch 'sev/menu_listbox_doubleclick'

9 years agoFix minus key bug in the weaponslist
Severin Meyer [Thu, 22 Jan 2015 22:11:53 +0000 (23:11 +0100)]
Fix minus key bug in the weaponslist

9 years agoMove double click detection from listbox subtypes to the superclass
Severin Meyer [Thu, 22 Jan 2015 17:33:50 +0000 (18:33 +0100)]
Move double click detection from listbox subtypes to the superclass

9 years agoMerge branch 'sev/hud_kh' into 'master'
Mario [Thu, 22 Jan 2015 08:13:18 +0000 (08:13 +0000)]
Merge branch 'sev/hud_kh' into 'master'

Reimplemented Keyhunt HUD modicon panel

The current Keyhunt HUD modicon panel is overly complicated and inconsistent with other gametypes:

- It uses most of the available space to show the original key color, which is irrelevant for the gameplay
- Teams are not grouped
- Ownership is conveyed with different alpha values, which is difficult to understand
- As a result, you get an "RGBA salad"

This branch reimplements the panel:

- Each key is shown in the color of its current owning team
- Keys are grouped by team
- The icons use the same taken/carrying/dropped pattern used for CTF
- The icons blink if RUN HERE is shown
- The icons are more evenly distributed in the available space, esp. in the case of fewer than 4 teams

---

![kh](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/b8cb9585fd/kh.png)

See merge request !75

9 years agoMerge branch 'master' into sev/hud_kh
Mario [Thu, 22 Jan 2015 08:12:07 +0000 (19:12 +1100)]
Merge branch 'master' into sev/hud_kh

9 years agoBlock players while the countdown to game start is going even if sv_ready_restart_aft...
terencehill [Wed, 21 Jan 2015 23:22:00 +0000 (00:22 +0100)]
Block players while the countdown to game start is going even if sv_ready_restart_after_countdown is enabled

9 years agoDon't play "Prepare for battle" announcement again when countdown to game start ends...
terencehill [Wed, 21 Jan 2015 23:09:21 +0000 (00:09 +0100)]
Don't play "Prepare for battle" announcement again when countdown to game start ends and countdown to round start begins

9 years agoThighten up the panel selection border in the HUD editor
Severin Meyer [Wed, 21 Jan 2015 22:26:53 +0000 (23:26 +0100)]
Thighten up the panel selection border in the HUD editor

9 years agoAdd cvar hud_panel_weapons_label_scale
Severin Meyer [Wed, 21 Jan 2015 20:33:09 +0000 (21:33 +0100)]
Add cvar hud_panel_weapons_label_scale

9 years agoImprove the distribution of icons in the HUD weapons panel
Severin Meyer [Wed, 21 Jan 2015 19:06:41 +0000 (20:06 +0100)]
Improve the distribution of icons in the HUD weapons panel

9 years agoUse unicode character for the playlist play symbol
Severin Meyer [Wed, 21 Jan 2015 07:53:58 +0000 (08:53 +0100)]
Use unicode character for the playlist play symbol

9 years agoFix a couple of minor things that have been bugging me for a while
Mario [Tue, 20 Jan 2015 02:42:36 +0000 (13:42 +1100)]
Fix a couple of minor things that have been bugging me for a while

9 years agoMerge branch 'sev/hud_ammo_panel' into 'master'
Mario [Mon, 19 Jan 2015 02:42:57 +0000 (02:42 +0000)]
Merge branch 'sev/hud_ammo_panel' into 'master'

Sev/hud ammo panel

This branch makes the following additions and changes to the HUD ammo panel:

- New cvar *hud_panel_ammo_noncurrent_alpha*, to set the alpha of all ammo items not currently used (was hardcoded)
- New cvar *hud_panel_ammo_noncurrent_scale*, to scale the size of not currently used ammo items in relation to the current ammo
- Never blacks out the current ammo, even if 0. A red 0 is easier to see and understand than a black item
- The red text color for low ammo is slightly brighter, for better visibility
- In conformance to established color codes, infinite ammo text is now green instead of blue
- Infinite ammo text shows the proper infinity symbol, instead of 999

The purpose of this is to improve consistency and to allow setting appart current from noncurrent ammo,
as an alternative to using *hud_panel_ammo_onlycurrent*.

Luma WIP:
![hud_ammo](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/119d9c32a0/hud_ammo.png)

See merge request !84

9 years agoUse proper infinity symbol for infinite ammo count
Severin Meyer [Sun, 18 Jan 2015 23:51:18 +0000 (00:51 +0100)]
Use proper infinity symbol for infinite ammo count

9 years agoFor a low ammo count, use slightly brighter red for better visibility. For infinity...
Severin Meyer [Sun, 18 Jan 2015 23:40:25 +0000 (00:40 +0100)]
For a low ammo count, use slightly brighter red for better visibility. For infinity ammo count, use green instead of blue, in conformance to established color codes (red=bad, green=good).

9 years agoAdd hud_panel_ammo_noncurrent_scale cvar
Severin Meyer [Sun, 18 Jan 2015 23:35:36 +0000 (00:35 +0100)]
Add hud_panel_ammo_noncurrent_scale cvar

9 years agoAdd hud_panel_ammo_noncurrent_alpha cvar
Severin Meyer [Sun, 18 Jan 2015 23:23:35 +0000 (00:23 +0100)]
Add hud_panel_ammo_noncurrent_alpha cvar

9 years agoNever black out the current ammo, even if empty. A red zero is easier to see and...
Severin Meyer [Sun, 18 Jan 2015 23:12:55 +0000 (00:12 +0100)]
Never black out the current ammo, even if empty. A red zero is easier to see and understand than a black item.

9 years agoRefactor the DrawAmmoItem() function: remove redundant and unnecessary code, use...
Severin Meyer [Sun, 18 Jan 2015 23:06:30 +0000 (00:06 +0100)]
Refactor the DrawAmmoItem() function: remove redundant and unnecessary code, use consistent variable names, calculate colors and alpha in one place

9 years agoMerge branch 'terencehill/music_player' into 'master'
Mario [Sun, 18 Jan 2015 10:42:33 +0000 (10:42 +0000)]
Merge branch 'terencehill/music_player' into 'master'

Merge branch terencehill/music_player (M merge request)

Adds a music player to the menu.

See merge request !66

9 years agoFix hit indication with arc and cl_hitsound 2-3
Mario [Sun, 18 Jan 2015 10:02:45 +0000 (21:02 +1100)]
Fix hit indication with arc and cl_hitsound 2-3

9 years agoTransifex sync. xonotic-v0.8.0
Rudolf Polzer [Tue, 13 Jan 2015 18:48:23 +0000 (19:48 +0100)]
Transifex sync.

9 years agoShow optionally condensed fonts right again :)
Rudolf Polzer [Tue, 13 Jan 2015 18:38:53 +0000 (10:38 -0800)]
Show optionally condensed fonts right again :)

9 years agoRevert removal of some autocvar initializations (compatibility)
terencehill [Tue, 13 Jan 2015 00:55:52 +0000 (01:55 +0100)]
Revert removal of some autocvar initializations (compatibility)

9 years agoRemove autocvar_crosshair_ring_vortex* and autocvar_crosshair_ring_arc* initializatio...
terencehill [Mon, 12 Jan 2015 16:42:03 +0000 (17:42 +0100)]
Remove autocvar_crosshair_ring_vortex* and autocvar_crosshair_ring_arc* initializations, the respective cvars are already initializated

9 years agoImprove a few cvar descriptions
terencehill [Mon, 12 Jan 2015 15:53:23 +0000 (16:53 +0100)]
Improve a few cvar descriptions

9 years agoAdd missing crosshair_ring_arc* to crosshairs.cfg so they get saved!
terencehill [Mon, 12 Jan 2015 15:44:34 +0000 (16:44 +0100)]
Add missing crosshair_ring_arc* to crosshairs.cfg so they get saved!

9 years agoUpdate cl_reticle* cvars and fix/improve their descriptions
terencehill [Mon, 12 Jan 2015 14:07:42 +0000 (15:07 +0100)]
Update cl_reticle* cvars and fix/improve their descriptions

9 years agoUpdate notification cvars with dumpnotifs
terencehill [Mon, 12 Jan 2015 13:38:48 +0000 (14:38 +0100)]
Update notification cvars with dumpnotifs

9 years agoOops, revert the chat bubble change for now. This was supposed to only
Rudolf Polzer [Sun, 11 Jan 2015 20:23:57 +0000 (12:23 -0800)]
Oops, revert the chat bubble change for now. This was supposed to only
go in with Luma.

9 years agoMerge branch 'terencehill/teams_override_cvars' into 'master'
Rudolf Polzer [Sun, 11 Jan 2015 16:22:12 +0000 (16:22 +0000)]
Merge branch 'terencehill/teams_override_cvars' into 'master'

Terencehill/teams override cvars

Remove g_keepaway_teams_override from the menu as it doesn't exist anymore

See merge request !73

9 years agoMerge branch 'sev/luma_supplement' into 'master'
Rudolf Polzer [Sun, 11 Jan 2015 16:14:30 +0000 (16:14 +0000)]
Merge branch 'sev/luma_supplement' into 'master'

Luma Supplement

This branch adds Luma variants of the net icon (lag) and the chatbubble.

The current images will be replaced, hence the separate branch.

See merge request !77

9 years agoMerge branch 'sev/scoreboard_skin' into 'master'
Rudolf Polzer [Sun, 11 Jan 2015 16:13:28 +0000 (16:13 +0000)]
Merge branch 'sev/scoreboard_skin' into 'master'

Scoreboard Skin

This branch cleans up the scoreboard skin.
Nothing spectacular, but the graphics and the color will better match the Luma (and Luminos) themes.

Old
![scoreboard_old](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/dcf9a69c07/scoreboard_old.png)

New
![scoreboard_new](https://gitlab.com/uploads/xonotic/xonotic-data.pk3dir/bacfd331fd/scoreboard_new.png)

See merge request !78

9 years agoMerge branch 'terencehill/eliminatedplayer_fix' into 'master'
Rudolf Polzer [Sun, 11 Jan 2015 16:10:26 +0000 (16:10 +0000)]
Merge branch 'terencehill/eliminatedplayer_fix' into 'master'

Terencehill/eliminatedplayer fix

Fix #1455 "Spectating frozen players blanks out spectator name"

See merge request !81

9 years agoMerge branch 'terencehill/keybinds.txt.it_update' into 'master'
Rudolf Polzer [Sun, 11 Jan 2015 16:09:16 +0000 (16:09 +0000)]
Merge branch 'terencehill/keybinds.txt.it_update' into 'master'

Terencehill/keybinds.txt.it update

keybinds.txt.it update

See merge request !71

9 years agoGib clones when they die, as I have no good way of activating their
Rudolf Polzer [Sun, 11 Jan 2015 15:21:48 +0000 (07:21 -0800)]
Gib clones when they die, as I have no good way of activating their
death animation.

9 years agoAdjust newlines a bit to make the code more readable.
Rudolf Polzer [Sun, 11 Jan 2015 15:08:13 +0000 (07:08 -0800)]
Adjust newlines a bit to make the code more readable.

9 years agoKill god mode support for clones/corpses.
Rudolf Polzer [Sun, 11 Jan 2015 15:04:47 +0000 (07:04 -0800)]
Kill god mode support for clones/corpses.

9 years agoRename anindecide_init to animdecide_load_if_needed (clearer).
Rudolf Polzer [Sun, 11 Jan 2015 15:01:18 +0000 (07:01 -0800)]
Rename anindecide_init to animdecide_load_if_needed (clearer).

9 years agoMerge remote-tracking branch 'origin/mrbougo/clonefixes'
Rudolf Polzer [Sun, 11 Jan 2015 14:58:45 +0000 (06:58 -0800)]
Merge remote-tracking branch 'origin/mrbougo/clonefixes'

9 years agoWelcome, Asturian, to the languages list!
Rudolf Polzer [Sun, 11 Jan 2015 06:39:34 +0000 (07:39 +0100)]
Welcome, Asturian, to the languages list!

9 years agoOops, clear useless flags at the end for consistency.
Rudolf Polzer [Sat, 10 Jan 2015 17:00:36 +0000 (09:00 -0800)]
Oops, clear useless flags at the end for consistency.

9 years agoAdd missing flag.
Rudolf Polzer [Sat, 10 Jan 2015 16:56:45 +0000 (08:56 -0800)]
Add missing flag.

9 years agoFix detection of useless waypoints.
Rudolf Polzer [Sat, 10 Jan 2015 05:32:13 +0000 (21:32 -0800)]
Fix detection of useless waypoints.

9 years agoFix initialization of Race and CTS game modes.
Rudolf Polzer [Sat, 10 Jan 2015 05:00:14 +0000 (21:00 -0800)]
Fix initialization of Race and CTS game modes.

9 years agoMinor autowaypointer fixes.
Rudolf Polzer [Fri, 9 Jan 2015 15:13:14 +0000 (07:13 -0800)]
Minor autowaypointer fixes.

9 years agoFix some spacing in the translations.
Rudolf Polzer [Fri, 9 Jan 2015 09:33:04 +0000 (01:33 -0800)]
Fix some spacing in the translations.

9 years agoAnother transifex sync.
Rudolf Polzer [Fri, 9 Jan 2015 07:53:05 +0000 (08:53 +0100)]
Another transifex sync.

9 years agoSet the name for Polish.
Rudolf Polzer [Thu, 8 Jan 2015 14:35:12 +0000 (06:35 -0800)]
Set the name for Polish.

9 years agoFix "spectating a frozen player also darkens the spectator's name in scoreboard"
terencehill [Wed, 7 Jan 2015 13:50:37 +0000 (14:50 +0100)]
Fix "spectating a frozen player also darkens the spectator's name in scoreboard"

9 years agoAuto transifex sync ;)
Rudolf Polzer [Tue, 6 Jan 2015 23:02:57 +0000 (00:02 +0100)]
Auto transifex sync ;)

9 years agoCondense fonts in listboxes too, where they are influenced by translation strings.
Rudolf Polzer [Tue, 6 Jan 2015 16:21:04 +0000 (17:21 +0100)]
Condense fonts in listboxes too, where they are influenced by translation strings.

9 years agoAuto transifex sync ;)
Rudolf Polzer [Mon, 5 Jan 2015 23:03:04 +0000 (00:03 +0100)]
Auto transifex sync ;)

9 years agoMerge branch 'Mirio/credits' into 'master'
Mario [Mon, 5 Jan 2015 22:11:04 +0000 (22:11 +0000)]
Merge branch 'Mirio/credits' into 'master'

Mirio/credits

Updated credits

See merge request !80