Commit graph

1733 commits

Author SHA1 Message Date
Mike Swanson
63efd56679 create_caption: Clean up copyright text more by removing "Freedoom, " 2017-03-14 17:51:34 -07:00
Ayub Ahmed
845c452f3b CREDITS: hex11's email, change sodaholic's name 2017-03-14 17:22:48 -07:00
Ayub Ahmed
65d46fc86c CREDITS: three new contributors
Litrivin, jupiter_ex and uhbooh weren't added to CREDITS previously
so add them now.
2017-03-14 17:22:43 -07:00
Mike Swanson
af5d98ec50 graphics: ignore the new t_phase1/t_phase2 files 2017-03-14 16:08:52 -07:00
Mike Swanson
0b3edc9548 Merge branch 'titlepic' of gh:Voros2/freedoom 2017-03-14 16:05:10 -07:00
Mike Swanson
a51b9d3398 Merge branch 'titlepic' of gh:Ferk/freedoom 2017-03-14 15:57:34 -07:00
Mike Swanson
6672395761 Merge branch 'shtgn' of gh:Voros2/freedoom 2017-03-14 15:56:25 -07:00
Mike Swanson
e6a561bdba Merge branch 'new_tntonia_texs' of gh:Talon1024/freedoom 2017-03-14 15:55:50 -07:00
Mike Swanson
6fca82bf60 Merge branch 'cand_cbra' of gh:luckypunk/freedoom 2017-03-14 15:55:17 -07:00
Mike Swanson
ebe61a9abf Merge branch 'sprites' of gh:luckypunk/freedoom 2017-03-14 15:54:58 -07:00
Mike Swanson
c105f5f810 Merge branch 'w106' of gh:luckypunk/freedoom 2017-03-14 15:54:18 -07:00
Mike Swanson
4b43e00e3d Merge branch 'p1par' of gh:Voros2/freedoom 2017-03-14 15:51:36 -07:00
Mike Swanson
913940b05e Merge branch 'dm24' of gh:Voros2/freedoom 2017-03-14 15:50:45 -07:00
RjY
3143339a64 parallel_textgen: run textgen in parallel
textgen: instead of running ImageMagick yourself, output a Makefile rule
for each graphic. Dependencies are passed on the command line.

Makefile: Add rule for 'textgen.mk' which is built by running textgen.
graphics.stamp depends on textgen.mk and all the built graphics files.
Then, each built graphic depends on textgen.mk, ensuring it is made
first. textgen.mk itself depends on textgen config, font, and dehacked.
(Makefile itself also depends on textgen.mk implicitly via include)

This duplicates previous behaviour where changing textgen config remakes
all text graphics, but one Make rule for each, allowing parallel make
with -j instead of the script doing one at a time.

The built IWADs are byte-for-byte identical before and after this patch
series is applied (provided VERSION is set to the same thing of course)

One problem is 'make clean' rebuilds textgen.mk because Make thinks the
Makefile needs it, but then immediately deletes it. Not sure how to fix.
Use git clean -fdx instead, or just don't clean twice in succession.

----

This gives the following improvement in build time (-j1 as control,
built on 4 cores and a large tmpfs so disk speed isn't a factor)

(master)

    make -j1  4.83s user 6.77s system 93% cpu 12.444 total
    make -j1  4.74s user 6.72s system 93% cpu 12.267 total
    make -j1  4.72s user 6.68s system 92% cpu 12.292 total

    make -j4  5.72s user 6.77s system 109% cpu 11.414 total
    make -j4  5.39s user 6.85s system 107% cpu 11.419 total
    make -j4  5.66s user 6.79s system 109% cpu 11.383 total

parallel_textgen

    make -j1  4.57s user 6.66s system 92% cpu 12.185 total
    make -j1  4.73s user 6.57s system 93% cpu 12.152 total
    make -j1  4.60s user 6.72s system 93% cpu 12.152 total

    make -j4  5.62s user 7.72s system 262% cpu 5.084 total
    make -j4  5.82s user 7.76s system 262% cpu 5.165 total
    make -j4  5.79s user 7.73s system 261% cpu 5.161 total
2017-03-14 17:46:40 +00:00
RjY
946db56ccd parallel_textgen: separate font_render and invoke_command
Replace font_render with get_command which returns the command line
instead of executing it. Move invoke_command to font_render callers.
2017-03-14 13:14:16 +00:00
RjY
e94bcdd9ea graphics/titlepic: remove author subdirectory
- move captainw/* into titlepic (rename fdmtitle to freedm_titlepic)
- fix file paths in dist/Makefile, graphics/titlepic/Makefile
2017-03-14 11:43:33 +00:00
Kevin Caccamo
fbc84b5383 patches: new BRICK and MOSSBRIK
BRICK is based on IMGP3322.JPG from tex-res-stone-and-moss.zip in this
texture pack:
http://opengameart.org/content/free-texture-resource-pack-moss-rock-patterns-and-misc

MOSSBRIK is based on IMGP5011.JPG in addition to IMGP3322.JPG from the
aforementioned texture pack.
2017-03-13 17:47:44 -04:00
Kevin Caccamo
d0aca0069d patches: improve MYWOOD
Add vertical streaks and darkened panels.
2017-03-13 17:47:44 -04:00
Kevin Caccamo
8ea1d1026c patches: new MC animation
The new patches that make up this animation are based on IMGP5011.JPG
and IMGP3092.JPG from tex-res-stone-and-moss.zip in this texture pack:
http://opengameart.org/content/free-texture-resource-pack-moss-rock-patterns-and-misc

Also, I did not replace MC9 because it is not actually used.
2017-03-13 17:47:44 -04:00
Kevin Caccamo
f5fc2713b2 patches: new MYWOOD
This patch is based on YukiHerz' textures from this thread:
https://www.doomworld.com/vb/freedoom/93250-some-textures/
2017-03-13 17:47:44 -04:00
Kevin Caccamo
bc9dcda27d patches: darken MARBLE1
Darken MARBLE1 to be closer to the original MARBLE1's brightness.
2017-03-13 17:47:44 -04:00
Kevin Caccamo
6a96ce42e0 patches: improved BROWN1 and BROWN5, new MARBLE1
BROWN1 and BROWN5 are based on IMGP5011.JPG and IMGP3092.JPG from
tex-res-stone-and-moss.zip in this texture pack:
http://opengameart.org/content/free-texture-resource-pack-moss-rock-patterns-and-misc

MARBLE1 is based on 13.png from ground.zip in this texture pack:
http://opengameart.org/content/seamless-terrain-and-concrete-textures
2017-03-13 17:47:44 -04:00
Kevin Caccamo
c7a0085e3d patches: improved NATROCK
It is now darker, and has more brown/tan pixels.
2017-03-13 17:47:44 -04:00
Kevin Caccamo
f10428d3b3 patches: better DARKROCK
Make DARKROCK look better by removing the duplicate streak introduced
in 2017-03-03T05:34:59Z!kevin@ciinet.org, as well as increasing the
brown/tan to gray pixel ratio.
2017-03-13 17:47:44 -04:00
Kevin Caccamo
5affac5c4e patches: new BROWN1 and BROWN5
Both of these are based on DOPUNK4.
2017-03-13 17:47:44 -04:00
Kevin Caccamo
a78e69ed11 patches: new MUD based on WALL78_1
The current MUD looks like rock to me, and I thought WALL78_1 looked
more like mud.
2017-03-13 17:47:44 -04:00
Kevin Caccamo
b5f6b0e02a patches: new NATROCK and DARKROCK
NATROCK is based on IMGP5011.JPG from tex-res-stone-and-moss.zip
DARKROCK is based on IMGP5010.JPG from tex-res-stone-and-moss.zip
tex-res-stone-and-moss.zip is from this texture pack:
http://opengameart.org/content/free-texture-resource-pack-moss-rock-patterns-and-misc
2017-03-13 17:47:44 -04:00
Catoptromancy
c7054c408b c4m2: Several gameplay tweaks.
* Add a switch in the secret exit area to allow backtracking.
* Make ledges in secret route non-damaging and made pit below into 20%
  damage slime, allowing jumpers to risk death for a couple shells.
* 10 DM starts.
2017-03-13 02:36:58 -04:00
Catoptromancy
2304c7cf9e map17: Adjustments for easy/normal skill levels. 2017-03-13 02:36:32 -04:00
Ayub Ahmed
b1a9fe95e5 titlepic/Makefile: clean only generated t_phase...
images within the directory.
2017-03-13 06:03:13 +06:00
Ayub Ahmed
bfa2d74900 musics: new d_dm09
This track gets cut off in vanilla, so replacing it
with one of jupiter_ex's track.
2017-03-12 12:48:25 +00:00
Fernando Carmona Varo
4f5bb82e61 Titlepic: use more discrete breathing orifices 2017-03-11 16:37:19 +01:00
Ayub Ahmed
758c53fb54 text/config.py: make t_phase images white 2017-03-11 21:05:25 +06:00
Ayub Ahmed
209f14f071 create_caption: increase height, remove -style 2017-03-11 19:15:00 +06:00
Ayub Ahmed
943ccbb126 create_caption: make y offset positive 2017-03-11 18:55:21 +06:00
Ayub Ahmed
4a39a7730e create_caption: align line 37 properly 2017-03-11 18:42:08 +06:00
Ayub Ahmed
2326d4a741 create_caption: change color to orange
For better visibility.
2017-03-11 18:37:43 +06:00
Ayub Ahmed
5efe26a29b titlepic/Makefile: fix typo 2017-03-11 11:02:21 +06:00
Ayub Ahmed
4f3acc1325 text/Makefile: select t_phase images for copying 2017-03-11 11:00:55 +06:00
Ayub Ahmed
7c00def304 config.py: add t_phase images to generate 2017-03-11 10:57:50 +06:00
Ayub Ahmed
0cdc7c2330 Makefile: generate t_phase images for titlepic 2017-03-11 10:51:50 +06:00
Ayub Ahmed
9261d53eb8 create_caption: footer and text updates
Use blue as fill color rather than white.
Add oblique style to footer text.
Replace URL with copyright notice.
Removed "Version: " text from version footer.
Use image rather than text to generate "Phase 1" and "Phase 2" words
2017-03-11 10:44:04 +06:00
Ayub Ahmed
7f10eb9ff3 dehacked: add Phase 1 par times
Along with par times, replace my level names with better ones 
and change the ones that are used in the commercial IWADs.
2017-03-10 02:19:00 +00:00
Ayub Ahmed
0630c97b18 sounds: updated dsshotgn sound
Done by jupiter_ex, this is an updated
version of the current shotgun sound.
2017-03-09 15:12:16 +00:00
Ayub Ahmed
9f88d1f554 musics: new d_dm24 track
Made by jupiter_ex. Current track in FreeDM
is unsuitable because of the slow tempo
present and gets cut off in Chocolate Doom.
2017-03-09 15:07:47 +00:00
luckypunk
cd8775072f buildcfg: correct offsets for sprites by cwolf and raymoohawk 2017-02-28 14:16:23 +00:00
luckypunk
a440287060 buildcfg: offsets for sprites by cwolf and raymoohawk 2017-02-28 14:11:02 +00:00
luckypunk
e8060c18bb buildcfg: offsets for sprites 2017-02-28 14:09:56 +00:00
luckypunk
49eb520a04 sprites: cand & cbra by cwolf and raymoohawk
https://www.doomworld.com/vb/post/1721082
2017-02-28 14:01:30 +00:00
luckypunk
59342c6e5f sprites: various by cwolf and raymoohawk
https://www.doomworld.com/vb/post/1720049
2017-02-28 13:55:06 +00:00