Commit Graph

298 Commits

Author SHA1 Message Date
Nut.andor
6ec4cbf83d Merge branch 'pulls/1195352/15'
Miss effect added, add comments to start script
2025-10-03 15:56:10 +02:00
Nut.andor
0df961c8d3 forgotten parameter 2025-10-03 15:12:00 +02:00
OMGeeky
be040a74bd change miss_effect to HitEffect instead of HitReceivedEffect
(the received effects might have been applied, but the game UI would not display them, so better not show them here too)
2025-10-02 15:57:21 +02:00
OMGeeky
7e5c8d05ab improve hints on who is getting what effect on hit / hit-received for npcs 2025-09-23 20:26:58 +02:00
OMGeeky
b2003bfc38 improve create pane content calls with overrides
also fixes a bug where the wrong one was used on accident
2025-09-23 20:10:30 +02:00
OMGeeky
806f0b10e6 miss effect 2025-09-23 18:48:46 +02:00
OMGeeky
29241f18b8 improve EffectPane generics and usage & fix hitReceivedEffect 2025-09-23 18:48:46 +02:00
Raphi
f93d865da7 Add spriteFlipChance as attribute in NPC.java 2025-09-04 21:41:27 +02:00
Raphi
bad86eec93 Add Sprite Flip Chance Field to NPCEditor.java 2025-09-04 21:29:04 +02:00
OMGeeky
364bf8ee11 cleanup some duplicate code 2025-08-31 23:34:46 +02:00
OMGeeky
e2b0b0e81e remove not double linking 2025-08-31 23:33:52 +02:00
OMGeeky
703b723322 improve GameDataCategory lookup time
by changing it to something backed by a HashMap with
 the id as key things can be found without looping over every element.
 This reduced the startup time on my machine to about half of the original time
2025-08-31 23:33:52 +02:00
OMGeeky
2bf64c417f Merge branch 'master' into jide-oss-update 2025-08-06 23:20:37 +02:00
OMGeeky
06d4131582 Add toJsonString method for JsonSerializable objects 2025-07-17 20:33:56 +02:00
OMGeeky
60205d54de Remove AndorsTrainer references and related functionality 2025-07-17 20:33:56 +02:00
OMGeeky
f6fbb0f5a3 Remove unused SavedGame references and related functionality
it didn't really work for a long time anyway and was extremely outdated
2025-07-17 20:33:56 +02:00
OMGeeky
af48341439 fix json project & workspace file paths when migrating from binary 2025-07-17 20:33:56 +02:00
OMGeeky
7b7218ad4e Add error handling for update check timeouts and HTTP status exceptions 2025-07-17 19:45:29 +02:00
OMGeeky
1ddf1c5051 Add notification for error when opening SpritesheetEditor 2025-07-17 18:20:16 +02:00
OMGeeky
f9a9ab97de Sort spritesheets by ID in the Project-Tree 2025-07-17 18:19:31 +02:00
OMGeeky
3c5ed1d6f6 Merge branch 'dedup-1' into json-project-files 2025-07-15 12:54:32 +02:00
OMGeeky
bc3333bd0e improve some checks when switching look and feel 2025-07-15 12:51:49 +02:00
OMGeeky
090584dbcc add warning about icon 2025-07-13 02:25:01 +02:00
OMGeeky
e858e436c6 Merge remote-tracking branch 'origin/master' into dedup-1
# Conflicts:
#	src/com/gpl/rpg/atcontentstudio/ATContentStudio.java
#	src/com/gpl/rpg/atcontentstudio/model/gamedata/NPC.java
2025-07-13 02:21:49 +02:00
OMGeeky
4b2aa77cb6 refactor to keep compatibility with old java version (openjdk-11 tested) 2025-07-03 20:16:36 +02:00
OMGeeky
24e1e526ce refactor to keep compatibility with old java version (openjdk-11 tested) 2025-07-03 20:05:00 +02:00
Nut.andor
861c4c3bb1 Merge branch 'pulls/1195352/8' 2025-06-28 21:23:39 +02:00
Nut.andor
9b1ac0d3e1 new item sprite (map objects) 2025-06-28 20:45:16 +02:00
OMGeeky
782d436681 Revert "remove saves (temporarily?) since they don't really work"
This reverts commit 7929ffe2a7.
2025-06-25 01:27:34 +02:00
OMGeeky
397d1ded8c make project file to json
same as with .workspace the .project file now saves as .project.json and falls back to .project
2025-06-25 01:24:41 +02:00
OMGeeky
c43b8464a2 save .workspace as json
(under .workspace.json)

falls back on old .workspace implementation
2025-06-24 23:27:38 +02:00
OMGeeky
7929ffe2a7 remove saves (temporarily?) since they don't really work 2025-06-24 21:51:41 +02:00
OMGeeky
a3ffecfd23 improve json saving to file 2025-06-24 21:50:52 +02:00
OMGeeky
1c83eedd80 format 2025-06-24 20:10:18 +02:00
OMGeeky
6c296868c0 add null check 2025-06-24 19:50:35 +02:00
OMGeeky
8f5452b487 add myself to Contributor list 2025-06-24 19:11:56 +02:00
OMGeeky
f9f1caafc6 extract some code 2025-06-24 18:57:53 +02:00
OMGeeky
c0e24b4cf5 fix bug, where condition buttons are enabled in readonly mode 2025-06-24 18:45:15 +02:00
OMGeeky
cd36813050 move some things around and make the code sturdier 2025-06-24 18:40:54 +02:00
OMGeeky
358d855eec fix number comparison bugs 2025-06-24 18:11:24 +02:00
OMGeeky
281e314815 extract ConditionEffectEditorPane 2025-06-24 18:00:47 +02:00
OMGeeky
3f19ca959b improve code a bit 2025-06-24 16:51:29 +02:00
OMGeeky
6b74ad5cbe fix bug, where some values were not being updated when switching category to a different action type 2025-06-24 16:40:42 +02:00
OMGeeky
93e44a2b50 improve *EffectPane initialisation 2025-06-24 16:39:46 +02:00
OMGeeky
652da07cc8 change warning message when no action type can be determined for an item when writing 2025-06-24 16:30:49 +02:00
OMGeeky
2dbe881dd7 change ItemEditor to use *EffectPane classes 2025-06-24 16:25:13 +02:00
OMGeeky
b7e9bf0582 move ListModels to CommonEditor for re-use 2025-06-24 16:07:50 +02:00
OMGeeky
6dcd8599b3 reformat CommonEditor 2025-06-24 15:38:55 +02:00
OMGeeky
ec04b810d9 fix bug 2025-06-24 15:23:44 +02:00
OMGeeky
18b92a3921 add valueChanged override for HitRecievedEffectPane 2025-06-24 15:16:36 +02:00