]>
git.rm.cloudns.org Git - xonotic/mediasource.git/log
LegendaryGuard [Fri, 16 Dec 2022 16:38:13 +0000 (17:38 +0100)]
Remove compiled bumblebee_body model due to testing reasons 😅
LegendaryGuard [Fri, 16 Dec 2022 01:43:42 +0000 (02:43 +0100)]
Add Bumblebee model sources (Blender 2.79b) and SMD sources to compile using dpmodel
LegendaryGuard [Fri, 9 Dec 2022 01:23:11 +0000 (01:23 +0000)]
Merge branch 'Mario/monsters' into 'master'
Add sources for the new monster models
See merge request xonotic/mediasource!28
Mario [Fri, 9 Dec 2022 01:23:10 +0000 (01:23 +0000)]
Add sources for the new monster models
LegendaryGuard [Fri, 9 Dec 2022 00:42:05 +0000 (00:42 +0000)]
Merge branch 'LegendaryGuard/decompile_ok_sources' into 'master'
Add Overkill weaponry decompiled sources (Blender 2.79b source files) and organize weapon directory structure to be similar to xonotic-data.pk3dir/models/weapons/
See merge request xonotic/mediasource!24
LegendaryGuard [Fri, 9 Dec 2022 00:42:04 +0000 (00:42 +0000)]
Add Overkill weaponry decompiled sources (Blender 2.79b source files) and organize weapon directory structure to be similar to xonotic-data.pk3dir/models/weapons/
terencehill [Fri, 29 Apr 2022 18:11:42 +0000 (20:11 +0200)]
Restore shotgun model sources, they were deleted in
9bc7534 with the intention of replacing the shotgun model with the arc model in game but it never became a reality
terencehill [Thu, 7 Apr 2022 12:45:48 +0000 (12:45 +0000)]
Merge branch 'LegendaryGuard/rename-v_shotgun-to-v_arc' into 'master'
Rename shotgun models to arc
Closes #18
See merge request xonotic/mediasource!23
LegendaryGuard [Thu, 7 Apr 2022 12:45:48 +0000 (12:45 +0000)]
Rename shotgun models to arc
terencehill [Thu, 7 Apr 2022 12:41:34 +0000 (14:41 +0200)]
Merge branch 'samual/menu_updates'
terencehill [Thu, 7 Apr 2022 12:30:26 +0000 (12:30 +0000)]
Move luminos gametype icons under luminos folder
terencehill [Wed, 23 Feb 2022 17:17:59 +0000 (17:17 +0000)]
Merge branch 'terencehill/sources' into 'master'
Add health and armor icons and Blaster source files
See merge request xonotic/mediasource!22
terencehill [Sun, 30 Jan 2022 21:22:57 +0000 (22:22 +0100)]
Add Blaster source by Morphed
terencehill [Sun, 30 Jan 2022 21:17:48 +0000 (22:17 +0100)]
Add health and armor source files for luma (authors: terencehill, sev) and luminos (author: terencehill)
terencehill [Fri, 5 Nov 2021 17:33:12 +0000 (17:33 +0000)]
Merge branch 'sev/luma-crosshairs' into 'master'
Render Luma crosshairs with Inkscape to avoid rsvg inconsistencies
See merge request xonotic/mediasource!21
Severin Meyer [Fri, 5 Nov 2021 13:47:55 +0000 (14:47 +0100)]
Render Luma crosshairs with Inkscape to avoid rsvg inconsistencies
terencehill [Thu, 4 Nov 2021 17:01:25 +0000 (17:01 +0000)]
Merge branch 'sev/luma-filters' into 'master'
Fix Luma svg filters
Closes #17
See merge request xonotic/mediasource!19
terencehill [Thu, 4 Nov 2021 00:23:01 +0000 (00:23 +0000)]
Merge branch 'bones_was_here/render-svg-fix' into 'master'
Fix gfx/luma/render-svg.sh to work on debian 11
See merge request xonotic/mediasource!18
Severin Meyer [Wed, 3 Nov 2021 19:16:51 +0000 (20:16 +0100)]
Fix Luma svg filters
bones_was_here [Mon, 1 Nov 2021 21:43:58 +0000 (07:43 +1000)]
Fix gfx/luma/render-svg.sh to work on debian 11
The condition of the source being newer than the destination was
silently failing when the destination file did not exist
It will now proceed when the destination file does not exist, and will
print the reason when declining to process a file
The output image was inverted with recent versions of imagemagick, same
fix applied as in https://gitlab.com/xonotic/mediasource/-/merge_requests/17
Rudolf Polzer [Tue, 24 Aug 2021 13:19:13 +0000 (13:19 +0000)]
Merge branch 'bones_was_here/logo_flip' into 'master'
Workaround for imagemagick regression causing logo inversion
Closes xonotic#331
See merge request xonotic/mediasource!17
bones_was_here [Tue, 24 Aug 2021 01:46:36 +0000 (11:46 +1000)]
Workaround for imagemagick regression causing logo inversion
Rudolf Polzer [Thu, 1 Apr 2021 13:41:57 +0000 (15:41 +0200)]
Support newer Inkscape version.
Mario [Wed, 18 Nov 2020 21:58:23 +0000 (21:58 +0000)]
Merge branch 'sev/xolonium4_2' into 'master'
Update Xolonium sources to version 4.2
See merge request xonotic/mediasource!16
Severin Meyer [Wed, 18 Nov 2020 21:28:41 +0000 (22:28 +0100)]
Update Xolonium sources to version 4.2
Mario [Mon, 1 Oct 2018 04:04:09 +0000 (04:04 +0000)]
Merge branch 'sev/luma_ok' into 'master'
Merge some older luma sourcefiles
See merge request xonotic/mediasource!14
sev [Mon, 1 Oct 2018 04:04:09 +0000 (04:04 +0000)]
Merge some older luma sourcefiles
Mario [Wed, 22 Aug 2018 08:10:39 +0000 (18:10 +1000)]
Add energy weapons source by Morphed
Mario [Wed, 22 Aug 2018 08:09:10 +0000 (18:09 +1000)]
Merge remote-tracking branch 'origin/master'
Mario [Wed, 22 Aug 2018 08:06:45 +0000 (18:06 +1000)]
Merge branch 'Mario/morphed_explosivesmodel'
Mario [Mon, 25 Jun 2018 03:16:59 +0000 (03:16 +0000)]
Merge branch 'Mario/morphed_explosivesmodel' into 'master'
Add sources for Morphed's explosives ammo box
See merge request xonotic/mediasource!13
Mario [Fri, 22 Jun 2018 11:40:51 +0000 (21:40 +1000)]
Add sources for Morphed's explosives ammo box
Mirio [Wed, 25 Apr 2018 15:10:59 +0000 (17:10 +0200)]
Add Audacity file of Lybertas kill sound
Mario [Fri, 31 Mar 2017 19:43:19 +0000 (05:43 +1000)]
Merge branch 'master' of ssh://gitlab.com/xonotic/mediasource
Mario [Fri, 31 Mar 2017 19:26:19 +0000 (05:26 +1000)]
Add source files for new mortar
Mirio [Thu, 23 Mar 2017 23:48:47 +0000 (23:48 +0000)]
Merge branch 'theaudiomonkey/gogetem' into 'master'
Add TheAudioMonkeys track Go Get Em sources
See merge request !12
Mirio [Mon, 13 Mar 2017 22:52:52 +0000 (23:52 +0100)]
Add TheAudioMonkeys track Go Get Em sources
Mario [Tue, 21 Feb 2017 10:29:00 +0000 (20:29 +1000)]
Merge branch 'Mario/monsters'
Mario [Tue, 21 Feb 2017 10:28:09 +0000 (20:28 +1000)]
Merge branch 'morphed/overkill'
Mario [Tue, 21 Feb 2017 10:26:43 +0000 (20:26 +1000)]
Merge branch 'morphed/newrl'
Mario [Mon, 20 Feb 2017 01:54:05 +0000 (11:54 +1000)]
Add source for new devastator by Morphed
Mario [Sat, 28 Jan 2017 01:01:35 +0000 (11:01 +1000)]
Add new sources for mg and sg
Mirio [Wed, 26 Oct 2016 00:28:01 +0000 (02:28 +0200)]
Add track Nanite to mediasource
Mario [Sat, 8 Oct 2016 16:29:28 +0000 (16:29 +0000)]
Merge branch 'sev/hud_ctf_update' into 'master'
Sources of CTF stalemate images
For merge xonotic/xonotic-data.pk3dir!338
See merge request !11
Severin Meyer [Sat, 8 Oct 2016 13:03:52 +0000 (15:03 +0200)]
Merge branch 'master' of gitlab.com:xonotic/mediasource into sev/hud_ctf_update
Mario [Wed, 28 Sep 2016 21:00:03 +0000 (07:00 +1000)]
Fix some minor typos
Severin Meyer [Wed, 27 Jul 2016 22:46:07 +0000 (00:46 +0200)]
Luma update for CTF stalemate
PeterMorphed [Sun, 3 Jul 2016 22:14:30 +0000 (23:14 +0100)]
new weapon sources
Mario [Tue, 28 Jun 2016 10:44:34 +0000 (20:44 +1000)]
Merge branch 'Mario/fireball_merge'
Mario [Fri, 24 Jun 2016 02:05:26 +0000 (12:05 +1000)]
Add source for diabolik's fireball
Mario [Sat, 30 Apr 2016 11:15:07 +0000 (11:15 +0000)]
Merge branch 'sev/luma_update' into 'master'
Luma Source Update
The sourcefiles for merged branch xonotic/xonotic-data.pk3dir!304
See merge request !10
Severin Meyer [Sat, 30 Apr 2016 11:05:06 +0000 (13:05 +0200)]
Revise luma background sourcefile name
Severin Meyer [Sun, 3 Apr 2016 22:28:36 +0000 (00:28 +0200)]
Add source of new Luma menu background image
Severin Meyer [Wed, 30 Mar 2016 10:12:47 +0000 (12:12 +0200)]
Update the luma sourcefiles
Mario [Fri, 26 Feb 2016 17:35:14 +0000 (17:35 +0000)]
Merge branch 'mirceakitsune/shotgun_cannon' into 'master'
Merge branch mirceakitsune/shotgun_cannon (M merge request)
The original model was merged with a colour swap as the Arc weapon model.
See merge request !9
Mario [Sun, 21 Feb 2016 07:01:59 +0000 (07:01 +0000)]
Merge branch 'morphed/hagar' into 'master'
Merge branch morphed/hagar (M merge request)
Media source for Morphed's hagar model.
See merge request !8
Mario [Mon, 15 Feb 2016 01:33:50 +0000 (11:33 +1000)]
Merge branch 'Mario/sniperrifle'
Mario [Mon, 15 Feb 2016 00:09:30 +0000 (10:09 +1000)]
Add sniper rifle source by LJFHutch
Mario [Sat, 21 Nov 2015 08:40:02 +0000 (18:40 +1000)]
Add delete icon source
Mario [Sat, 21 Nov 2015 08:20:42 +0000 (18:20 +1000)]
Add bulldozer asset sources by KingPimpCommander
Mario [Sat, 21 Nov 2015 08:18:30 +0000 (18:18 +1000)]
Merge branch 'Melanosuchus/minigames'
PeterMorphed [Sat, 7 Nov 2015 19:06:12 +0000 (19:06 +0000)]
Hagar source
Rudolf Polzer [Tue, 25 Aug 2015 13:04:20 +0000 (15:04 +0200)]
Fix versionbuilder.
Rudolf Polzer [Tue, 25 Aug 2015 01:49:07 +0000 (03:49 +0200)]
Make it able to use separate input and output dirs.
Rudolf Polzer [Tue, 25 Aug 2015 01:45:55 +0000 (03:45 +0200)]
Use Xolonium GPL.
Mario [Thu, 13 Aug 2015 13:28:09 +0000 (13:28 +0000)]
Merge branch 'sev/luma_itemstime' into 'master'
Update Luma sourcefiles
Some more updates to the Luma sourcefiles after the recent merge of the Luma itemstime icons.
See merge request !6
Severin Meyer [Thu, 13 Aug 2015 13:10:38 +0000 (15:10 +0200)]
Update Luma sourcefiles
Mario [Mon, 10 Aug 2015 19:10:59 +0000 (19:10 +0000)]
Merge branch 'sev/luma_hud_vehicles' into 'master'
Luma sourcefiles
This branch includes all recent updates to the Luma sourcefiles (don't mind the branch name).
Now that all my recent Luma branches have been merged into master, I recommend merging the sourcefiles as well.
See merge request !5
Mario [Wed, 5 Aug 2015 05:13:58 +0000 (05:13 +0000)]
Merge branch 'sev/xolonium3' into 'master'
Xolonium sourcefiles
The sourcefiles of the latest version of Xolonium.
See merge request !4
Severin Meyer [Tue, 4 Aug 2015 21:31:29 +0000 (23:31 +0200)]
Update Luma sourcefiles
Severin Meyer [Tue, 4 Aug 2015 19:34:15 +0000 (21:34 +0200)]
Remove extension from obsolete files to hide them from the build script
Severin Meyer [Tue, 4 Aug 2015 19:24:07 +0000 (21:24 +0200)]
Add buff icon sourcefiles
Severin Meyer [Tue, 4 Aug 2015 11:27:41 +0000 (13:27 +0200)]
Update buff shader names
Severin Meyer [Fri, 31 Jul 2015 17:52:34 +0000 (19:52 +0200)]
Update Luma sourcefiles
Severin Meyer [Thu, 30 Jul 2015 22:22:54 +0000 (00:22 +0200)]
Update Luma buff sourcefiles
Severin Meyer [Wed, 29 Jul 2015 16:58:10 +0000 (18:58 +0200)]
Update vehicle crosshair sourcefiles
Severin Meyer [Tue, 28 Jul 2015 19:35:58 +0000 (21:35 +0200)]
Update Luma sourcefiles and two new Luminos files
Severin Meyer [Tue, 28 Jul 2015 11:14:07 +0000 (13:14 +0200)]
Update Luma sourcefiles
Severin Meyer [Mon, 27 Jul 2015 22:21:26 +0000 (00:21 +0200)]
Update Luma sourcefiles
Severin Meyer [Mon, 27 Jul 2015 16:27:23 +0000 (18:27 +0200)]
Update Luma sourcefiles
Severin Meyer [Sun, 26 Jul 2015 15:39:20 +0000 (17:39 +0200)]
Remove obsolete Luma sourcefiles
Severin Meyer [Sat, 25 Jul 2015 16:55:15 +0000 (18:55 +0200)]
Update Luma sourcefiles
Severin Meyer [Fri, 24 Jul 2015 09:12:02 +0000 (11:12 +0200)]
Add Luma sourcefiles for the vehicles HUD
Severin Meyer [Thu, 11 Jun 2015 15:23:02 +0000 (17:23 +0200)]
Update Xolonium font sources to version 3.1
Severin Meyer [Mon, 4 May 2015 17:24:52 +0000 (19:24 +0200)]
Update Xolonium font sources to version 3.0
Mattia Basaglia [Mon, 27 Apr 2015 12:01:10 +0000 (14:01 +0200)]
C4 board
Mattia Basaglia [Fri, 13 Feb 2015 21:52:24 +0000 (22:52 +0100)]
Use smooth mask on the pong ball
Mattia Basaglia [Fri, 13 Feb 2015 20:45:36 +0000 (21:45 +0100)]
Improve pong ball glow
Mattia Basaglia [Fri, 13 Feb 2015 15:09:27 +0000 (16:09 +0100)]
Tweak pong visuals some more
Mattia Basaglia [Fri, 13 Feb 2015 14:54:36 +0000 (15:54 +0100)]
Tweak pong textures
Mattia Basaglia [Thu, 12 Feb 2015 12:41:14 +0000 (13:41 +0100)]
Pong glow textures
Mattia Basaglia [Wed, 11 Feb 2015 22:01:17 +0000 (23:01 +0100)]
Sources for Pong graphics
Mattia Basaglia [Fri, 6 Feb 2015 12:46:14 +0000 (13:46 +0100)]
Include minigame busy sprite to the build script
Mattia Basaglia [Thu, 5 Feb 2015 18:25:49 +0000 (19:25 +0100)]
Minigame busy icon by Snow_56767
Mattia Basaglia [Thu, 5 Feb 2015 18:25:00 +0000 (19:25 +0100)]
Minor tweaks to the minigame texture build script
Mattia Basaglia [Thu, 5 Feb 2015 17:47:21 +0000 (18:47 +0100)]
Minigame texture sources
The files gfx/minigames/*/piece*.xcf are by Snow_56767
Mario [Wed, 4 Feb 2015 02:56:27 +0000 (02:56 +0000)]
Merge branch 'sev/luma' into 'master'
Luma sourcefiles
Title says it all. Reference: xonotic/xonotic-data.pk3dir!76
See merge request !2
Mario [Wed, 4 Feb 2015 02:54:57 +0000 (02:54 +0000)]
Merge branch 'sev/crosshairs' into 'master'
Crosshair sourcefiles
The sourcefiles for xonotic/xonotic-data.pk3dir!103
See merge request !3
Severin Meyer [Tue, 3 Feb 2015 09:50:47 +0000 (10:50 +0100)]
Update and add luma crosshair sourcefiles
Severin Meyer [Tue, 3 Feb 2015 09:47:49 +0000 (10:47 +0100)]
Move crosshair sourcefiles to dedicated directories