Compare commits

...

309 Commits

Author SHA1 Message Date
minjaesong
083ff2b466 initial test, ~40% of the performance was achieved 2020-03-01 04:14:54 +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
704 changed files with 20657 additions and 11051 deletions

2
.gitattributes vendored
View File

@@ -3,3 +3,5 @@
*.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

15
.gitignore vendored
View File

@@ -3,18 +3,21 @@ out/*
bin/*
build/*
.gradle/*
TerrarumBuild.jar
# Java native errors
hs_err_pid*
replay_pid*
# OS files
Thumbs.db
.DS_Store
desktop.ini
# Resources that should not be tracked
*.jar
assets/mods/basegame/demoworld
assets/mods/basegame/demoworld.gz
external_resource_packs
#assets/mods/basegame/demoworld.gz
external_resource_packs.zip
# IntelliJ
@@ -23,11 +26,17 @@ workspace.xml
# Temporary files
.tmp*
tmp_*
## Microsoft Office
~$*
## Generic temp files in Linux
*~
## Vim temp files
*.swp
*.swo
# Eclipse MAT heap files
*.hprof
*.bin
*.index
*.threads
*_Leak_Suspects.zip
*_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

@@ -19,6 +19,7 @@
<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" />

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_X" default="false" project-jdk-name="15-ea" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

View File

@@ -1,6 +1,6 @@
*Terrarum*
Copyright (C) 2013-2019 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
@@ -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

@@ -6,6 +6,7 @@
|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..-1 (all negative numbers)|Faction (2147M possible)|
* dynamic items have own properties that will persist through savegame.

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

@@ -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.

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

@@ -10,9 +10,9 @@ uniform sampler2D u_texture;
// "steps" of R, G and B. Must be integer && equal or greater than 2
uniform float rcount = 64.0;
uniform float rcount = 32.0;
uniform float gcount = 64.0;
uniform float bcount = 64.0;
uniform float bcount = 32.0;
uniform float acount = 1.0;
int bayer[14 * 14] = int[](131,187,8,78,50,18,134,89,155,102,29,95,184,73,22,86,113,171,142,105,34,166,9,60,151,128,40,110,168,137,45,28,64,188,82,54,124,189,80,13,156,56,7,61,186,121,154,6,108,177,24,100,38,176,93,123,83,148,96,17,88,133,44,145,69,161,139,72,30,181,115,27,163,47,178,65,164,14,120,48,5,127,153,52,190,58,126,81,116,21,106,77,173,92,191,63,99,12,76,144,4,185,37,149,192,39,135,23,117,31,170,132,35,172,103,66,129,79,3,97,57,159,70,141,53,94,114,20,49,158,19,146,169,122,183,11,104,180,2,165,152,87,182,118,91,42,67,25,84,147,43,85,125,68,16,136,71,10,193,112,160,138,51,111,162,26,194,46,174,107,41,143,33,74,1,101,195,15,75,140,109,90,32,62,157,98,167,119,179,59,36,130,175,55,0,150);
@@ -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" : "โมดูล"
}

View File

@@ -1,3 +1,7 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "Her hakkı saklıdır",
"COPYRIGHT_GNU_GPL_3": "GNU GPL 3 kapsamında dağıtılan",
"APP_WARNING_HEALTH_AND_SAFETY": "UYARI-SAĞLIK VE GÜVENLİK",
"MENU_LABEL_PRESS_START_SYMBOL": "> basınız",
"MENU_MODULES" : "Modüller"
}

View File

@@ -1,3 +1,11 @@
{
"COPYRIGHT_ALL_RIGHTS_RESERVED": "版权所有",
"COPYRIGHT_GNU_GPL_3": "分布在GNU GPL 3下",
"APP_WARNING_HEALTH_AND_SAFETY": "健康游戏忠告",
"APP_CHINESE_HEALTHY_GAME_MSG_1": "抵制不良游戏 拒绝盗版游戏",
"APP_CHINESE_HEALTHY_GAME_MSG_2": "注意自我保护 谨防受骗上当",
"APP_CHINESE_HEALTHY_GAME_MSG_3": "适度游戏益脑 过度游戏伤身",
"APP_CHINESE_HEALTHY_GAME_MSG_4": "合理安排时间 享受健康生活",
"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" : "模塊"
}

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.

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