Compare commits

...

978 Commits

Author SHA1 Message Date
minjaesong
e0fcf35f5b fix: inventory cells not tangible 2020-09-17 11:22:03 +09:00
minjaesong
b2ad541355 transition works as intended but ui is not tangible 2020-09-14 15:19:34 +09:00
minjaesong
eb2e47e2a5 fix: inventory panels and their indices are mutually inversed 2020-09-14 14:04:46 +09:00
minjaesong
b07e7f5fdd q&d hack for ui opacity control using a shader 2020-09-12 11:24:32 +09:00
minjaesong
ac144da0b4 index is reversed, transparency not working 2020-09-09 16:58:35 +09:00
minjaesong
f5624af47c UI is now rendered in correct pos 2020-09-09 16:05:56 +09:00
minjaesong
299e10a381 UI visible and render is offsetted but update is ok 2020-09-09 15:38:21 +09:00
minjaesong
de164f6516 inventory ui transition wip 2020-08-30 16:09:42 +09:00
minjaesong
7f99bb4f4f less fancy inventory transition WIP 2020-08-22 18:23:17 +09:00
minjaesong
619352e915 lfs: tracking .kra files 2020-08-22 16:47:20 +09:00
minjaesong
8469d22f93 adding title menu element for mod options 2020-08-22 16:44:37 +09:00
minjaesong
c849669845 collision code for staircasing 2020-08-04 12:23:46 +09:00
minjaesong
be6cddb1d6 replacing all nonstaircasing collistion function usage into staircasing one 2020-07-24 14:41:54 +09:00
minjaesong
2faebfcd27 added a todo message 2020-07-22 22:40:12 +09:00
minjaesong
64e9d3c0e4 phys: wip staircasing modification is still compatible with old code 2020-07-20 21:24:22 +09:00
minjaesong
4d46a44c51 phys: making colliding side indices more sensible 2020-07-17 22:50:24 +09:00
minjaesong
87ce59194c phys arguments are now single PhysProperties object 2020-07-15 21:58:44 +09:00
minjaesong
4feb889aa8 new tonemapping lut using some random fibseq 2020-07-12 10:29:39 +09:00
minjaesong
f3e1cc53f8 new properties in apploader: aspectRatio 2020-06-21 13:56:50 +09:00
minjaesong
37bc8a6aff biome in worldgen 2020-06-12 15:21:55 +09:00
minjaesong
04cf817303 default screen size to be exact 3:2 again (and obs-linux compatible) 2020-05-13 22:33:32 +09:00
minjaesong
f7ff220967 terragen: making sky-to-ground ratio to be constant 2020-05-03 10:43:31 +09:00
minjaesong
ccb9d33a36 more hangul improvements 2020-05-01 17:13:46 +09:00
minjaesong
096a34c6a6 implementing working multithreading Terragen to the game 2020-04-29 11:26:59 +09:00
minjaesong
4076e6d74e more testing on skydome / font change 2020-04-29 08:48:06 +09:00
minjaesong
b5da05c9a0 both idea works 2020-04-29 08:47:27 +09:00
minjaesong
25043cb36e more testing on resolving noisy artefact in worldgen 2020-04-29 08:15:40 +09:00
minjaesong
1a98292b92 using Coroutines instead of Threadpool but the artefact is still there :( 2020-04-27 03:36:34 +09:00
minjaesong
f469772c86 reverting Unsafe usage of worldgennoisesandbox 2020-04-27 03:05:19 +09:00
minjaesong
0bc52a7351 major hangul font update 2020-04-23 01:04:58 +09:00
minjaesong
9670b5771f Hosek skylight model translated from C to Kotlin 2020-04-20 04:47:40 +09:00
minjaesong
9e3008d6fe adding the missing pdf file 2020-04-19 01:21:03 +09:00
minjaesong
ae390fe6f5 updating LibGDX to 1.9.10 2020-04-19 01:06:25 +09:00
minjaesong
02ad64487b minor improvement on rotund r 2020-04-14 07:25:47 +09:00
minjaesong
8f08609d65 font support for LatinExt-D 2020-04-14 06:31:05 +09:00
minjaesong
42b26597b4 comment 2020-04-13 05:03:53 +09:00
minjaesong
9e082e914d simplified the tiling shader a bit 2020-04-13 02:13:24 +09:00
minjaesong
a08d09b1b8 Reducing hierarchy by merging ActorWithBody with ActorWBMovable 2020-03-20 19:30:17 +09:00
minjaesong
3982933aad closing issue #34, it was just hitbox not properly being updated 2020-03-10 23:34:36 +09:00
minjaesong
ed5c823154 fixing bug where the hitbox won't change when actor is rescaled, wip issue #34 2020-03-10 06:52:40 +09:00
minjaesong
8589f1f8fa Fixing bad quickslot behaviour where it would unequip things when the selection changed 2020-03-09 04:01:03 +09:00
minjaesong
16f85f6bfa some code pruning 2020-03-07 03:39:26 +09:00
minjaesong
6b2970cbfd Tentatively fixed the issue #35
if it's truly been fixed, the culprit was the mixed use of lx/ly and worldx/worldy
2020-03-07 02:39:01 +09:00
minjaesong
a501a353dd Pre-calculation. Plagued with segfaults. Feel free to roll back. 2020-03-06 21:52:06 +09:00
minjaesong
47d5d9c1b2 more functions 2020-03-06 21:51:06 +09:00
minjaesong
9ddfa48cd9 commenting out the assert code that is called ~50 000 times per frame 2020-03-06 01:54:18 +09:00
minjaesong
3b793d5ad4 fixing bug where blocks cant be placed if mouse is over quickslot and watch 2020-03-06 01:30:33 +09:00
minjaesong
82514180ea stupid idea that didnt work 2020-03-04 10:32:05 +09:00
minjaesong
b31d5fcb89 see issue #31 2020-03-01 01:03:25 +09:00
minjaesong
aaba6976b3 fixing unlit torch bug 2020-02-29 20:28:55 +09:00
minjaesong
facf29b34c gitignore: linux temp files 2020-02-28 17:47:14 +09:00
minjaesong
19f0225e0d back to octagonal lightspreading and one more failed test 2020-02-28 05:39:46 +09:00
minjaesong
c629013a59 more comments 2020-02-28 05:14:13 +09:00
minjaesong
0d23d13401 removing temporary-zoom snippet 2020-02-27 18:18:55 +09:00
minjaesong
90c8609f54 determining array base offset: replaced trick code with proper code 2020-02-27 17:54:35 +09:00
minjaesong
fa19d0ae51 middle click to open pie menu 2020-02-27 05:41:57 +09:00
minjaesong
4a177c5f76 TEST: 5-pass performs better than 2-split idea 2020-02-25 00:05:54 +09:00
minjaesong
fac45e8a97 lightsource randomiser hash will be same even when x < 0 2020-02-24 14:46:37 +09:00
minjaesong
e2195ba809 using proper hashing function 2020-02-24 14:45:12 +09:00
minjaesong
b4533b86df setting default res to 1108:740, an OBS-friendly number 2020-02-24 01:23:24 +09:00
minjaesong
d4f349eda3 randomised torch flicker 2020-02-24 01:00:11 +09:00
minjaesong
819eb612cd amending last commit 2020-02-23 15:57:33 +09:00
minjaesong
12b9ec3c06 another attempt 2020-02-23 03:35:50 +09:00
minjaesong
d65305569c fixing bad code regarding lightsource detection
...I'm stupid
2020-02-22 22:43:33 +09:00
minjaesong
8b68e8917b memoised dynamic luminosity 2020-02-22 15:47:34 +09:00
minjaesong
7eee6e34d1 half-assed but working radiator with no directional quirks 2020-02-22 06:07:24 +09:00
minjaesong
bf9f46756f comment 2020-02-22 00:15:55 +09:00
minjaesong
3035887ff7 radiosity: nice try but works half-assed and is slower
better optimise the old method, there's lots of overlaps there
2020-02-21 21:28:55 +09:00
minjaesong
88fbe7a5c1 quick idea 2020-02-21 05:07:34 +09:00
minjaesong
4a7b5952b0 new lightmap: nice try but didn't work 2020-02-21 03:40:37 +09:00
minjaesong
42b87d30a0 make quickslots work with dynamic items 2020-02-13 15:08:59 +09:00
minjaesong
54bbc473b1 global framerate limit
should help with some edge cases that occur when GPU is overloaded
2020-02-11 02:46:15 +09:00
CuriousTorvald
c626c5b833 Create energy_flow.gv 2020-01-19 18:09:00 +09:00
minjaesong
016f8ab554 re-draw floater gui texture 2020-01-05 21:44:44 +09:00
minjaesong
c7251d1139 testing borders on inventory cells 2019-12-29 00:27:20 +09:00
minjaesong
27af9ea7e0 test commit 2019-12-23 18:46:10 +09:00
minjaesong
3f58fcfb75 small remedy for KDE Plasma 2019-12-23 04:48:30 +09:00
minjaesong
e7b0bf74e2 re-impl skybox vertical parallax 2019-12-22 22:24:16 +09:00
minjaesong
3e5a581e89 making dithering work on skybox drawing 2019-12-15 12:39:20 +09:00
minjaesong
b319485637 wip2 2019-12-10 18:04:37 +09:00
minjaesong
5db5a23add new skybox drawing wip 2019-12-10 15:24:05 +09:00
minjaesong
c9904a113e what fucking linux crashes if i reduce the screen size?
This reverts commit e4a512a420.
2019-12-06 20:41:32 +09:00
minjaesong
0cf4264002 Revert "setting default height to be 720"
This reverts commit e4a512a420.
2019-12-06 19:37:29 +09:00
minjaesong
e4a512a420 setting default height to be 720
streaming-friendly
2019-12-05 14:16:55 +09:00
minjaesong
fe3a27932c lightmaprenderer: removing minOf() 2019-12-05 10:34:52 +09:00
minjaesong
a0aed03af5 lightmaprenderer: exporting LUT to its own class 2019-12-05 10:27:54 +09:00
minjaesong
60df739563 updated Terragen.kt 2019-12-04 15:38:32 +09:00
minjaesong
385ea3b5a9 worldgenloadscreen now makes transition 2019-11-27 17:31:29 +09:00
minjaesong
cfda47405d hypothetical multithreading on terragen 2019-11-27 16:59:24 +09:00
minjaesong
98993f1755 load screen actually draws the world
transition still not working
2019-11-27 16:42:49 +09:00
minjaesong
68ecb9139a at least message shows on loadscreen
does the transition works?
2019-11-27 15:53:09 +09:00
minjaesong
ed8e35d593 worldgen preview loadscreen (NOT WORKING) 2019-11-20 15:24:45 +09:00
minjaesong
3d59634ad9 renderToPreview() 2019-11-18 12:52:28 +09:00
minjaesong
fc15dd1f65 minor edits 2019-11-18 12:26:43 +09:00
minjaesong
a31825dbce Various Loadscreens WIP 2019-11-18 01:20:17 +09:00
minjaesong
9972f80874 fixed worldgen and threadexecutor so that they will actually wait for the thread termination 2019-11-16 02:41:25 +09:00
minjaesong
9a139be7ad Update WorldgenLoadScreen.kt, Terragen.kt, and WorldgenNoiseSandbox.kt 2019-11-10 22:35:22 +09:00
minjaesong
612b7950ed wip fixing multithreaded noisy image bug
decided to remove my own thread pool impl to reduce the scope of attack
2019-11-08 01:34:39 +09:00
minjaesong
86be4e4edb Update ui_config_keymap_keycap.tga 2019-11-07 19:32:41 +09:00
minjaesong
b051f7c1a1 using new terragen on main game -- noisy tiles are real issue 2019-10-30 15:13:38 +09:00
minjaesong
5a0bf98737 added missing code pieces 2019-10-24 20:56:56 +09:00
minjaesong
240efc5537 uiitem keymap keycap wip 2019-10-17 14:46:20 +09:00
minjaesong
278eff04b7 uiitem toggle button impl 2019-10-17 10:59:47 +09:00
minjaesong
eea7ddffe0 toggler graphics update 2019-10-17 02:02:18 +09:00
minjaesong
47ff45bba3 Added uiitem-toggler assets 2019-10-16 18:43:16 +09:00
minjaesong
33f74385bd issue #28 2019-10-14 20:55:53 +09:00
minjaesong
17c9d184b2 adding missing texture 2019-10-14 19:32:24 +09:00
minjaesong
77398abcb3 motherfucking git 2019-10-14 15:40:01 +09:00
minjaesong
60e91b0532 key config ui mockup 2019-10-09 00:21:12 +09:00
minjaesong
951d9e0e71 var jump just pressed 2019-10-06 14:50:16 +09:00
minjaesong
02b67de91a corrcet case for font sheet name 2019-10-04 17:04:00 +09:00
minjaesong
ae59a179d8 wall-kick-jump WIP 2019-10-02 15:24:05 +09:00
minjaesong
9789f2ef55 slight edit on kana font sheet 2019-09-30 15:08:25 +09:00
minjaesong
9bf3bc103b different hardware testing results update 2019-09-20 18:30:45 +09:00
minjaesong
b3db49c6e6 improved shader compatibility with intel builtin gpu
apparently you can't use 1f for float, always use 1.0
2019-09-20 14:15:26 +09:00
minjaesong
1cf62da4c5 commit 2019-09-19 18:10:54 +09:00
minjaesong
bce3da1446 update gitignore, new worldgen wip 2019-09-15 08:12:04 +09:00
minjaesong
5e386eb9e9 worldgentest: soil layer 2019-08-29 23:10:23 +09:00
minjaesong
98988d0065 noise test to simulate the actual worldgen 2019-08-28 22:24:53 +09:00
minjaesong
e3a0bd6a5b displays time on main window 2019-08-27 16:17:26 +09:00
minjaesong
bbcc457176 removing redundant properties 2019-08-27 01:30:46 +09:00
minjaesong
1e6c1eeeaf some minor touches 2019-08-26 16:47:30 +09:00
minjaesong
8973cd93fd terraingen candidate 1 2019-08-25 23:35:51 +09:00
minjaesong
d6040b6c17 terrain gen adjustments wip 2019-08-25 19:54:55 +09:00
minjaesong
79448a6f2b cavegen candidate 1 2019-08-25 19:29:10 +09:00
minjaesong
732e32b454 cavegen candidate 0 2019-08-25 18:53:01 +09:00
minjaesong
4a87e0a84a new cavegen is finally doing something 2019-08-25 14:14:25 +09:00
minjaesong
3fe514493b fixed minor anomalies 2019-08-21 15:12:19 +09:00
minjaesong
26d573c971 inventory ui will get taller if screen is taller 2019-08-19 03:44:15 +09:00
minjaesong
2b7376e1e4 fixd a bug where HUD will draw on top of console window 2019-08-19 02:05:00 +09:00
minjaesong
debced982d actual health message on appload 2019-08-18 05:01:56 +09:00
minjaesong
1a1a9c52d3 terrain glow tex drawing 2019-08-15 19:42:16 +09:00
minjaesong
fe97231db6 terrain glow tex composing 2019-08-15 19:03:16 +09:00
minjaesong
8a4bc98657 shitty implementaion of "air jumping" 2019-08-15 00:20:42 +09:00
minjaesong
7b12f878dd health message on splash 2019-08-14 01:45:00 +09:00
Minjae Song
56a9b186d6 fix func name conflict 2019-08-13 15:50:31 +09:00
minjaesong
6cced41888 lightmap fix fox edge case when CameraX < 0 2019-08-13 14:47:23 +09:00
minjaesong
b62412f2a8 some random stuffs? 2019-08-12 03:59:39 +09:00
minjaesong
8054ccf234 light calc area shrinks when zoomed in 2019-08-12 03:59:27 +09:00
minjaesong
974c357d5e no stuttering zoom (inefficient) 2019-08-12 03:04:16 +09:00
minjaesong
7077bf9fcf zooming properly with z key (with some async artefacts) 2019-08-11 21:33:12 +09:00
minjaesong
22916ebcec uis won't open or close when console is up 2019-08-11 20:42:59 +09:00
minjaesong
3fbf2754bd screen zooming, temporarily toggle with Z key 2019-08-11 05:42:04 +09:00
minjaesong
87f28435ee inventory lister's category setting must be held by its parent 2019-08-06 02:28:07 +09:00
minjaesong
aaec9c6b5b inventory ui: number of cells can be given on creation 2019-08-05 05:20:09 +09:00
minjaesong
df63824f69 inventorydynamiclist to have more options; fixed wrong shade values for trees; commonresourcepool to check dupes 2019-08-05 04:58:33 +09:00
minjaesong
3dfbde0e6c special symbols to use shortcuts instead of literals 2019-08-05 04:19:00 +09:00
minjaesong
24569f53d6 adjusted ui's y pos so that there's even gaps between catbar and control helper 2019-08-05 03:51:38 +09:00
minjaesong
d767dc1dbf tree impl test; falling blocks won't destroy transparent blocks 2019-07-31 01:38:27 +09:00
minjaesong
d37f431144 correct impl for RNG of joise lib 2019-07-27 14:45:19 +09:00
minjaesong
8d58c09ffa texture for tree trunk 2019-07-27 00:36:53 +09:00
minjaesong
bf2cc35d51 some tiny little optimisations on tiling shader 2019-07-26 16:45:24 +09:00
minjaesong
63d2880d8b grass tex revert to smooth 2019-07-26 03:28:57 +09:00
minjaesong
b83da51e26 minor fixes 2019-07-21 20:40:45 +09:00
minjaesong
b37c782b4e ingame computer wip; gamepad deadzone disp on f3 2019-07-19 23:19:25 +09:00
minjaesong
801e737683 newly written circulararray 2019-07-14 03:55:27 +09:00
minjaesong
81625a4382 colourmap and assets 2019-07-12 02:26:20 +09:00
minjaesong
b6bc5d5246 fixed MDA scroll behaviour 2019-07-10 20:49:20 +09:00
minjaesong
edbbefe584 fix wrong assert usage; addOneArgFun for Lua globals works 2019-07-10 16:20:45 +09:00
minjaesong
605b62b980 new iteration of the ingame computer -- display adapter 2019-07-09 22:26:28 +09:00
minjaesong
3e871a2e84 some UIs can be closed with ESC key 2019-07-08 21:50:35 +09:00
minjaesong
377fced95f fixture ui almost working 2019-07-08 19:41:35 +09:00
minjaesong
29572f907e trying to make fixtures with UIs working, was not successful 2019-07-08 04:05:04 +09:00
minjaesong
dd8404097b throwing in a pr-tree onto the project 2019-07-07 22:13:37 +09:00
minjaesong
85985807e4 test impl of "collision interpolator'; new number font for itemslots 2019-07-07 20:53:20 +09:00
minjaesong
e628286442 blocks csv fixed wrong opacity value 2019-07-06 20:44:15 +09:00
minjaesong
53d970a179 comment 2019-07-03 04:12:56 +09:00
minjaesong
c452be669b issue #26 resolved (someone is hoolding stale ingame context) 2019-07-03 03:59:37 +09:00
minjaesong
a399d22dd1 backend stuffs in the Terrarum moved to the AppLoader 2019-07-02 05:10:32 +09:00
minjaesong
1a00f73d52 no more context fuckups on apploader 2019-07-02 04:59:24 +09:00
minjaesong
da1c752996 new tiny numbers font 2019-06-26 19:32:27 +09:00
minjaesong
98ec8154d5 fallable sim to properly work on multiple fallable "stacks" 2019-06-26 02:00:41 +09:00
minjaesong
0396b026fb fallable blocks actually falls 2019-06-25 23:30:22 +09:00
minjaesong
ce4b070428 more cleanup regarding fireRecalculateEvent 2019-06-25 22:48:38 +09:00
minjaesong
fe61b65f0d refactoring the call order of the renderers' init code invocation 2019-06-25 22:26:16 +09:00
minjaesong
bbf83b1944 q&d hack to circumvent the dangling pointer issue #26 2019-06-25 15:22:24 +09:00
minjaesong
4e89a32e4e issue #26: the reason was the dangling pointer? 2019-06-23 02:20:01 +09:00
minjaesong
601afc2636 BlockLayer temporarily use DirectByteBuffer (averting the issue #26) 2019-06-23 01:43:56 +09:00
minjaesong
88a288243c sorta working unsafesvecarray; and then issue #26 is fucking shit up 2019-06-22 04:16:03 +09:00
minjaesong
79b317d9e1 it turns out the test-entering is broken; will fix later idk; Threadparallel.startAllWaitForDie seems to work as intended 2019-06-21 16:05:02 +09:00
minjaesong
e5bf6874fd the placeholder "nullworld" is now singleton 2019-06-11 23:52:17 +09:00
minjaesong
33c663d901 fixture spawns with correct tex pos and hitbox; unsure if issue #26 is fixed tho 2019-06-11 23:46:52 +09:00
minjaesong
44e12825ac blockprop: fall is now grav 2019-06-11 20:55:28 +09:00
minjaesong
cf03e24af3 it's still a progress right? 2019-06-10 17:38:06 +09:00
minjaesong
79d7c71000 new block: scaffolding (does not fall yet) 2019-06-10 01:40:10 +09:00
minjaesong
af29e1b598 intbox debugger is back 2019-06-09 01:26:14 +09:00
minjaesong
b16c23f1f0 unsafe array on lightmaprenderer: could this be possible? 2019-06-08 04:14:13 +09:00
minjaesong
9db6e86ac3 no more access violation from freeing already freed memory 2019-06-08 03:29:38 +09:00
minjaesong
4f8c3591c2 80 fps with unsafe access 2019-06-08 03:00:47 +09:00
minjaesong
a1d51d4028 just a fixme tag 2019-06-07 22:16:38 +09:00
minjaesong
593a528d32 apparently I'm fucking dumb 2019-06-07 10:37:04 +09:00
minjaesong
4a99722f71 i discovered something to be looked at 2019-06-07 10:23:22 +09:00
Minjae Song
97f8aa6e6e weather to not use expensive math; colormap now also holds cvec 2019-06-05 21:22:27 +09:00
Minjae Song
85ab1b823d mod metadata: changed versioning scheme 2019-06-05 21:22:27 +09:00
minjaesong
812e9e5b76 light parallel failed attempt 2019-06-05 21:04:01 +09:00
minjaesong
a87866438f debugwindow: correct ui count 2019-06-01 04:47:20 +09:00
minjaesong
c692928c1a lightmap is now array of array because debug-ability > slight framerate drop 2019-06-01 04:06:36 +09:00
minjaesong
5ff0c22b0f cvec: java to kotlin 2019-06-01 03:49:14 +09:00
minjaesong
eb1273c561 migration wip java 9 modularise 2019-06-01 03:25:20 +09:00
minjaesong
50c110f34b fixed using wrong type of exception 2019-06-01 02:06:07 +09:00
minjaesong
c180953d7d fixtures won't spawn when there's block or other fixtures 2019-05-31 22:57:20 +09:00
minjaesong
a1ac9b177a fixing "roundworld anomaly": some actors won't render 2019-05-31 04:10:00 +09:00
minjaesong
c50d07b541 wip debugging "roundworld anomaly" 2019-05-30 23:35:01 +09:00
minjaesong
56fdb2f556 contracted itemcount string 2019-05-30 21:36:02 +09:00
minjaesong
d2ddca85a6 font: hangul update 2019-05-30 14:10:09 +09:00
minjaesong
9aa002f4cc tiki torch correctly spawns; gotta check for collision 2019-05-29 23:20:39 +09:00
minjaesong
3a5fcb9ba0 added definition for fixture null blockbox 2019-05-28 23:57:51 +09:00
minjaesong
7d5a37cd6d tiki torch spawns but is not centred 2019-05-28 22:46:10 +09:00
minjaesong
75c79d8ca2 no secondary click; tiki torch kinda spawns? 2019-05-26 22:55:50 +09:00
minjaesong
0b7a3a5636 disposable singletons to an array in loader; single float for both notification and tooltip 2019-05-24 20:38:35 +09:00
Minjae Song
c5e0de2393 stupid gimp 2019-05-22 12:57:20 +09:00
Minjae Song
19fb5b1319 tileable message float ui 2019-05-22 12:51:01 +09:00
minjaesong
2fff2c24cf cherrypicked from the branch test-cvec-for-light 2019-05-21 17:50:54 +09:00
minjaesong
92d5cac2ff furred npc test might delete later 2019-05-20 12:07:01 +09:00
minjaesong
471b0c805d font: new redesigned hangul 2019-05-14 13:16:10 +09:00
minjaesong
16b7457d08 font: hangul redraw wip -- less "laundry line" 2019-05-12 23:52:27 +09:00
minjaesong
5c20ceeedc font: hangul redraw wip 2019-05-12 17:09:46 +09:00
minjaesong
49df5f9676 gradle script fix typo and add assertion jvm option 2019-05-12 01:03:35 +09:00
minjaesong
48ba273317 comment 2019-05-08 21:23:42 +09:00
minjaesong
52d6955ffc blocksdrawer now draws wire 2019-05-04 18:19:08 +09:00
minjaesong
08f07e566d adding missing resources/moving zip files to lfs 2019-05-04 04:11:33 +09:00
minjaesong
c423190725 block functions now share one centralised core function 2019-05-04 03:29:59 +09:00
minjaesong
61078cf5a8 debug info for upcoming wires 2019-05-02 00:56:25 +09:00
minjaesong
eafdeddc94 fixed a long bug where item would be used twice but discounted by only one on single click 2019-05-01 23:26:01 +09:00
minjaesong
9050378e81 more comments 2019-04-30 03:06:19 +09:00
minjaesong
fecb20da13 sortedarraylist update; physball breaks the actor render dunno why 2019-04-30 02:52:09 +09:00
minjaesong
c89f602c06 actually using (and rediscovering) the kdtree 2019-04-18 23:42:54 +09:00
minjaesong
21e14babb9 gamepad keyboard mockup 2019-04-15 12:26:54 +09:00
minjaesong
a4eac2173a controller getaxisraw, calibration on startup 2019-04-09 23:42:10 +09:00
minjaesong
c74fd0736a fixed: noclipped player won't move up and down when gamepad is plugged in 2019-04-06 03:58:02 +09:00
minjaesong
3ddf3ec123 weponmeleecore 2019-03-19 13:35:58 +09:00
minjaesong
1dcbd3ddbe moduleinfo won't contain bad modules 2019-03-17 13:49:20 +09:00
minjaesong
c81414f097 inventory UI won't rebuild when pie menu is in operation 2019-03-16 03:44:03 +09:00
minjaesong
bc2b1f68d1 always sorting arraylist; more wire stuffs 2019-03-12 22:27:26 +09:00
minjaesong
e1340aac29 colour-changing durability and encumbrance bar 2019-03-12 02:29:58 +09:00
minjaesong
73b18e1252 can retrieve item image for dynamic items 2019-03-12 01:42:07 +09:00
minjaesong
bae9c60c81 not reading material csv issue fixed 2019-03-12 00:47:06 +09:00
minjaesong
7171055016 my CSV was malformed :( 2019-03-11 19:36:42 +09:00
minjaesong
341c35fab7 distinguishable item placeholder image 2019-03-11 00:20:08 +09:00
minjaesong
e13c2ac59b autofill inventory with "available" blocks (has texture) 2019-03-10 23:42:48 +09:00
minjaesong
80c29f871c reading material from the module; pixaxes use it
But "dynamic item" created from the pickaxe class is not right
2019-03-10 23:38:11 +09:00
minjaesong
2570b13ad4 a piece of wire is considered as a tool for inventory (for now) 2019-03-10 18:13:29 +09:00
minjaesong
4b91f485a5 game item to load its own image if needed; common resource pool to assist that 2019-03-10 17:46:48 +09:00
minjaesong
9cf30ab3f4 removing lwjgl patch 2019-03-10 00:31:16 +09:00
minjaesong
63e416f472 minimap: only update and render when needed 2019-03-10 00:28:47 +09:00
minjaesong
464e0380e4 rudimentary minimap draw only 2019-03-08 18:49:38 +09:00
minjaesong
2942276341 minor comment update 2019-03-05 23:39:36 +09:00
minjaesong
d65f0cb17f ingamerenderer: things won't update when the game is paused (e.g. UI open) 2019-03-05 17:45:41 +09:00
minjaesong
ea69f28d05 minimap test: zoom and pan of the image 2019-03-04 18:33:39 +09:00
Minjae Song
3f213cfbe0 requesting xinput will always fail on non-windows 2019-03-04 04:55:12 +09:00
minjaesong
efa5d21717 some more blocks 2019-03-04 02:48:49 +09:00
minjaesong
3cc13f32c9 createtileatlas: fixing a mistake where non-47 blocks won't be rendered to atlas 2019-03-03 21:53:56 +09:00
minjaesong
f3c2ddb3e2 did my best to draw fluids. The thing is, tiles suck at this and I need polygon-based render for fluids 2019-03-03 12:18:04 +09:00
minjaesong
58bbb73cb1 codes to produce fluid atlas 2019-03-03 00:25:42 +09:00
minjaesong
44745bfad1 brighter corners on the tile mask 2019-03-02 22:48:24 +09:00
minjaesong
5daea4fa57 fluid masks tga 2019-03-02 20:20:00 +09:00
minjaesong
98d013267e new blocksdrawer: works well with masktype 0 and 2 2019-03-02 00:57:26 +09:00
minjaesong
522279fec6 blocksdrawer: now generates terrain and wall item image 2019-03-01 23:25:23 +09:00
minjaesong
dfb9d0d8d9 enough resources to test impl the thing 2019-03-01 03:22:46 +09:00
minjaesong
8589847e3d I put wrong colour on the terrain mask type3 2019-03-01 02:20:14 +09:00
minjaesong
4a9b003fe5 test impl of the new block atlas maker 2019-03-01 01:20:07 +09:00
minjaesong
adcedaeba8 dynamic shape: added metadata doc
sililar to the one used in the game's font
2019-02-28 21:57:56 +09:00
minjaesong
9922f81100 block masks and docs according to the new dynamic whatever 2019-02-28 00:15:17 +09:00
minjaesong
c69025a251 completely new terrain masks to cover 256 possible surroundings 2019-02-27 06:28:48 +09:00
minjaesong
a66afb7b6a terrain mask PSDs 2019-02-26 17:26:19 +09:00
minjaesong
f12271f087 WriteWorldInfo: actually working thumbnail export 2019-02-25 02:07:39 +09:00
minjaesong
6afd36db64 prettier text print on Notification 2019-02-24 05:06:54 +09:00
minjaesong
7cbe09eee8 lang updater 2019-02-24 00:27:50 +09:00
minjaesong
e56149f953 more tests with gson (de)serialiser 2019-02-23 17:40:13 +09:00
minjaesong
8ffdf5fbc5 seemingly working savewriter with fixed TEVD 2019-02-23 05:03:20 +09:00
minjaesong
a10d54c314 some random idea 2019-02-22 15:24:56 +09:00
minjaesong
a54ba0925f HasAssembledSprite saves path instead of FileHandle (easier gson-ing) 2019-02-22 15:19:39 +09:00
minjaesong
bcb8db852c inventory: saving ID only, most things still work 2019-02-22 05:22:09 +09:00
minjaesong
53737bd746 gson test in progress 2019-02-22 04:50:43 +09:00
minjaesong
f24ddb5c82 temp minimap placeholder 2019-02-21 03:54:09 +09:00
minjaesong
391463a4e4 world: ZIP compression is the reference now 2019-02-21 00:25:23 +09:00
minjaesong
6dcdf32627 gamepad button label; gamepad calibrate on startup 2019-02-21 00:12:12 +09:00
minjaesong
b55fe09d9f lightmap drawing won't use spritebatch 2019-02-20 23:14:28 +09:00
minjaesong
72ad6dc4e0 payloadutil and unhelpful commit message 2019-02-20 22:43:35 +09:00
minjaesong
390dd51045 actorwbmovable: alias vars are latched to its update; sprite that's out of screen won't render 2019-02-20 15:38:18 +09:00
minjaesong
71baddd8bc inventory equip slot icon 2019-02-20 01:34:47 +09:00
minjaesong
ffb69813ed buildingmaker: can hide/show selection overlay 2019-02-18 16:57:28 +09:00
minjaesong
6c7e1c30c7 buildingmaker block marking 2019-02-18 16:36:21 +09:00
minjaesong
98c602ef65 doc update for UICanvas and UIItem 2019-02-17 19:42:00 +09:00
minjaesong
439312e711 fully working blockchooser 2019-02-17 03:52:27 +09:00
minjaesong
afa942e75d working pen menu 2019-02-16 22:48:27 +09:00
minjaesong
3148f18007 terrain quarried stone fix 2019-02-16 19:56:12 +09:00
minjaesong
448e0aa9c5 penmenu with icons (render only) 2019-02-16 17:52:18 +09:00
minjaesong
7a62c06bc6 buildingmaker penmenu; resolving mouse click clash between world and UIs 2019-02-16 17:11:36 +09:00
minjaesong
66fdb6ab5d new basicinfo ui; each module should be dispose()-able 2019-02-16 01:32:17 +09:00
minjaesong
f8d4d284d6 buildingmaker palette close and open again 2019-02-14 22:33:54 +09:00
minjaesong
fcf9aa1b79 fixing list UI's colours; buildingmaker palette wip 2019-02-14 15:55:31 +09:00
minjaesong
72dbc18128 PUA: LR buttons are now xbox shaped, added xbox one's View and Menu buttons 2019-02-13 17:53:40 +09:00
minjaesong
33db76e3c8 block placing is now primary-use (left click/main trigger/screen tap) 2019-02-12 01:30:31 +09:00
minjaesong
9031ff0c2a inventory wallet view 2019-02-11 18:02:52 +09:00
minjaesong
b9fbacad14 set environment as console if gamepad is detected 2019-02-11 14:54:57 +09:00
minjaesong
21d7b83f96 pov for gdxcontrolleradapter (untested) 2019-02-10 03:48:39 +09:00
minjaesong
10572f4d7e making xinput to actually work (tested with xbone gamepad) 2019-02-09 18:33:54 +09:00
minjaesong
34364af1a1 noop mask doc 2019-02-08 23:50:04 +09:00
minjaesong
003fed6cf0 making gamepad work again 2019-02-08 18:57:47 +09:00
minjaesong
589ac0de95 bgBG: one dark pixel fixed 2019-02-08 09:56:30 +09:00
minjaesong
697449fca9 better and random-coloured grass 2019-02-08 09:27:13 +09:00
minjaesong
3da4719c8e light: skipping some of the update round wasn't a good idea 2019-02-07 18:04:34 +09:00
minjaesong
3f7ce632cb Font fixed, clearing issue #19 #23 2019-02-07 17:31:55 +09:00
minjaesong
5258c4b677 re-impl of once-scrapped "No-op Mask", and it works 2019-02-06 23:31:21 +09:00
minjaesong
28cf447ec4 inventory screen doesn't need two char info display 2019-02-06 11:05:58 +09:00
minjaesong
d1a84b17ab player info cell, INVENTORY UI LEAKS MEMORY 2019-02-06 05:18:00 +09:00
minjaesong
2a08f2c771 lang update (+delete world, worlds: ) 2019-02-06 05:17:02 +09:00
minjaesong
d16d232a0f Lightmap: i'm only doing round 2-4-2 and it works?! 2019-02-04 22:59:42 +09:00
minjaesong
1301943e6a removing maxBlend function; only use maxAndAssign from now on 2019-02-04 18:47:16 +09:00
minjaesong
5d8e64ca7f disabling clamp() on Gdx.color makes it 1+ms faster? 2019-02-04 17:49:43 +09:00
minjaesong
52b1bee3a3 blockprop opacity to be actually cached 2019-02-04 17:17:48 +09:00
minjaesong
a73a865d29 histogram to display UV values 2019-02-04 05:23:07 +09:00
minjaesong
3f108a6ea9 quicker camera on buildingmaker 2019-02-04 01:37:31 +09:00
minjaesong
a831a4d798 fixing mouseUp on NSMenu; making pen on buildingmaker work 2019-02-03 23:53:46 +09:00
minjaesong
e3ed712a42 F3 moved to PostProcessor; palette UI for buildingmaker 2019-02-03 17:01:27 +09:00
minjaesong
daf5c02605 #12 event for world block change -- mainly meant for fixture updating itself 2019-02-02 01:58:49 +09:00
minjaesong
e8b39fc668 blocksdrawer use offsetted time_t 2019-02-02 01:08:14 +09:00
minjaesong
c20d7edb34 closing #22 2019-02-01 22:45:34 +09:00
minjaesong
28f305e76f application icons 2019-02-01 20:15:19 +09:00
minjaesong
4c3fc2352c #21, also making seasonal grasses easier on PSD 2019-02-01 18:47:02 +09:00
minjaesong
01094d49eb wall block item to use its own texture (for real) 2019-02-01 17:28:08 +09:00
minjaesong
7d3bf0eece terrain texture change by all seasons 2019-02-01 15:59:54 +09:00
minjaesong
75f128a8f7 fixed notificator UI 2019-01-31 20:54:25 +09:00
minjaesong
514f1e9012 nsmenu to invoke class with defined args; working settime on buildingmaker 2019-01-31 18:01:33 +09:00
minjaesong
60db83eddb making sure unused screen be disposed, and not breaking the app 2019-01-31 13:29:40 +09:00
minjaesong
90a7fcd4d0 fix memory leak from my ididcy; relationship w #19 needs investigation 2019-01-31 05:02:44 +09:00
minjaesong
d93c6de851 language is moved inside of options 2019-01-31 03:27:03 +09:00
minjaesong
f603b58307 adjusting disposing behavs so that we can go back and forth the ingame and titlescr 2019-01-31 00:12:38 +09:00
minjaesong
074fe2438d inventory gamemenu visual only 2019-01-29 23:37:38 +09:00
minjaesong
69e9fa4b0f 3 screens impl of inventory UI wip 2019-01-29 20:24:11 +09:00
minjaesong
9373feff34 nice try, but it crashes the gpu AND I get <1 fps :( 2019-01-29 17:35:56 +09:00
minjaesong
10c188bea7 wrong colour fixed -- Gdx.Color.toIntBits() returns ABGR, GLSL expects RGBA 2019-01-29 03:04:01 +09:00
minjaesong
cd1ad9277a gpu rendered light wip 2019-01-29 02:21:22 +09:00
minjaesong
465ed0d7a4 inventory ui won't always draw item count 2019-01-28 19:22:47 +09:00
minjaesong
bd1c1bff8a amount of fluid affects the light absorption 2019-01-27 16:58:29 +09:00
minjaesong
8ac5f1dc9e nuked fluidcodex 2019-01-27 05:09:52 +09:00
minjaesong
268907ee9d so not making new objs frequently does make it bit faster... 2019-01-27 02:09:20 +09:00
minjaesong
9937c34d25 light calc takes fluid into account 2019-01-27 00:30:56 +09:00
minjaesong
bdbb30bc58 new watch design consistent with existing UI 2019-01-24 23:46:24 +09:00
minjaesong
bdbf6cd458 new TV-safe watch UI 2019-01-24 02:32:28 +09:00
minjaesong
e4f456ffa7 gapbox toggle with F11 2019-01-23 12:45:40 +09:00
minjaesong
73a6c844c8 less intrusive gapbox colours 2019-01-23 03:52:28 +09:00
minjaesong
84ca954a26 F12 for screenshot; it's high time to care about TVs
(besides, the EBU gap is also a good guideline for placing UIs on edge)
2019-01-23 03:46:46 +09:00
minjaesong
66b18bf8c5 equipped items are drawn into their respective slot 2019-01-23 00:50:20 +09:00
minjaesong
6d0bff2879 greater number of inventory cells 2019-01-23 00:09:31 +09:00
minjaesong
14b485dc32 small number font moved to apploader 2019-01-22 23:05:29 +09:00
minjaesong
a192abd657 glsl works differently on my macbook? 2019-01-22 22:23:30 +09:00
minjaesong
0d534fd60c adding demoworld.gz 2019-01-22 21:34:00 +09:00
minjaesong
a4dabbbf37 adding gradle-wrapper.jar 2019-01-22 21:27:56 +09:00
minjaesong
450874540c initial screen size is read from the config 2019-01-22 20:56:16 +09:00
minjaesong
53c45d6829 smoothDelta is now come from Gdx's LwjglGraphics instead of AppLoader 2019-01-22 13:16:21 +09:00
minjaesong
1c839f7135 test impl kalman delta on gdx 2019-01-22 06:30:11 +09:00
minjaesong
f133406df3 copyright update 2019-01-22 05:57:38 +09:00
minjaesong
ae14026191 implementing the iconic 'lag behind' camera the right way 2019-01-22 05:46:26 +09:00
minjaesong
b9a4e0f64b game actually reads fps setting from config 2019-01-22 05:29:03 +09:00
minjaesong
aef601e9b8 some classes in sprite assembler is now internal 2019-01-22 03:51:18 +09:00
minjaesong
88db71f780 ingame will only render visible actor 2019-01-22 03:50:35 +09:00
minjaesong
ded9cb1a10 instead of dealing with delta, we'll just update multiple times, THIS TIME IN CORRECT WAY
(because it really works :p)
2019-01-22 02:59:22 +09:00
minjaesong
afba402c6c the entire game will use new smooth delta 2019-01-21 05:22:49 +09:00
minjaesong
b027f662ce forgot to comment out the debug print 2019-01-21 01:44:19 +09:00
minjaesong
c60b0b42ad I'll settle with 'Kalman filter with adaptive reset' 2019-01-20 22:50:22 +09:00
minjaesong
40580a57cd smooth delta uses framerate-averaged instead of raw delta; stupid but works :\ 2019-01-20 21:46:11 +09:00
minjaesong
09b4a34d14 trying to get smooth delta (because fuck you GDX) 2019-01-20 20:13:56 +09:00
minjaesong
613b69a20f issue #16: jump height is "close enough", friction and walk/stop needs fix 2019-01-20 07:03:23 +09:00
minjaesong
5738418f39 the simplest case of noclip=true 2019-01-20 06:43:59 +09:00
minjaesong
10cf3fb007 reverting changes on ActorWBMovable: gotta make new branch 2019-01-20 06:39:01 +09:00
minjaesong
be20fd8328 removing default batch on blendxxx() funs 2019-01-20 03:09:23 +09:00
minjaesong
d1a2e6b8f2 issue #16: walking fixed, jump not 2019-01-19 16:44:59 +09:00
minjaesong
5bf8b6cad7 on-the-fly sprite assembly WIP 2019-01-19 04:34:50 +09:00
minjaesong
2c59d60a15 spriteassembler: oob bodyparts will clip, as they should be
...to hide unwanted bodyparts in the skeleton
2019-01-18 18:59:05 +09:00
minjaesong
68df2a223e parallel light always does this random noise 2019-01-18 04:24:14 +09:00
minjaesong
784a6a13e3 f 2019-01-18 03:14:37 +09:00
minjaesong
9040ff2c87 light: seems like the problem is the ram access time 2019-01-17 21:08:50 +09:00
minjaesong
c4510f9c3b still working on light, no improvements perf-wise 2019-01-17 18:28:43 +09:00
minjaesong
ebce90aa4b light: lantern lookup should be faster 2019-01-17 16:06:00 +09:00
minjaesong
25d0e195c3 all my confusions were derived from not wiping old map; fixed things accordingly 2019-01-17 15:12:52 +09:00
minjaesong
e209967730 light: slightly improved performance with careful skipping
(hopefully...)
2019-01-17 06:52:04 +09:00
minjaesong
f689e1de99 added some features and comments for coding convenience 2019-01-17 05:32:52 +09:00
minjaesong
6e33dbdfaf ui itemlist scrolls with wheel 2019-01-16 01:37:44 +09:00
minjaesong
b10e8aa777 lol 2019-01-16 01:23:23 +09:00
minjaesong
6a343ae382 taking screenshot 2019-01-15 16:10:40 +09:00
minjaesong
17b6738308 fixing a new GDX version colouring bug 2019-01-15 06:05:43 +09:00
minjaesong
078cdfefa4 See Github issue #15 2019-01-15 05:50:36 +09:00
minjaesong
81f9c92e48 adding test code to export fboRGB 2019-01-15 03:02:40 +09:00
minjaesong
8237188dc3 a setup to mitigate directional artefacts in light 2019-01-15 01:18:54 +09:00
minjaesong
7b120020e4 map data format adds world generator version and fluids 2019-01-14 23:15:01 +09:00
minjaesong
f4cd4f49b2 width fixes in UI 2019-01-14 02:46:23 +09:00
minjaesong
09b039c62f trying to work on issue #15 and I'm stumped 2019-01-13 23:51:04 +09:00
minjaesong
ff8791f48a Gzipping PSDs; every art must be alpha premultiplied; added converter batch 2019-01-13 21:23:01 +09:00
minjaesong
43bc99548c copyright update 2019-01-13 04:42:40 +09:00
minjaesong
380a14492f grey box issue fixed (github issue #13) 2019-01-13 04:06:53 +09:00
minjaesong
692e08fc1e UI: quickslot register; IngameController: quickslot selection using wheel
This closes github issue #14
2019-01-13 03:02:57 +09:00
minjaesong
33ad8520f8 quickslot selections are controlled by the ingame rather than the 'bar UI' 2019-01-13 02:17:49 +09:00
minjaesong
9aa8eb395d fixed various quirks and removed dirty hacks on quickslot bar/pie 2019-01-12 22:56:48 +09:00
minjaesong
34d50b8d70 fixed wrong coords 2019-01-12 00:59:15 +09:00
minjaesong
07e8e21eae lightmap edge-case fixed
when camera.x is in -15..-1, all thing shifts to left
2019-01-11 04:44:52 +09:00
minjaesong
525273e37f TerrarumSansBitmap update 2019-01-11 03:07:10 +09:00
minjaesong
34a8113d53 tooltip positioning should work again 2019-01-11 03:06:45 +09:00
minjaesong
4f8cf2cb02 csv sort by ID (hacky?) 2019-01-09 15:15:26 +09:00
minjaesong
8a0abf22da circular array is fixed and tested 2019-01-09 05:43:56 +09:00
minjaesong
9140d6d8b0 prolonged alpha blending issue seemingly fixed?
at least it's partially fixed...
2019-01-07 17:34:47 +09:00
minjaesong
9133f05b5e sprite tool exports "formatted" TGA
meaning if alpha is zero, RGB is also zero
2019-01-07 17:11:43 +09:00
minjaesong
790d16b85d gradle tasks for two new apps 2019-01-07 14:19:15 +09:00
minjaesong
adf60e357e sprite assembler can produce intended output 2019-01-07 05:01:28 +09:00
minjaesong
f81db26e60 ALL kwd in transform implemented 2019-01-07 04:24:13 +09:00
minjaesong
655eccbe19 first successful sprite assembly
ALL kwd still not implemented
2019-01-07 04:13:38 +09:00
minjaesong
5b31b4768f screw AWT, we'll use GDX for sprite preview 2019-01-07 00:35:20 +09:00
minjaesong
425cb82133 TODO added: when the transform joint is "ALL" 2019-01-06 22:45:51 +09:00
minjaesong
344e4ebdab adproperties now has transforms list; assembler can make transformed skeleton
new fun: LinearSearch(By)
2019-01-06 22:43:50 +09:00
minjaesong
32afb2e2e5 updated the psd with the actual assembly 2019-01-06 19:28:06 +09:00
minjaesong
3100a093fd animation metadata now contains discovered frame count
...in hacky way
2019-01-06 15:13:17 +09:00
minjaesong
fb06200d26 ADProperties now properly stores parsed mumbojumbo 2019-01-06 04:19:21 +09:00
minjaesong
1696cc8601 fixed a bug properties view won't show scroll bars 2019-01-06 03:25:40 +09:00
minjaesong
4072b9fb09 adproperties now hold filename-related info 2019-01-06 02:57:49 +09:00
minjaesong
36160a6579 sprite assembler app can read and disp ADL
garbage code not properly handled
2019-01-06 02:06:51 +09:00
minjaesong
4986d570a0 sprite assembler test assets 2019-01-06 00:30:43 +09:00
minjaesong
1965eabaa3 joints in skeleton are ordered according to drawing order, PSD also updated 2019-01-05 16:53:21 +09:00
minjaesong
90784afd48 TIL you can go multiline on Java .properties 2019-01-05 16:33:40 +09:00
minjaesong
258364f37e skeleton datasets from sprite_joints.psd 2019-01-05 16:23:19 +09:00
minjaesong
f99531c9d4 testing how joints of sprites should look like
humanoid only
2019-01-05 04:53:22 +09:00
minjaesong
74cfc05fba parsing ADL
a road to auto-gen'd spriteanimation spritesheet
2019-01-05 02:19:56 +09:00
minjaesong
15868a5a2d forgot to update tga file 2019-01-04 21:19:11 +09:00
minjaesong
3abca8989a somewhat successful walk/idle anim impl 2019-01-04 17:44:22 +09:00
minjaesong
ae9a1ebcb4 write to the actual file 2019-01-03 13:02:54 +09:00
Minjae Song
18a05ace64 new csv and it asks number of lines to init 2019-01-02 22:41:20 +09:00
Minjae Song
3b2c38cf0b csv reader can read file, stringify (not real save) and read the save itself wrote 2019-01-02 22:25:44 +09:00
Minjae Song
6ecbb672fb csv editor read file with imperfections 2019-01-02 22:03:52 +09:00
Minjae Song
30954d239a CSV editor: test export of spreadsheet
Seems working?
2019-01-02 10:55:32 +09:00
Minjae Song
edd15a4f79 watch is semitransparent when EL is off 2019-01-01 22:29:18 +09:00
Minjae Song
db110d1ca4 csv editor wip 2019-01-01 21:00:33 +09:00
Minjae Song
e3e97000a7 New year's first commit
is just a comment
2019-01-01 00:10:37 +09:00
Minjae Song
ce2d9a271a slow descend of the platform fixed 2018-12-31 21:34:50 +09:00
Minjae Song
222aef7e3d more screwing around and commenting 2018-12-31 00:50:44 +09:00
Minjae Song
08bbdaf70b platform sorta works as intended 2018-12-31 00:00:47 +09:00
Minjae Song
7300b05442 removing useless list "affectingTiles" 2018-12-30 23:41:57 +09:00
Minjae Song
cd13e04658 platform going down with Down button on keeb 2018-12-30 20:17:28 +09:00
Minjae Song
48de42d98b jumping up to the platform working 2018-12-30 20:02:24 +09:00
Minjae Song
35c0c45500 WIP platforms, at least "should I collide with this?" is one single function 2018-12-30 19:50:22 +09:00
Minjae Song
6c01aa9b0b removed FLUID prop from the blocks 2018-12-29 21:04:27 +09:00
Minjae Song
2335312081 WIP removing fluid marker block
see "work_files/todo_platforms.png"
2018-12-29 17:04:46 +09:00
Minjae Song
abfd9b68fc detailed impl of fixtures WIP 2018-12-29 04:11:26 +09:00
Minjae Song
500c72ebc9 Summary
Description
2018-12-26 19:26:08 +09:00
Minjae Song
00fc4f1b8c reduced boot time by not using proper wall tex; darker wall draw 2018-12-25 16:28:38 +09:00
Minjae Song
98755fab61 still cleaning up
Making wall item textures takes SO long
2018-12-25 15:39:01 +09:00
Minjae Song
09d8702089 have been forgetting to update fullscreenquad on resize :\ 2018-12-25 05:34:59 +09:00
Minjae Song
9080127d38 when it's not dev build, title bar shows less info
they take some processing time
2018-12-25 01:58:18 +09:00
Minjae Song
d7664c7f46 moved things a lot just so that splash screen shows up WHILE things load 2018-12-25 01:39:22 +09:00
Minjae Song
47da7d5b81 Added JoiseDoc 2018-12-24 22:49:08 +09:00
Minjae Song
ef3690765d simplified fluid render 2018-12-23 02:13:41 +09:00
Minjae Song
33c333e7fa new version number
eheheheh
2018-12-22 02:10:33 +09:00
Minjae Song
10128a20a0 rendering scheme of the world changed, fluids draw as intended
But my idea wasn't very stellar, *sigh*
2018-12-22 02:08:08 +09:00
Minjae Song
764945fc30 prep for fluid exclusive render 2018-12-19 22:23:50 +09:00
Minjae Song
3098c0afd2 fluidmap won't have errenous behaviour at the world edge; tga alpha fix 2018-12-19 01:53:09 +09:00
Minjae Song
101c67a107 water flow works
turns out, var.coerceIn() returns value and does not modify the var
2018-12-18 01:48:38 +09:00
Minjae Song
a1661fbb4e fluid multiplies themselves ?! 2018-12-17 22:39:19 +09:00
Minjae Song
04c5e32ddf test: tiles tex blend according to seasons 2018-12-17 04:30:08 +09:00
Minjae Song
b78d488044 duh 2018-12-16 16:17:05 +09:00
Minjae Song
832e296bc5 rename TARGET_FPS to PHYS_TIME_FRAME; shader to use multiple atlas tex; and things 2018-12-16 15:30:25 +09:00
Minjae Song
46e5860143 at least this fluid sim passes collection assertion codes 2018-12-16 02:55:12 +09:00
Minjae Song
4fa44abd3e bugs on fluid sim, Type is NULL but fill isn't 0/new temporary fluid draw 2018-12-16 02:10:04 +09:00
Minjae Song
191a91cb81 blockingthreadpool test done
not very effective
2018-12-15 14:43:55 +09:00
Minjae Song
388d3d6f2f noise generator: automated test and reporting 2018-12-14 23:19:40 +09:00
Minjae Song
b1b29387e3 new thread pooling strategy and test program WIP 2018-12-14 22:53:25 +09:00
Minjae Song
764edea832 Update ThreadParallel.kt 2018-12-14 15:06:55 +09:00
Minjae Song
16e4067d89 working very crude fluid sim 2018-12-14 00:52:10 +09:00
Minjae Song
05a8f47006 implementing water sim but not actually working 2018-12-13 04:45:09 +09:00
Minjae Song
1f1d6f1eda preparing fluid updater: debug water bucket 2018-12-12 23:29:30 +09:00
Minjae Song
27f79238a1 perhaps missed this from before? 2018-12-12 20:47:06 +09:00
Minjae Song
6d553ea583 replacing water/lava tiles with one fluid marker
actual fluid not implemented
2018-12-12 20:32:13 +09:00
Minjae Song
ad8d3ba210 see page 9 2018-12-12 18:49:18 +09:00
Minjae Song
e441cdf5f0 fluid layer data and fluid sim specifications
See added note FLUID_SIMULATION
2018-12-12 18:39:14 +09:00
Minjae Song
9c3c35067d adjusted items ID range for more static items 2018-12-12 03:00:49 +09:00
Minjae Song
7a60ae0629 support for screen-overlay actors; buildingmaker has light now 2018-12-12 02:52:33 +09:00
Minjae Song
258273fd25 nonprivate lateinits are bitch 2018-12-11 16:39:27 +09:00
Minjae Song
dc502b2f12 Summary 2018-12-11 16:14:11 +09:00
Minjae Song
803e59a0ee Merge remote-tracking branch 'origin/master' 2018-12-11 16:08:41 +09:00
Minjae Song
e31eaf0241 matching blendglow's version with others 2018-12-11 11:06:03 +09:00
Minjae Song
8181bec481 things "look" good enough, should stop here and work on the main game 2018-12-11 04:02:23 +09:00
Minjae Song
7c1d6e6b88 fix: textbuttonlist selector appearance bug, nsmenu not closing its child 2018-12-11 02:22:31 +09:00
Minjae Song
7e7e54eed7 other commit didn't work, duh; this SHOULD fix shit
the other commit: "prev commit didn't work" at 2018-12-09 (16a7d2abe7)
2018-12-10 20:35:54 +09:00
Minjae Song
57c9b7b277 yaml: adding generic parse-as-invokable 2018-12-10 04:15:57 +09:00
Minjae Song
984eb4de00 nsmenu working submenu navigation; new graphics bug discovered 2018-12-10 03:33:08 +09:00
Minjae Song
c4b4bfd2fc UINSMenu is made to show how to code 'UI dragging' 2018-12-09 20:00:52 +09:00
Minjae Song
cf9bce5bac NSMenu WIP 2018-12-09 17:51:17 +09:00
Minjae Song
16a7d2abe7 prev commit didn't work 2018-12-09 17:31:17 +09:00
Minjae Song
a690b46456 textbuttonlist fixed incorrect vertical placement 2018-12-09 17:24:26 +09:00
Minjae Song
b55cd415f2 'the entire screen is shifted!' bug fixed 2018-12-09 13:38:25 +09:00
minjaesong
4c2b73197d NSMenu WIP, but also caught a source of the old bug 2018-12-09 04:40:46 +09:00
minjaesong
1c1ae37f41 moved white box tex to AppLoader; textButton now has alignment option 2018-12-09 04:36:53 +09:00
minjaesong
57fa6de62a making Yaml and BFS of QNDTree work 2018-12-09 01:52:57 +09:00
minjaesong
6f0a923df7 WIP new UI elem 2018-12-08 23:26:01 +09:00
minjaesong
4b04bf3781 replaced a hack that starts random game on title screen 2018-12-08 18:30:10 +09:00
minjaesong
eca0469f32 bringing back onscreen debug info 2018-12-08 05:05:42 +09:00
minjaesong
d588f73ed6 Memory leak alleviated FUCK YEAH? 2018-12-08 04:26:01 +09:00
minjaesong
b40a78b706 Update LightmapRendererNew.kt 2018-12-07 06:15:41 +09:00
minjaesong
93a43899e7 why they are keep resurrecting 2018-12-03 22:37:51 +09:00
minjaesong
155ba9eb56 Update .gitignore 2018-12-03 11:05:35 +09:00
minjaesong
4224d56b25 exit now gracefully calls gdx.app.exit 2018-12-03 00:34:31 +09:00
minjaesong
cc14218dd5 removing kotlin-stdlib.jar again duuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuh 2018-12-03 00:25:01 +09:00
minjaesong
b856829ca9 Merge branch 'gradle-migration-1' 2018-12-02 23:01:25 +09:00
minjaesong
a9bc4f47f8 Update .gitignore 2018-12-02 19:28:38 +09:00
minjaesong
bf9c172206 minor edits 2018-12-02 17:34:01 +09:00
minjaesong
fa86ca2e05 rem external_resource_packs.zip 2018-11-22 19:14:49 +09:00
minjaesong
9cc0a62188 rem workspace.xml 2018-11-22 19:09:48 +09:00
minjaesong
f3b0044d5f fixing one of the new bugs: block duplication artefact on render 2018-11-20 22:16:20 +09:00
minjaesong
f5d36e2c92 physics anomaly at x 0..33? are fixed, other issues (re)introduced
See ActorWBMovable@Line1238
2018-11-20 06:08:21 +09:00
minjaesong
8da80e88a3 Reverting GDX to nightly-20170610
Due to the some fuck rendering issue on certain graphics processors (maybe?)
2018-11-20 04:27:14 +09:00
minjaesong
f21ed3bf0d commiting minor changes cause I need to track down some bugs
- Text on small font goes dark gradually (?)
2018-11-20 04:10:13 +09:00
minjaesong
4d0c772dd8 1dim-ised lightmap 2018-11-16 22:44:54 +09:00
minjaesong
f4f0e59811 lightbufferastex is now properly disposed of
should help with my mem leak probs
2018-11-16 20:42:30 +09:00
minjaesong
d9f576e4dc change in ingame config: useamericanunit -> temperatureunit 2018-11-16 20:37:44 +09:00
minjaesong
091f79c7f8 reconfiguring docs and libs
- Targeting Java 10
- Gdx nightly 20181111 (1.9.9)
2018-11-11 20:13:31 +09:00
minjaesong
8942f352a1 drawing of the tile breakage 2018-11-10 21:09:02 +09:00
minjaesong
1aa90077a4 Can setTitle() cause memleak (right before test commit) 2018-11-08 22:42:27 +09:00
minjaesong
3360ab0dfe starting day of the game is now Spring 1st 2018-11-06 23:49:22 +09:00
minjaesong
4eee5ee2b1 a new watchface to support seasons instead of months 2018-11-06 23:40:36 +09:00
minjaesong
c7c68187eb fixed a NaN bug caused by a zero-width/height hitbox
Also inventory is widened to 10x7 of prev 9x7
2018-11-06 04:02:33 +09:00
minjaesong
5c8cdd3162 new ingame calendar impl
for some reason it runs slower that it should do
2018-10-30 22:47:41 +09:00
minjaesong
73d1a1bdc5 new RNG for everything; Joise update 2018-10-27 00:03:06 +09:00
minjaesong
ee3d98662c read world info 2018-10-09 23:49:14 +09:00
minjaesong
d77b552518 writeworldinfo tested to be working 2018-10-08 18:15:05 +09:00
Minjae Song
5f75288dc7 worldinfo writer 2018-10-08 01:16:29 +09:00
Minjae Song
74d76440ee new outputstream for bytearray64 2018-10-06 01:16:26 +09:00
minjaesong
e072aff897 testing the GDX's LZMA de/compressor 2018-10-06 00:49:06 +09:00
minjaesong
397b2a8795 abolished a need to pass world as parametre
+ simply changing the single variable (ingame.world) will update all the renderer's behaviour
+ somehow my git changelogs are exploding
2018-10-05 23:40:03 +09:00
minjaesong
ae1e99aa3e layer seems load, need to write better test-able code 2018-10-05 22:13:55 +09:00
minjaesong
17e550a6a0 layer write should write proper zlib 2018-10-05 01:23:18 +09:00
minjaesong
292de8d56a it's not zipping correctly; some fixes on readlayer 2018-10-05 01:11:12 +09:00
minjaesong
626aa710c1 layer export: tested output seems legit but can't confirm 2018-10-04 23:46:24 +09:00
minjaesong
78fc6fc657 GameWorld: adding "worldIndex"; more save/load stuffs 2018-10-03 23:15:24 +09:00
minjaesong
d2b7c76734 new map data format and its read/writer
!! UNTESTED !! UNTESTED !! UNTESTED !!
2018-10-03 19:20:11 +09:00
minjaesong
4cfd3b8c45 decided not to GZip the CSVs; hack it away! 2018-10-02 21:13:02 +09:00
minjaesong
e645eaade9 newer map data format 2018-10-02 21:10:02 +09:00
minjaesong
af34d94e6a the event works; ingame works; but starts as "bugged noclip" 2018-10-02 00:12:04 +09:00
minjaesong
98539e698f World Click events
let's hope it works w/o tests as I can't get to the Ingame now
2018-10-01 23:51:04 +09:00
minjaesong
03b642ddd3 player is now nullable; wtf is calling Ingame 5 times? 2018-09-17 01:46:50 +09:00
minjaesong
967eafe8a3 serialised RNG; font update 2018-09-16 03:32:12 +09:00
minjaesong
69eb2d7a3b title remocon: menu UI with no child should be displayed now 2018-09-15 01:08:10 +09:00
minjaesong
6d4ac92133 font update; ui remocon fix; save doc elaboration
UI RemoCon fix: RemoCon will no longer widen to the screen width when being used
2018-09-14 01:14:13 +09:00
minjaesong
b40af8e1b3 more remoCon thingies 2018-08-30 21:30:39 +09:00
minjaesong
c381250665 UI Remote Controller reworked (now 90% less stupidity) 2018-08-30 17:24:53 +09:00
minjaesong
497a88c8de font updates; PBS 2018-08-23 21:06:08 +09:00
minjaesong
0bad86bb9d partially working sky model 2018-08-05 21:57:39 +09:00
minjaesong
eee8a18875 dump (another useless message) 2018-08-05 21:57:18 +09:00
minjaesong
24b2e2a2af ENVIRON guide update straight from my observation 2018-07-21 19:58:56 +09:00
minjaesong
e48731b2e3 reducing down HistoricalFigure to nothing
It doesn't seem like a good idea
2018-07-03 22:45:00 +09:00
minjaesong
8f9022827c removing branching on tiling shader, improving performance
Now tga export needs extra care, but boy that 5 FPS improvement
2018-07-03 22:17:34 +09:00
minjaesong
de19f49d26 making debugwindow to appear again 2018-07-03 14:33:20 +09:00
minjaesong
9ade08013f intro screen flipped correctly, build passes 2018-07-03 14:28:30 +09:00
minjaesong
6b929ac107 PostProcessor working: nested FBO won't work, use FrameBufferManager 2018-07-03 13:48:34 +09:00
minjaesong
108a3e6188 title screen using IngameRenderer 2018-07-01 01:38:07 +09:00
minjaesong
07681110c7 IngameRenderer: damned thing finally works somewhat 2018-06-30 16:47:22 +09:00
minjaesong
abd1827182 still broken, still renders
because im going to break it once again
See my comment in PostProcessor.kt
2018-06-28 21:31:39 +09:00
minjaesong
9736d39e04 trying to optimise the rendering, this is BEFORE job 2018-06-26 09:10:05 +09:00
minjaesong
8daf0a2c38 still wip modularisation, game somehow boots 2018-06-21 17:33:22 +09:00
minjaesong
6bbfd5d167 scrollable inventory with up/down UI button 2018-05-09 19:41:04 +09:00
minjaesong
4664c9ba0d ModMgr: I can load class by name; dropped Groovy script support, coding must go to JAR 2018-05-09 05:34:39 +09:00
minjaesong
fded7f1dfb computery stuff and new set of wires 2018-03-04 19:15:43 +09:00
minjaesong
d11fd281f4 colourutil update 2018-02-16 10:49:13 +09:00
minjaesong
40423ede52 adopting Java 9/Kotlin 1.2 2018-02-10 21:40:17 +09:00
minjaesong
941d9fa107 rain megaparticle experiment 2017-12-18 20:45:32 +09:00
minjaesong
c5fa83b2f4 196 dithering instead of 625 2017-12-10 14:33:12 +09:00
minjaesong
51a2e47430 cheat detected notification 2017-12-10 14:32:32 +09:00
minjaesong
6715308f88 language vars are fully moved to apploader 2017-11-25 22:29:59 +09:00
minjaesong
35f2cf6b4d tooltip UI; tooltip in the inventory 2017-11-25 17:56:57 +09:00
minjaesong
f45a3d252a inventory grid mode buttons working highlight 2017-11-07 23:29:07 +09:00
minjaesong
ade77473c4 map & save button for inventory 2017-11-03 22:48:13 +09:00
minjaesong
7cd7b4047f postprocessor for 3dlut colcorr; dithering should be managed in "dirty" way
dirty way: loads dithered/passthru shader according to the game's config (boolean fxdither)
2017-11-02 17:47:52 +09:00
minjaesong
f5636fe0d3 hacked the titlescreen to fix resize-related UI shit 2017-11-01 15:46:09 +09:00
minjaesong
948f922041 encumbrance meter for new inventory 2017-10-30 04:28:27 +09:00
minjaesong
6c72bef0de black background for inventory 2017-10-29 13:26:34 +09:00
minjaesong
fe21340186 working "equipped" view with unequip 2017-10-28 15:07:58 +09:00
minjaesong
516314c47f "equipped" indicator on item grid 2017-10-25 05:53:39 +09:00
minjaesong
55cdac9269 fixed uiItem stupidity with uiCanvas; it activated even if its parent is invisible 2017-10-24 07:25:05 +09:00
minjaesong
a506269906 catbar and grid: updates and renders as intended 2017-10-24 00:21:13 +09:00
minjaesong
77b563396e at least some of the new UIs are working 2017-10-23 03:44:45 +09:00
minjaesong
98a67c80c6 new inventory design: is it good?
See work_files/inventory_nouveau_2.psd
2017-10-22 02:03:23 +09:00
minjaesong
a8398765c6 somehow fixed a consolewin bug
- It would read a key even if it's closed
2017-10-18 03:52:11 +09:00
minjaesong
6df79b96dd lightmap draw shift fixed; game will properly resize 2017-10-16 22:47:16 +09:00
minjaesong
83b9f74100 renderFront is fixed 2017-10-14 02:48:52 +09:00
minjaesong
d9a01a70c3 sprite shift re-fixed with a correct method 2017-10-14 02:13:06 +09:00
minjaesong
06949848f8 player sprites now aligned to hitbox && drawn at centre of the screen 2017-10-13 00:36:03 +09:00
minjaesong
0e1c46f18d Houston, we have a render (again) 2017-10-07 22:21:37 +09:00
minjaesong
fe8163c1e4 Feature idea I had around for months 2017-09-22 00:22:35 +09:00
minjaesong
e3ac877c3d Rectified heretic YY-MM-DD to standard YYYY-MM-DD 2017-09-20 14:36:40 +09:00
minjaesong
b560011d2f Scientifically correct moondial
Flipped crescents are my mistake 😄
2017-09-19 14:43:06 +09:00
minjaesong
e76458bff6 we've got something
- except actor's RGB won't draw; only the glow does
2017-09-18 02:32:47 +09:00
minjaesong
558430b4f3 fixed camera not putting actor at the centre of the screen
- Actually may not be fixed, but it does not cause render bugs at least!
2017-09-17 23:42:13 +09:00
minjaesong
1149311076 module UI now has margin; game update will drop consecutive updates if its try count is exhausted (reduced lag after window move/resize) 2017-09-15 01:40:12 +09:00
minjaesong
ef176909b4 Ingame: great, nothing renders :( 2017-09-15 00:40:11 +09:00
minjaesong
1d8e66a9cc simple hack for out-of-place render of terrain and lightmap
- Just made them not have negative value
2017-09-14 02:13:37 +09:00
minjaesong
cdf961df09 Guess it's fully working for titlescreen 2017-09-13 18:10:03 +09:00
minjaesong
01a32ad00c NOT using a trick in issue #5 was the key, also closes issue #8 2017-09-13 01:06:01 +09:00
minjaesong
7ffb417618 almost works but dae fucking jitter again 2017-09-12 23:52:16 +09:00
minjaesong
82ddfeb6ee Light fuck: At least I've figured out what the fuck was wrong with. 2017-09-12 21:29:45 +09:00
minjaesong
e67b97257c at least now I know which part is to be patched... 2017-09-09 02:45:58 +09:00
minjaesong
e6e962ecf7 terrain AND wall renders 2017-09-01 01:05:21 +09:00
minjaesong
749a82bcf7 now I can't even tell if it's working as intended or not 2017-08-30 22:16:10 +09:00
minjaesong
f9897bc439 new blocks drawer WIP 2017-08-29 21:06:30 +09:00
minjaesong
1c6560797d terrain atlas: added black patch 2017-08-28 20:37:39 +09:00
minjaesong
75192bef17 camera moving works 2017-08-28 02:27:53 +09:00
minjaesong
05560cf04c Tiling shader -- FIXME: cameraTranslation not working as it should 2017-08-27 23:55:54 +09:00
minjaesong
ee7d51c21b fucking finally... (needs cleanup) 2017-08-27 23:47:30 +09:00
minjaesong
2928aa2eb7 tiling using shader, sorta works 2017-08-26 23:48:07 +09:00
minjaesong
d0702c9159 trying to tile by shader 2017-08-25 19:37:12 +09:00
minjaesong
2bf9acb07a some sort of error screen impl 2017-08-20 22:10:47 +09:00
minjaesong
25ce7958ae better dithering 2017-08-07 01:09:04 +09:00
minjaesong
64f36d2d7c load app using apploader -- no more black screen on app load 2017-08-01 23:55:48 +09:00
minjaesong
65bc67710c RemoCons fully working; also fixed my stupidity 2017-07-26 17:03:22 +09:00
minjaesong
86d3a4a08d UIs wont FOR SURE update (more like, process events) anymore when they are not visible 2017-07-25 18:34:23 +09:00
minjaesong
33da9777ea UI: sub-UIs work? 2017-07-25 17:21:02 +09:00
minjaesong
07ee987411 fixed quickbar and piemenu texture 2017-07-23 19:55:06 +09:00
minjaesong
72b7adcf39 more compatible shader 2017-07-23 18:23:53 +09:00
minjaesong
c595270faa leak patched I guess 2017-07-23 17:38:57 +09:00
minjaesong
d753365e54 titlescreen: camera follows terraini undulation 2017-07-22 18:27:58 +09:00
minjaesong
116b4cc390 title screen renders well 2017-07-21 20:28:12 +09:00
minjaesong
a5dd5b9e98 generalised things so that they would work outside of ingame.world; title screen wip 2017-07-21 19:59:51 +09:00
minjaesong
f51417e709 action listener on textbutton list 2017-07-20 22:25:40 +09:00
minjaesong
fd7d724f39 parallax (sky looks bluer when you go up) 2017-07-20 18:39:05 +09:00
minjaesong
528fdc9fc5 limitedly successful attempt to create a title screen 2017-07-20 00:36:41 +09:00
minjaesong
33a774b5b7 Ingame's Player is now mandatory; player spawn on right position 2017-07-18 00:19:55 +09:00
minjaesong
58205e5eb5 Inventory UI: items page button 2017-07-17 14:37:10 +09:00
minjaesong
31b7203d01 some bayer matrix things and my discoveries 2017-07-17 12:22:15 +09:00
minjaesong
c9932fc81b simplified a structure of UIs a bit 2017-07-16 23:15:32 +09:00
minjaesong
145a4e5e71 dithered skybox 2017-07-16 05:03:04 +09:00
minjaesong
81529eb215 bayer-dithering shader revisited 2017-07-15 18:35:57 +09:00
minjaesong
057df6632a camera clamping, UI resize 2017-07-15 02:02:30 +09:00
minjaesong
5499ded796 wall render bug fixed
- wall wouldn't render if transparent-yet-sold tiles like glass is placed on top of it
2017-07-15 00:02:00 +09:00
minjaesong
61427b849a load screen adj, faster gravity response for standard 2017-07-14 18:48:48 +09:00
minjaesong
a53f818ba6 Rudimentary load screen works (only with Ingame screen) 2017-07-13 19:10:11 +09:00
minjaesong
d9a3318768 GenuineSonic 2017-07-13 18:07:12 +09:00
minjaesong
d241e5cbb0 disposable UI; loading screen mockup (i heard like loading screen -- sonic 06) 2017-07-13 17:53:40 +09:00
minjaesong
49a9278c59 load screen render, fixed some init code of the app 2017-07-13 03:59:26 +09:00
minjaesong
fc9516fd39 how changing the screen should be done 2017-07-13 01:34:09 +09:00
minjaesong
6bff02d91e lightmap downsample works, sampling bug fixed with Filter.NEAREST, now having shrinkage issue 2017-07-12 14:33:59 +09:00
minjaesong
bad6ff296a working UV simulation using alpha channel 2017-07-12 02:35:36 +09:00
minjaesong
1e9c04d7c0 working world-glow blend 2017-07-11 13:34:14 +09:00
minjaesong
3ffdd7233f prep for draw glow 2017-07-09 20:29:35 +09:00
minjaesong
5a5fb45c3b diching RGB10; colors are now fully vec3 2017-07-09 02:21:24 +09:00
minjaesong
1a33c3be5a float lightmap seems it does have little boost on fps 2017-07-09 00:51:25 +09:00
minjaesong
0ad7db3b51 failed attempt at multithreading 2017-07-08 22:34:45 +09:00
minjaesong
8504337da9 asynch update and render (aka frameskip) 2017-07-08 20:38:05 +09:00
minjaesong
f2f5cd7daf former bug fixed; now we have ceiling-stair-clip bug 2017-07-07 02:11:24 +09:00
minjaesong
464d30a384 improved collision displacer: no more clip-to-climb-up-rightside-only thingy 2017-07-07 00:01:20 +09:00
minjaesong
009b55481b new collision displacer: got one-block-ceiling-passthru bug, but otherwise tolerable 2017-07-06 16:35:58 +09:00
minjaesong
72e7931f4d 4096 shader finally works... perhaps it needs bayer matrix? 2017-07-05 18:30:53 +09:00
minjaesong
0e4dd79cc1 downsampling sorta works, ONLY WHEN (width or height % 4) is 0 or 1 2017-07-05 16:03:50 +09:00
minjaesong
f676938176 control scheme update 2017-07-05 12:49:26 +09:00
minjaesong
8a759cb178 Ladies and Gents, we have shader-powered smooth lighting! 2017-07-05 02:20:10 +09:00
minjaesong
66e4dcd1c4 shader seems working!; it's messed up by all the test codes but I commit anyway 2017-07-05 02:05:03 +09:00
minjaesong
d9381fc58e blur shader works 2017-07-04 23:30:48 +09:00
minjaesong
039ccea58f shader does work at least... 2017-07-04 22:04:07 +09:00
minjaesong
b592b8fa0f killed old zoom so that framebuffer would render without hack 2017-07-04 20:11:54 +09:00
minjaesong
b82d172d58 needs more shader (for smoothing out lightmap render) 2017-07-04 14:58:18 +09:00
minjaesong
41f9f4032d barely managed to fix inventory UI 2017-07-04 01:27:18 +09:00
minjaesong
7b2b6caf82 dunno why but setting camera position to negative works... 2017-07-03 23:42:59 +09:00
minjaesong
b7fb8ff4da putting ore vein prototype on main sheet; also a commit before fuck-up 2017-07-03 19:26:00 +09:00
minjaesong
2ea3ce0c67 fixed bug: things go dark as inventory is opened
Not cloning the color when MULing was the culprit
2017-07-03 02:55:33 +09:00
minjaesong
9b32cf63ff fixed bad color rendering on blocksdrawer and lightmaprenderer 2017-07-02 21:53:50 +09:00
minjaesong
2129cce7f3 debugger's got its colour codes back 2017-07-02 15:28:45 +09:00
minjaesong
c8c1bdf836 proper sprite flip draw 2017-07-02 00:45:57 +09:00
minjaesong
4a54c87826 keyboard control ported to GDX (at least as much as I can right now) 2017-07-01 18:31:00 +09:00
minjaesong
7248616e58 ore veins 2017-06-30 02:06:53 +09:00
minjaesong
33b5a21c26 blocks camera and framebuffer seems working 2017-06-30 01:50:06 +09:00
minjaesong
1095cb451f can see camera working but not the actor gravity 2017-06-28 22:15:42 +09:00
minjaesong
4472722c5d a commit before heading to the airport 2017-06-23 02:18:03 +09:00
minjaesong
ab846ad805 More game-related documentations 2017-06-22 19:00:15 +09:00
minjaesong
187277d6a8 Just got enought to render without error (no display tho) 2017-06-22 18:59:53 +09:00
minjaesong
ad481853bb LibGDX, here I am. 2017-06-22 02:31:07 +09:00
minjaesong
1ecbc57f83 gdx font: thai works good enough; RIP performance tho 2017-06-16 22:06:08 +09:00
minjaesong
41791af764 gdx font: can customise font spritesheet location 2017-06-16 19:29:40 +09:00
minjaesong
c664755ad8 gdx font working good 2017-06-16 19:27:14 +09:00
minjaesong
984881421c gdx font: working locale switch 2017-06-16 19:12:57 +09:00
minjaesong
e07e321ee3 gdx font almost working
- TODO: bulgarian/serbian, shadow
2017-06-16 18:52:03 +09:00
minjaesong
6e403f97f8 re-arranged all the docs in more convenient fashion 2017-06-16 15:10:55 +09:00
minjaesong
87242da9cc Terrarum Sans Bitmap imple on GDX -- wip 2017-06-16 15:09:19 +09:00
minjaesong
12c6f6fd04 more inlining and minor performance tweaks on LightmapRenderer 2017-06-12 04:04:54 +09:00
minjaesong
980c92f213 more minor changes 2017-06-11 18:01:03 +09:00
minjaesong
8a3c4fd65e LibGDX stuffs for issue #23 2017-06-11 18:00:48 +09:00
minjaesong
67ca216243 test watches 2017-06-11 01:22:46 +09:00
minjaesong
7bd7a6532d this fixes *some* case of abnormal displacement 2017-06-03 00:37:47 +09:00
minjaesong
c5765fc08a lightmap and skybox update 2017-06-03 00:07:47 +09:00
minjaesong
7f909e3796 lightmap aesthetics: blocks exposed to light are now rendered brighter 2017-06-02 00:46:45 +09:00
minjaesong
b4042f0060 fixed LB/RB/BR bug (actor jitters because of false positive collision?) with a hack 2017-06-01 23:10:08 +09:00
minjaesong
da2452c84e still sketchy, but at least I can only care about corner cases, as it's not generalised 2017-06-01 16:58:25 +09:00
minjaesong
f0a6c36f8a fixed a problem in prev commit msg somehow 2017-06-01 15:25:40 +09:00
minjaesong
fdb9d38e03 this new method should work (except can't escape after right/bottom collision) 2017-06-01 14:52:32 +09:00
minjaesong
799a77c929 some realisation after a bad idea (bad idea part is hidden/omitted/overridden in this commit) 2017-06-01 03:25:08 +09:00
minjaesong
41050337f4 I really have no idea if i'm doing it right or wrong 2017-05-30 01:10:10 +09:00
minjaesong
85ab2a2066 various patches and renaming; thai-variable font sheet 2017-05-27 20:05:12 +09:00
minjaesong
06cbac1cc5 phys for player works good (but not perfect); phys for objs are still fucked up 2017-05-27 20:04:41 +09:00
minjaesong
50b597de5f why it's not super-fied? 2017-05-27 15:54:01 +09:00
minjaesong
b96daa7d3d physics sorta works well with player, but not balls
- bounce for downward works, bounce for left/right wall hit does not
- headbutt is still undefined behaviour for all phys objs
2017-05-27 15:48:35 +09:00
minjaesong
80777fcccb now works for both LR but actor sticks to left cliff but not right 2017-05-25 22:30:36 +09:00
minjaesong
a601d4c57b removing 99999 for endX finally works 2017-05-25 22:02:36 +09:00
minjaesong
f7eaa4c4f0 with some hacks, I was able to make LR walk colliding work, but not the headbutt 2017-05-25 20:37:52 +09:00
minjaesong
f466f6f001 no message 2017-05-25 20:23:24 +09:00
minjaesong
5255ae60af Terrarum Sans Bitmap: wider hangul 2017-05-25 00:04:21 +09:00
minjaesong
2a575351d3 anti-stuck somewhat working 2017-05-25 00:03:12 +09:00
minjaesong
58b229a7fa houston, we have (bad) render 2017-05-24 15:40:58 +09:00
minjaesong
905ab1004c light de-banding when they exceed 255 out of 1023 2017-05-22 20:36:20 +09:00
minjaesong
b7ed3dd814 much failure, such note; wow 2017-05-12 17:02:29 +09:00
minjaesong
ccbf56b322 still glitchy but working? 2017-05-12 16:08:23 +09:00
minjaesong
87213e8fbd lcd font update 2017-05-12 04:35:28 +09:00
minjaesong
40e48eec21 pre-fuck-up commit inside of pre-fuck-up commit 2017-05-11 19:37:18 +09:00
minjaesong
b421dcf187 av fuck 2017-05-11 03:12:10 +09:00
minjaesong
2eb6e7c0a2 code cleanup unrelated 2017-05-10 21:02:57 +09:00
minjaesong
3de9cedec3 code cleanup related to ActorWithPhysics 2017-05-10 21:02:05 +09:00
minjaesong
f45dc6fde2 no ui toggle when console is open 2017-05-10 21:01:19 +09:00
minjaesong
31954f3ca7 physics almost works, except for bunch of TODOs and FIXMEs 2017-05-10 03:41:46 +09:00
minjaesong
4262b02faf fixed dividng by zero (Line 756) 2017-05-09 23:38:09 +09:00
minjaesong
46fe5fb1e2 That's it for the today, thanks for coding and have a nice day 2017-05-09 02:52:15 +09:00
minjaesong
23cc28d3bd Features that are reckoned are working (which means the full features are WIP) 2017-05-09 02:40:22 +09:00
minjaesong
9732c6d66f y-down blocking work (can jump down to hit the ground but not the ceiling) 2017-05-09 00:46:38 +09:00
minjaesong
566c76c1a2 removing moveDelta to utilise externalForce and controllerMoveDelta separately, for great justice 2017-05-08 21:19:28 +09:00
minjaesong
81220fa542 ground slide (balls) works; walking works; still no wall... 2017-05-08 02:55:12 +09:00
minjaesong
572fbb4b9c at least it snaps without hacks; adding one important documentaion 2017-05-08 00:47:21 +09:00
minjaesong
10a99b7db6 I can jump around at least, isTouching() needs more work 2017-05-08 00:10:58 +09:00
minjaesong
959873413d fucked up while making ActorValue delegated – not applicable; can't have default value
making commits for files to keep so that I can discard changes
2017-05-07 18:39:26 +09:00
minjaesong
14dfb5c963 I think I can ignore this CCD-ing bug but it's happening 2017-05-07 03:11:42 +09:00
minjaesong
86821d2d98 fuck it; we do it tomorrow (or Monday) 2017-05-07 02:17:38 +09:00
minjaesong
c9d786390c forgot to commit... 2017-05-07 00:48:57 +09:00
minjaesong
ade9592d67 sorta works? 2017-05-07 00:24:00 +09:00
minjaesong
22ad180e04 hitbox displacement rewritten 2017-05-05 02:03:29 +09:00
minjaesong
479c0ce91f does this plan look good? 2017-05-03 15:02:49 +09:00
minjaesong
a9d35678c5 why things are keep happening? 2017-05-03 14:41:09 +09:00
minjaesong
cbb4eaad94 more commits before the havoc 2017-05-03 03:07:35 +09:00
minjaesong
165ae1777b some organisation, Base32 password generator 2017-05-03 02:37:03 +09:00
Song Minjae
ecf775c664 no message 2017-05-01 08:00:07 +09:00
Song Minjae
1375f91505 A commit to save my soul as I'm going to fuck up things a bit... 2017-04-30 21:26:20 +09:00
Song Minjae
c9c761598a inventoryItem -> gameItem 2017-04-29 23:11:54 +09:00
Song Minjae
9a7885fc80 kotlin runtime update 2017-04-29 22:53:32 +09:00
Song Minjae
9508249533 blocks now have properly formatted ids 2017-04-29 00:05:10 +09:00
Song Minjae
3498a100a4 clean ice tex fix 2017-04-28 21:52:05 +09:00
Song Minjae
7a3e7546de Sandstone connectivity change
- TODO do the same with ice block
2017-04-28 17:07:45 +09:00
Song Minjae
93939f22bf quickslot works, new event for actor "actorValueChanged"
- "unpacking" fresh new tool would un-register quickslot desig.
- priority issue on "equipped by quickslot change" and "equipped by inventory UI"
2017-04-28 12:21:27 +09:00
Song Minjae
253260de6f blocks name update 2017-04-28 01:49:32 +09:00
Song Minjae
a7dea93744 Quickbar: all working except for equip/unequip 2017-04-28 01:48:51 +09:00
Song Minjae
26cbe6970a modularised lang 2017-04-27 23:41:19 +09:00
Song Minjae
3e54dcab2c working walls, quickbar and piemenu fixed 2017-04-27 17:22:56 +09:00
Song Minjae
56b77d1838 working quickbar and piemenu 2017-04-27 14:45:55 +09:00
Song Minjae
f4db93ca9e Tile -> Block && Map -> World 2017-04-27 01:57:45 +09:00
Song Minjae
a9eb1f579e Loading item from module using Groovy 2017-04-26 23:53:22 +09:00
Song Minjae
36a7983024 durability meter: stack of (new) tools displayed as intended
- displaying NOT based on their stacks but their health
2017-04-25 17:24:56 +09:00
Song Minjae
ab8f019109 removing stupidity which harmed AmmoMeterProxy 2017-04-25 15:29:24 +09:00
Song Minjae
ebc8174d2c fresh-new dynamic items (e.g. pickaxe) can be stacked 2017-04-25 02:59:59 +09:00
Song Minjae
c35ba8201a new ID for dynamic item work flawlessly with adding multiple at once 2017-04-24 21:31:53 +09:00
Song Minjae
5cd5ebbea3 Resolving issues #16 and #20 2017-04-24 02:23:13 +09:00
Song Minjae
6399c2d66b Resolving issue #18 and #19 2017-04-23 22:53:49 +09:00
Song Minjae
b342e7d042 working vital meter for tool durability 2017-04-21 18:11:30 +09:00
Song Minjae
c6e42ffbbe wenquanyi: fixed bad code point allocation 2017-04-20 20:48:23 +09:00
Song Minjae
e0a23f6089 more housecleaning 2017-04-19 22:56:10 +09:00
Song Minjae
c779baa72d compressing large font images 2017-04-19 22:31:55 +09:00
Song Minjae
aa4fbba711 about issue #17 2017-04-19 21:15:09 +09:00
Song Minjae
2895f4be6d Proper tga.gz loading using own imagedata 2017-04-19 20:53:03 +09:00
Song Minjae
fcd378c51a Some space saving, terrain reads GZip directly 2017-04-19 16:15:14 +09:00
Song Minjae
fe94ebbe4a terrain damage data is now properly removed when the tile is newly placed 2017-04-19 03:03:53 +09:00
Song Minjae
8689ab1565 does it work? 2017-04-18 01:24:54 +09:00
Song Minjae
4f43fdbd27 README update 2017-04-18 01:23:15 +09:00
Song Minjae
5fe604cf45 pickaxe working as intended 2017-04-18 01:14:25 +09:00
Song Minjae
f840dbe7de modular first test 2017-04-17 16:14:35 +09:00
Song Minjae
532c836553 mod support design wip 2017-04-17 04:03:58 +09:00
Song Minjae
7ebb21124c voi helvetti 2017-04-17 02:29:05 +09:00
Song Minjae
f2ae2d9449 fixes, bits and pieces, changes in ID referencing, terrain and wall takes damage, working test pickaxe, and a new issue 2017-04-17 02:18:52 +09:00
Song Minjae
6087072d3d 10-bit RGB conversion tool 2017-04-14 22:45:55 +09:00
Song Minjae
a47eb41d9a inventory ui update 2017-04-13 03:25:49 +09:00
Song Minjae
47b9b92797 font adjustments 2017-04-12 00:27:14 +09:00
Song Minjae
037e84d6e2 setting up the inventory using builder (during init) requires ingame.player to be nullable, lateinit won't work 2017-04-11 23:07:29 +09:00
Song Minjae
1301121aa9 sanity check on equipping the item 2017-04-11 21:12:51 +09:00
Song Minjae
d20190b2bd selecting and consuming item in inventory 2017-04-11 19:21:32 +09:00
Song Minjae
bb797a0910 clickable inventory for (un)equip 2017-04-11 02:30:34 +09:00
Song Minjae
d33d25f384 working inventory clicking ingame 2017-04-10 01:35:28 +09:00
Song Minjae
12015669c6 UIs will draw on "backing" framebuffer where skybox is 2017-04-09 22:22:29 +09:00
Song Minjae
671048e1e1 Inventory UI on ingame 2017-04-09 03:35:18 +09:00
Song Minjae
c5367f8f1c vt: new filesystem using tevd 2017-04-07 19:12:27 +09:00
Song Minjae
2332239ef2 global light matched to skybox 2017-04-07 19:11:56 +09:00
Song Minjae
25128d45e5 change in light
- darker night
- no blue in deep night, as in real life
2017-04-07 03:46:16 +09:00
Song Minjae
207c90d35e new WorldTime based on TIME_T 2017-04-05 02:52:00 +09:00
Song Minjae
1057e7d442 VT: shit is still rolling
- We might need virtual disk image...

Former-commit-id: c3278cd9fe1ddad8b26b45577fecb0500365d38b
2017-03-31 17:27:53 +09:00
Song Minjae
5bfc5c3a38 inventory now shows equipped position
Former-commit-id: 10950ffc409accfa914b9f531193b2fac0783f7d
2017-03-31 17:26:44 +09:00
Song Minjae
84f91e6a7a brighter soil and grass tex
Former-commit-id: 8457edfdd297ddef3ebc6c6327611a42d21dbb44
2017-03-31 17:26:01 +09:00
Song Minjae
4363bd4ba2 fixed a bug where for whatever reason io.read would return 0x0D (CR)
Former-commit-id: 769e2d3931472d14ce66cfef3a496a3913dc51be
2017-03-31 17:25:31 +09:00
Song Minjae
48315daa7d proper way of setting quickslot #
Former-commit-id: 5cd21f043def3c7622290df5bf11f0b3f0080d30
2017-03-28 03:44:43 +09:00
Song Minjae
cd710de280 inventory UI wip update
Two columns, some marginal spaces to make it look better


Former-commit-id: c26d11e499970280b78193772d29937295916ae2
2017-03-27 02:58:52 +09:00
Song Minjae
816502df3d inventory UI: quickslot designation
Former-commit-id: b2bddf7c271c678213f8f346d1de4b5c1dc27f60
2017-03-26 00:42:41 +09:00
Song Minjae
b6290134a9 runes: fixed numbers not coming up
Former-commit-id: 845b721d289842d39ea47043154a06ff7069be77
2017-03-25 02:28:49 +09:00
Song Minjae
1e3ffd2272 runes: fixing little mistakes
Former-commit-id: 2bfd0fd56a8219d44eed429671436ed2c638706f
2017-03-25 00:53:11 +09:00
Song Minjae
1f59082c15 runes update
Former-commit-id: 65a31563da924f46d5ce62c2af25549a97092762
2017-03-25 00:47:21 +09:00
Song Minjae
2e11676ee6 new runes impl and test
Former-commit-id: f92f6d528128ed19aadffee7e112daa5736d50e3
2017-03-24 23:59:57 +09:00
Song Minjae
f919b45e18 string for GPL 3
Former-commit-id: f114ac32817d94b1fca3bc7463a8afc24d166f74
2017-03-23 16:38:53 +09:00
Song Minjae
24de647284 inventory ui
icon in list


Former-commit-id: 7182dcda408d9710d77e25e357f3a67bdd42fff9
2017-03-22 23:58:18 +09:00
Song Minjae
accf1cf584 marking obsolete resources as _old_
Former-commit-id: f0919500afaafa91adaeb7f7c7377a5e2f10ef08
2017-03-21 23:39:15 +09:00
Song Minjae
6bea8af9db This project is now GPL3
Former-commit-id: 173c5833f232f3f6f7f091c02d56498cff600822
2017-03-17 23:52:10 +09:00
Song Minjae
d3547e47ca MIDI input test
Former-commit-id: 8ec51637782a2c4185716f3164c837477e648975
2017-03-17 23:49:48 +09:00
Song Minjae
208fd2ba15 added greek ano teleia
Former-commit-id: d2c67302b1e196949e8b6765b750ffffb38d2699
2017-03-17 19:23:40 +09:00
Song Minjae
72204fd5cd there was a mistake :D
Former-commit-id: 972b0f9481218f995e145e19dee3107dac912b72
2017-03-17 18:35:00 +09:00
Song Minjae
41da296bce font upd kana
Former-commit-id: c61920ca695eeafb3a9e200b5083b323b11814e6
2017-03-17 17:28:22 +09:00
Song Minjae
114bfe395f kana font wip
Former-commit-id: 0290410638e7ddd5981aba5d40acc2c1008b0658
2017-03-17 03:30:18 +09:00
Song Minjae
2491a03c99 inventory and its ui
Former-commit-id: b1a073c5636ac4516e6c9cf41bb97a844057de3f
2017-03-17 03:28:47 +09:00
Song Minjae
3d91023011 TextButtonList working kinematic background
Former-commit-id: 8976d3b3d1e40731adf13430ad747351a6401b24
2017-03-15 01:06:13 +09:00
Song Minjae
ff817c25e6 text labels now has background
Former-commit-id: 05f2767134b385960deb65c2e76c97432c8303ad
2017-03-14 15:08:18 +09:00
Song Minjae
f47c66db44 magic description language update
Former-commit-id: 9637f09aa90345c2c2f4889a85d69af9f9c1e584
2017-03-13 21:41:08 +09:00
Song Minjae
bc4fd8866a UI testing env and working text buttons
Former-commit-id: b8fd27c7f71f9bc8da259ae132badcbc9ce117ac
2017-03-13 21:40:50 +09:00
Song Minjae
0113ca5d09 new inventory UI idea
Former-commit-id: 0032d2b023d8ab3d2393541d452673ceeafc372e
2017-03-12 04:21:58 +09:00
Song Minjae
920d8085cd an idea
Former-commit-id: 2f1562b654b3e8eb9ad5c36ff371472858a1a9ec
2017-03-10 23:31:41 +09:00
Song Minjae
a10134db2e minor fixes in UI with aliases
Former-commit-id: 539604058bcf7e545de920b1c7a5958e30577a34
2017-03-10 21:23:51 +09:00
Song Minjae
edb2f5ce11 pre-assigned vital metre
Former-commit-id: 48d968d5b93ed6a4fb5a2f7fe63e2c24b7aaa476
2017-03-10 02:15:17 +09:00
Song Minjae
a22d27408c message notificator bug fixed where it would only work properly for first time
Former-commit-id: 640b113cb242ec572f17654feaa8b9be52c333c3
2017-03-10 02:14:58 +09:00
Minjae Song
dac69f504c Add contribution guide
Former-commit-id: 5d501e16b94c4056efb00ea96e9253aaa00a2578
2017-03-09 16:23:57 +00:00
Minjae Song
dfd71435de Update README.md
Former-commit-id: fd89faba7d151412ebce782ee76fe1c1fb2b08b1
2017-03-09 16:15:58 +00:00
Song Minjae
76fcb5b12f git gud
Former-commit-id: 86d4fba868dbe1c2841e1829f2857ff47187cc57
2017-03-05 01:31:40 +09:00
Song Minjae
e9572488be ordered vital metre -- you can display two or more vitals
Former-commit-id: 27767b632a1c65060750e49c55db7e71a0e443ae
Former-commit-id: b431478a0d43193ac60011a958f6305673334755
2017-03-05 00:28:20 +09:00
Song Minjae
08417be027 eliminated reddening on T+52300
Former-commit-id: 5106f760b5945f3b9a90f66d5de155e7a223cfab
Former-commit-id: 7dd1718d64e84e98d8e08a50cfa8ed50366bcc32
2017-03-05 00:27:50 +09:00
Song Minjae
edd97b45a7 vital metre prototype
Former-commit-id: c3f95f7ef280eabc5516ad6885386cb89d6ee35d
Former-commit-id: ab9cd5bd8daf27d37828a5ca4a737a723d76fa1a
2017-03-04 01:52:30 +09:00
Song Minjae
0a0aea9589 vital metre mockup
Former-commit-id: c49f7ba80cff854db6d79af1c9d50d77b0bae76d
Former-commit-id: bd62a24bfd4c9737e2f23b0bae1756df62a19acf
2017-03-03 18:42:47 +09:00
Song Minjae
f5db4cb2fb have no idea how LFS works :/
Former-commit-id: 81595f4fd40bb497150c26b063c994e7dd267cda
Former-commit-id: 94aeebbd5f3949f014497bcd79f8e83f6dd84d5a
2017-03-03 12:18:14 +09:00
Song Minjae
75ab8c6558 forgot gitattributes
Former-commit-id: 3283e9aa0f0cbb450a325f743033150b5b031c80
Former-commit-id: 0a4113e9280e66194ee627dedf6432a23cdf470b
2017-03-03 04:34:21 +09:00
Song Minjae
63ec3a8917 removing old test sounds
Former-commit-id: 916a2b8fb5f290451cfb604fe4b2b3b2abd5bc81
Former-commit-id: 2be333efeff82648db00057975d7c02bd7dfddda
2017-03-03 04:31:34 +09:00
Song Minjae
4c8ceaf301 updating old copyright notice
Former-commit-id: 49f0ae772e48f122919220accaffd4ebf73ed3e3
Former-commit-id: b2b7ad7cf731f5c51938e84714f354bd8ffd6e6e
2017-03-03 04:15:44 +09:00
Song Minjae
6d8f9d2901 still working on vt, still buggy :/
Former-commit-id: 9164ca8ef33917f7254c65f3947903b8a17dd654
Former-commit-id: 3ebf64f00a0b86d11a449c1d399e149f2714839c
2017-03-03 04:05:00 +09:00
Song Minjae
efd3284e30 some UI suggestion
Former-commit-id: 4526bc289a05ddd0fd205c8c9986785196bdd487
Former-commit-id: ce0bf7a3ce0f083e698cddf708419341f4a73fa9
2017-03-03 03:56:07 +09:00
Song Minjae
b29e6af643 working io.read from STDIN
Former-commit-id: b1168a53fd5fbd09c6a5a76506402560fc4e0fd7
Former-commit-id: a0d455da14a6eb7bf0127e136949273ec5a28628
2017-03-02 22:35:13 +09:00
Song Minjae
96c6cb2cc6 bunch of codes:
- Test InputStream() on VirtualComputer (blocking/unblocking using simple semaphore) -- no more dirty lua impl of io.read
- Typealias Kotlin 1.1
- Primitive box drawing on VideoCard
- Removing unnecessary fonts


Former-commit-id: cece88af3a3430678e685856eec78b4a9d598b4f
Former-commit-id: 22eed3a7beb9b4cb34636cbab2ff0e94989bdb31
2017-03-02 02:11:50 +09:00
Song Minjae
bdba27d776 Update to Kotlin 1.1
Former-commit-id: bd35f4973ce672c9fa4b36a1c8655bd719df5148
Former-commit-id: 010bb8907f6afa453de6a678cf97cc6c72483dd4
2017-03-01 21:33:46 +09:00
Song Minjae
71091cce98 vc ppu: some updates for Lua
Former-commit-id: 3d99a6788d05eaf3e90bffe8d412f0ab92e7f9bb
Former-commit-id: 306ed39d09f2b0b5461cb71d0cef96d7d5793769
2017-02-26 03:08:58 +09:00
Song Minjae
679a65a12e fixed lantern colour not update
Former-commit-id: 153d3f4fbdae65f71c7c63a3b0a87fee08677186
Former-commit-id: 732f527d49dc31bbc669bbfed4624018c471dbe0
2017-02-26 03:08:21 +09:00
Song Minjae
a3445d631a actor hit ceiling and now properly bounce back (again, gah!)
Former-commit-id: 05ce5bbae52337a92e26bd6937d610bd2c14cefb
Former-commit-id: 810db52f9f9f1756d2d667229487fb653f87898e
2017-02-26 03:07:54 +09:00
Song Minjae
b23f848d95 working real-time software blur
Former-commit-id: a545802b19188fb9d3b6168885f40d46e3376195
Former-commit-id: f71dbfa2521888cc847937f549e627f87625ea17
2017-02-25 02:50:48 +09:00
Song Minjae
3b7e88b0af no memory leak on ImageBuffer rendering
Turns out, <ImageBuffer>.image creates new Image instance which will NEVER be reclaimed (which causes OutOfMemoryError) unless manually destroy()ed.


Former-commit-id: 34840cf63e52e5635ec8acd5fb1bb78923c61063
Former-commit-id: aca4388320fae022a4744f75c1b0f66b544bdafb
2017-02-25 02:39:02 +09:00
Song Minjae
d7b49b0f9d graphics computer -- working sprite system
Former-commit-id: eedad5c99d0d8fa1d74a7a5b4e6250017d55163b
Former-commit-id: 0dc08e778cca3300ffc6f696ba395eb8ca2b154b
2017-02-24 17:35:32 +09:00
Song Minjae
0180c7cf0a yet another font update
Former-commit-id: 332bdbd2e55d148f42f3e3635dbc94a71f152f01
Former-commit-id: 27308c98fe0fe858bcbb42301dd714a49d92c81c
2017-02-20 23:27:00 +09:00
Song Minjae
b33f179a9b font upd, added ext-b
Former-commit-id: f8f324ea45e12608017c9a09c4a8994d341d91a1
Former-commit-id: 37fff79ddb4eec7bd5f3006ff0db1e1e3abd3653
2017-02-20 20:28:54 +09:00
Song Minjae
c48308efe1 font upd
Former-commit-id: bf42a690c7cd199d4f2ec00855213b83aecb144b
Former-commit-id: b992aac69b93c5d1632e96c4985cf61a6419b6a8
2017-02-20 01:43:26 +09:00
Song Minjae
076c5ba1f1 terrain tex upd
Former-commit-id: 19fe7efbde3db7d5655c8470489da1c5a5a188ec
Former-commit-id: 94c984500c0f8ef3b323e953c91306b525bd4623
2017-02-20 01:41:37 +09:00
Song Minjae
d7576ce844 New RNG for the game and Joise
Former-commit-id: 4a5b7f7ef6546d04be106d881e7d3f9dd6dc1b57
Former-commit-id: 90c15fa64cde39e33206ff7be645db9bceda1161
2017-02-20 01:41:01 +09:00
Song Minjae
1c0b969078 resolving issue #12
Former-commit-id: eee32f1d3b74a431626888ab32166e0cad14f522
Former-commit-id: e58fecf50f193d695f7a7852117183486a12cc62
2017-02-14 23:25:18 +09:00
Song Minjae
5d7349386e ActorWithSprite: correct offsetting on X axis
Former-commit-id: 7c981241889cff139b3523d751e85885af04f867
Former-commit-id: 33b93c99c94813afa2a7ce272f59e7b28faf9da1
2017-02-14 18:56:55 +09:00
Song Minjae
3065d642b5 finalising fonts
Former-commit-id: e85038e433c9e451761a25ce93fa976b847c9e1e
Former-commit-id: 0f59fe3a1b5a174ff63f5a79f11007f0e9d4a204
2017-02-14 18:51:55 +09:00
Song Minjae
d028593842 unhelpful git comment about the font
Former-commit-id: 272cb1b56834c4796d4db9c9ba3d5ead69084513
Former-commit-id: 0395adeefc72aa618d5a422c99db2932a05fe2c4
2017-02-13 14:13:40 +09:00
Song Minjae
5c4036e73f fixing mistakes
Former-commit-id: 2bb63bc0616d42937372781a5f7c779a2b1fb984
Former-commit-id: 80746e41232f5170b807ff54efa3b1e477ee9467
2017-02-13 02:29:39 +09:00
Song Minjae
a9b00bd909 more changes on greek
Former-commit-id: cfde7383844a9a183bf57edad3a772ae74f19af8
Former-commit-id: 178d7b4b788ffe43db64eb453543ea1e20d94acf
2017-02-12 16:45:03 +09:00
Song Minjae
add2be7109 new greek and more tweaks
Former-commit-id: 0c480dd7ce173a37f2f48b5b5d711c2641cbda00
Former-commit-id: 18492d01862bdeecb9c0eba825a3b25da76211b0
2017-02-12 04:12:26 +09:00
Song Minjae
226ae77ab4 cyrillic
Former-commit-id: b5b4c8495b387dbc6516829f3ddf0124f87d8500
Former-commit-id: 2c78b2fb6112199bc7bf4d55b3df01da10f14958
2017-02-11 23:57:42 +09:00
Song Minjae
5799cc39ce Basic Latin, Ext-A
Former-commit-id: 82df422b6a9b9e9c0fba0d11762cbdf2ca5b6f40
Former-commit-id: ff29dc32eb21b9626c78eb53518f5eff12439832
2017-02-11 23:22:35 +09:00
Song Minjae
afe197caf7 newfontsystem branch init commit
Former-commit-id: 5f03cdbec6058f90ef1354db5ee1c6dac9755feb
Former-commit-id: f132b6c4e1a51146fb7522686e24008640e88c45
2017-02-11 16:45:47 +09:00
Minjae Song
cc01ff62e6 citation needed
Former-commit-id: 92b35f459de0ce84064bc44a2ff54be07f06e711
Former-commit-id: 682ed520288e1144c15ac998d7a1b53971f7482d
2017-02-09 16:45:28 +00:00
Song Minjae
bd58c9e40b video card wip for virtual computer
Former-commit-id: 3c71eb0e8614e92e63fd3b29906a3cfd311c916f
Former-commit-id: 3472d6eb7d03a29bfd859e9207f76aeb23cef89b
2017-02-09 22:18:27 +09:00
Song Minjae
9ddf0dee63 data format docs
Former-commit-id: 5da80ac39d23d518bec0ed4e838fd0a4ae19bd11
Former-commit-id: f7ec7a4cd2c1d7a795aa19352065ee1ea1550fe4
2017-02-07 04:50:26 +09:00
Song Minjae
ad68309bc5 reading text from JInputField to support multilingual input
Former-commit-id: 4dc1228ba000f88d3af29569aa3954cb8acc4d90
Former-commit-id: 7fd7f8bd4f35e3be30cd9fa0da96684a48eedad3
2017-02-05 22:04:33 +09:00
Song Minjae
0a2bf64bff HumanoidNPC: explicit initialiser call no longer required
Former-commit-id: ecc822302182bc55f9a11ede39f74bfaf8fe6c87
Former-commit-id: 92f49eb574cb4f7bbf93dae8bf0ff32fa33a74ae
2017-02-05 03:05:18 +09:00
Song Minjae
e66304bea0 assets update
Former-commit-id: 2988c67408159e5b17dd40a10b3eca4ea187d10f
Former-commit-id: b255a9c812f71f13d17922e11257afde59648ada
2017-02-04 22:55:55 +09:00
Song Minjae
8e7b61ea0c Combined ItemProp to InventoryItem and introduced Material
Former-commit-id: d73882505cb26a99a5cc70ef5dc2b7e2d087823c
Former-commit-id: cf061fd2edb6fbe765ac812507cb5b0d7b77ee7b
2017-02-04 22:55:06 +09:00
Song Minjae
bb33d9e381 Actually utilising ActorAI interface to support AIs written in Kotlin as well as in Lua
Former-commit-id: 53901f5a5d53b33c4254091ec507be82289d57fd
Former-commit-id: 86ce8d2a646a1564ee5e33ef07c5affb338c028e
2017-02-04 22:53:36 +09:00
Song Minjae
65dec9661c killactor command
Former-commit-id: 9f5b3014c3023988e3d86317f8684d8fc7b714c5
Former-commit-id: 637d39819470a6b8c9d88c9805e49ef7cd4f5fb0
2017-01-31 19:07:06 +09:00
Song Minjae
2c9906888b bringing other memory info back
Former-commit-id: a189dc26e906a6cfd85ca68b4db849426c48ce52
Former-commit-id: 267e95f7d52c126b5d3787358477fc29fb50ad8e
2017-01-31 01:10:18 +09:00
Song Minjae
2f7eaea6b8 Merge branch 'newworldgen'
# Conflicts:
#	.idea/workspace.xml
#	src/net/torvald/terrarum/gameactors/Actor.kt


Former-commit-id: 533aeed3cd26565478a3b8c602c9e9aa7e15b43f
Former-commit-id: e7e851ed9734b47cc05144df1c6187ea50f7ecab
2017-01-31 01:05:38 +09:00
Song Minjae
abad2eb1a6 somehow fixed a phys bug where heavier objects accelerate more by gravity
Former-commit-id: 5a39d6495c861f9abe32b09db4bba8f26667de95
Former-commit-id: f9b8307b6371d553174f268f812a2edc71324a34
2017-01-31 01:01:51 +09:00
Song Minjae
12b04fabdf caves and stuff
Former-commit-id: 248077312d8561ad01819a43a4c4a5205c122ff4
Former-commit-id: f4dc915a66bd26338376b9d6008f136fb36b3060
2017-01-30 22:39:34 +09:00
Song Minjae
dbdee14481 new terrain gen
Former-commit-id: ef5db466ae4170c6054df806bc4018ed223fc87f
Former-commit-id: 1ea0525c992dd72532589bed963ea2f0804a0a2c
2017-01-30 03:57:03 +09:00
Song Minjae
172e5752ca more renaming things
Former-commit-id: 80e29fc17e431e350d8d4860273ec42bc4ad67df
Former-commit-id: d70546a097d66ade94de93b4be157b7c9637e98f
2017-01-29 20:48:55 +09:00
Song Minjae
c60a967050 more world settings
Former-commit-id: 5b9f7717ed2a4ad2f054e8db75b404b5c974539b
Former-commit-id: bc5d18446028a734a3a9707c928f069bcd1d5a7f
2017-01-29 02:04:19 +09:00
Song Minjae
361f322d78 just updating things so that I can have a backup point...
Former-commit-id: 0a5a6d7f68ee1a96562532572c8d45fe102d3c25
Former-commit-id: a1a78f61f2fe2a8707e47633caa6cd67a829b35e
2017-01-26 16:58:06 +09:00
Song Minjae
8b111ef262 not going to be easy; just renaming and changing things
Former-commit-id: 5cb93ffbd1b545e4a346fa3edc6bb874ec5b508e
Former-commit-id: 194e2ea1e057415bbc2a516346dc1d8d216d64cb
2017-01-26 16:57:16 +09:00
Song Minjae
df5f4771a1 more update
Former-commit-id: f64d9a30057d587ef0410ae692800795c29ccdb9
Former-commit-id: 8359b51c881035b3ef822bae1ca2c82e0cd83e93
2017-01-26 01:30:06 +09:00
Song Minjae
2d34db3022 adding/removing actors in game won't go wrong now (perhaps...)
Former-commit-id: c66db4b652e2fae34e66200aca4b101c16bab5d9
Former-commit-id: 5bafa85cabf7ead6db5f48475164d0694f66f15d
2017-01-26 01:29:17 +09:00
Song Minjae
5a76b1cc13 space saving by converting tga back to png on large matte images
Former-commit-id: 8f3289355692b3e73d383522ce037e1233651efc
Former-commit-id: 3710b500b5184c500eb67f44ff0373b7cf00012d
2017-01-25 17:54:05 +09:00
Song Minjae
9aab3d3664 fixed bad light calc from 1b83e7deb7 [formerly d900c0733a6d1dcbd9aaed8e9f7f1671c3866624] [formerly 5611e2d89f4601e57d014c45f0479600778217f6]
Former-commit-id: 7906df081a965ba70224fce4890ec3e067ea1636
Former-commit-id: f63552ac04de18ebc4b3283b87cf803eca5ae347
2017-01-25 17:53:06 +09:00
Song Minjae
c5b452f779 removed red tinge on t=52100+
Former-commit-id: 34c03b14a4103bf64c88fdceb82c5ed13e82858d
Former-commit-id: ad8f050b4906c5582ae895bb9e5032b1e180394c
2017-01-24 14:20:38 +09:00
Song Minjae
95ea8d9b7c more like real MT-32
Former-commit-id: c6af2f7dbf8745488e508127c13a0f5ef3132be9
Former-commit-id: 1df1334644896d4790b42cf2448ef4e902f34bca
2017-01-24 03:36:05 +09:00
Song Minjae
f02c931715 actor draw issue fixed for real this time
Former-commit-id: 16d315a8df6477748bdb78b567ee1c97ffc2f455
Former-commit-id: 96c8efc59b69c78ae7c861ebd371fc315d3be058
2017-01-24 03:35:37 +09:00
Song Minjae
225f2f2235 VT redraw on request
Former-commit-id: 3ada71215d9291760704a982cc3952061dbc7afe
Former-commit-id: ca1495e668e88bc7214429472ad918621a650189
2017-01-24 00:50:12 +09:00
Song Minjae
1b83e7deb7 tiles with light level <= 1 will be rendered as black square, phys support for non-self-moving bodies (e.g. balls)
Former-commit-id: 5611e2d89f4601e57d014c45f0479600778217f6
Former-commit-id: d900c0733a6d1dcbd9aaed8e9f7f1671c3866624
2017-01-23 19:06:12 +09:00
Song Minjae
e951a6285e replaced quick and dirty fix into proper fix
Former-commit-id: ee305ad1bb84716a0bb8c17e9aa873eafb0baa6e
Former-commit-id: a9d7e6495bbfdea42b253070f66a0978463a8814
2017-01-23 19:04:42 +09:00
Song Minjae
0717b883b4 README update
Former-commit-id: 425ceb7e5fec5ce0cbcc28bd657e7c6360d9d47f
Former-commit-id: e2e348bc8425861f4263ffba483f04a2837c5c51
2017-01-23 19:03:08 +09:00
Song Minjae
6c94dc9632 iterative circular array for slightly better performance (test might be wrong tho)
Former-commit-id: 95c4e576efca6e12af68c184ed5effa4b115d8c4
Former-commit-id: bbd74994f90f582d0643ebbbca58f40d097e2f82
2017-01-22 14:20:24 +09:00
Song Minjae
54b52b1b6e more efficient particles
Former-commit-id: 56dad88ecd715ad6e357e33b903851a47a358dcd
Former-commit-id: c85c0b759a447c0461563d98156f59879fa95db2
2017-01-22 04:13:45 +09:00
Song Minjae
4acc797fee actorwithbody splitted in favour of new particle type
Former-commit-id: 121bd069d0a9eeef60f5ecb085a11a93c4b4a84d
Former-commit-id: 539b4b6916e808c01298190cf347e928f61fe62e
2017-01-21 16:52:16 +09:00
Song Minjae
5db3aadaf4 ai won't jump if it sees tall ledge that can't jump over
Former-commit-id: c74b12206547838c72301d3d2223a98c9098687d
Former-commit-id: a1f7c29cc42758f92c202d20d28e47820546c900
2017-01-20 01:56:29 +09:00
Song Minjae
02f38eab3c actor jump slowdown in water
Former-commit-id: 45fdd22f084ec4e9a9017bd617393c9e6acd56e8
Former-commit-id: bf1bbc9210bd2232381116312447724976aaf1f8
2017-01-19 13:43:38 +09:00
Song Minjae
b08060bffc fixme: fixed
Former-commit-id: a8beadca625c0714d687784c95a39e1ddbf7559c
Former-commit-id: 936a978f2d50e313611f3417f0e5a7cee716896e
2017-01-19 04:10:31 +09:00
Song Minjae
fdecb83ebf correct actor walk velo/accel control even when submerged; new tileprop Viscosity
Former-commit-id: 164238c9e5e0b33f9291cb09d804e2ce2f2e1721
Former-commit-id: ec07a206dd980b9ee73530f0beab876393030656
2017-01-19 04:05:57 +09:00
Song Minjae
e139fb891f proper impl of walk friction control (WIP submerged case)
Former-commit-id: cf8c11dee3eed491893bbfa61167e47863524366
Former-commit-id: 30a8fbedcc05cb6aee5f131708152d4db1fd9415
2017-01-19 03:25:22 +09:00
Song Minjae
efbb654b45 skybox
Former-commit-id: 839fda074d5cf6a3fe1a0a16e10da67908bc4f03
Former-commit-id: 4ed8324110eafc434fd00f09fe48f3858ad5fd3a
2017-01-18 21:24:59 +09:00
Song Minjae
ea4c4bdb2b new sunlight and skybox colouring collected from real world measurements (reports TBA)
Former-commit-id: 6abaa1e16d0fd7a71f95bd0265809aad9e34a425
Former-commit-id: bb871bd87072f27b9cc29594f9eed615351df5f8
2017-01-17 23:42:25 +09:00
Song Minjae
e9c7ef4930 PNG -> TGA
Former-commit-id: 394d3af24b5f1a125c40197a09f47867cc6fc566
Former-commit-id: 5428b1d2d7370b5a912851d5f5aa9f6b036f64f5
2017-01-16 18:24:19 +09:00
Song Minjae
1f1e2f6899 colorutil update, some code cleanup
Former-commit-id: 47b13e7e899dc9151f7a1ae71977ed8d4b403345
Former-commit-id: 136f9c787b76aec75d76535891cf264170bd3b04
2017-01-15 20:51:42 +09:00
Song Minjae
e7276513d7 new hair finished
Former-commit-id: bed636531552e3c6e6f2abf80d1e2550f22075d2
Former-commit-id: ced0e4dc213a6f711b7f450458ec745fff5d91e1
2017-01-14 16:00:43 +09:00
Song Minjae
8ae07c8d20 working tapestry decoder and fixture object
Former-commit-id: dd61b61e6061cfb3dc2ad9d9f65fd1b272475718
Former-commit-id: 7acc72a0e59203c0ea56c355eadaeed1474e3ac1
2017-01-14 16:00:07 +09:00
Song Minjae
bac246cd9a corrected candlelight colour (using Yxy instead of Lab)
Former-commit-id: 7d784a840c2339a49f1dfc5a739bf8ce306ec2e4
Former-commit-id: d3b18605dd51ceb779841835c88802b8cf3afaa4
2017-01-13 12:33:02 +09:00
Song Minjae
ec73d2ea1e Parallel: wait for all ths to die
Former-commit-id: d95a5fc60c424cb1722d70ced610a81237ddb681
Former-commit-id: 64d1177a164a2a53e9beabe634a6f5997cfa8d7b
2017-01-12 21:05:23 +09:00
Song Minjae
213831ad31 StateBlurTest from blur test (gah)
Former-commit-id: ea7d2b3cd9c5f072846aea102b43f09226f73a57
Former-commit-id: 3d716699cbf6ed344c5e7b2ab5a2f8b121f828a8
2017-01-12 21:04:29 +09:00
Song Minjae
b52d6f89f7 new hair (wip?)
Former-commit-id: 31cd1b402be82b34487b92c3fd3f05da15d5e2f6
Former-commit-id: 826df0dfc7e8a885ba681dc9ba0c05fa610eb44f
2017-01-12 21:03:44 +09:00
Song Minjae
dfb769c982 test image from blur test
Former-commit-id: 6f4ebae0f8fe170567082f1e9973763d5c0e3654
Former-commit-id: 48712cd1144ab3718e568945b9dd39d8db710708
2017-01-12 21:03:31 +09:00
Song Minjae
9e9bca3442 now torch colour from colourimeter mesurement
Former-commit-id: 8bd0eb9ef67e2a5c259137ea779b857daac792bc
Former-commit-id: 5aa153a8cd3e94fc663d071f033fe3d5cdafed1b
2017-01-12 21:02:59 +09:00
Song Minjae
b1686ec5ab blur test
Former-commit-id: 33120239e532c01aedbc409dd224fdf3e6b58ee1
Former-commit-id: 8dd650ee0704c9dfbf83dc81b4c3c7b53af52647
2017-01-12 21:01:58 +09:00
Song Minjae
d076676a2f sample code for software rendering
Former-commit-id: a9d5b8e49305af4a406a7842469086438494b12c
Former-commit-id: 372ef77b6562942fd74128dffda22bf34a5df7fa
2017-01-12 02:27:06 +09:00
Song Minjae
1e89ddfec7 added endianness
Former-commit-id: c3ec99b381816d0a4afb245a1dc4623db2f59f88
Former-commit-id: 19d8e083f74f0281ae91df8bf89f046cb7b78d43
2017-01-10 00:02:19 +09:00
Song Minjae
1c5ee6f32c data formats doc update
Former-commit-id: b1e1da4b568e9d282874e73e867a6449560337b4
Former-commit-id: df35e8acb0b981122402736735f69009820af960
2017-01-09 23:48:57 +09:00
Song Minjae
083197f4cb updated pal on TextTerminal to match the game's 16 pal
Former-commit-id: f96c58b1a29e71d9877c824631dd252956dbc321
Former-commit-id: 1224ec4e300d44fa05a7aef39eedbaea0cad4f56
2017-01-09 23:28:21 +09:00
Song Minjae
135f8f86e8 fixed discrepancy between 64- and 16-colour palettes
Former-commit-id: 71fdc236220f77fd3f3eb7fef9bf9c75d1a10996
Former-commit-id: d3ffbfa92e18fdd36e07607faddaadb8faa5739d
2017-01-09 23:25:57 +09:00
Song Minjae
f7d055806b sprites!
Former-commit-id: 099c7d1b27988830f6c2d876684d4675078170e9
Former-commit-id: eea5b0ff2a04142e1a19505a98c252a6ca5aa666
2017-01-09 23:22:31 +09:00
Song Minjae
5944a215df README update
Former-commit-id: 79ea4bbfe747c18b4401e037aa350c23a9dc7fa2
Former-commit-id: 4feab90a769c9a8a52acc3a0b7223813c193756a
2017-01-09 23:21:58 +09:00
Song Minjae
0f8f64cddf wall now uses terrain tileset
Former-commit-id: 13b5389d905c1c302ec4e7991fbfdd06ed333814
Former-commit-id: 1416055d9aa0755147c461512f9b638e25df908e
2017-01-09 22:56:15 +09:00
Song Minjae
0b7485fd57 less saturated red sands
Former-commit-id: fc87746519435da0e77fe4381190a9a9e52ac3cb
Former-commit-id: 132451d755ed806850af59c9f660c21a88666142
2017-01-09 19:46:42 +09:00
Song Minjae
e499c24c0d AI auto jump test
Former-commit-id: f48972fa48a526e8f697a47cde90b26240f549a3
Former-commit-id: c45dcbcae2f7d85c801ed87c049c403609a6d6d0
2017-01-07 00:37:46 +09:00
Song Minjae
aab8da6ac7 "heavier" jump control, closing issue #10
Former-commit-id: 5329d496cff482083243e2002472496347c624f3
Former-commit-id: 99dd9f51f4790444ea950368453f74aef8441d44
2017-01-06 03:59:09 +09:00
Song Minjae
ea73ff3153 16/64 tapestry palettes, sample tapestry image (theworld)
Former-commit-id: 74858cf3203e1da643e50d57b277d18d4a516735
Former-commit-id: 92a626c5a2e340d0d6995d14c7724e7de58bc1e6
2017-01-06 00:02:49 +09:00
Song Minjae
4b54fb3b67 lang update
Former-commit-id: 89a4f1725dbe386aede2954d88c3465ffaa8dba2
Former-commit-id: 7ba3fee3c2ca48dfabd879c9e19c0b3fb8deadf0
2017-01-06 00:00:41 +09:00
Song Minjae
4d8ff11ece issue #9
Former-commit-id: 8e4257f62c97c5b8defd9d722624fb1448e0209a
Former-commit-id: 01e47cdbe82ab0832695f6d6b0cbd6cf5ddf1458
2017-01-04 23:04:27 +09:00
Song Minjae
3eb1fe98cd sprite updates
Former-commit-id: a52e024a231e54e7e837b7c717606f4f0d187758
Former-commit-id: fcdb5a9e12802c9671bea24481c94a8876dfd418
2017-01-04 22:46:51 +09:00
Song Minjae
df8c0813c3 fuck
Former-commit-id: c48f789e138b5d9f78422a5ec93f4f973225fe2f
Former-commit-id: 9843d2c1482d6bd38c65bc2036696dce5901dd91
2017-01-02 14:32:23 +09:00
Song Minjae
ae97310bf7 circular (octagon actually) propagation of light
Former-commit-id: 1e67a3284ea298a0d8f27309d9d8ca800a8525c8
Former-commit-id: a5067df80d1053ceec6d78b6fda6cf0afa3c286c
2017-01-02 14:08:24 +09:00
Song Minjae
0c2cb48135 ThreadPool renamed to PhreadParallel, tweaks on font
Former-commit-id: 52c6d53764449cecd9ab1aa96b23810e5e406cc2
Former-commit-id: cf8ff86f3c62851c8be2370774b426e09410ad6f
2017-01-01 15:06:19 +09:00
Song Minjae
f5f0fcb077 Copyright update 2017
Former-commit-id: 8c662c7cb637ae4565e95e661b0e627d9bfd7e5a
Former-commit-id: 4a5279b47f7c8f4fadb62ee6843b3848f803f433
2017-01-01 00:04:43 +09:00
Song Minjae
d3080ffb78 added sources for Slick
Former-commit-id: 1647fa32ef6894bd7db44f741f07c2f4dcdf9054
Former-commit-id: 0e5810dcfbe1fd59b13e7cabe9f1e93c5542da2d
2016-12-30 23:29:12 +09:00
Song Minjae
d1f01a203d getActorByID now searches for inactive actors
Former-commit-id: 1828e2819bc5575d590e51b616415c91645cad56
Former-commit-id: 5b470d524401135358f9926587651ae932d4d5e9
2016-12-30 23:28:44 +09:00
Song Minjae
da06e0fa93 mouse buttons now configurable
Former-commit-id: 789b34a0a80553afc7fa7f563ffa33350310ac21
Former-commit-id: 8b3687ee15aa53fb6decb8480ebdf6897b5cce61
2016-12-30 23:28:06 +09:00
Song Minjae
0b024dcf70 issue #7 implemented
Former-commit-id: e63de56e81e19c842c519c77019b9750d751851e
Former-commit-id: 6b018d6ac3bb471d5997c1eece4485f967f82ded
2016-12-30 18:07:36 +09:00
Song Minjae
ac05b5edf1 separated Camera from TileDrawer (was MapCamera)
Former-commit-id: b2fe7716722634b03f3750fade420d26022500f9
Former-commit-id: 521826d176c6902007646e6b9b9c7b5d4f3468cf
2016-12-30 02:47:15 +09:00
Song Minjae
9a8090038e improved ActorValueTracker: can now change actor currently tracking
Former-commit-id: 71daf44209f700b8702f2b73294583edefda49c9
Former-commit-id: 3ab76c6509086490ba6ea9501b1ba08e444a7e53
2016-12-30 02:22:58 +09:00
Song Minjae
0e60380718 skybox will now scaled properly according to screen zoom
Former-commit-id: 619bfcad7bd14313d8f94c291350ddb5bb9684b4
Former-commit-id: c42d41c7e32a2c44cffc7d1450fa550d7d5c32f7
2016-12-30 02:22:10 +09:00
Song Minjae
71294a6bd1 64 colour palette test
Former-commit-id: 44420079369d6a7ea4752d390608ca2174594a99
Former-commit-id: 84c6fcd4f7deb0e8648e0e8a8b6cf578ff872cb4
2016-12-29 21:35:46 +09:00
Song Minjae
f4332afd3c better character shading
Former-commit-id: 8c10062edbb66c1a184f24067873deaf59d0447f
Former-commit-id: 4193fcfa61d3d14e82622f6bf6849cd75377c4ee
2016-12-29 21:35:28 +09:00
Song Minjae
f7365ea47b more AI, divided ACCELBUFF and ACCELMULT_MOVEMENT
Former-commit-id: f3b4c390c363612dcc58c3d50cb7a47ba7452567
Former-commit-id: 95f71db97104cf55af7aba8e0289eb89efc078a4
2016-12-29 21:10:42 +09:00
Song Minjae
63bc018550 new debugging tool ActorsList
Former-commit-id: 51109b6766a1ebd92613055064e3fa8bd69c37fc
Former-commit-id: d5fc3d52b208d3cbbdcec47758cd73aef3240dc8
2016-12-29 21:09:44 +09:00
Song Minjae
bc36cc946d highest ID of dynamicItem reduced to 1048575
Former-commit-id: b1e36d020a57aac497eff5d3db7142940f590fe4
Former-commit-id: c437e8447ba2a58fdc7dfd05f1ac80284f845702
2016-12-29 20:45:42 +09:00
Song Minjae
767802e75f new debugging tool ActorValueTracker
Former-commit-id: f30d2a859521082609425722edb91d3c366fbc58
Former-commit-id: 1486ad6b0a85415124c87522f07c012d4a335567
2016-12-29 20:31:05 +09:00
Song Minjae
a6bbf256f0 Issue #6 resolved
Former-commit-id: 643ca0b3757f329107a7677fe3bf5f43ffac7639
Former-commit-id: caa5582abb797485e90b8c3e47a6307b177ff456
2016-12-28 18:17:48 +09:00
Song Minjae
e253641471 ActorAI's walk speed can be adjusted now
Former-commit-id: 556677bddf9cc29358471c81f7febc40e8e6cc7d
Former-commit-id: 35b994001dd034e166ba6c6709cb92fd5dca073e
2016-12-28 00:17:52 +09:00
Song Minjae
2e2e4a0281 buffed Teleport command
Former-commit-id: adc06bc2b24f9ac3ef4dc48756a8e3aa006f620f
Former-commit-id: be364044a1a790da69a4a5012f8d6b832f16abd9
2016-12-27 22:43:30 +09:00
Song Minjae
433612ebdb random roam around AI
Former-commit-id: 5edf7e848f519d440ecb915b7d6e27e9ead8dd6f
Former-commit-id: e89bfcd8b443c77e88d5ec7090f836b77ae5f02b
2016-12-27 22:43:15 +09:00
Song Minjae
f06c6f7502 Joise updated to 1.0.2
Former-commit-id: 8fdfe95a5a2be895b55785b1cfc57ae16e10100a
Former-commit-id: 52248306c1b226bca423415d76b0f929e285103e
2016-12-27 22:08:33 +09:00
Song Minjae
81e9539381 AI script is now persistent (you can keep variables)
Former-commit-id: 20ca0a8e80f0712c4a3d6a21ee9ae5f15c46c406
Former-commit-id: 2f1cfc2c9b60981053e928a3e7b07117d3b18919
2016-12-27 21:56:34 +09:00
Song Minjae
e88124f065 "mult" renamed to "buff" to prevent confusion with pre-calculated "mult" (character variants)
Former-commit-id: 104d0a57bc67491427d823c2f91688c85e8841c5
Former-commit-id: 5a835c7a759006df25d8783f4f97b568a1517104
2016-12-27 21:56:03 +09:00
Song Minjae
35a723ee0f actor AI from Lua script
Former-commit-id: 184160efc59c4f846f1cc154fe3e60d21b301ee3
Former-commit-id: 4e228542975ea52945a597b7ca1bc06b407c3be7
2016-12-26 23:55:54 +09:00
Song Minjae
d0109a88af remove hard-drawn shadow from images, they're now drawn by the software
Former-commit-id: fe09a6ba3dd3b2f9e53874c854210f4f73bac160
Former-commit-id: f2b1571609c36cf4e177488ed2978df671ffa80a
2016-12-26 12:50:10 +09:00
Song Minjae
5e2cb526ee cp949 -> cp437 (wrong name)
Former-commit-id: 07e737dfa438bac2b42271a35f3e1d3aa0e9f041
Former-commit-id: 158c2c7c6dbd324f55727eed057c21bdb2cf8908
2016-12-26 12:36:02 +09:00
Song Minjae
8e6fc55f46 javadoc for LWJGL
Former-commit-id: c9c053368cf5b7bbaf7aa2aa1a986611c3dad698
Former-commit-id: a9835ae3c2b484bcb5b1ee6fa57504c406c61490
2016-12-26 12:00:28 +09:00
Song Minjae
ae45cf32a7 new blending function for SpriteGlow, which now uses no alpha channel; reduced the number of framebuffer used to draw a world from 2 to 1.
Former-commit-id: 823182690f0c0dfc73a46474e194cbf6470fe5ad
Former-commit-id: 9c4e041ef2799841d905c2b6dc32d578d9c082a3
2016-12-25 16:33:56 +09:00
Song Minjae
a9a2b93341 visible actors are defaulted to Visible, SpriteAnimations now has "parent" actors and uses its Visible property
Former-commit-id: 0e240de4ca38a59724f364df4624c8dc79c0112d
Former-commit-id: b017b24ab7591ea2fd2518308bd5656597c14f47
2016-12-23 20:49:29 +09:00
Song Minjae
639f1c158e multithreading now should divide jobs evenly without any job missing out
Former-commit-id: 0511065489b0813fef82361b74369040fc2ad887
Former-commit-id: fe23e50fa33d6cf0c5118916bb29669d69bed5b9
2016-12-23 00:38:21 +09:00
Song Minjae
1362f6921e resolving issue #5
Former-commit-id: 12d11b683a242172a7c3ec831efb7d65f552951f
Former-commit-id: fd276318b77ac5ef9b1963e84fb33380ddbae45c
2016-12-22 22:20:49 +09:00
Song Minjae
611b78ffa5 texture update
Former-commit-id: 8b056329db1403b163e635e22141e0d021580805
Former-commit-id: c9e0605ba6021ac4889f199799268df61517a794
2016-12-22 13:21:03 +09:00
Song Minjae
c1e7b3537d noise texture generator: multithreded
Former-commit-id: 4d9539a53aa058eff1fe47f6fce95528a44dff40
Former-commit-id: a0301f167412d1c67ca0cc6956d9e7683e82efaf
2016-12-22 13:19:40 +09:00
Song Minjae
72e348b5e5 messing around w/ GL blend equations, think got something working...
Former-commit-id: 6c9bb1a9d49c9ea0a5f8a68f4b2d05b0d8390b96
Former-commit-id: 7947f3b32dbe0d17a7bd206b3fd8850fdf3ea9c1
2016-12-22 03:05:13 +09:00
Song Minjae
e76f8840ba updating TODO tags
Former-commit-id: f0ce830cc72911b9c1974a394581003726dfc4e1
Former-commit-id: dfc012568d8362de583b7efa95fd79e35a22b83a
2016-12-22 02:20:23 +09:00
Song Minjae
656aa07e8b new dirt tex
Former-commit-id: 963c5f0ec46eeb950b56a357df3cfe352c9d60c1
Former-commit-id: 38e1c52cbf3001013399d015c3bca678f77745dc
2016-12-22 02:19:57 +09:00
Song Minjae
4548a2fe3d noise pattern generator (loops x and y)
Former-commit-id: 548612468f454aaf037544e5c3a86deb4f30fc63
Former-commit-id: 1026b3d7420fd5a14117e4c295009dc5831862ad
2016-12-22 02:02:13 +09:00
Song Minjae
70d85398ce cavegen now loops (fine-tune required)
Former-commit-id: 5a59323f39ca1cfcfcc0c89c0d7f71f0e2d92762
Former-commit-id: f7d35ae69fcb49af0d1342624eb9f3b0027db398
2016-12-21 01:06:05 +09:00
Song Minjae
dd60448cae seamlessly looped terrain generation WIP (resolving issue #4)
Former-commit-id: cb2110fc1574ddfbff9ea6bd21596945c5895e13
Former-commit-id: 4f17d4d0bb1b1ed1ee61872651abfeb046de8b9c
2016-12-20 21:01:22 +09:00
Song Minjae
8c8a0cbb23 modified light penetration to penetrate less
Former-commit-id: 43b6fa9456ab58d6c59b738c718d0dcbe27799d1
Former-commit-id: ac3da567accddaea19ede6f7fcf59aff4cc10c9a
2016-12-20 14:37:29 +09:00
Song Minjae
e0665db121 fixed bug in commandinterpreter where space(s) behind semicolon, without secondary command (e.g. "nc; ") caused crash
Former-commit-id: 6b7afd141964ecefaae4f8952551859ca6c25c9d
Former-commit-id: dd21356206c45bde1c9f17fc604755d372189d7e
2016-12-20 14:35:49 +09:00
Song Minjae
aeb377a857 more sprite glow (test)
Former-commit-id: 857997e5a00ccbb3f3d2ca7be5065f4f66487a4f
Former-commit-id: 232ae9161a43762730fad1e77003b4033d72bb2a
2016-12-19 00:56:59 +09:00
Song Minjae
e501b356cd colourmaps for virtualcomputers, adding 64-col
Former-commit-id: 7db2015263d5a48eda8f96e215352d62f6e23602
Former-commit-id: c0df19ce699cc19c72e0a67133dba129cd98f9dd
2016-12-19 00:15:54 +09:00
Song Minjae
01def757e9 minor edits
Former-commit-id: 727c880ff913f72cf17f89155c35966f38224c07
Former-commit-id: 65d4bf1045440de7d23efd3ef43176e1cddfa1e4
2016-12-18 23:21:51 +09:00
Song Minjae
ea1e90b035 working platform rendering
Former-commit-id: ec50eeb7f6fbf5799d197a88b036f60e51693336
Former-commit-id: 4172ffc733b8df89bc839b59476c57ac6bf3572d
2016-12-18 16:18:41 +09:00
Song Minjae
0db1130b41 working zoom out
Former-commit-id: a53ed485163ef36cf5b59941eb657761cde166d5
Former-commit-id: a2b575150e128ceb7894d9ba4eb0db127d071bcb
2016-12-18 03:09:20 +09:00
Song Minjae
1ad9f2611d working ZOOM IN (zoom out still broken)
Former-commit-id: 40d72f2ebfcaffe40e1875a7a76d05ff06ad0323
Former-commit-id: c5fae728ab10693f0fb7ae1ece109ad88cbedd0c
2016-12-18 02:41:23 +09:00
Song Minjae
9c7e7ed266 fixed roundworld anormaly, camera zoom still broken
Former-commit-id: ec08c302349c962992a111e820b60eb0a46d7c2e
Former-commit-id: 5bcf3baf2ec194c431b009aa2839ff11caa4d82d
2016-12-18 01:39:03 +09:00
Song Minjae
56530a6041 code cleanup, shortening things
Former-commit-id: d1c81cf3207fff4dd311e9b6c3beb04c194aebc5
Former-commit-id: 26f5042ba41cd577e681a22465435945434c864b
2016-12-17 14:16:42 +09:00
Song Minjae
af8516be68 cleaning up code, adaptive CCD displacement tick
Former-commit-id: dff86e81e174f3cb12a3b5fde54d67104f84f146
Former-commit-id: 349213aafe52ddbd52ed7b58d42a81237a84ee3d
2016-12-17 11:38:43 +09:00
Song Minjae
9df31df54f no more gradle
Former-commit-id: 0f6743976fa4337a40e60eb18b7b3e3a91ca0a7d
Former-commit-id: e8749adce56c47c03a86249edc2199884b1ab148
2016-12-17 00:59:54 +09:00
Song Minjae
b66b02ceeb forEach codes for occupying and feet tiles
Former-commit-id: f8a719b262420d673b3672f7e21764a0dbc754b9
Former-commit-id: e09af27d09cb7ab1dbe08637b4a8690ab612466c
2016-12-17 00:31:19 +09:00
Song Minjae
7a7fac776a tilewiseHitbox takes nextHitbox
Former-commit-id: c6bc5c935f4a79687eecf14ef321c16066607e35
Former-commit-id: 72a0f51b7c676f5206848ed56cc62b1f7fe94e52
2016-12-17 00:30:47 +09:00
Song Minjae
d179d090c5 tiles won't place to the position where occupied by actors
Former-commit-id: 745558470933aea8d1f03da30ca5042a82c69eac
Former-commit-id: 09e741f5eaec3eb18b8a76c82fcc2aa62378e82e
2016-12-16 23:57:46 +09:00
Song Minjae
174a0f9101 added sugar to the Hitbox: Can use both (x1, y1, x2, y2) and (x1, y1, w, h)
Former-commit-id: d8d62440493bf1ffe4f15420f85d0973c9de79ed
Former-commit-id: c66228059d46a1258257c2c0ceb64da99ecd2871
2016-12-16 23:57:08 +09:00
Song Minjae
fd7a629757 UML updates and an error correction
Former-commit-id: 2458f3e7485f766644ce7382552084889aea8b96
Former-commit-id: 8cc0ce08fcfd8f61b38152de95e484cad2034639
2016-12-16 23:11:40 +09:00
Song Minjae
a5ca82f2c7 get operator on Tile/ItemPropCodex
Former-commit-id: f6c4ecbad8c0ce2486524be70e68292d6aae799e
Former-commit-id: 9738a693eb55861d1292e59d8df2bec7f5603c40
2016-12-16 23:07:14 +09:00
Song Minjae
4552d7b7db Inventory now stores objects instead of item IDs
Former-commit-id: 6d7397fe82c986a3ac48ce86fe9fa75a354cf5d3
Former-commit-id: 46b759e0707fe2f7cb207e215708118034aff4f4
2016-12-16 23:02:21 +09:00
Song Minjae
fe994621c0 InventoryItem is now abstract class
Former-commit-id: b7d22a2cc169a89cbe82aae8b13277b1be747b94
Former-commit-id: dcbf2bf830046b97673a0d2bab65e53c4451966f
2016-12-16 23:01:17 +09:00
Song Minjae
5dc99f5612 equip item by body parts
Former-commit-id: 34294de21d16c03da98427edae3b3c6ed94088aa
Former-commit-id: b37fe27635b1643e72e8f714bfea6ce214006931
2016-12-16 18:56:13 +09:00
Song Minjae
1d1769a2c3 working proof-of-concept inventory system
Former-commit-id: 1be5d6d10d0a5c93bceaf12f15d2ee50602cb602
Former-commit-id: 44f25a27c3b5d196210f4efcc3fef4dec8e30ff7
2016-12-14 15:41:20 +09:00
Song Minjae
7078ecfed4 Echo().execute(message) is now just Echo(message)
Former-commit-id: 851e141fc91b170190d6027f42f59906dda0f31f
Former-commit-id: 03dbb9da1788e1c50e84ae33d95f76194ad9a08d
2016-12-14 12:40:53 +09:00
Song Minjae
1dd156d172 still WIP inventory impl, held item impl
Former-commit-id: 9468cfae21ff09c3dd30352a849910364e01d780
Former-commit-id: 50247ccebf3284f739877a1d6c6d8574449a9824
2016-12-14 00:28:42 +09:00
Song Minjae
22bb5d83e1 Object-ified console commands (singleton!)
Former-commit-id: d04fc939a659fc4a6b952d64894bd28edf97bc38
Former-commit-id: 6c20526f3bdda2d9d08dc156b3b0fe271e89bffb
2016-12-14 00:28:09 +09:00
Song Minjae
e1642c799c WIP inventory implementation
Former-commit-id: ce7d2125209c2c4f49b7d755b068ce72387f5e8f
Former-commit-id: f413b2699ee7448f3d3b70775ca7b679ade66475
2016-12-12 23:29:13 +09:00
Song Minjae
870c9b36ff youcankillmenow;)
Former-commit-id: 906db790ab715ecdb1b7b9df11c74bc188afceb0
Former-commit-id: c229422f3faeafe31c44870183fa753564b32fa7
2016-12-12 20:35:00 +09:00
975 changed files with 77199 additions and 14857 deletions

3
.gitattributes vendored
View File

@@ -3,3 +3,6 @@
*.tga filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.opus filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.kra filter=lfs diff=lfs merge=lfs -text

36
.gitignore vendored
View File

@@ -1,15 +1,45 @@
# Build-related
out/*
bin/*
build/*
.gradle/*
TerrarumBuild.jar
# Java native errors
hs_err_pid*
replay_pid*
# OS files
Thumbs.db
*.jar
.DS_Store
~$*
desktop.ini
.directory
*/.directory
# Resources that should not be tracked
assets/mods/basegame/demoworld
assets/mods/basegame/demoworld.gz
external_resource_packs
#assets/mods/basegame/demoworld.gz
external_resource_packs.zip
# IntelliJ
workspace.xml
# Temporary files
.tmp*
tmp_*
*.bak
## Microsoft Office
~$*
## Generic temp files in Linux
*~
## Vim temp files
*.swp
*.swo
# Eclipse MAT heap files
*.hprof
*.bin
*.index
*.threads
*_Leak_Suspects.zip

View File

@@ -5,7 +5,10 @@
<element id="directory" name="META-INF">
<element id="file-copy" path="$PROJECT_DIR$/src/META-INF/MANIFEST.MF" />
</element>
<element id="module-output" name="Terrarum_renewed" />
<element id="library" level="project" name="KotlinJavaRuntime" />
<element id="library" level="project" name="lib" />
<element id="module-output" name="ingamemodule_basegame" />
<element id="module-output" name="terrarum" />
</root>
</artifact>
</component>

5
.idea/compiler.xml generated
View File

@@ -4,10 +4,7 @@
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
</annotationProcessing>
<bytecodeTargetLevel target="10">
<module name="terrarum_main" target="11" />
<module name="terrarum_test" target="11" />
</bytecodeTargetLevel>
<bytecodeTargetLevel target="8" />
</component>
<component name="JavacSettings">
<option name="PREFER_TARGET_JDK_COMPILER" value="false" />

View File

@@ -0,0 +1,23 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="ArrayEquality" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="ConstantConditionIf" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="CsvValidation" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="ExplicitThis" enabled="false" level="INFORMATION" enabled_by_default="false" />
<inspection_tool class="KotlinDoubleNegation" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="NullChecksToSafeCall" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="RedundantCompanionReference" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="RedundantExplicitType" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="RedundantGetter" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="RedundantSetter" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="RedundantUnitExpression" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="RedundantUnitReturnType" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="RemoveCurlyBracesFromTemplate" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="RemoveEmptyPrimaryConstructor" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="RemoveEmptySecondaryConstructorBody" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
<inspection_tool class="RemoveRedundantBackticks" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="RemoveRedundantQualifierName" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="RemoveSingleExpressionStringTemplate" enabled="false" level="WARNING" enabled_by_default="false" />
</profile>
</component>

View File

@@ -4,6 +4,9 @@
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlin-test.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlinx-coroutines-core-1.0.1.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlinx-coroutines-io-jvm-0.1.1.jar!/" />
<root url="jar://$KOTLIN_BUNDLED$/lib/kotlinx-coroutines-jdk8-1.0.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>

View File

@@ -0,0 +1,53 @@
<component name="libraryTable">
<library name="com.badlogicgames.gdx:gdx-backend-lwjgl3:1.9.10" type="repository">
<properties maven-id="com.badlogicgames.gdx:gdx-backend-lwjgl3:1.9.10" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.9.10.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.2.1-natives-windows.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.2.1-natives-linux.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.2.1-natives-macos.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.2.1-natives-windows.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.2.1-natives-linux.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.2.1-natives-macos.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.2.1-natives-windows.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.2.1-natives-linux.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.2.1-natives-macos.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.2.1-natives-windows.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.2.1-natives-linux.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.2.1-natives-macos.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.2.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.2.1-natives-windows.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.2.1-natives-linux.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.2.1-natives-macos.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.9.10-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.2.1-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.2.1-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.2.1-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.2.1-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.2.1-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.9.10-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-3.2.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-glfw-3.2.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-jemalloc-3.2.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-opengl-3.2.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-openal-3.2.1-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -0,0 +1,41 @@
<component name="libraryTable">
<library name="com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.10" type="repository">
<properties maven-id="com.badlogicgames.gdx:gdx-backend-lwjgl:1.9.10" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl-1.9.10.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-2.9.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-platform-2.9.3-natives-windows.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-platform-2.9.3-natives-linux.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-platform-2.9.3-natives-osx.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jinput-2.0.5.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jutils-1.0.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jinput-platform-2.0.5-natives-linux.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jinput-platform-2.0.5-natives-windows.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jinput-platform-2.0.5-natives-osx.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl_util-2.9.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl-1.9.10-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-2.9.3-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jinput-2.0.5-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jutils-1.0.0-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl_util-2.9.3-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/gdx-backend-lwjgl-1.9.10-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl-2.9.3-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jinput-2.0.5-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jutils-1.0.0-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/lwjgl_util-2.9.3-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jlayer-1.0.1-gdx-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jorbis-0.0.17-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -0,0 +1,20 @@
<component name="libraryTable">
<library name="com.badlogicgames.gdx:gdx-controllers-desktop:1.9.10" type="repository">
<properties maven-id="com.badlogicgames.gdx:gdx-controllers-desktop:1.9.10" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-desktop-1.9.10.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-1.9.10.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-desktop-1.9.10-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-1.9.10-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-desktop-1.9.10-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-1.9.10-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -0,0 +1,18 @@
<component name="libraryTable">
<library name="com.badlogicgames.gdx:gdx-controllers-platform:1.9.10" type="repository">
<properties maven-id="com.badlogicgames.gdx:gdx-controllers-platform:1.9.10" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-platform-1.9.10.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-1.9.10.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-1.9.10-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/gdx-controllers-1.9.10-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/gdx-1.9.10-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -0,0 +1,10 @@
<component name="libraryTable">
<library name="com.badlogicgames.gdx:gdx-platform:1.9.10" type="repository">
<properties maven-id="com.badlogicgames.gdx:gdx-platform:1.9.10" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/gdx-platform-1.9.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@@ -4,23 +4,17 @@
<root url="file://$PROJECT_DIR$/lib" />
</CLASSES>
<JAVADOC>
<root url="file://$PROJECT_DIR$/lib/javadoc" />
<root url="http://libgdx.badlogicgames.com/nightlies/docs/api/" />
<root url="https://libgdx.badlogicgames.com/ci/nightlies/docs/api/" />
<root url="jar://$PROJECT_DIR$/lib/javadoc/gdx-docs.zip!/" />
</JAVADOC>
<NATIVE>
<root url="file://$PROJECT_DIR$/lib" />
<root url="file://$PROJECT_DIR$/lib/x86" />
<root url="file://$PROJECT_DIR$/lib/x86_64" />
</NATIVE>
<SOURCES>
<root url="file://$PROJECT_DIR$/lib/source" />
<root url="jar://$PROJECT_DIR$/lib/Terrarum_Joise.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/source/gdx-backend-lwjgl-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/TerrarumSansBitmap.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/prtree.jar!/" />
</SOURCES>
<jarDirectory url="file://$PROJECT_DIR$/lib" recursive="false" />
<jarDirectory url="file://$PROJECT_DIR$/lib/source" recursive="false" type="SOURCES" />
</library>
</component>

8
.idea/markdown-exported-files.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="MarkdownExportedFiles">
<htmlFiles />
<imageFiles />
<otherFiles />
</component>
</project>

View File

@@ -1,3 +1,3 @@
<component name="MarkdownNavigator.ProfileManager">
<settings default="" pdf-export="" />
<settings default="" pdf-export="" plain-text-search-scope="Project Files" />
</component>

2
.idea/misc.xml generated
View File

@@ -38,7 +38,7 @@
<property name="caretWidth" class="java.lang.Integer" />
</properties>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_10" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8.0_242" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

View File

@@ -1,6 +1,6 @@
*Terrarum*
Copyright (C) 2013-2018 Minjaesong (Torvald)
Copyright (C) 2013-2020 Minjaesong (Torvald)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*Terrarum Sans Bitmap*
Copyright (c) 2017 Minjae Song (Torvald) and the contributors
Copyright (c) 2017-2019 Minjae Song (Torvald) and the contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -66,7 +66,7 @@ limitations under the License.
*Accidental Noise Library*
Joise is a derivative work based on Josua Tippetts' C++ library:
http://accidentalnoise.sourceforge.net/index.html
<http://accidentalnoise.sourceforge.net/index.html>
Copyright (C) 2011 Joshua Tippetts
@@ -90,7 +90,7 @@ Copyright (C) 2011 Joshua Tippetts
*Vector2.java*, *Epsilon.java*
Copyright (c) 2010-2015 William Bittle http://www.dyn4j.org/
Copyright (c) 2010-2015 William Bittle <http://www.dyn4j.org/>
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted
@@ -127,7 +127,7 @@ Ambient sound recordings:
crickets_02.ogg
Copyright (C) 2012, 2013, 2015, 2016, 2017 Klankbeeld
Sound from http://www.freesound.org/people/klankbeeld/
Sound from <http://www.freesound.org/people/klankbeeld/>
----
@@ -155,6 +155,39 @@ THE SOFTWARE.
----
PRTree, a Priority R-Tree, a spatial index for java code
Copyright (c) 2008-2012 Robert Olofsson.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the authors nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
----
Some of the resources were created by _raxod502_.
@@ -176,4 +209,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.

View File

@@ -3,10 +3,11 @@
|0..4095|Tiles (4096 possible)|
|4096..8191|Walls (4096 possible)|
|8192..8447|Wires (256 possible)|
|8448..32767|Items (static) (24320 possible)|
|32768..0x0FFF_FFFF|Items (dynamic\*) (268M possible)|
|0x1000_0000..0x7FFF_FFFF|Actors|
|-2147483648..-1 (all negative numbers)|Faction|
|8448..0x0F_FFFF|Items (static) (1M possible)|
|0x10_0000..0x0FFF_FFFF|Items (dynamic\*) (267M possible)|
|0x1000_0000..0x7FFF_FFFF|Actors (1879M possible)|
|-1..-65536|Virtual Tiles|
|-2147483648..-65537 (all negative numbers)|Faction (2147M possible)|
* dynamic items have own properties that will persist through savegame.
@@ -14,7 +15,10 @@ Actors range in-depth
|Range|Description|
|-----|-----------|
|0x1000_0000..0x1FFF_FFFF|Rendered behind (e.g. tapestries)
|0x2000_0000..0x5FFF_FFFF|Regular actors (e.g. almost all of them)
|0x6000_0000..0x6FFF_FFFF|Special (e.g. weapon swung, bullets, dropped item, particles)
|0x7000_0000..0x7FFF_FFFF|Rendered front (e.g. fake tile)
|0x1000_0000..0x1FFF_FFFF|Rendered behind (e.g. tapestries)|
|0x2000_0000..0x4FFF_FFFF|Regular actors (e.g. almost all of them)|
|0x5000_0000..0x5FFF_FFFF|Special (e.g. weapon swung, bullets, dropped item, particles)|
|0x6000_0000..0x6FFF_FFFF|Rendered front (e.g. fake tile)|
|0x7000_0000..0x7FFF_FFFF|Rendered as screen overlay, not affected by light nor environment overlays|
Actor IDs are assigned in 256 groups, single actor can have 256 sub-actors

View File

@@ -1,11 +1,11 @@
## Minimum requirements ##
* Processor with 2.4 GHz speed
* GPU that can support OpenGL 2.1, is capable of 4K texture
* 6 GB of RAM
* GeForce MX 150
* 4 GB of RAM
* 4 GB of free disk space
* Windows Vista/Mac OS X Lion or higher (Mac OS X Snow Leopard is incompatible with a shader the game uses)
* PC: Java 8, Up-to-date graphics driver
* PC: Java 8
## Recommended requirements ##
@@ -14,12 +14,13 @@
* 8 GB of RAM
* 8 GB of free disk space
* Windows Vista/Mac OS X Lion or higher
* PC: Java 8, Up-to-date graphics driver
* PC: Java 8
## Tested environment ##
## Tested environments ##
(to devs: please extend this list with your test results!)
* MacBookPro9,2 (MacBook Pro 13 inch mid-2012)
* Intel 6700K, nVidia GTX970, Windows 10
* MacBookPro9,2 (MacBook Pro 13 inch mid-2012) -- shader don't work
* Intel 6700K, nVidia GTX970, Windows 10 -- fully works
* Intel 6600, nVidia GT 710, Windows 8 -- unplayable framerate
* Intel 8265U, Intel UHD620/nVidia MX 250, Windows 10 -- fully works with Intel iGPU (24 fps), fully works with MX 250 (66 fps)

View File

@@ -20,6 +20,8 @@ uniform float rcount = 64.0; // it even works on 256.0!
uniform float gcount = 64.0; // using 64: has less banding and most monitors are internally 6-bit
uniform float bcount = 64.0;
// inverted zoom; this value must set to (1f/zoom)
uniform float zoomInv = 1.0;
/*int bayer[7 * 7] = int[](
32,42,10,27,37,5,15,
@@ -72,12 +74,13 @@ void main(void) {
float scale = v_texCoords.y * (1.0 - parallax_size) + (parallax_size / 2.0) + (parallax * parallax_size / 2.0);
float zoomSamplePoint = (1.0 - zoomInv) / 2.0; // will never quite exceed 0.5
float inR = mix(bottomColor.r, topColor.r, scale);
float inG = mix(bottomColor.g, topColor.g, scale);
float inB = mix(bottomColor.b, topColor.b, scale);
// I don't even know if it works, and also not sure if I actually want it
vec3 newBottom = mix(bottomColor, topColor, zoomSamplePoint);
vec3 newTop = mix(topColor, bottomColor, zoomSamplePoint);
vec4 inColor = vec4(inR, inG, inB, 1.0);
vec4 inColor = vec4(mix(newBottom, newTop, scale), 1.0);
vec2 entry = mod(gl_FragCoord.xy, vec2(bayerSize, bayerSize));

BIN
assets/appicon128.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 462 B

BIN
assets/appicon16.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 366 B

BIN
assets/appicon256.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 559 B

BIN
assets/appicon32.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 387 B

BIN
assets/appicon64.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 418 B

View File

@@ -1,4 +1,4 @@
#version 100
#version 120
#ifdef GL_ES
precision mediump float;
#endif

View File

@@ -71,7 +71,7 @@ The control is omnidirectional. In other words, \emph{not} cell-based.
\subsubsection{ISO\slash ANSI\slash JIS pedalboards}
Your default moving around uses ESDF (qwerty)\slash FRST (colemak)\slash .OEW (dvorak) pedals for default `WASD', in order for you to provide more modifier pedals---QAZ (qwerty\slash colemak), /A; (dvorak)---that are pressed with your little finger and more comfort to some pedalboards with Topre actuators.\footnote{Writers of this book would recommend you to use pedalboard with Cherry MX Red actuators, though any decent pedalboard should be sufficient.}
\subsubsection{Joypads}
\subsubsection{gamepads}
Your moving around uses left stick, and direction of the movement is \emph{not} limited to 8 directions, hence the term, “omni\-direc\-tion\-al”.
\section{World}

View File

@@ -0,0 +1,15 @@
SET basefilename=%~d1%~p1%~n1
SET inputextension=%~x1
rem inputextension should be dot-psd
rem color space must be Lab16
IF "%inputextension%" NEQ ".psd" goto fail
convert %1 -colorspace sRGB -write mpr:temp -background black -alpha Remove mpr:temp -compose Copy_Opacity -composite "%basefilename%.tga"
exit
:fail
echo "File not PSD"
pause
exit /b 1

BIN
assets/graphics/blocks/init.tga LFS Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
assets/graphics/fonts/terrarum-sans-bitmap/insular_variable.tga LFS Normal file → Executable file

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Binary file not shown.

BIN
assets/graphics/gui/inventory/category.tga LFS Normal file → Executable file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -11,7 +11,7 @@ uniform sampler2D u_texture;
// "steps" of R, G and B. Must be integer && equal or greater than 2
uniform float rcount = 32.0;
uniform float gcount = 32.0;
uniform float gcount = 64.0;
uniform float bcount = 32.0;
uniform float acount = 1.0;
@@ -53,6 +53,7 @@ void main(void) {
vec2 entry = mod(gl_FragCoord.xy, vec2(bayerSize, bayerSize));
gl_FragColor = nearestColour(inColor + spread * (bayer[int(entry.y) * int(bayerSize) + int(entry.x)] / bayerDivider - 0.5));
vec4 outColor = nearestColour(inColor + spread * (bayer[int(entry.y) * int(bayerSize) + int(entry.x)] / bayerDivider - 0.5));
gl_FragColor = outColor;
}

BIN
assets/item_kari_16.tga LFS Normal file

Binary file not shown.

Binary file not shown.

BIN
assets/item_kari_32.tga LFS Normal file

Binary file not shown.

Binary file not shown.

View File

@@ -1,52 +0,0 @@
{
"qwerty": {
"layout": "1234567890-=QWERTYUIOP[]ASDFGHJKL;'ZXCVBNM,./",
"capslock": "Caps",
"name": "QWERTY"
},
"qwertz": {
"layout": "1234567890-=QWERTZUIOP[]ASDFGHJKL;'YXCVBNM,./",
"capslock": "Caps",
"name": "QWERTZ"
},
"azerty": {
"layout": "1234567890-=AZERTYUIOP[]QSDFGHJKL;'WXCVBNM,./",
"capslock": "Caps",
"name": "AZERTY"
},
"colemak": {
"layout": "1234567890-=QWFPGJLUY;[]ARSTDHNEIO'ZXCVBKM,./",
"capslock": "Back",
"name": "Colemak"
},
"workman": {
"layout": "1234567890-=QDRWBJFUP;[]ASHTGYNEOI'ZXMCVKL,./",
"capslock": "Back",
"name": "Workman"
},
"dvorak": {
"layout": "1234567890[]',.PYFGCRL/=AOEUIDHTNS-;QJKXBMWVZ",
"capslock": "Caps",
"name": "Dvorak"
},
"bepo": {
"layout": "1234567890=%BÉPOÈ!VDLJZWAUIE,CTSRNMÀYX.K'QGHF",
"capslock": "Caps",
"name": "Bépo"
},
"turk-f": {
"layout": "1234567890/-FGĞIODRNHPQWUİEAÜTKMLYŞJÖVCÇZSB.,",
"capslock": "Caps",
"name": "F klavye"
},
"qwerty-jis-apple": {
"layout": "1234567890-=QWERTYUIOP[]ASDFGHJKL;'ZXCVBNM,./",
"capslock": "Ctrl",
"name": "Apple 日本語"
},
"hhkb": {
"layout": "1234567890-=QWERTYUIOP[]ASDFGHJKL;'ZXCVBNM,./",
"capslock": "Ctrl",
"name": "HHKB2"
}
}

View File

@@ -0,0 +1,6 @@
layout_name=Colemak
ROW1=4s;4qNUM_1;4qNUM_2;4qNUM_3;4qNUM_4;4qNUM_5;4qNUM_6;4qNUM_7;4qNUM_8;4qNUM_9;4qNUM_0;4qMINUS;4qEQUALS;6qBACKSPACE
ROW2=6qTAB;4qQ;4qW;4qF;4qP;4qG;4qJ;4qL;4qU;4qY;4qSEMICOLON;4qLEFT_BRACKET;4qRIGHT_BRACKET;4qBACKSLASH
ROW3=7qCAPS_LOCK;4qA;4qR;4qS;4qT;4qD;4qH;4qN;4qE;4qI;4qO;4qAPOSTROPHE;7qENTER
ROW4=9qSHIFT_LEFT;4qZ;4qX;4qC;4qV;4qB;4qK;4qM;4qCOMMA;4qPERIOD;4qSLASH;9qSHIFT_RIGHT
ROW5=15s;28qSPACE

View File

@@ -0,0 +1,6 @@
layout_name=Dvorak Simplified
ROW1=4s;4qNUM_1;4qNUM_2;4qNUM_3;4qNUM_4;4qNUM_5;4qNUM_6;4qNUM_7;4qNUM_8;4qNUM_9;4qNUM_0;4qLEFT_BRACKET;4qRIGHT_BRACKET;6qBACKSPACE
ROW2=6qTAB;4qAPOSTROPHE;4qCOMMA;4qPERIOD;4qP;4qY;4qF;4qG;4qC;4qR;4qL;4qSLASH;4qEQUALS;4qBACKSLASH
ROW3=7qCAPS_LOCK;4qA;4qO;4qE;4qU;4qI;4qD;4qH;4qT;4qN;4qS;4qMINUS;7qENTER
ROW4=9qSHIFT_LEFT;4qSEMICOLON;4qQ;4qJ;4qK;4qX;4qB;4qM;4qW;4qV;4qZ;9qSHIFT_RIGHT
ROW5=15s;28qSPACE

View File

@@ -0,0 +1,6 @@
layout_name=Maltron 89
ROW1=4qNUM_1;4qNUM_2;4qNUM_3;4qNUM_4;4qNUM_5;10s;4qNUM_6;4qNUM_7;4qNUM_8;4qNUM_9;4qNUM_0
ROW2=4qQ;4qP;4qY;4qC;4qB;10s;4qV;4qM;4qU;4qZ;4qL
ROW3=4qA;4qN;4qI;4qS;4qF;10s;4qD;4qT;4qH;4qO;4qR
ROW4=4qCOMMA;4qPERIOD;4qJ;4qG;4qSEMICOLON;10s;4qAPOSTROPHE;4qW;4qK;4qX;4qNULL
ROW5=4qSHIFT_LEFT;4qBACKSLASH;4qLEFT_BRACKET;4qMINUS;3s;4qE;4s;4qENTER;3s;4qEQUALS;4qRIGHT_BACKET;4qSLASH;4qSHIFT_RIGHT

View File

@@ -0,0 +1,13 @@
! generic QWERTY keyboard
! row format: (n)q(keyname)
! n: width of a key, 4 for regular key (1.0u). Value smaller than 4 will break the UI, so DON'T
! keyname: name of the key that is recognised by the UI parser.
! each key in the row is separated by one semicolon.
layout_name=QWERTY
ROW1=4s;4qNUM_1;4qNUM_2;4qNUM_3;4qNUM_4;4qNUM_5;4qNUM_6;4qNUM_7;4qNUM_8;4qNUM_9;4qNUM_0;4qMINUS;4qEQUALS;6qBACKSPACE
ROW2=6qTAB;4qQ;4qW;4qE;4qR;4qT;4qY;4qU;4qI;4qO;4qP;4qLEFT_BRACKET;4qRIGHT_BRACKET;4qBACKSLASH
ROW3=7qCAPS_LOCK;4qA;4qS;4qD;4qF;4qG;4qH;4qJ;4qK;4qL;4qSEMICOLON;4qAPOSTROPHE;7qENTER
ROW4=9qSHIFT_LEFT;4qZ;4qX;4qC;4qV;4qB;4qN;4qM;4qCOMMA;4qPERIOD;4qSLASH;9qSHIFT_RIGHT
ROW5=15s;28qSPACE

View File

@@ -1,3 +1,7 @@
{
"APP_WARNING_HEALTH_AND_SAFETY": "ВНИМАНИЕ-ЗДРАВЕ И БЕЗОПАСНОСТ",
"MENU_LABEL_PRESS_START_SYMBOL": "атисни >",
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Всички права запазени",
"COPYRIGHT_GNU_GPL_3": "Разпределени под GNU GPL 3",
"MENU_MODULES" : "Модули"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Všechna práva vyhrazena",
"COPYRIGHT_GNU_GPL_3": "Šířen pod licencí GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "POZOR-ZDRAVÍ A BEZPEČNOST",
"MENU_LABEL_PRESS_START_SYMBOL": "Stiskněte >",
"MENU_MODULES" : "Moduly"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Alle rettigheder forbeholdes",
"COPYRIGHT_GNU_GPL_3": "Distribueret under GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "ADVARSEL-SUNDHED OG SIKKERHED",
"MENU_LABEL_PRESS_START_SYMBOL": "Tryk >",
"MENU_MODULES" : "Moduler"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Alle Rechte vorbehalten",
"COPYRIGHT_GNU_GPL_3": "Verteilt unter GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "WARNUNG-GESUNDHEIT UND SICHERHEIT",
"MENU_LABEL_PRESS_START_SYMBOL": "Drücke >",
"MENU_MODULES" : "Modulen"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Όλα τα δικαιώματα διατηρούνται",
"COPYRIGHT_GNU_GPL_3": "Διανέμεται υπό την GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "ΠΡΟΣΟΧΗ-ΥΓΕΙΑ ΚΑΙ ΑΣΦΑΛΕΙΑ",
"MENU_LABEL_PRESS_START_SYMBOL": "Πάτα >",
"MENU_MODULES" : "Ενότητες"
}

View File

@@ -1,4 +1,8 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "All rights reserved",
"COPYRIGHT_GNU_GPL_3": "Distributed under GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "WARNING-HEALTH AND SAFETY",
"MENU_LABEL_PRESS_START_SYMBOL": "Press >",
"MENU_MODULES" : "Modules",
"MENU_CREDIT_GPL_DNT" : "GPL"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Todos los derechos reservados",
"COPYRIGHT_GNU_GPL_3": "Distribuido bajo GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "ADVERTENCIA-SALUD Y SEGURIDAD",
"MENU_LABEL_PRESS_START_SYMBOL": "Pulsa >",
"MENU_MODULES" : "Módulos"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Kaikki oikeudet pidätetään",
"COPYRIGHT_GNU_GPL_3": "Jaetaan GNU GPL 3:n mukaisesti",
"APP_WARNING_HEALTH_AND_SAFETY": "VAROITUS-TERVEYS JA TURVALLISUUS",
"MENU_LABEL_PRESS_START_SYMBOL": "Paina >",
"MENU_MODULES" : "Moduulit"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Tous les droits sont réservés",
"COPYRIGHT_GNU_GPL_3": "Distribué sous GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "ATTENTION-SANTÉ ET SÉCURITÉ",
"MENU_LABEL_PRESS_START_SYMBOL": "Appuyez sur >",
"MENU_MODULES" : "Modules"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Minden jog fenntartva",
"COPYRIGHT_GNU_GPL_3": "Elosztott GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "VIGYÁZAT-EGÉSZSÉGÜGYI ÉS BIZTONSÁGI",
"MENU_LABEL_PRESS_START_SYMBOL": "Nyomd meg a >ot",
"MENU_MODULES" : "Modulok"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Öll réttindi áskilinn",
"COPYRIGHT_GNU_GPL_3": "Dreift samkvæmt GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "VIÐVÖRUN-HEILSA OG ÖRYGGI",
"MENU_LABEL_PRESS_START_SYMBOL": "Ýttu >",
"MENU_MODULES" : "Einingar"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Tutti i diritti riservati",
"COPYRIGHT_GNU_GPL_3": "Distribuito sotto licenza GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "ATTENZIONE-SALUTE E SICUREZZA",
"MENU_LABEL_PRESS_START_SYMBOL": "Premi >",
"MENU_MODULES" : "Moduli"
}

View File

@@ -1,3 +1,6 @@
{
{ "COPYRIGHT_ALL_RIGHTS_RESERVED": "全著作権所有",
"COPYRIGHT_GNU_GPL_3": "GNU GPL 3で配布",
"APP_WARNING_HEALTH_AND_SAFETY": "警告ー健康と安全のために",
"MENU_LABEL_PRESS_START_SYMBOL": "> ボタンを押す",
"MENU_MODULES" : "モジュール"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "ぜんちょさくけん しょゆう",
"COPYRIGHT_GNU_GPL_3": "GNU GPL 3で はいふ",
"APP_WARNING_HEALTH_AND_SAFETY": "けいこくーけんこうと あんぜんの ために",
"MENU_LABEL_PRESS_START_SYMBOL": "> ボタンを おす",
"MENU_MODULES" : "モジュール"
}

View File

@@ -2053,7 +2053,7 @@
},
{
"n": "MENU_LABEL_MAINMENU",
"s": "메뉴"
"s": "메인 메뉴"
},
{
"n": "MENU_LABEL_MORE",

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "모든 권리 보유",
"COPYRIGHT_GNU_GPL_3": "GNU GPL 3에 따라 배포됨",
"APP_WARNING_HEALTH_AND_SAFETY": "경고—건강과 안전을 위하여",
"MENU_LABEL_PRESS_START_SYMBOL": ">을 누르세요",
"MENU_MODULES" : "모듈"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Alle rechten voorbehouden",
"COPYRIGHT_GNU_GPL_3": "Gedistribueerd onder GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "WAARSCHUWING-GEZONDHEID EN VEILIGHEID",
"MENU_LABEL_PRESS_START_SYMBOL": "Druk op >",
"MENU_MODULES" : "Modules"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Alle rettigheter reservert",
"COPYRIGHT_GNU_GPL_3": "Distribuert under GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "ADVARSEL-HELSE OG SIKKERHET",
"MENU_LABEL_PRESS_START_SYMBOL": "Trykk >",
"MENU_MODULES" : "Moduler"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Wszelkie prawa zastrzeżone",
"COPYRIGHT_GNU_GPL_3": "Rozpowszechniana w GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "UWAGA-ZDROWIE I BEZPIECZEŃSTWO",
"MENU_LABEL_PRESS_START_SYMBOL": "Naciśnij >",
"MENU_MODULES" : "Moduły"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Todos os direitos reservados",
"COPYRIGHT_GNU_GPL_3": "Distribuído sob GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "ATENÇÃO-SAÚDE E SEGURANÇA",
"MENU_LABEL_PRESS_START_SYMBOL": "Pressione >",
"MENU_MODULES" : "Módulos"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Todos os direitos reservados",
"COPYRIGHT_GNU_GPL_3": "Distribuído sob GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "ATENÇÃO-SAÚDE E SEGURANÇA",
"MENU_LABEL_PRESS_START_SYMBOL": "Carrega no >",
"MENU_MODULES" : "Módulos"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Toate drepturile rezervate",
"COPYRIGHT_GNU_GPL_3": "Distribuit sub GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "ATENȚIONARE-SĂNĂTATE ȘI SIGURANȚĂ",
"MENU_LABEL_PRESS_START_SYMBOL": "Apasă >",
"MENU_MODULES" : "Module"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Все права защищены",
"COPYRIGHT_GNU_GPL_3": "Распространяется в соответствии с GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "ПРЕДУПРЕЖДЕНИЕ-ЗДОРОВЬЕ И БЕЗОПАСНОСТЬ",
"MENU_LABEL_PRESS_START_SYMBOL": "Нажмите >",
"MENU_MODULES" : "Модули"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Alla rättigheter förbehållna",
"COPYRIGHT_GNU_GPL_3": "Distribueras under GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "VARNING-HÄLSA OCH SÄKERHET",
"MENU_LABEL_PRESS_START_SYMBOL": "Tryck >",
"MENU_MODULES" : "Moduler"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "สงวนลิขสิทธิ์",
"COPYRIGHT_GNU_GPL_3": "เผยแพร่ภายใต้ GNU GPL 3",
"APP_WARNING_HEALTH_AND_SAFETY": "คำเตือน-อนามัยและความปลอดภัย",
"MENU_LABEL_PRESS_START_SYMBOL": "กดปุ่ม >",
"MENU_MODULES" : "โมดูล"
}

Some files were not shown because too many files have changed in this diff Show More