 ed
|
2fe6a0884c
|
Merge tag 'v0.9.11-alpha' into odin
# Conflicts:
# src/df/gfx/generated/df_gfx.meta.c
|
2024-06-26 23:07:46 -04:00 |
|
|
ed
|
d1391c5f91
|
Merge remote-tracking branch 'EpicGames/dev' into odin
|
2024-06-19 23:04:56 -04:00 |
|
|
ed
|
fc8dfcc506
|
Merge remote-tracking branch 'EpicGames/dev' into odin
|
2024-06-13 21:12:26 -04:00 |
|
|
ed
|
1028318de2
|
Merge remote-tracking branch 'EpicGames/dev' into odin
|
2024-06-11 18:52:08 -04:00 |
|
|
ed
|
4fdd2aee71
|
Compile fixes
|
2024-06-04 13:29:05 -04:00 |
|
|
ed
|
245560552e
|
Merge remote-tracking branch 'EpicGames/dev' into odin
|
2024-06-04 13:25:19 -04:00 |
|
|
ed
|
1101854de5
|
new def_core.meta
|
2024-05-30 13:33:14 -04:00 |
|
|
ed
|
0bbf33514b
|
Merge remote-tracking branch 'EpicGames/dev' into odin_dll_calls_not_working
# Conflicts:
# src/df/core/generated/df_core.meta.c
|
2024-05-30 13:33:03 -04:00 |
|
|
ed
|
9086233d89
|
compile fixes
|
2024-05-26 11:16:20 -04:00 |
|
|
ed
|
ad1b2fa23d
|
Merge tag 'v0.9.10-alpha' into odin
|
2024-05-26 11:12:40 -04:00 |
|
|
ed
|
f67098f54b
|
Merge remote-tracking branch 'EpicGames/master' into odin
# Conflicts:
# src/df/core/df_core.mdesk
# src/df/core/generated/df_core.meta.c
|
2024-05-18 12:03:19 -04:00 |
|
|
ed
|
ea4e671a44
|
Merge remote-tracking branch 'EpicGames/master' into odin
|
2024-05-14 22:27:18 -04:00 |
|
|
ed
|
0c4c18c64f
|
Fixes for latest merge into with last changes for odin support from gingerBill
|
2024-05-07 18:44:00 -04:00 |
|
|
ed
|
ba9d68951d
|
Merge branch 'master' into odin
# Conflicts:
# src/df/core/generated/df_core.meta.c
# src/df/gfx/df_gfx.mdesk
# src/df/gfx/df_view_rules.c
# src/df/gfx/generated/df_gfx.meta.c
# src/df/gfx/generated/df_gfx.meta.h
|
2024-05-07 18:27:10 -04:00 |
|
|
ed
|
340d504f10
|
Merge remote-tracking branch 'gingerbill/master' into odin
|
2024-04-02 15:48:04 -04:00 |
|
|
ed
|
ba41543543
|
Merge remote-tracking branch 'gingerbill/master' into odin
# Conflicts:
# src/df/core/df_core.mdesk
# src/df/core/generated/df_core.meta.c
# src/df/core/generated/df_core.meta.h
# src/df/gfx/df_gfx.c
# src/df/gfx/df_view_rule_hooks.c
# src/font_cache/font_cache.c
# src/txti/txti.c
# src/txti/txti.h
|
2024-03-30 13:02:37 -04:00 |
|
|
ed
|
2721adf088
|
remove hmh comment from build script (remnant of copy & paste)
|
2024-02-12 11:52:08 -05:00 |
|
|
ed
|
ffcecd659e
|
Merge remote-tracking branch 'gingerbill/master' into odin
|
2024-02-12 11:32:35 -05:00 |
|
|
ed
|
76ce8a79c2
|
Made ease of use scripts for building and cleaning
|
2024-02-09 17:50:42 -05:00 |
|
|
ed
|
932db741fa
|
Merge remote-tracking branch 'leidegre/feature/odin' into build_scripts
|
2024-02-09 16:08:40 -05:00 |
|