Commit graph

138 commits

Author SHA1 Message Date
Damien 2ce4167a51 blanc blanc 2021-05-12 18:51:31 +02:00
Laureηt f5d9cbc011 feat: dynamic texture coloring 2021-05-12 18:36:21 +02:00
Laureηt 026c2aaef9 Merge branch 'master' of git.inpt.fr:tobgang/sagittarius 2021-05-12 17:51:34 +02:00
Laureηt ce73fca475 feat: tried disabling "transform" in the Stages' Groups 2021-05-12 17:51:21 +02:00
Laureηt 6ca47f41e6 fix: drawing of debugInfos over the textures 2021-05-12 17:49:19 +02:00
Damien 1a9c5a24f2 changement de couleur pas encore au point 2021-05-12 17:06:31 +02:00
Damien fb1a181b9e mise a blanc des textures 2021-05-12 16:17:56 +02:00
Damien 355f436baa changement de la texture du joeur 2021-05-12 16:04:56 +02:00
Damien 7c6132426f tout le monde a une texture maintenant il faut que ca soit un peu plus joli 2021-05-12 14:34:07 +02:00
Damien ffd7957afb avec les textures c'est mieu 2021-05-12 14:09:21 +02:00
Damien 9f2b058311 maintenant les joueurs ont une texture 2021-05-12 14:08:43 +02:00
Damien d00d4f1619 la texture suit la rotation de la planet 2021-05-12 13:57:49 +02:00
Damien a5d379fa82 avec la transparence 2021-05-12 13:18:14 +02:00
Damien 474b8fc5e7 les tailles sont bonnes 2021-05-12 13:14:38 +02:00
Damien 4b5dbff4a4 Vace les textures c'est mieux 2021-05-12 13:10:22 +02:00
Damien 39106002a7 Dessin des planets encore bien buggé 2021-05-12 13:06:38 +02:00
Johan guillemin 63239e35df enlever coucou 2021-05-03 15:24:46 +02:00
Johan guillemin 86c1ad4fe3 coucou 2021-05-03 15:20:33 +02:00
Laureηt a18d8cfaf7 feat: minor modifications 2021-05-03 15:16:10 +02:00
Laureηt 7817353e15 fix: Arrow TTL killing problem 2021-04-23 17:36:56 +02:00
Laureηt 8b95bc03a5 feat: really basic zoom functionnality 2021-04-23 17:32:17 +02:00
Laureηt 939ceaed4a feat!: camera now follows arrows and players 2021-04-23 17:03:40 +02:00
Laureηt ce3b1e265a feat: bow cancel function 2021-04-23 16:26:17 +02:00
Laureηt ed9e805c88 feat: added revolving planets (and moons) 2021-04-23 16:17:09 +02:00
Laureηt 5b591e3f8e feat!:turn system finally finished
returned to old computeForce using Vectors2
2021-04-23 15:53:10 +02:00
Laureηt f82147cbcc fix: moved FPS and MouseInfo in view 2021-04-22 17:54:51 +02:00
Laureηt ea826d2ca7 feat: remove BaseActor, some cleaning necessary 2021-04-22 17:53:00 +02:00
Laureηt eb0a6a6253 feat: used Entities instead of Actors 2021-04-22 17:43:41 +02:00
Laureηt 6cd727c09d refacto: more Entities work 2021-04-22 17:29:49 +02:00
Laureηt 463e513d71 feat: created Entities 2021-04-22 16:11:50 +02:00
Laureηt a4ed374a4c fix: Entity.java 2021-04-22 14:20:17 +02:00
Laureηt 20315c3ee2 fix: java compatibility to version 8 2021-04-17 22:01:34 +02:00
Laureηt 315f3c9eba fix: minor changes 2021-04-17 17:57:54 +02:00
Pierre-Eliot Jourdan 9b92364f12 Upload New File 2021-04-16 13:16:08 +00:00
Laureηt 715e5971ae fix: turn system, kinda broken and ugly 2021-04-16 14:30:25 +02:00
Laureηt eff5fc1f99 feat: added a debugMode checkbox to settings 2021-04-16 13:57:02 +02:00
Laureηt 0355d98baf fix: slight improvments 2021-04-16 13:48:57 +02:00
Laureηt 91008f575b feat: improved the menus, turn system still broken by me 2021-04-16 13:43:59 +02:00
Laureηt bcfdc1e5d5 fix: changed "playing" for "active" 2021-04-13 21:57:53 +02:00
Laureηt f57d2da53d refacto: verifyLanding of Arrow 2021-04-13 21:55:14 +02:00
Laureηt 6b74d3ad7c fix: changed a couple of methods 2021-04-13 21:24:36 +02:00
Laureηt 696735af14 fix: reapplied changes 2021-04-13 21:08:25 +02:00
Laureηt 1cd41cc5e3 Merge branch 'master' of git.inpt.fr:tobgang/sagittarius 2021-04-13 20:50:32 +02:00
Laureηt 16d8631635 test conflict 2021-04-13 20:50:28 +02:00
Damien 2c5b66eb65 Ca marche ? 2021-04-13 19:45:49 +02:00
Laureηt 41a997b1d0 feat: MouseInfo now extends BaseActor 2021-04-13 19:29:47 +02:00
Laureηt fd222f1dc7 fix: some javadoc 2021-04-13 19:19:05 +02:00
Laureηt ec764c56fb fix: separated angle and rotation in Player 2021-04-13 19:12:18 +02:00
Laureηt b279519b55 feat: created BaseActor + factorized some code 2021-04-13 18:43:41 +02:00
Laureηt 613dc0a757 fix: rolled back to when Planet didn't contain Moons 2021-04-12 20:45:09 +02:00
Laureηt f9c1f258bc fix: arrow position 2021-04-10 12:22:48 +02:00
Laureηt bbf9a24092 fix: files re-structuring 2021-04-09 17:00:16 +02:00
Laureηt 59a3cfe85b fix: Trajectory prediction is BACK !:: 2021-04-09 16:58:32 +02:00
Laureηt 1d887cad5c fix: typo, I'm stupid 2021-04-09 16:56:29 +02:00
Laureηt 0301d8af71 fix: almost working, physics is still broken 2021-04-09 16:45:43 +02:00
Laureηt 6a95fe7d3a fix: Bow & Arrow partially working 2021-04-09 16:30:24 +02:00
Laureηt c70d2beace fix: moved G in SagittariusGame 2021-04-09 16:28:37 +02:00
Laureηt 26e3b5f9ad feat: changed Planet to Group
Moons now go in Planet's Group
2021-04-09 15:49:33 +02:00
Laureηt c56c5e92df fix: remove unused HUD.java 2021-04-09 15:10:58 +02:00
Laureηt afb5c05a60 feat: added a Moon to the level 2021-04-09 15:10:39 +02:00
Laureηt 41d8518890 fix: BaseGame not needed (for now?) 2021-04-09 15:09:47 +02:00
Laureηt 56bde9124c feat: modifed GameScreen according to last commits 2021-04-09 15:03:24 +02:00
Laureηt 51495f7509 chore: added one getter to BaseScreen 2021-04-09 14:56:36 +02:00
Laureηt ccbdd559e1 fix: Player debug drawing 2021-04-09 14:55:36 +02:00
Laureηt f921f922c0 feat: added cursor coordinates diplay 2021-04-09 14:55:03 +02:00
Laureηt efe5635e05 feat: added FPS counter 2021-04-09 14:53:55 +02:00
Laureηt eecefbe8a5 fix: moved BaseGame.java 2021-04-09 13:31:56 +02:00
Laureηt 80e2ffa8e3 fix: changed deltaTime to dt 2021-04-09 12:01:00 +02:00
Laureηt 9bc8b487ae refactor!: Created BaseScreen and BaseGame
the game runs now, still kinda broken
Entity was redundant of Actor
2021-04-09 11:57:52 +02:00
Laureηt 38e5ed9bc7 refactor: rewriting of Moon 2021-04-08 23:10:07 +02:00
Laureηt f39d6b48cb refactor: rewriting of Player, now extends Actor 2021-04-08 23:09:54 +02:00
Laureηt 0c843bdea1 refactor: rewriting of Planet, now extends Actor 2021-04-08 22:13:03 +02:00
Laureηt 5de61a169d feat: created StartScreen
really simple for now
2021-04-08 21:36:39 +02:00
Laureηt 3daea10663 refactor!: reorganized packages,
everything is broken for now
2021-04-08 21:34:17 +02:00
Laureηt 2941bcef47 fix: indentation Arrow.java 2021-04-08 19:38:33 +02:00
Laureηt 020c408250 chore: README + typo 2021-04-08 19:31:46 +02:00
Laureηt ea2575b89c chore: added some javadoc 2021-04-08 14:51:58 +02:00
Laureηt 6363a6f1c5 fix: better README 2021-04-08 14:17:57 +02:00
Laureηt b7f6b5bd69 chore: added some javadoc
chore: trimmed some whitespaces
2021-04-07 19:38:48 +02:00
Laureηt 60fd51a774 ftea: added Moons 2021-04-06 22:59:10 +02:00
Laureηt a2b1108ad5 fix: changed package name 2021-04-06 22:08:14 +02:00
Laureηt 64b487f80d feat: added Bow's aimAssist 2021-04-06 12:58:27 +02:00
Laureηt 9f58fa4a33 feat: Player can move around his Planet 2021-04-05 23:31:06 +02:00
Laureηt d92730db13 feat: Player's Bow can now shoot Arrows
(physics need adjusting)
2021-04-05 23:14:56 +02:00
Laureηt caa6c614eb feat: Player class bound to a planet 2021-04-05 20:42:51 +02:00
Laureηt f02f41e2e7 feat: seperated HUD batch from GameScreen batch 2021-04-05 19:01:25 +02:00
Laureηt 4b36703287 feat: basic drawing 2021-04-05 18:45:57 +02:00
Laureηt f221aa639d chore: git init 2021-04-05 17:29:06 +02:00