Commit Graph

81 Commits

Author SHA1 Message Date
gary cff0ff94b2 Merge commit 'bd416f82e25f1b710ab2b7890274571dd3fcd53d' 2024-05-03 23:42:00 -05:00
gary bd416f82e2 Squashed 'deps/nostalgia/' changes from 227f3cd9..47a6a410
47a6a410 [ox/std] Update Vector memory map for preloader
d82c0822 [buildcore] Add error message to pybb debug for missing debugger

git-subtree-dir: deps/nostalgia
git-subtree-split: 47a6a410c4baabf8700bd271a303232dd2e0d3e9
2024-05-03 23:42:00 -05:00
gary d1c44eda7f [keel] Minor optimization
Build / build (push) Has been cancelled
2024-05-03 23:00:38 -05:00
gary df22a1e51b Squashed 'deps/nostalgia/' changes from 0c0ccd1a..227f3cd9
227f3cd9 [nostalgia/core/studio] Update itoa usages
20ff0f89 [ox/std] Rework itoa
4061b831 [ox/model] Remove broken global var
18bb5062 [ox/std] Add String::append(StringView), cleanup
6a4b4822 [nostalgia,studio] Fixes for Ox changes
d2a3cfa7 [ox/std] Remove append operators from IString
7c4e2a65 [ox/std] Cleanup IString
e30ebce4 [nostalgia] Add pyenv to .gitignore
7163947e [ox/std] Cleanup
0a0a6e30 [studio] Move UndoCommand implementation to its own file
97bc9332 [nostalgia/core] Fix TileSheetV1 to use PaletteV1
9caf7099 [keel] Fix for Ox change
fda1280d [ox/std] Make substr always take and return a StringView
59aa4ad2 [cityhash] Cleanup
1a8afa1a [nostalgia/sample_project] Add missing type descriptor
cdbc2d6c [olympic/studio] Move UndoCommand to its own file
acd93337 [ox/std] Fix Integer assignment operator return
cebd3b0a [ox/std] Fix Integer assignment operator return
43e2e215 [ox/std] Cleanup
be1f9095 [ox/std] Make safeDelete constexpr
0f2c18d5 [ox/std] Add std::string(_view) variant of MaybeView

git-subtree-dir: deps/nostalgia
git-subtree-split: 227f3cd9f584039cfddad75f1fe1275ad6cac000
2024-05-03 21:15:51 -05:00
gary 72cdc32e71 Merge commit 'df22a1e51b411329184b3fe33cfc0b665b7b87b6' 2024-05-03 21:15:51 -05:00
gary 35c97cfb67 Merge commit '22e6299e90e85cb2b5ee814ebf2324b1a74d7091' 2024-04-24 23:12:54 -05:00
gary 22e6299e90 Squashed 'deps/nostalgia/' changes from 84205879..0c0ccd1a
0c0ccd1a [nostalgia/core/studio] Cleanup scratchpad code
1b629da8 [ox/std] Make Vector::contains always noexcept
32e4702d [ox] Improve hasing and MaybeView
6b47133c [nostalgia] Cleanup StudioModules
0764720f [nostalgia,olympic] Update for Ox changes
78955376 [glutils] Update for Ox changes
a00a0bd2 [ox] Rename BString to IString
ed4f0e1f [nostalgia,olympic] Replace oxIgnoreError with std::ignore
ea1feb72 [ox] Remove oxIgnoreError
e9a6a096 [ox] Run liccor
d7f30975 Merge commit 'c0baf7efca0e4c3a86a018ad2564d9df7b07c133'
eeb2a5a1 [olympic/studio] Add new ImGui util functions
453f2750 [nostalgia/core/studio] Cleanup context types
189ba4c5 [olympic/studio] Make studio::run static
05773808 [olympic] Change TypeId building to use constexpr globals
272eabc7 [nostalgia/core/opengl] Unbind vertex arrays when done with them
a0256669 [glutils] Remove trailing whitespace
6808adc8 [ox/std] Replace ox::ignore with std::ignore
abc076d6 [ox/std] Cleanup
1b790a34 [ox/std] Fix Signed_c and Unsigned_c
92202716 [nostalgia/core] Update pack transforms to use ModelTypeId_v
7941a514 [ox/model] Add constexpr ModelTypeId_v
0c09c530 [ox/std] Fix sfmt constexpr problems
3ff91af8 [ox/std] Sort of fix custom assert
79b42e1d [ox/std] Fix some Vector constexpr problems
5eec9085 [ox/std] Add nodiscard to some string functions
af7c8956 [ox/std] Add ox::ignore

git-subtree-dir: deps/nostalgia
git-subtree-split: 0c0ccd1a692169d99beb8c238b8b2c466e81a13d
2024-04-24 23:10:33 -05:00
gary 26d2645174 Merge commit 'c0baf7efca0e4c3a86a018ad2564d9df7b07c133' 2024-04-21 13:13:26 -05:00
gary c0baf7efca Squashed 'deps/nostalgia/' changes from 6a523191..84205879
84205879 [olympic] Cleanup ItemMaker, remove unnecessary copy
ebf3a696 [ox/std] Add String constructor that takes a StringLiteral
dfd27afd [ox/std] Add implicit String constructor for str literals
6bfe1842 [ox/std] Remove unnecessary copying from HashMap::expand
700d7016 [nostalgia] Update for Ox changes
92232383 [ox] Cleanup
3b8d13dc [nostalgia,olympic] Fixes for Ox update
a20d7fd9 [ox] Cleanup
2c0e0227 [ox/std] Add assert to AnyPtr::Wrap::copyTo to ensure sufficiently large buff
e3c74637 [turbine] Make applicationData return const&
41e08d67 [turbine] Make keyEventHandler nodiscard
50f3479d [ox/std] Make AnyPtr constexpr
1616ca70 [turbine] Replace WrapPtr with ox::AnyPtr
3fa247e3 [ox/std] Add AnyPtr
27f1df8f [nostalgia,olympic] Further reduce use of applicationData
a4f0c7cd [nostalgia/core/studio] Remove applicationData usages

git-subtree-dir: deps/nostalgia
git-subtree-split: 84205879d46610dfe08098d1265c0398f2215d3d
2024-04-21 10:33:10 -05:00
gary 7ceee8c84d [olympic/studio] Add new ImGui util functions 2024-04-21 10:24:53 -05:00
gary b8ba386494 [nostalgia/core/studio] Cleanup context types 2024-04-21 10:24:29 -05:00
gary 83e4c52e2c [olympic/studio] Make studio::run static 2024-04-21 10:23:55 -05:00
gary 4bec1e13f0 [olympic] Change TypeId building to use constexpr globals 2024-04-21 10:23:22 -05:00
gary 52e931d8a3 [nostalgia/core/opengl] Unbind vertex arrays when done with them 2024-04-21 10:22:32 -05:00
gary 5f0e113f10 [glutils] Remove trailing whitespace 2024-04-21 10:21:44 -05:00
gary 24085f38e8 [ox/std] Replace ox::ignore with std::ignore 2024-04-13 00:35:49 -05:00
gary 223c975e0c [ox/std] Cleanup
Build / build (push) Successful in 2m50s
2024-04-13 00:10:09 -05:00
gary 7439310a9e [ox/std] Fix Signed_c and Unsigned_c
Build / build (push) Has been cancelled
2024-04-13 00:07:40 -05:00
gary 5598d9a381 [nostalgia/core] Update pack transforms to use ModelTypeId_v
Build / build (push) Successful in 2m48s
2024-04-10 22:20:26 -05:00
gary ccf197643d [ox/model] Add constexpr ModelTypeId_v
Build / build (push) Has been cancelled
2024-04-10 00:00:48 -05:00
gary 70bf26b538 [ox/std] Fix sfmt constexpr problems 2024-04-09 23:47:18 -05:00
gary 05ce318a85 [ox/std] Sort of fix custom assert 2024-04-09 23:46:54 -05:00
gary f6910ab1f7 [ox/std] Fix some Vector constexpr problems 2024-04-09 23:46:12 -05:00
gary 092d14d1b7 [ox/std] Add nodiscard to some string functions
Build / build (push) Successful in 3m54s
2024-04-09 22:40:37 -05:00
gary cbebbc108e [ox/std] Add ox::ignore 2024-04-09 22:40:20 -05:00
gary 5627a63572 Squashed 'deps/nostalgia/' changes from 04f3d6b4..6a523191
6a523191 [turbine] Cleanup applicationData
205f2a69 [turbine] Fix applicationData to properly return null
82f02896 [turbine] Cleanup type safety code for application data
aa43cb3d [turbine] Add some type safety to application data
05d08a76 Merge commit 'd6403991d49292d4f2b7d441636949472ca2b249'
c6750d50 [studio/modlib] Add ig::ChildStackItem
dade484d [olympic/studio] Make StudioContext::ui a ref instead of ptr
b015fe88 [ox/std] Make ranges predicates const refs

git-subtree-dir: deps/nostalgia
git-subtree-split: 6a523191561cf76db3d734e42199aaae0af7d21b
2024-03-20 21:37:42 -05:00
gary 3dee350f17 Merge commit '5627a6357219246db3b23ca420360d3c8a77faa5'
Build / build (push) Successful in 3m6s
2024-03-20 21:37:42 -05:00
gary d6403991d4 Squashed 'deps/nostalgia/' changes from b97d7d99..04f3d6b4
04f3d6b4 [keel] Fix some static const vars to be constexpr
db2dc28f [keel] Remove use of removed ModelValue operator
74fb051e [ox] Remove panicing ModelValue operators
24fda7d5 [ox] Make serialize and allocate Writer_c functions take refs
a60cdf0a Merge commit '9c712cc38ae706b021807b271899bce56c234fa5'
9a0a2fd4 Merge commit '56f9d7a4634c9de9b09df390c4385c67ab646607'
9c0acf1b Merge commit 'ace68f7c1d870ed53e69c55ba53709a9425388be'
a41e93c5 Merge commit '8e0467ca5fdb3f983738a97c17cba742a0d233fd'
dbcd37d7 Merge commit '0d61e5a064382a7076b62d32b25c70298ee0706e'
6a500345 Merge commit '057272347486efe5046691f32f51604e3a594e6a'
f038b89a Merge commit 'cfc27a384b00388fc1ce30ac47c266ddd1f8e6f1'
b9fddd47 Merge commit 'db978290f3465d2da30a27a98b12face50bbe091'
961ab756 Merge commit 'ae1f8ce11a81624f376be3a3dd56e80ba479dd89'
d740609c Merge commit '6640e00ad9ee5b731a2ddb06da31436463c3ae65'
08be822b [ox/fs] Add FileAddress::operator==(FileAddress)

git-subtree-dir: deps/nostalgia
git-subtree-split: 04f3d6b491105a4f124d9738f612b9e0c505b2b0
2024-03-14 23:33:20 -05:00
gary 27e54b8a93 Merge commit 'd6403991d49292d4f2b7d441636949472ca2b249' 2024-03-14 23:33:20 -05:00
gary a0d25a13c3 [studio/modlib] Add ig::ChildStackItem
Build / build (push) Successful in 2m47s
2024-03-14 23:32:05 -05:00
gary cf1f2c3372 [olympic/studio] Make StudioContext::ui a ref instead of ptr
Build / build (push) Has been cancelled
2024-03-14 23:31:01 -05:00
gary 675e1a87fe [ox/std] Make ranges predicates const refs 2024-02-17 11:43:25 -06:00
gary a826c5daf2 [keel] Remove use of removed ModelValue operator
Build / build (push) Failing after 52s
2024-02-11 20:35:48 -06:00
gary 0e758f59b3 [ox] Remove panicing ModelValue operators 2024-02-11 20:35:19 -06:00
gary 9ac83a9095 [ox] Make serialize and allocate Writer_c functions take refs
Build / build (push) Failing after 51s
2024-02-11 19:39:29 -06:00
gary 9c712cc38a Squashed 'deps/nostalgia/' changes from 4e50889b..b97d7d99
b97d7d99 [ox/preloader] Remove debug code
ce1eea81 [olympic/keel] Remove debug line

git-subtree-dir: deps/nostalgia
git-subtree-split: b97d7d995632f674d35fbe4d3cc3847c3a144f52
2024-02-11 17:30:45 -06:00
gary 4ad295d005 Merge commit '9c712cc38ae706b021807b271899bce56c234fa5' 2024-02-11 17:30:45 -06:00
gary 56f9d7a463 Squashed 'deps/nostalgia/' changes from ee051184..4e50889b
4e50889b [ox/model,ox/preloader] Add ability to handle inline arrays

git-subtree-dir: deps/nostalgia
git-subtree-split: 4e50889b5cb05833e644b98140908253ef5f53c1
2024-02-11 17:24:22 -06:00
gary 4c0aa60a52 Merge commit '56f9d7a4634c9de9b09df390c4385c67ab646607' 2024-02-11 17:24:22 -06:00
gary ace68f7c1d Squashed 'deps/nostalgia/' changes from 59fa3907..ee051184
ee051184 [ox] Add ability for ModelValue to represent inline arrays, add to preloader

git-subtree-dir: deps/nostalgia
git-subtree-split: ee051184786d03fe909da752d5b40e80f690a177
2024-02-04 10:21:12 -06:00
gary d9be861ec4 Merge commit 'ace68f7c1d870ed53e69c55ba53709a9425388be' 2024-02-04 10:21:12 -06:00
gary 8e0467ca5f Squashed 'deps/nostalgia/' changes from 10a12f2a..59fa3907
59fa3907 [keel] Update pack for Preloader changes
c55994f6 [ox/std] Add Vector::capacity
e81d28a6 [ox] Fix various preloader problems
0626c2a8 [ox/fs] Add comparison operator for FileAddress

git-subtree-dir: deps/nostalgia
git-subtree-split: 59fa39070f0c93be71060afb2584608e90cef84f
2024-02-01 21:07:56 -06:00
gary 4d5f1c0392 Merge commit '8e0467ca5fdb3f983738a97c17cba742a0d233fd' 2024-02-01 21:07:56 -06:00
gary d588d822af Merge commit '0d61e5a064382a7076b62d32b25c70298ee0706e' 2024-01-31 23:18:13 -06:00
gary 0572723474 Squashed 'deps/nostalgia/' changes from b75bbc4d..28b1c6dc
28b1c6dc [ox/preloader] Fix case where alignOf always used NativePlatSpec
ef9cb8be [olympic/modlib] Add ListBox to ImGui util
0d106bde [ox/oc] Fix objects to always write when members of arrays

git-subtree-dir: deps/nostalgia
git-subtree-split: 28b1c6dcf4b2d7d1e3c50850f5886ab8d85c9c96
2024-01-31 23:13:34 -06:00
gary d75dead89d Merge commit '057272347486efe5046691f32f51604e3a594e6a' 2024-01-31 23:13:34 -06:00
gary cfc27a384b Squashed 'deps/nostalgia/' changes from f128664a..b75bbc4d
b75bbc4d [olympic,nostalgia] Change order of oxModelFieldRename args
227dd68a [ox/model] Change order of oxModelFieldRename args
02db760b [olympic] Add more ImGui helpers, studio::Editor::pushCommand
09c57545 [ox/std] Add Vector::at

git-subtree-dir: deps/nostalgia
git-subtree-split: b75bbc4d200c0f4187f5c4068ba686dad34820cd
2024-01-28 18:05:09 -06:00
gary bc7bbb57c8 Merge commit 'cfc27a384b00388fc1ce30ac47c266ddd1f8e6f1' 2024-01-28 18:05:09 -06:00
gary db978290f3 Squashed 'deps/nostalgia/' changes from 124c7029..f128664a
f128664a [olympic/studio] Add ig::IndentStackItem
e84df780 [glutils] Add ProgramSource::vboLen
caa59f37 [nostalgia/core] Add functions for mapping tile idx to subsheet
1cf09433 [nostalgia/core/studio] Cleanup TileSheetEditor with new GlUtils helpers
9948346c [ox/model] Fix clangd false alarm
aa8200be [glutils] Add helper functions for setting up shaders

git-subtree-dir: deps/nostalgia
git-subtree-split: f128664a81b817aaf066de02cc3a09650958ace9
2024-01-27 23:55:20 -06:00
gary ec099aa386 Merge commit 'db978290f3465d2da30a27a98b12face50bbe091' 2024-01-27 23:55:20 -06:00