Commit Graph

92 Commits

Author SHA1 Message Date
Aaron Franke
99e4f80969 Merge pull request #77 from aaronfranke/bullet-aim
Prevent aiming at other bullets by setting their collision layer to zero
3.2-99e4f80
2020-06-29 21:52:19 -04:00
Aaron Franke
0d8fd4f578 Prevent aiming at other bullets by setting their collision layer to zero 2020-06-29 19:10:25 -04:00
Aaron Franke
28a1de400d Merge pull request #8 from StraToN/camera-shake
Add camera shake effect on shoot
2020-06-29 03:34:22 -04:00
Julian Murgia
a09a19826c Add shake effect on shooting.
based on youtube.com/watch?v=tu-Qe66AvtY (Squirrel Eiserloh, Math for Game Programmers: Juicing Your Cameras With Math, GDC 2016)
Thanks to asheraryam
2020-06-29 08:09:19 +02:00
Aaron Franke
de9f405224 Merge pull request #72 from aaronfranke/formatting
Add a formatting script for GitHub Actions
2020-06-23 01:33:32 -04:00
Aaron Franke
5697b0976d Commit files changed by the formatting script 2020-06-23 01:28:32 -04:00
Aaron Franke
b13770b709 Add a formatting script for GitHub Actions 2020-06-23 01:28:32 -04:00
Aaron Franke
73b4218b69 Merge pull request #75 from aaronfranke/free-orphans
Free orphan nodes after removing them
2020-06-21 19:45:11 -04:00
Aaron Franke
cf45430744 Free orphan nodes after removing them 2020-06-21 03:49:29 -04:00
Aaron Franke
513636b1aa Merge pull request #71 from aaronfranke/minor-problems
Fix some minor problems
2020-06-15 17:32:15 -04:00
Aaron Franke
733e195dab Fix some minor problems 2020-06-15 17:16:43 -04:00
Aaron Franke
bbd039ac76 Merge pull request #67 from aaronfranke/debug
Implement some in-game debug text
2020-06-14 21:15:30 -04:00
Aaron Franke
be5e19b0ad Implement some in-game debug text 2020-06-14 21:09:13 -04:00
Aaron Franke
184c28d281 Merge pull request #66 from aaronfranke/node-names
Standardize node names and cache node references
2020-06-14 20:51:31 -04:00
Aaron Franke
2372e52042 Standardize node names and cache node references 2020-06-14 19:21:49 -04:00
Aaron Franke
0b5291c5cf Merge pull request #65 from aaronfranke/textures
Standardize the names of all textures and remove unused textures
2020-06-14 15:27:29 -04:00
Aaron Franke
cf3d605b92 Standardize the names of all textures and remove unused textures 2020-06-14 13:22:35 -04:00
Aaron Franke
f7f0f1f463 Merge pull request #64 from aaronfranke/reflectionprobes
Re-add reflection probes
2020-06-14 11:43:31 -04:00
Aaron Franke
db4b1ac251 Merge pull request #63 from aaronfranke/readme
Remove Git LFS requirement from README
2020-06-14 11:41:40 -04:00
Aaron Franke
85199a7521 Re-add reflection probes 2020-06-14 02:04:17 -04:00
Aaron Franke
f3978f473f Remove Git LFS requirement from README
Also move the screenshot to a subfolder
2020-06-14 01:39:25 -04:00
Aaron Franke
500970d50a Merge pull request #62 from aaronfranke/reorganize
Reorganize misc parts of the project
2020-06-13 23:01:03 -04:00
Aaron Franke
f9579d6fdc Reorganize misc parts of the project 2020-06-13 21:46:11 -04:00
Aaron Franke
e101983bb0 Merge pull request #61 from aaronfranke/door
Organize Door files
2020-06-13 21:45:40 -04:00
Aaron Franke
ba02498779 Organize Door files 2020-06-13 21:44:56 -04:00
Aaron Franke
f9b65cf645 Merge pull request #60 from aaronfranke/robot
Organize Red Robot files
2020-06-13 21:44:31 -04:00
Aaron Franke
b6f027b19c Organize Red Robot files 2020-06-13 20:06:13 -04:00
Aaron Franke
a3962056c1 Merge pull request #59 from aaronfranke/player
Organize player files
2020-06-13 20:06:01 -04:00
Aaron Franke
4baf8cac20 Organize Player files 2020-06-13 18:28:51 -04:00
Aaron Franke
5b9a1fad70 Merge pull request #58 from aaronfranke/forklift
Change Flying Forklift to GLTF
2020-06-12 11:23:59 -04:00
Aaron Franke
96a77f95b8 Change Flying Forklift to GLTF 2020-06-12 11:22:32 -04:00
Aaron Franke
d6ee2e88e7 Merge pull request #55 from aaronfranke/remake
Remake the level using GLTF and compound colliders
2020-06-12 00:27:35 -04:00
Aaron Franke
c55d058a26 Remove unused "baked" files 2020-06-11 23:50:02 -04:00
Aaron Franke
5bd97e7712 Remake the level using GLTF and compound colliders
Requires Godot 3.2.2 or newer
2020-06-11 23:50:02 -04:00
Aaron Franke
337acb342b Merge pull request #57 from aaronfranke/readme-3.2.1
Update README file for the 3.2.1 branch
2020-06-11 21:59:35 -04:00
Aaron Franke
ceab8bdde6 Update README file for the 3.2.1 branch 2020-06-11 21:09:55 -04:00
Aaron Franke
ec6c7161fe Merge pull request #54 from aaronfranke/env
Update default_env.tres to the Godot 3.1/3.2 default environment
2020-05-22 01:34:25 -04:00
Aaron Franke
caac12635f Update default_env.tres to the Godot 3.1/3.2 default environment 2020-05-22 00:48:18 -04:00
Aaron Franke
47ab74cef4 Merge pull request #52 from aaronfranke/player
Player movement, camera, and respawn code
2020-02-25 00:28:38 -05:00
Aaron Franke
7ea3d4de9c Respawn when the player falls off the map 2020-02-24 04:10:07 -05:00
Aaron Franke
429ddd108b Switch to Bullet and use a SpringArm node for the camera 2020-02-24 01:32:29 -05:00
Aaron Franke
f78779fa21 Adjust player movement code 2020-02-24 01:31:35 -05:00
Aaron Franke
3a87f56402 Merge pull request #51 from aaronfranke/update-3.2
Finish updating to Godot 3.2 and fix many errors
2020-02-19 15:08:22 -05:00
Aaron Franke
b1048c5a7b Finish updating to Godot 3.2 and fix many errors
Fix the fog and fix the models referencing non-existent textures.
2020-02-19 04:15:45 -05:00
Aaron Franke
31b5feb488 Merge pull request #50 from aaronfranke/controller
Tweak controller support
2020-02-19 01:57:02 -05:00
Aaron Franke
2235ce182f Tweak controller support 2020-02-17 04:49:02 -05:00
Aaron Franke
90d3c025d7 Merge pull request #16 from sinuhemb/gnextia-patch-1
Added git pull
2020-02-17 04:27:07 -05:00
Aaron Franke
9a9e4aca87 Merge pull request #49 from groud/allow_going_back_to_menu
Allow going back and forth to the main menu, and toggle fullscreen with Alt+tab
2020-02-17 04:20:49 -05:00
Gilles Roudière
275d2d0c74 Allow going back and forth to the main menu, and toggle fullscreen 2020-02-15 15:14:59 +01:00
Aaron Franke
1cea8dc5b3 Merge pull request #48 from groud/add_loading_bar
Adds a loading bar
2020-02-13 13:48:10 -05:00