ed
ee086a06f8
Merge tag 'v0.9.14-alpha' 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.mdesk
# src/df/gfx/df_view_rules.c
# src/df/gfx/generated/df_gfx.meta.c
# src/font_cache/font_cache.c
# src/raddbg/generated/raddbg.meta.h
Need to redo the view rules
2024-11-24 19:12:20 -05:00
ed
e9abd2ab3a
Merge remote-tracking branch 'EpicGamesExt/dev' into odin
...
Had to change odin's slice view rule to odin slice since there is now an offical slice definition.
# Conflicts:
# src/df/core/df_core.mdesk
# src/df/core/generated/df_core.meta.c
2024-07-03 21:31:26 -04:00
ed
b6f9766fe5
Compile fixes reported from Odin community discord
...
Multiple people were having compilation issues this resolves it.
2024-07-03 21:19:09 -04:00
ed
b6dca789df
compile fixes
2024-06-26 23:23:40 -04:00
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
gingerBill
e8f03562bf
Add hash row under key
2024-04-01 15:42:20 +01:00
gingerBill and GitHub
c946f88b2a
Merge pull request #1 from EpicGamesExt/master
...
Update
2024-04-01 15:14:55 +01:00
gingerBill
56e7bae038
Minor clean up
2024-04-01 15:13:22 +01:00
gingerBill
c1741b4f39
odin_map visualization with nested key-value pairs
2024-04-01 14:51:30 +01: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
gingerBill
5ae60aedc5
Correct brace style
2024-03-30 14:13:06 +00:00
gingerBill
f23979e20a
Mock out logic for map iteration
2024-03-30 14:00:27 +00:00
gingerBill
57fb0eb833
VERY basic map support with map cell info
2024-03-30 13:47:18 +00:00
gingerBill
5d2d13d9d9
Dumb map rendering showing keys only (including dummy ones)
2024-03-30 11:59:04 +00:00
gingerBill
8342cfbd53
Add slice view
2024-03-30 10:46:51 +00: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
gingerBill
0ccfb51102
Very bad odin_map view rule, only renders keys currently
2024-02-12 15:51:31 +00:00
gingerBill
f41f8dd719
Remove dbg_printf
2024-02-12 14:33:57 +00:00
gingerBill
fa6b04ab24
Support String8 like strings
2024-02-12 14:32:49 +00:00
gingerBill
156615a3ba
Add view rule slice
2024-02-12 14:16:23 +00:00
gingerBill
57a35c6b28
Make tabs 4-spaces (1 was too little)
2024-02-12 12:35:43 +00: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
John Leidegren and GitHub
0add3ef72c
Merge branch 'master' into feature/odin
2024-01-21 15:59:23 +01:00
John Leidegren and GitHub
e417a96ce4
Fixed typo
2024-01-20 17:53:49 +01:00
John Leidegren
b2262532a7
Fixed mistakes
2024-01-20 15:21:55 +01:00
John Leidegren
b24326f502
Fixed formatting
2024-01-20 14:27:38 +01:00
John Leidegren
66c1fa337c
Adds syntax colors to .odin files
2024-01-20 14:23:23 +01:00